From 15cd434674051e5d29215b47862686c773625fd4 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期五, 28 四月 2023 23:20:02 +0800
Subject: [PATCH] 代码提交
---
app/src/main/res/drawable-xxhdpi/ic_dialog_close.png | 0
app/src/main/java/com/application/zhangshi_app_android/ui/function/AnnualHealthStatusActivityViewModel.java | 62
app/src/main/res/layout/fragment_function.xml | 13
app/src/main/java/com/application/zhangshi_app_android/ui/function/AnnualHealthStatusDetailActivityViewModel.java | 42
app/src/main/java/com/application/zhangshi_app_android/ui/function/CertificateOfHonorActivity.java | 2
app/src/main/res/layout/item_growth_experience_holder_condition.xml | 19
app/src/main/java/com/application/zhangshi_app_android/ui/function/AnnualHealthStatusDetailActivity.java | 102
app/src/main/java/com/application/zhangshi_app_android/bean/ContactsBean.java | 19
app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceAbroadConditionBean.java | 22
app/src/main/res/drawable/shape_fffad1e0_stroke_0_10_10_10.xml | 9
app/src/main/res/layout/activity_annual_health_status.xml | 144
app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceDetailActivity.java | 9
app/src/main/java/com/application/zhangshi_app_android/ui/function/PetMemoDetailActivityViewModel.java | 42
app/src/main/res/layout/activity_health_care.xml | 3758 ++++++++++++++++++
app/src/main/res/layout/item_daily_consume_record.xml | 96
app/src/main/java/com/application/zhangshi_app_android/adapter/DailyConsumeRecordRvAdapter.java | 97
app/src/main/res/layout/activity_property.xml | 2
app/src/main/res/layout/activity_hundred_wish.xml | 2
app/src/main/res/layout/item_privacy.xml | 304 +
app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismDetailActivity.java | 93
app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceAutobiographyBean.java | 63
app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperiencePrimaryRvAdapter.java | 55
app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java | 53
app/src/main/res/drawable-xxhdpi/ic_radio_button_unselected.png | 0
app/src/main/res/drawable/mail_list_pic.png | 0
app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceAbroadConditionRvAdapter.java | 55
app/src/main/res/drawable/selector_tab_background_pink.xml | 12
app/src/main/res/drawable/shape_ffe0eefe_10_10_0_0.xml | 9
app/src/main/res/drawable-xhdpi/ic_tourism_add.png | 0
app/src/main/res/layout/activity_pet_memo.xml | 145
app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismActivity.java | 57
app/src/main/res/layout/item_growth_experience_abroad_condition.xml | 16
app/src/main/java/com/application/zhangshi_app_android/ui/function/ContactsActivityViewModel.java | 91
app/src/main/res/layout/item_tourism.xml | 363 +
app/src/main/res/layout/item_pet_image.xml | 29
app/src/main/res/layout/activity_family_memorabilia_create.xml | 2
app/src/main/res/values/styles.xml | 5
app/src/main/java/com/application/zhangshi_app_android/ui/function/PetMemoActivity.java | 64
app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismDetailActivityViewModel.java | 42
app/src/main/res/drawable-xhdpi/ic_radio_button_unselected.png | 0
app/src/main/res/values/colors.xml | 1
app/src/main/res/drawable-xxhdpi/ic_tourism_add.png | 0
app/src/main/java/com/application/zhangshi_app_android/ui/dialog/BigImageDialog.java | 58
app/src/main/java/com/application/zhangshi_app_android/ui/function/MarriageActivity.java | 12
app/src/main/res/drawable-xhdpi/ic_back.png | 0
app/src/main/res/layout/dialog_pet_owner_info.xml | 239 +
app/src/main/java/com/application/zhangshi_app_android/adapter/PetImageRvAdapter.java | 46
app/src/main/res/layout/item_contacts.xml | 118
app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceInformationBean.java | 70
app/src/main/res/layout/item_family_memorabilia.xml | 1
app/src/main/java/com/application/zhangshi_app_android/ui/home/HomeFragment.java | 34
app/src/main/res/layout/item_growth_experience_relationship.xml | 18
app/src/main/java/com/application/zhangshi_app_android/adapter/HonorCollectionRvAdapter.java | 7
app/src/main/java/com/application/zhangshi_app_android/ui/function/HomeDevicesActivity.java | 2
app/src/main/res/layout/activity_tourism.xml | 144
app/src/main/java/com/application/zhangshi_app_android/bean/ConsumeRecordBean.java | 81
.idea/deploymentTargetDropDown.xml | 2
app/src/main/java/com/application/zhangshi_app_android/bean/AnnualHealthStatusBean.java | 91
app/src/main/java/com/application/zhangshi_app_android/ui/function/PrivacyDetailActivity.java | 102
app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivity.java | 2
app/src/main/res/drawable-xxhdpi/ic_radio_button_selected.png | 0
app/src/main/res/layout/item_annual_health_status.xml | 236 +
app/src/main/java/com/application/zhangshi_app_android/ui/function/PetMemoActivityViewModel.java | 56
app/src/main/res/layout/pop_operate_pet.xml | 62
app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceHolderConditionBean.java | 25
app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java | 52
app/src/main/res/layout/pop_annual_health_status.xml | 29
app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceResponseBean.java | 14
zhangshiapp.keystore.jks | 0
app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceRequestBean.java | 20
app/src/main/res/drawable/shape_fffad1e0_10_10_0_10.xml | 6
app/src/main/res/drawable-xhdpi/ic_dialog_close.png | 0
app/src/main/java/com/application/zhangshi_app_android/bean/TourismBean.java | 122
app/src/main/java/com/application/zhangshi_app_android/ui/function/HealthCareActivity.java | 154
app/src/main/res/layout/activity_tourism_detail.xml | 321 +
app/src/main/java/com/application/zhangshi_app_android/ui/function/PetMemoDetailActivity.java | 108
app/src/main/res/layout/activity_marriage.xml | 107
app/src/main/java/com/application/zhangshi_app_android/adapter/ContactsRvAdapter.java | 46
app/src/main/java/com/application/zhangshi_app_android/adapter/TourismRvAdapter.java | 35
app/src/main/res/layout/activity_growth_experience.xml | 174
app/src/main/res/layout/activity_privacy_detail.xml | 242 +
app/src/main/res/layout/dialog_big_image.xml | 40
app/src/main/java/com/application/zhangshi_app_android/adapter/PrivacyRvAdapter.java | 40
app/src/main/res/drawable-xxhdpi/ic_back.png | 0
app/build.gradle | 1
app/src/main/res/layout/activity_annual_health_status_detail.xml | 191
app/src/main/res/drawable/selector_radio_button.xml | 12
app/src/main/res/layout/item_pet_memo.xml | 153
app/src/main/java/com/application/zhangshi_app_android/ui/dialog/PetOwnerInfoDialog.java | 46
app/src/main/res/drawable/shape_fffad1e0_10_10_0_0.xml | 9
app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyAssetsActivity.java | 2
app/src/main/res/layout/layout_drawer.xml | 3
app/src/main/java/com/application/zhangshi_app_android/data/DataRepository.java | 64
app/src/main/java/com/application/zhangshi_app_android/ui/function/AnnualHealthStatusActivity.java | 58
app/src/main/res/layout/activity_pet_memo_detail.xml | 141
app/src/main/java/com/application/zhangshi_app_android/adapter/AnnualHealthStatusRvAdapter.java | 39
app/src/main/res/layout/activity_pet.xml | 331 +
app/src/main/java/com/application/zhangshi_app_android/ui/function/PrivacyDetailActivityViewModel.java | 42
app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismActivityViewModel.java | 56
app/src/main/java/com/application/zhangshi_app_android/data/source/http/HttpDataSourceImpl.java | 61
app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceRelationshipRvAdapter.java | 56
app/src/main/res/layout/item_hundred_wish.xml | 6
app/src/main/res/layout/item_growth_experience_primary.xml | 12
app/src/main/java/com/application/zhangshi_app_android/ui/function/GrowthExperienceActivityViewModel.java | 344 +
app/src/main/java/com/application/zhangshi_app_android/ui/function/PrivacyActivityViewModel.java | 64
app/src/main/java/com/application/zhangshi_app_android/bean/PrivacyBean.java | 121
app/src/main/res/drawable/selector_tab_background_blue.xml | 12
app/src/main/res/layout/activity_privacy.xml | 144
app/src/main/java/com/application/zhangshi_app_android/adapter/PetMemoRvAdapter.java | 38
app/src/main/java/com/application/zhangshi_app_android/data/source/HttpDataSource.java | 42
app/src/main/res/layout/activity_contacts.xml | 119
app/src/main/java/com/application/zhangshi_app_android/bean/PetMemoBean.java | 59
app/src/main/java/com/application/zhangshi_app_android/ui/function/PetActivity.java | 63
app/src/main/java/com/application/zhangshi_app_android/ui/function/ContactsActivity.java | 91
app/src/main/res/drawable-xhdpi/ic_radio_button_selected.png | 0
app/src/main/res/layout/activity_certificate_of_honor.xml | 2
app/src/main/java/com/application/zhangshi_app_android/ui/function/GrowthExperienceActivity.java | 215 +
app/src/main/res/drawable/shape_fffad1e0_10_10_0_0_weak.xml | 11
app/src/main/java/com/application/zhangshi_app_android/ui/function/HealthCareActivityViewModel.java | 68
app/src/main/AndroidManifest.xml | 24
app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceHolderConditionRvAdapter.java | 53
app/src/main/java/com/application/zhangshi_app_android/ui/function/PrivacyActivity.java | 56
app/src/main/res/drawable/shape_ffe0eefe_10_10_0_0_weak.xml | 9
/dev/null | 175
app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java | 6
app/src/main/res/layout/activity_income_and_expenses.xml | 2
app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceBean.java | 89
app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceRelationshipBean.java | 23
app/src/main/java/com/application/zhangshi_app_android/bean/DailyConsumeRecordBean.java | 42
129 files changed, 11,309 insertions(+), 661 deletions(-)
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 004cd78..aec7213 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -12,6 +12,6 @@
</deviceKey>
</Target>
</targetSelectedWithDropDown>
- <timeTargetWasSelectedWithDropDown value="2023-04-18T13:54:47.432784600Z" />
+ <timeTargetWasSelectedWithDropDown value="2023-04-24T13:39:33.778993800Z" />
</component>
</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index c75ca12..f8cf1da 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,6 +57,7 @@
implementation 'androidx.annotation:annotation:1.3.0'
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
+ implementation 'com.google.android.material:material:1.8.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4206b9e..5795b46 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -144,6 +144,30 @@
<activity
android:name=".ui.function.MarriageActivity"
android:exported="false" />
+ <activity
+ android:name=".ui.function.PetActivity"
+ android:exported="false" />
+ <activity
+ android:name=".ui.function.PetMemoActivity"
+ android:exported="false" />
+ <activity
+ android:name=".ui.function.PetMemoDetailActivity"
+ android:exported="false" />
+ <activity
+ android:name=".ui.function.HealthCareActivity"
+ android:exported="false" />
+ <activity
+ android:name=".ui.function.AnnualHealthStatusActivity"
+ android:exported="false" />
+ <activity
+ android:name=".ui.function.AnnualHealthStatusDetailActivity"
+ android:exported="false" />
+ <activity
+ android:name=".ui.function.PrivacyActivity"
+ android:exported="false" />
+ <activity
+ android:name=".ui.function.PrivacyDetailActivity"
+ android:exported="false" />
</application>
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/AnnualHealthStatusRvAdapter.java
similarity index 74%
copy from app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java
copy to app/src/main/java/com/application/zhangshi_app_android/adapter/AnnualHealthStatusRvAdapter.java
index 6e3351f..9c2a138 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/AnnualHealthStatusRvAdapter.java
@@ -12,10 +12,9 @@
import com.android.app_base.base.adapter.BaseRVAdapter;
import com.android.app_base.manager.AppManager;
import com.application.zhangshi_app_android.R;
-import com.application.zhangshi_app_android.bean.CleanStorageBean;
-import com.application.zhangshi_app_android.bean.PetBean;
-import com.application.zhangshi_app_android.databinding.ItemCleanStorageBinding;
-import com.application.zhangshi_app_android.databinding.ItemPetBinding;
+import com.application.zhangshi_app_android.bean.AnnualHealthStatusBean;
+import com.application.zhangshi_app_android.databinding.ItemAnnualHealthStatusBinding;
+import com.application.zhangshi_app_android.ui.function.AnnualHealthStatusDetailActivity;
import com.application.zhangshi_app_android.ui.function.CleanStorageDetailActivity;
import java.util.ArrayList;
@@ -24,21 +23,21 @@
/**
* @author Ljj
- * @date 2023.04.17. 18:40
+ * @date 2023.04.28. 19:20
* @desc
*/
-public class PetRvAdapter extends BaseRVAdapter<PetBean, ItemPetBinding, PetRvAdapter.ViewHolder> {
- public PetRvAdapter(Context context) {
+public class AnnualHealthStatusRvAdapter extends BaseRVAdapter<AnnualHealthStatusBean, ItemAnnualHealthStatusBinding, AnnualHealthStatusRvAdapter.ViewHolder> {
+ public AnnualHealthStatusRvAdapter(Context context) {
super(context);
}
@Override
protected int getLayoutId() {
- return R.layout.item_pet;
+ return R.layout.item_annual_health_status;
}
@Override
- protected ViewHolder getViewHolder(ItemPetBinding itemBind, int viewType) {
+ protected ViewHolder getViewHolder(ItemAnnualHealthStatusBinding itemBind, int viewType) {
return new ViewHolder(itemBind);
}
@@ -102,16 +101,32 @@
});
holder.getBinding().layoutContent.setOnClickListener(v -> {
AppManager.getAppManager().startActivity(
- new Intent(getRecyclerView().getContext(), CleanStorageDetailActivity.class)
+ new Intent(getRecyclerView().getContext(), AnnualHealthStatusDetailActivity.class)
.putExtra("bean",mDataList.get(position)));
});
+ ImageRvAdapter adapter = new ImageRvAdapter(mContext);
+ holder.getBinding().rvImage.setLayoutManager(new GridLayoutManager(mContext,3));
+ holder.getBinding().rvImage.setAdapter(adapter);
+ String url = mDataList.get(position).getUrl();
+ if (url == null||url.isEmpty()){
+ return;
+ }
+ List<String> list;
+ if (url.contains(",")){
+ String[] split = url.split(",");
+ list = new ArrayList<>(Arrays.asList(split));
+ }else {
+ list = new ArrayList<>();
+ list.add(url);
+ }
+ adapter.setData(list);
}
- public static class ViewHolder extends BaseRVAdapter.BaseViewHolder<ItemPetBinding> {
+ public static class ViewHolder extends BaseRVAdapter.BaseViewHolder<ItemAnnualHealthStatusBinding> {
private boolean isExpended;
- public ViewHolder(ItemPetBinding binding) {
+ public ViewHolder(ItemAnnualHealthStatusBinding binding) {
super(binding);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/ContactsRvAdapter.java
similarity index 73%
copy from app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java
copy to app/src/main/java/com/application/zhangshi_app_android/adapter/ContactsRvAdapter.java
index 6e3351f..bee11c6 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/ContactsRvAdapter.java
@@ -1,44 +1,38 @@
package com.application.zhangshi_app_android.adapter;
import android.content.Context;
-import android.content.Intent;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.Transformation;
import android.widget.FrameLayout;
-import androidx.recyclerview.widget.GridLayoutManager;
-
import com.android.app_base.base.adapter.BaseRVAdapter;
-import com.android.app_base.manager.AppManager;
import com.application.zhangshi_app_android.R;
-import com.application.zhangshi_app_android.bean.CleanStorageBean;
-import com.application.zhangshi_app_android.bean.PetBean;
-import com.application.zhangshi_app_android.databinding.ItemCleanStorageBinding;
-import com.application.zhangshi_app_android.databinding.ItemPetBinding;
-import com.application.zhangshi_app_android.ui.function.CleanStorageDetailActivity;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import com.application.zhangshi_app_android.bean.ContactsBean;
+import com.application.zhangshi_app_android.databinding.ItemContactsBinding;
+import com.application.zhangshi_app_android.ui.function.ContactsActivityViewModel;
/**
- * @author Ljj
- * @date 2023.04.17. 18:40
- * @desc
+ * @author Gss
+ * @date 2023.04.18. 19:52
+ * @desc 閫氳褰� recyclerView 鐨� adapter
*/
-public class PetRvAdapter extends BaseRVAdapter<PetBean, ItemPetBinding, PetRvAdapter.ViewHolder> {
- public PetRvAdapter(Context context) {
+public class ContactsRvAdapter extends BaseRVAdapter<ContactsBean, ItemContactsBinding, ContactsRvAdapter.ViewHolder> {
+
+ private ContactsActivityViewModel viewModel;
+
+ public ContactsRvAdapter(Context context) {
super(context);
}
+
@Override
protected int getLayoutId() {
- return R.layout.item_pet;
+ return R.layout.item_contacts;
}
@Override
- protected ViewHolder getViewHolder(ItemPetBinding itemBind, int viewType) {
+ protected ViewHolder getViewHolder(ItemContactsBinding itemBind,int viewType) {
return new ViewHolder(itemBind);
}
@@ -100,19 +94,17 @@
}
}
});
- holder.getBinding().layoutContent.setOnClickListener(v -> {
- AppManager.getAppManager().startActivity(
- new Intent(getRecyclerView().getContext(), CleanStorageDetailActivity.class)
- .putExtra("bean",mDataList.get(position)));
- });
}
- public static class ViewHolder extends BaseRVAdapter.BaseViewHolder<ItemPetBinding> {
+
+ public static class ViewHolder extends BaseViewHolder<ItemContactsBinding>{
private boolean isExpended;
- public ViewHolder(ItemPetBinding binding) {
+ public ViewHolder(ItemContactsBinding binding) {
super(binding);
}
}
+
}
+
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/DailyConsumeRecordRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/DailyConsumeRecordRvAdapter.java
new file mode 100644
index 0000000..ddba88a
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/DailyConsumeRecordRvAdapter.java
@@ -0,0 +1,97 @@
+package com.application.zhangshi_app_android.adapter;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ValueAnimator;
+import android.content.Context;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.Transformation;
+
+import androidx.annotation.NonNull;
+import androidx.databinding.ViewDataBinding;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.app_base.base.adapter.BaseRVAdapter;
+import com.application.zhangshi_app_android.R;
+import com.application.zhangshi_app_android.bean.DailyConsumeRecordBean;
+import com.application.zhangshi_app_android.databinding.ItemDailyConsumeRecordBinding;
+import com.application.zhangshi_app_android.databinding.ItemPropertyBinding;
+
+/**
+ * @author Ljj
+ * @date 2023.04.28. 22:28
+ * @desc 姣忔棩娑堣垂璁板綍閫傞厤鍣�
+ */
+public class DailyConsumeRecordRvAdapter extends BaseRVAdapter<DailyConsumeRecordBean, ItemDailyConsumeRecordBinding, DailyConsumeRecordRvAdapter.ViewHolder> {
+ public DailyConsumeRecordRvAdapter(Context context) {
+ super(context);
+ }
+
+ @Override
+ protected int getLayoutId() {
+ return R.layout.item_daily_consume_record;
+ }
+
+ @Override
+ protected void onBind(ViewHolder holder, int position) {
+
+ }
+
+ @Override
+ protected ViewHolder getViewHolder(ItemDailyConsumeRecordBinding itemBind, int viewType) {
+ return new ViewHolder(itemBind);
+ }
+
+
+ public static class ViewHolder extends BaseRVAdapter.BaseViewHolder<ItemDailyConsumeRecordBinding> {
+ private boolean isExpended;
+
+ public ViewHolder(ItemDailyConsumeRecordBinding binding) {
+ super(binding);
+ }
+ }
+
+ public void collapseView(View initialView, View collapsedView){
+ int initialHeight = initialView.getMeasuredHeight();
+ int collapsedHeight = collapsedView.getMeasuredHeight();
+ int distanceToCollapse = (int) (initialHeight - collapsedHeight);
+
+ Animation a = new Animation() {
+ @Override
+ protected void applyTransformation(float interpolatedTime, Transformation t) {
+ if (interpolatedTime == 1){
+ }
+ initialView.getLayoutParams().height = (int) (initialHeight - (distanceToCollapse * interpolatedTime));
+ initialView.requestLayout();
+ }
+
+ @Override
+ public boolean willChangeBounds() {
+ return true;
+ }
+ };
+ a.setDuration(500);
+ initialView.startAnimation(a);
+ }
+ public void expendView(View initialView){
+ int initialHeight = initialView.getMeasuredHeight();
+ initialView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
+ int targetHeight = initialView.getMeasuredHeight();
+ ValueAnimator animator = ValueAnimator.ofInt(initialHeight,targetHeight);
+ animator.addUpdateListener(animation -> {
+ initialView.getLayoutParams().height = (int) animation.getAnimatedValue();
+ initialView.requestLayout();
+ });
+ animator.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ initialView.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
+ initialView.setLayoutParams(initialView.getLayoutParams());
+ }
+ });
+ animator.setDuration(500);
+ animator.start();
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceAbroadConditionRvAdapter.java
similarity index 69%
copy from app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java
copy to app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceAbroadConditionRvAdapter.java
index 6e3351f..53476c0 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceAbroadConditionRvAdapter.java
@@ -2,43 +2,51 @@
import android.content.Context;
import android.content.Intent;
+import android.view.LayoutInflater;
import android.view.View;
+import android.view.ViewGroup;
import android.view.animation.Animation;
import android.view.animation.Transformation;
import android.widget.FrameLayout;
-
-import androidx.recyclerview.widget.GridLayoutManager;
-
+import androidx.annotation.NonNull;
+import androidx.databinding.DataBindingUtil;
import com.android.app_base.base.adapter.BaseRVAdapter;
import com.android.app_base.manager.AppManager;
import com.application.zhangshi_app_android.R;
-import com.application.zhangshi_app_android.bean.CleanStorageBean;
-import com.application.zhangshi_app_android.bean.PetBean;
-import com.application.zhangshi_app_android.databinding.ItemCleanStorageBinding;
-import com.application.zhangshi_app_android.databinding.ItemPetBinding;
-import com.application.zhangshi_app_android.ui.function.CleanStorageDetailActivity;
-
+import com.application.zhangshi_app_android.bean.GrowthExperienceAbroadConditionBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceBean;
+import com.application.zhangshi_app_android.databinding.ItemGrowthExperienceAbroadConditionBinding;
+import com.application.zhangshi_app_android.ui.function.GrowthExperienceActivity;
+import com.application.zhangshi_app_android.ui.function.GrowthExperienceActivityViewModel;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
- * @author Ljj
- * @date 2023.04.17. 18:40
- * @desc
+ * @author Gss
+ * @date 2023.04.07. 21:31
+ * @desc 鎴愰暱缁忓巻(鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�) recyclerView 鐨� adapter
*/
-public class PetRvAdapter extends BaseRVAdapter<PetBean, ItemPetBinding, PetRvAdapter.ViewHolder> {
- public PetRvAdapter(Context context) {
+public class GrowthExperienceAbroadConditionRvAdapter extends BaseRVAdapter<GrowthExperienceAbroadConditionBean, ItemGrowthExperienceAbroadConditionBinding, GrowthExperienceAbroadConditionRvAdapter.ViewHolder> {
+
+ private GrowthExperienceActivityViewModel viewModel;
+
+ public GrowthExperienceAbroadConditionRvAdapter(Context context) {
super(context);
+ }
+
+ public GrowthExperienceAbroadConditionRvAdapter(Context context, GrowthExperienceActivityViewModel viewModel) {
+ super(context);
+ this.viewModel = viewModel;
}
@Override
protected int getLayoutId() {
- return R.layout.item_pet;
+ return R.layout.item_growth_experience_abroad_condition;
}
@Override
- protected ViewHolder getViewHolder(ItemPetBinding itemBind, int viewType) {
+ protected ViewHolder getViewHolder(ItemGrowthExperienceAbroadConditionBinding itemBind,int viewType) {
return new ViewHolder(itemBind);
}
@@ -46,7 +54,7 @@
protected void onBind(ViewHolder holder, int position) {
holder.getBinding().setBean(mDataList.get(position));
if (position % 2 != 0){
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
+ holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_green));
}else {
holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink));
}
@@ -100,19 +108,18 @@
}
}
});
- holder.getBinding().layoutContent.setOnClickListener(v -> {
- AppManager.getAppManager().startActivity(
- new Intent(getRecyclerView().getContext(), CleanStorageDetailActivity.class)
- .putExtra("bean",mDataList.get(position)));
- });
}
- public static class ViewHolder extends BaseRVAdapter.BaseViewHolder<ItemPetBinding> {
+ public static class ViewHolder extends BaseViewHolder<ItemGrowthExperienceAbroadConditionBinding>{
private boolean isExpended;
- public ViewHolder(ItemPetBinding binding) {
+ public ViewHolder(ItemGrowthExperienceAbroadConditionBinding binding) {
super(binding);
}
}
+
+
}
+
+
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceHolderConditionRvAdapter.java
similarity index 70%
copy from app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java
copy to app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceHolderConditionRvAdapter.java
index 6e3351f..1c79a1a 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceHolderConditionRvAdapter.java
@@ -2,43 +2,51 @@
import android.content.Context;
import android.content.Intent;
+import android.view.LayoutInflater;
import android.view.View;
+import android.view.ViewGroup;
import android.view.animation.Animation;
import android.view.animation.Transformation;
import android.widget.FrameLayout;
-
-import androidx.recyclerview.widget.GridLayoutManager;
-
+import androidx.annotation.NonNull;
+import androidx.databinding.DataBindingUtil;
import com.android.app_base.base.adapter.BaseRVAdapter;
import com.android.app_base.manager.AppManager;
import com.application.zhangshi_app_android.R;
-import com.application.zhangshi_app_android.bean.CleanStorageBean;
-import com.application.zhangshi_app_android.bean.PetBean;
-import com.application.zhangshi_app_android.databinding.ItemCleanStorageBinding;
-import com.application.zhangshi_app_android.databinding.ItemPetBinding;
-import com.application.zhangshi_app_android.ui.function.CleanStorageDetailActivity;
-
+import com.application.zhangshi_app_android.bean.GrowthExperienceBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceHolderConditionBean;
+import com.application.zhangshi_app_android.databinding.ItemGrowthExperienceHolderConditionBinding;
+import com.application.zhangshi_app_android.ui.function.GrowthExperienceActivity;
+import com.application.zhangshi_app_android.ui.function.GrowthExperienceActivityViewModel;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
- * @author Ljj
- * @date 2023.04.17. 18:40
- * @desc
+ * @author Gss
+ * @date 2023.04.07. 21:31
+ * @desc 鎴愰暱缁忓巻(鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�) recyclerView 鐨� adapter
*/
-public class PetRvAdapter extends BaseRVAdapter<PetBean, ItemPetBinding, PetRvAdapter.ViewHolder> {
- public PetRvAdapter(Context context) {
+public class GrowthExperienceHolderConditionRvAdapter extends BaseRVAdapter<GrowthExperienceHolderConditionBean, ItemGrowthExperienceHolderConditionBinding, GrowthExperienceHolderConditionRvAdapter.ViewHolder> {
+
+ private GrowthExperienceActivityViewModel viewModel;
+
+ public GrowthExperienceHolderConditionRvAdapter(Context context) {
super(context);
+ }
+
+ public GrowthExperienceHolderConditionRvAdapter(Context context, GrowthExperienceActivityViewModel viewModel) {
+ super(context);
+ this.viewModel = viewModel;
}
@Override
protected int getLayoutId() {
- return R.layout.item_pet;
+ return R.layout.item_growth_experience_holder_condition;
}
@Override
- protected ViewHolder getViewHolder(ItemPetBinding itemBind, int viewType) {
+ protected ViewHolder getViewHolder(ItemGrowthExperienceHolderConditionBinding itemBind,int viewType) {
return new ViewHolder(itemBind);
}
@@ -100,19 +108,18 @@
}
}
});
- holder.getBinding().layoutContent.setOnClickListener(v -> {
- AppManager.getAppManager().startActivity(
- new Intent(getRecyclerView().getContext(), CleanStorageDetailActivity.class)
- .putExtra("bean",mDataList.get(position)));
- });
}
- public static class ViewHolder extends BaseRVAdapter.BaseViewHolder<ItemPetBinding> {
+ public static class ViewHolder extends BaseViewHolder<ItemGrowthExperienceHolderConditionBinding>{
private boolean isExpended;
- public ViewHolder(ItemPetBinding binding) {
+ public ViewHolder(ItemGrowthExperienceHolderConditionBinding binding) {
super(binding);
}
}
+
+
}
+
+
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperiencePrimaryRvAdapter.java
similarity index 69%
copy from app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java
copy to app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperiencePrimaryRvAdapter.java
index 6e3351f..7bc8ef3 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperiencePrimaryRvAdapter.java
@@ -2,49 +2,60 @@
import android.content.Context;
import android.content.Intent;
+import android.view.LayoutInflater;
import android.view.View;
+import android.view.ViewGroup;
import android.view.animation.Animation;
import android.view.animation.Transformation;
import android.widget.FrameLayout;
-import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.annotation.NonNull;
+import androidx.databinding.DataBindingUtil;
import com.android.app_base.base.adapter.BaseRVAdapter;
import com.android.app_base.manager.AppManager;
import com.application.zhangshi_app_android.R;
-import com.application.zhangshi_app_android.bean.CleanStorageBean;
-import com.application.zhangshi_app_android.bean.PetBean;
-import com.application.zhangshi_app_android.databinding.ItemCleanStorageBinding;
-import com.application.zhangshi_app_android.databinding.ItemPetBinding;
-import com.application.zhangshi_app_android.ui.function.CleanStorageDetailActivity;
-
+import com.application.zhangshi_app_android.bean.GrowthExperienceBean;
+import com.application.zhangshi_app_android.databinding.ItemGrowthExperiencePrimaryBinding;
+import com.application.zhangshi_app_android.ui.function.GrowthExperienceActivity;
+import com.application.zhangshi_app_android.ui.function.GrowthExperienceActivityViewModel;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
- * @author Ljj
- * @date 2023.04.17. 18:40
- * @desc
+ * @author Gss
+ * @date 2023.04.07. 21:31
+ * @desc 鎴愰暱缁忓巻(涓昏瀛︿範鍙婂伐浣滅粡鍘�) recyclerView 鐨� adapter
*/
-public class PetRvAdapter extends BaseRVAdapter<PetBean, ItemPetBinding, PetRvAdapter.ViewHolder> {
- public PetRvAdapter(Context context) {
+public class GrowthExperiencePrimaryRvAdapter extends BaseRVAdapter<GrowthExperienceBean, ItemGrowthExperiencePrimaryBinding, GrowthExperiencePrimaryRvAdapter.ViewHolder> {
+
+ private GrowthExperienceActivityViewModel viewModel;
+
+ public GrowthExperiencePrimaryRvAdapter(Context context) {
super(context);
+ }
+
+ public GrowthExperiencePrimaryRvAdapter(Context context, GrowthExperienceActivityViewModel viewModel) {
+ super(context);
+ this.viewModel = viewModel;
}
@Override
protected int getLayoutId() {
- return R.layout.item_pet;
+ return R.layout.item_growth_experience_primary;
}
@Override
- protected ViewHolder getViewHolder(ItemPetBinding itemBind, int viewType) {
+ protected ViewHolder getViewHolder(ItemGrowthExperiencePrimaryBinding itemBind,int viewType) {
return new ViewHolder(itemBind);
}
@Override
protected void onBind(ViewHolder holder, int position) {
+
holder.getBinding().setBean(mDataList.get(position));
+
if (position % 2 != 0){
holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
}else {
@@ -76,8 +87,9 @@
holder.getBinding().cardView.startAnimation(a);
holder.isExpended = false;
}else{
+ int recyclerviewHeight = mRecyclerView.getMeasuredHeight();
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
- holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
+ holder.getBinding().cardView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
int distanceToExpand = targetHeight - initialHeight;
Animation a = new Animation() {
@@ -100,19 +112,18 @@
}
}
});
- holder.getBinding().layoutContent.setOnClickListener(v -> {
- AppManager.getAppManager().startActivity(
- new Intent(getRecyclerView().getContext(), CleanStorageDetailActivity.class)
- .putExtra("bean",mDataList.get(position)));
- });
}
- public static class ViewHolder extends BaseRVAdapter.BaseViewHolder<ItemPetBinding> {
+ public static class ViewHolder extends BaseViewHolder<ItemGrowthExperiencePrimaryBinding>{
private boolean isExpended;
- public ViewHolder(ItemPetBinding binding) {
+ public ViewHolder(ItemGrowthExperiencePrimaryBinding binding) {
super(binding);
}
}
+
+
}
+
+
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceRelationshipRvAdapter.java
similarity index 70%
copy from app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java
copy to app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceRelationshipRvAdapter.java
index 6e3351f..7aab133 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceRelationshipRvAdapter.java
@@ -2,43 +2,52 @@
import android.content.Context;
import android.content.Intent;
+import android.view.LayoutInflater;
import android.view.View;
+import android.view.ViewGroup;
import android.view.animation.Animation;
import android.view.animation.Transformation;
import android.widget.FrameLayout;
-
-import androidx.recyclerview.widget.GridLayoutManager;
-
+import androidx.annotation.NonNull;
+import androidx.databinding.DataBindingUtil;
import com.android.app_base.base.adapter.BaseRVAdapter;
import com.android.app_base.manager.AppManager;
import com.application.zhangshi_app_android.R;
-import com.application.zhangshi_app_android.bean.CleanStorageBean;
-import com.application.zhangshi_app_android.bean.PetBean;
-import com.application.zhangshi_app_android.databinding.ItemCleanStorageBinding;
-import com.application.zhangshi_app_android.databinding.ItemPetBinding;
-import com.application.zhangshi_app_android.ui.function.CleanStorageDetailActivity;
-
+import com.application.zhangshi_app_android.bean.GrowthExperienceBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceRelationshipBean;
+import com.application.zhangshi_app_android.databinding.ItemGrowthExperienceRelationshipBinding;
+import com.application.zhangshi_app_android.ui.function.GrowthExperienceActivity;
+import com.application.zhangshi_app_android.ui.function.GrowthExperienceActivityViewModel;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
- * @author Ljj
- * @date 2023.04.17. 18:40
- * @desc
+ * @author Gss
+ * @date 2023.04.07. 21:31
+ * @desc 鎴愰暱缁忓巻(瀹跺涵鎴愬憳鍙婁富瑕佺ぞ浼氬叧绯绘儏鍐�) recyclerView 鐨� adapter
*/
-public class PetRvAdapter extends BaseRVAdapter<PetBean, ItemPetBinding, PetRvAdapter.ViewHolder> {
- public PetRvAdapter(Context context) {
+public class GrowthExperienceRelationshipRvAdapter extends BaseRVAdapter<GrowthExperienceRelationshipBean, ItemGrowthExperienceRelationshipBinding, GrowthExperienceRelationshipRvAdapter.ViewHolder> {
+
+ private GrowthExperienceActivityViewModel viewModel;
+
+ public GrowthExperienceRelationshipRvAdapter(Context context) {
super(context);
}
+ public GrowthExperienceRelationshipRvAdapter(Context context, GrowthExperienceActivityViewModel viewModel) {
+ super(context);
+ this.viewModel = viewModel;
+ }
+
+
@Override
protected int getLayoutId() {
- return R.layout.item_pet;
+ return R.layout.item_growth_experience_relationship;
}
@Override
- protected ViewHolder getViewHolder(ItemPetBinding itemBind, int viewType) {
+ protected ViewHolder getViewHolder(ItemGrowthExperienceRelationshipBinding itemBind,int viewType) {
return new ViewHolder(itemBind);
}
@@ -46,7 +55,7 @@
protected void onBind(ViewHolder holder, int position) {
holder.getBinding().setBean(mDataList.get(position));
if (position % 2 != 0){
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
+ holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_green));
}else {
holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink));
}
@@ -100,19 +109,18 @@
}
}
});
- holder.getBinding().layoutContent.setOnClickListener(v -> {
- AppManager.getAppManager().startActivity(
- new Intent(getRecyclerView().getContext(), CleanStorageDetailActivity.class)
- .putExtra("bean",mDataList.get(position)));
- });
}
- public static class ViewHolder extends BaseRVAdapter.BaseViewHolder<ItemPetBinding> {
+ public static class ViewHolder extends BaseViewHolder<ItemGrowthExperienceRelationshipBinding>{
private boolean isExpended;
- public ViewHolder(ItemPetBinding binding) {
+ public ViewHolder(ItemGrowthExperienceRelationshipBinding binding) {
super(binding);
}
}
+
+
}
+
+
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/HonorCollectionRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/HonorCollectionRvAdapter.java
index 4ab8436..e1809aa 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/HonorCollectionRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/HonorCollectionRvAdapter.java
@@ -101,9 +101,10 @@
.putExtra("bean",mDataList.get(position)));
});
- String time = mDataList.get(position).getGetTime().split(" ")[0];
- holder.getBinding().tvTime.setText(time);
-
+ if (mDataList.get(position).getGetTime()!=null){
+ String time = mDataList.get(position).getGetTime().split(" ")[0];
+ holder.getBinding().tvTime.setText(time);
+ }
ImageRvAdapter adapter = new ImageRvAdapter(mContext);
holder.getBinding().rvImage.setLayoutManager(new GridLayoutManager(mContext,3));
holder.getBinding().rvImage.setAdapter(adapter);
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/PetImageRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/PetImageRvAdapter.java
new file mode 100644
index 0000000..ecbaf30
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/PetImageRvAdapter.java
@@ -0,0 +1,46 @@
+package com.application.zhangshi_app_android.adapter;
+
+import android.content.Context;
+import android.view.View;
+
+import com.android.app_base.base.adapter.BaseRVAdapter;
+import com.application.zhangshi_app_android.R;
+import com.application.zhangshi_app_android.databinding.ItemPetImageBinding;
+import com.application.zhangshi_app_android.ui.dialog.BigImageDialog;
+
+
+/**
+ * @author Ljj
+ * @date 2023.04.25. 19:06
+ * @desc 瀹犵墿鍥剧墖閫傞厤鍣�
+ */
+public class PetImageRvAdapter extends BaseRVAdapter<String, ItemPetImageBinding, BaseRVAdapter.BaseViewHolder<ItemPetImageBinding>> {
+
+ public PetImageRvAdapter(Context context) {
+ super(context);
+ }
+
+ @Override
+ protected int getLayoutId() {
+ return R.layout.item_pet_image;
+ }
+
+ @Override
+ protected void onBind(BaseViewHolder<ItemPetImageBinding> holder, int position) {
+ holder.getBinding().setUrl(mDataList.get(position));
+ holder.itemView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ BigImageDialog.Builder builder = new BigImageDialog.Builder(mContext);
+// builder.setBigImage(mDataList.get(position));
+ builder.setBigImage(R.drawable.img_sakura);
+ builder.show();
+ }
+ });
+ }
+
+ @Override
+ protected BaseViewHolder<ItemPetImageBinding> getViewHolder(ItemPetImageBinding itemBind,int viewType) {
+ return new BaseViewHolder<>(itemBind);
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/PetMemoRvAdapter.java
similarity index 76%
copy from app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java
copy to app/src/main/java/com/application/zhangshi_app_android/adapter/PetMemoRvAdapter.java
index 6e3351f..2957a4a 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/PetMemoRvAdapter.java
@@ -12,11 +12,10 @@
import com.android.app_base.base.adapter.BaseRVAdapter;
import com.android.app_base.manager.AppManager;
import com.application.zhangshi_app_android.R;
-import com.application.zhangshi_app_android.bean.CleanStorageBean;
-import com.application.zhangshi_app_android.bean.PetBean;
-import com.application.zhangshi_app_android.databinding.ItemCleanStorageBinding;
-import com.application.zhangshi_app_android.databinding.ItemPetBinding;
+import com.application.zhangshi_app_android.bean.PetMemoBean;
+import com.application.zhangshi_app_android.databinding.ItemPetMemoBinding;
import com.application.zhangshi_app_android.ui.function.CleanStorageDetailActivity;
+import com.application.zhangshi_app_android.ui.function.PetMemoDetailActivity;
import java.util.ArrayList;
import java.util.Arrays;
@@ -27,18 +26,18 @@
* @date 2023.04.17. 18:40
* @desc
*/
-public class PetRvAdapter extends BaseRVAdapter<PetBean, ItemPetBinding, PetRvAdapter.ViewHolder> {
- public PetRvAdapter(Context context) {
+public class PetMemoRvAdapter extends BaseRVAdapter<PetMemoBean, ItemPetMemoBinding, PetMemoRvAdapter.ViewHolder> {
+ public PetMemoRvAdapter(Context context) {
super(context);
}
@Override
protected int getLayoutId() {
- return R.layout.item_pet;
+ return R.layout.item_pet_memo;
}
@Override
- protected ViewHolder getViewHolder(ItemPetBinding itemBind, int viewType) {
+ protected ViewHolder getViewHolder(ItemPetMemoBinding itemBind, int viewType) {
return new ViewHolder(itemBind);
}
@@ -102,16 +101,33 @@
});
holder.getBinding().layoutContent.setOnClickListener(v -> {
AppManager.getAppManager().startActivity(
- new Intent(getRecyclerView().getContext(), CleanStorageDetailActivity.class)
+ new Intent(getRecyclerView().getContext(), PetMemoDetailActivity.class)
.putExtra("bean",mDataList.get(position)));
});
+ ImageRvAdapter adapter = new ImageRvAdapter(mContext);
+ holder.getBinding().rvImage.setLayoutManager(new GridLayoutManager(mContext,3));
+ holder.getBinding().rvImage.setAdapter(adapter);
+ String url = mDataList.get(position).getUrl();
+ if (url == null||url.isEmpty()){
+ return;
+ }
+ List<String> list;
+ if (url.contains(",")){
+ String[] split = url.split(",");
+ list = new ArrayList<>(Arrays.asList(split));
+ }else {
+ list = new ArrayList<>();
+ list.add(url);
+ }
+ adapter.setData(list);
+
}
- public static class ViewHolder extends BaseRVAdapter.BaseViewHolder<ItemPetBinding> {
+ public static class ViewHolder extends BaseRVAdapter.BaseViewHolder<ItemPetMemoBinding> {
private boolean isExpended;
- public ViewHolder(ItemPetBinding binding) {
+ public ViewHolder(ItemPetMemoBinding binding) {
super(binding);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/PrivacyRvAdapter.java
similarity index 75%
copy from app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java
copy to app/src/main/java/com/application/zhangshi_app_android/adapter/PrivacyRvAdapter.java
index 6e3351f..bcfc0e9 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/PrivacyRvAdapter.java
@@ -12,11 +12,9 @@
import com.android.app_base.base.adapter.BaseRVAdapter;
import com.android.app_base.manager.AppManager;
import com.application.zhangshi_app_android.R;
-import com.application.zhangshi_app_android.bean.CleanStorageBean;
-import com.application.zhangshi_app_android.bean.PetBean;
-import com.application.zhangshi_app_android.databinding.ItemCleanStorageBinding;
-import com.application.zhangshi_app_android.databinding.ItemPetBinding;
-import com.application.zhangshi_app_android.ui.function.CleanStorageDetailActivity;
+import com.application.zhangshi_app_android.bean.PrivacyBean;
+import com.application.zhangshi_app_android.databinding.ItemPrivacyBinding;
+import com.application.zhangshi_app_android.ui.function.PrivacyDetailActivity;
import java.util.ArrayList;
import java.util.Arrays;
@@ -24,21 +22,21 @@
/**
* @author Ljj
- * @date 2023.04.17. 18:40
+ * @date 2023.04.28. 20:32
* @desc
*/
-public class PetRvAdapter extends BaseRVAdapter<PetBean, ItemPetBinding, PetRvAdapter.ViewHolder> {
- public PetRvAdapter(Context context) {
+public class PrivacyRvAdapter extends BaseRVAdapter<PrivacyBean, ItemPrivacyBinding, PrivacyRvAdapter.ViewHolder> {
+ public PrivacyRvAdapter(Context context) {
super(context);
}
@Override
protected int getLayoutId() {
- return R.layout.item_pet;
+ return R.layout.item_privacy;
}
@Override
- protected ViewHolder getViewHolder(ItemPetBinding itemBind, int viewType) {
+ protected ViewHolder getViewHolder(ItemPrivacyBinding itemBind, int viewType) {
return new ViewHolder(itemBind);
}
@@ -102,16 +100,32 @@
});
holder.getBinding().layoutContent.setOnClickListener(v -> {
AppManager.getAppManager().startActivity(
- new Intent(getRecyclerView().getContext(), CleanStorageDetailActivity.class)
+ new Intent(getRecyclerView().getContext(), PrivacyDetailActivity.class)
.putExtra("bean",mDataList.get(position)));
});
+ ImageRvAdapter adapter = new ImageRvAdapter(mContext);
+ holder.getBinding().rvImage.setLayoutManager(new GridLayoutManager(mContext,3));
+ holder.getBinding().rvImage.setAdapter(adapter);
+ String url = mDataList.get(position).getUrl();
+ if (url == null||url.isEmpty()){
+ return;
+ }
+ List<String> list;
+ if (url.contains(",")){
+ String[] split = url.split(",");
+ list = new ArrayList<>(Arrays.asList(split));
+ }else {
+ list = new ArrayList<>();
+ list.add(url);
+ }
+ adapter.setData(list);
}
- public static class ViewHolder extends BaseRVAdapter.BaseViewHolder<ItemPetBinding> {
+ public static class ViewHolder extends BaseRVAdapter.BaseViewHolder<ItemPrivacyBinding> {
private boolean isExpended;
- public ViewHolder(ItemPetBinding binding) {
+ public ViewHolder(ItemPrivacyBinding binding) {
super(binding);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/TourismRvAdapter.java
similarity index 76%
rename from app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java
rename to app/src/main/java/com/application/zhangshi_app_android/adapter/TourismRvAdapter.java
index 6e3351f..a0b8a97 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/TourismRvAdapter.java
@@ -12,11 +12,11 @@
import com.android.app_base.base.adapter.BaseRVAdapter;
import com.android.app_base.manager.AppManager;
import com.application.zhangshi_app_android.R;
-import com.application.zhangshi_app_android.bean.CleanStorageBean;
-import com.application.zhangshi_app_android.bean.PetBean;
-import com.application.zhangshi_app_android.databinding.ItemCleanStorageBinding;
-import com.application.zhangshi_app_android.databinding.ItemPetBinding;
-import com.application.zhangshi_app_android.ui.function.CleanStorageDetailActivity;
+import com.application.zhangshi_app_android.bean.TourismBean;
+import com.application.zhangshi_app_android.databinding.ItemTourismBinding;
+import com.application.zhangshi_app_android.ui.function.TourismActivity;
+import com.application.zhangshi_app_android.ui.function.TourismDetailActivity;
+import com.application.zhangshi_app_android.ui.function.TourismExperienceDetailActivity;
import java.util.ArrayList;
import java.util.Arrays;
@@ -24,21 +24,21 @@
/**
* @author Ljj
- * @date 2023.04.17. 18:40
+ * @date 2023.04.28. 21:18
* @desc
*/
-public class PetRvAdapter extends BaseRVAdapter<PetBean, ItemPetBinding, PetRvAdapter.ViewHolder> {
- public PetRvAdapter(Context context) {
+public class TourismRvAdapter extends BaseRVAdapter<TourismBean, ItemTourismBinding, TourismRvAdapter.ViewHolder> {
+ public TourismRvAdapter(Context context) {
super(context);
}
@Override
protected int getLayoutId() {
- return R.layout.item_pet;
+ return R.layout.item_tourism;
}
@Override
- protected ViewHolder getViewHolder(ItemPetBinding itemBind, int viewType) {
+ protected ViewHolder getViewHolder(ItemTourismBinding itemBind, int viewType) {
return new ViewHolder(itemBind);
}
@@ -102,16 +102,25 @@
});
holder.getBinding().layoutContent.setOnClickListener(v -> {
AppManager.getAppManager().startActivity(
- new Intent(getRecyclerView().getContext(), CleanStorageDetailActivity.class)
+ new Intent(getRecyclerView().getContext(), TourismDetailActivity.class)
.putExtra("bean",mDataList.get(position)));
+ });
+
+ holder.getBinding().tvDetail.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ AppManager.getAppManager().startActivity(
+ new Intent(getRecyclerView().getContext(), TourismExperienceDetailActivity.class)
+ .putExtra("bean",mDataList.get(position)));
+ }
});
}
- public static class ViewHolder extends BaseRVAdapter.BaseViewHolder<ItemPetBinding> {
+ public static class ViewHolder extends BaseRVAdapter.BaseViewHolder<ItemTourismBinding> {
private boolean isExpended;
- public ViewHolder(ItemPetBinding binding) {
+ public ViewHolder(ItemTourismBinding binding) {
super(binding);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/AnnualHealthStatusBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/AnnualHealthStatusBean.java
new file mode 100644
index 0000000..c474cd2
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/AnnualHealthStatusBean.java
@@ -0,0 +1,91 @@
+package com.application.zhangshi_app_android.bean;
+
+import java.io.Serializable;
+
+/**
+ * @author Ljj
+ * @date 2023.04.28. 19:39
+ * @desc 骞村害鍋ュ悍鐘跺喌 Bean
+ */
+public class AnnualHealthStatusBean implements Serializable {
+ //搴忓彿
+ private int id;
+ //浣撴鏃堕棿
+ private String time;
+ //绫诲埆
+ private String type;
+ //灏辩梾鍖婚櫌
+ private String hospital;
+ //鎻愬悕
+ private String name;
+ //娉ㄦ剰浜嬮」
+ private String attention;
+ //澶囨敞
+ private String remark;
+ //鐢靛瓙鏂囦欢
+ private String url;
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ public String getTime() {
+ return time;
+ }
+
+ public void setTime(String time) {
+ this.time = time;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getHospital() {
+ return hospital;
+ }
+
+ public void setHospital(String hospital) {
+ this.hospital = hospital;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getAttention() {
+ return attention;
+ }
+
+ public void setAttention(String attention) {
+ this.attention = attention;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/ConsumeRecordBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/ConsumeRecordBean.java
new file mode 100644
index 0000000..71da392
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/ConsumeRecordBean.java
@@ -0,0 +1,81 @@
+package com.application.zhangshi_app_android.bean;
+
+import java.io.Serializable;
+
+/**
+ * @author Ljj
+ * @date 2023.04.28. 21:32
+ * @desc 娑堣垂璇︾粏璁板綍
+ */
+public class ConsumeRecordBean implements Serializable {
+ //鍐呭
+ private String content;
+ //鎬婚噾棰�
+ private String totalMoney;
+ //椁愯垂
+ private String mealMoney;
+ //浣忓璐�
+ private String hotelMoney;
+ //浜ら�氳垂
+ private String trafficMoney;
+ //璐墿
+ private String shoppingMoney;
+ //闂ㄧエ
+ private String ticketMoney;
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+ public String getTotalMoney() {
+ return totalMoney;
+ }
+
+ public void setTotalMoney(String totalMoney) {
+ this.totalMoney = totalMoney;
+ }
+
+ public String getMealMoney() {
+ return mealMoney;
+ }
+
+ public void setMealMoney(String mealMoney) {
+ this.mealMoney = mealMoney;
+ }
+
+ public String getHotelMoney() {
+ return hotelMoney;
+ }
+
+ public void setHotelMoney(String hotelMoney) {
+ this.hotelMoney = hotelMoney;
+ }
+
+ public String getTrafficMoney() {
+ return trafficMoney;
+ }
+
+ public void setTrafficMoney(String trafficMoney) {
+ this.trafficMoney = trafficMoney;
+ }
+
+ public String getShoppingMoney() {
+ return shoppingMoney;
+ }
+
+ public void setShoppingMoney(String shoppingMoney) {
+ this.shoppingMoney = shoppingMoney;
+ }
+
+ public String getTicketMoney() {
+ return ticketMoney;
+ }
+
+ public void setTicketMoney(String ticketMoney) {
+ this.ticketMoney = ticketMoney;
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/ContactsBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/ContactsBean.java
new file mode 100644
index 0000000..c8fae21
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/ContactsBean.java
@@ -0,0 +1,19 @@
+package com.application.zhangshi_app_android.bean;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class ContactsBean implements Serializable {
+ private long id;
+ public long getId() {
+ return id;
+ }
+
+ public void setId(long id) {
+ this.id = id;
+ }
+
+ public List<ContactsBean> getData() {
+ return null;
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/DailyConsumeRecordBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/DailyConsumeRecordBean.java
new file mode 100644
index 0000000..64724af
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/DailyConsumeRecordBean.java
@@ -0,0 +1,42 @@
+package com.application.zhangshi_app_android.bean;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Ljj
+ * @date 2023.04.28. 21:39
+ * @desc 姣忔棩娑堣垂璇︾粏璁板綍
+ */
+public class DailyConsumeRecordBean implements Serializable {
+ //鏃ユ湡
+ private String date;
+ //姣忔棩閲戦
+ private String dailyMoney;
+ //娑堣垂璁板綍
+ private List<ConsumeRecordBean> consumeRecordBeans;
+
+ public String getDate() {
+ return date;
+ }
+
+ public void setDate(String date) {
+ this.date = date;
+ }
+
+ public List<ConsumeRecordBean> getConsumeRecordBeans() {
+ return consumeRecordBeans;
+ }
+
+ public void setConsumeRecordBeans(List<ConsumeRecordBean> consumeRecordBeans) {
+ this.consumeRecordBeans = consumeRecordBeans;
+ }
+
+ public String getDailyMoney() {
+ return dailyMoney;
+ }
+
+ public void setDailyMoney(String dailyMoney) {
+ this.dailyMoney = dailyMoney;
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceAbroadConditionBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceAbroadConditionBean.java
new file mode 100644
index 0000000..fdaa81a
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceAbroadConditionBean.java
@@ -0,0 +1,22 @@
+package com.application.zhangshi_app_android.bean;
+
+/**
+ * 鎴愰暱缁忓巻-鍑哄浗鎯呭喌
+ */
+public class GrowthExperienceAbroadConditionBean {
+ private String userId;
+ private String destination;
+ private String cause;
+ private String startDate;
+
+
+ public String getUserId() { return userId; }
+ public void setUserId(String value) { this.userId = value; }
+ public String getDestination() { return destination; }
+ public void setDestination(String value) { this.destination = value; }
+ public String getCause() { return cause; }
+ public void setCause(String value) { this.cause = value; }
+
+ public String getStartDate() { return startDate; }
+ public void setStartDate(String value) { this.startDate = value; }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceAutobiographyBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceAutobiographyBean.java
new file mode 100644
index 0000000..ddb7ed3
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceAutobiographyBean.java
@@ -0,0 +1,63 @@
+package com.application.zhangshi_app_android.bean;
+import java.io.Serializable;
+import java.util.List;
+
+public class GrowthExperienceAutobiographyBean implements Serializable{
+
+ private int id;
+ private int userId;
+ private String content;
+ //鏃舵湡
+ private String term;
+ //寮�濮嬪勾榫�
+ private String ageBegin;
+ //缁撴潫骞撮緞
+ private String ageEnd;
+
+ public String getTerm() {
+ return term;
+ }
+
+ public void setTerm(String term) {
+ this.term = term;
+ }
+
+ public String getAgeBegin() {
+ return ageBegin;
+ }
+
+ public void setAgeBegin(String ageBegin) {
+ this.ageBegin = ageBegin;
+ }
+
+ public String getAgeEnd() {
+ return ageEnd;
+ }
+
+ public void setAgeEnd(String ageEnd) {
+ this.ageEnd = ageEnd;
+ }
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ public int getUserId() {
+ return userId;
+ }
+
+ public void setUserId(int userId) {
+ this.userId = userId;
+ }
+
+ public String getContent() {
+ return content;
+ }
+ public void setContent(String content) {
+ this.content = content;
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceBean.java
index 2dd0127..1ab559f 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceBean.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceBean.java
@@ -8,70 +8,53 @@
* @date 2023.03.31. 17:47
* @desc 鎴愰暱缁忓巻 bean 绫�
*/
-public class GrowthExperienceBean implements Serializable {
- private String idName;
- private String usedName;
- private String gender;
- private String nationality;
- private String ethnicGroup;
- private String marriageCondition;
- private String politicalStatus;
- private String contactNumber;
- private String idNumber;
- private String address;
- private String duringTime;
- private String relationship;
- private String School;
- private String passCheck;
- private String abroadZone;
- private List<String> url;
+public class GrowthExperienceBean implements Serializable{
- public String getAddress() { return address; }
- public void setAddress(String value) { this.address = value; }
-
- public String getIdName() { return idName; }
- public void setIdName(String value) { this.idName = value; }
- public String getUsedName() { return usedName; }
- public void setUsedName(String value) { this.usedName = value; }
+ private String id;
+ private String userId;
+ private String content;
+ private String startDate;
+ private String witness;
- public String getGender() { return gender; }
- public void setGender(String value) { this.gender = value; }
+ public String getId() {
+ return id;
+ }
- public String getNationality() { return nationality; }
- public void setNationality(String value) { this.nationality = value; }
+ public void setId(String id) {
+ this.id = id;
+ }
- public String getEthnicGroup() { return ethnicGroup; }
- public void setEthnicGroup(String value) { this.ethnicGroup = value; }
+ public String getUserId() {
+ return userId;
+ }
- public String getMarriageCondition() { return marriageCondition; }
- public void setMarriageCondition(String value) { this.marriageCondition = value; }
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
- public String getPoliticalStatus() { return politicalStatus; }
- public void setPoliticalStatus(String value) { this.politicalStatus = value; }
+ public String getContent() {
+ return content;
+ }
- public String getContactNumber() { return contactNumber; }
- public void setContactNumber(String value) { this.contactNumber = value; }
+ public void setContent(String content) {
+ this.content = content;
+ }
- public String getIdNumber() { return idNumber; }
- public void setIdNumber(String value) { this.idNumber = value; }
+ public String getStartDate() {
+ return startDate;
+ }
- public String getDuringTime() { return duringTime; }
- public void setDuringTime(String value) { this.duringTime = value; }
+ public void setStartDate(String startDate) {
+ this.startDate = startDate;
+ }
- public String getSchool() { return School; }
- public void setSchool(String value) { this.School = value; }
+ public String getWitness() {
+ return witness;
+ }
- public String getRelationship() { return relationship; }
- public void setRelationship(String value) { this.relationship = value; }
-
- public String getPassCheck() { return passCheck; }
- public void setPassCheck(String value) { this.passCheck = value; }
- public String getAbroadZone() { return abroadZone; }
- public void setAbroadZone(String value) { this.abroadZone = value; }
- public List<String> getUrl() { return url; }
- public void setUrl(List<String> value) { this.url = value; }
-
-
+ public void setWitness(String witness) {
+ this.witness = witness;
+ }
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceHolderConditionBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceHolderConditionBean.java
new file mode 100644
index 0000000..ac8dfc2
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceHolderConditionBean.java
@@ -0,0 +1,25 @@
+package com.application.zhangshi_app_android.bean;
+
+/**
+ * 鎴愰暱缁忓巻-鎸佽瘉鎯呭喌
+ */
+public class GrowthExperienceHolderConditionBean {
+ private String userId;
+ private String cerName;
+ private String idNo;
+ private String validityDate;
+ private String ownStatus;
+
+ public String getUserId() { return userId; }
+ public void setUserId(String value) { this.userId = value; }
+ public String getCerName() { return cerName; }
+ public void setCerName(String value) { this.cerName = value; }
+ public String getIdNo() { return idNo; }
+ public void setIdNo(String value) { this.idNo = value; }
+
+ public String getValidityDate() { return validityDate; }
+ public void setValidityDate(String value) { this.validityDate = value; }
+
+ public String getOwnStatus() { return ownStatus; }
+ public void setOwnStatus(String value) { this.ownStatus = value; }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceInformationBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceInformationBean.java
new file mode 100644
index 0000000..8acae11
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceInformationBean.java
@@ -0,0 +1,70 @@
+package com.application.zhangshi_app_android.bean;
+import java.io.Serializable;
+import java.util.List;
+/**
+ * @author Gss
+ * @date 2023.03.31. 17:47
+ * @desc 鎴愰暱缁忓巻涓汉鍩烘湰淇℃伅 bean 绫�
+ */
+public class GrowthExperienceInformationBean implements Serializable {
+ private int userId;
+ private String nickName;
+ private String oldName;
+ private int sex;
+ private String nationality;
+ private String nation;
+ private int maritalStatus;
+ private String politicalOutlook;
+ private String phoneNumber;
+ private String idNum;
+ private String locationAddress;
+ private String alwaysAddress;
+ private String alwaysPolice;
+ private String unit;
+ private String position;
+ private int outStatus;
+ private String idNo;
+ private String img;
+ private String birth;
+ private String url;
+ public int getUserId() { return userId; }
+ public void setUserId(int value) { this.userId = value; }
+ public String getNickName() { return nickName; }
+ public void setNickName(String value) { this.nickName = value; }
+ public String getOldName() { return oldName; }
+ public void setOldName(String value) { this.oldName = value; }
+ public int getSex() { return sex; }
+ public void setSex(int value) { this.sex = value; }
+ public String getNationality() { return nationality; }
+ public void setNationality(String value) { this.nationality = value; }
+ public String getNation() { return nation; }
+ public void setNation(String value) { this.nation = value; }
+ public int getMaritalStatus() { return maritalStatus; }
+ public void setMaritalStatus(int value) { this.maritalStatus = value; }
+ public String getPoliticalOutlook() { return politicalOutlook; }
+ public void setPoliticalOutlook(String value) { this.politicalOutlook = value; }
+ public String getPhoneNumber() { return phoneNumber; }
+ public void setPhoneNumber(String value) { this.phoneNumber = value; }
+ public String getIdNum() { return idNum; }
+ public void setIdNum(String value) { this.idNum = value; }
+
+ public String getLocationAddress() { return locationAddress; }
+ public void setLocationAddress(String value) { this.locationAddress = value; }
+
+ public String getAlwaysAddress() { return alwaysAddress; }
+ public void setAlwaysAddress(String value) { this.alwaysAddress = value; }
+ public String getUnit() { return unit; }
+ public void setUnit(String value) { this.unit = value; }
+ public String getPosition() { return position; }
+ public void setPosition(String value) { this.position = value; }
+ public int getOutStatus() { return outStatus; }
+ public void setOutStatus(int value) { this.outStatus = value; }
+ public String getIdNo() { return idNo; }
+ public void setIdNo(String value) { this.idNo = value; }
+ public String getImg() { return img; }
+ public void setImg(String value) { this.img = value; }
+ public String getBirth() { return birth; }
+ public void setBirth(String value) { this.birth = value; }
+ public String getUrl() { return url; }
+ public void setUrl(String value) { this.url = value; }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceRelationshipBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceRelationshipBean.java
new file mode 100644
index 0000000..c901ad8
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceRelationshipBean.java
@@ -0,0 +1,23 @@
+package com.application.zhangshi_app_android.bean;
+
+public class GrowthExperienceRelationshipBean {
+ private String nickName;
+ private String relation;
+ private String unit;
+ private String position;
+ private String politicalOutlook;
+
+ public String getNickName() { return nickName; }
+ public void setNickName(String value) { this.nickName = value; }
+ public String getRelation() { return relation; }
+ public void setRelation(String value) { this.relation = value; }
+ public String getUnit() { return unit; }
+ public void setUnit(String value) { this.unit = value; }
+ public String getPosition() { return position; }
+ public void setPosition(String value) { this.position = value; }
+ public String getPoliticalOutlook() { return politicalOutlook; }
+ public void setPoliticalOutlook(String value) { this.politicalOutlook = value; }
+
+ }
+
+
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceRequestBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceRequestBean.java
index 6176878..7f56dba 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceRequestBean.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceRequestBean.java
@@ -11,6 +11,8 @@
private String idName;
private String usedName;
+
+ private String witness;
private String gender;
private String nationality;
private String ethnicGroup;
@@ -18,8 +20,13 @@
private String politicalStatus;
private String contactNumber;
private String idNumber;
+ private String residenceNumber;
+ private String associate;
+ private String reason;
private String address;
private String duringTime;
+ private String duringYear;
+ private String identity;
private String School;
private String passCheck;
private String abroadZone;
@@ -38,10 +45,15 @@
public void setIdName(String value) {
this.idName = value;
}
+ public String getWitness() { return witness; }
+ public void setWitness(String value) { this.witness = value; }
public String getGender() { return gender; }
public void setGender(String value) { this.gender = value; }
-
+ public String getReason() { return reason; }
+ public void setReason(String value) { this.reason = value; }
+ public String getAssociate() { return associate; }
+ public void setAssociate(String value) { this.associate = value; }
public String getNationality() { return nationality; }
public void setNationality(String value) { this.nationality = value; }
@@ -59,6 +71,10 @@
public String getIdNumber() { return idNumber; }
public void setIdNumber(String value) { this.idNumber = value; }
+ public String getResidenceNumber() { return idNumber; }
+ public void setResidenceNumber(String value) { this.idNumber = value; }
+ public String getIdentity() { return identity; }
+ public void setIdentity(String value) { this.identity = value; }
public int getPageNum() {
return pageNum;
@@ -78,6 +94,8 @@
}
public String getDuringTime() { return duringTime; }
public void setDuringTime(String value) { this.duringTime = value; }
+ public String getDuringYear() { return duringYear; }
+ public void setDuringYear(String value) { this.duringYear = value; }
public String getSchool() { return School; }
public void setSchool(String value) { this.School = value; }
public String getPassCheck() { return passCheck; }
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceResponseBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceResponseBean.java
index 0a10a3a..600127c 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceResponseBean.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceResponseBean.java
@@ -7,5 +7,19 @@
* @desc 鑾峰彇鎴愰暱缁忓巻鐨勮繑鍥炵被
*/
public class GrowthExperienceResponseBean {
+ private List<GrowthExperienceBean> data;
+ private long pageNum;
+ private long pageSize;
+ private long total;
+ public List<GrowthExperienceBean> getData() { return data; }
+ public void setData(List<GrowthExperienceBean> value) { this.data = value; }
+ public long getPageNum() { return pageNum; }
+ public void setPageNum(long value) { this.pageNum = value; }
+
+ public long getPageSize() { return pageSize; }
+ public void setPageSize(long value) { this.pageSize = value; }
+
+ public long getTotal() { return total; }
+ public void setTotal(long value) { this.total = value; }
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/PetBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/PetBean.java
deleted file mode 100644
index 36c8e6f..0000000
--- a/app/src/main/java/com/application/zhangshi_app_android/bean/PetBean.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.application.zhangshi_app_android.bean;
-
-import java.io.Serializable;
-
-/**
- * @author Ljj
- * @date 2023.04.17. 18:52
- * @desc
- */
-public class PetBean implements Serializable {
- private int id;
- private String idNum;
- private String securityCode;
- private String type;
- private String name;
- private String birth;
- private int sex;
- private String color;
- private String properties;
- private String eatHabit;
- private String lifeHabit;
- private String disEatHabit;
- private String disLifeHabit;
- private String address;
- private String dialect;
- private String url;
-
- public int getId() {
- return id;
- }
-
- public void setId(int id) {
- this.id = id;
- }
-
- public String getIdNum() {
- return idNum;
- }
-
- public void setIdNum(String idNum) {
- this.idNum = idNum;
- }
-
- public String getSecurityCode() {
- return securityCode;
- }
-
- public void setSecurityCode(String securityCode) {
- this.securityCode = securityCode;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getBirth() {
- return birth;
- }
-
- public void setBirth(String birth) {
- this.birth = birth;
- }
-
- public int getSex() {
- return sex;
- }
-
- public void setSex(int sex) {
- this.sex = sex;
- }
-
- public String getColor() {
- return color;
- }
-
- public void setColor(String color) {
- this.color = color;
- }
-
- public String getProperties() {
- return properties;
- }
-
- public void setProperties(String properties) {
- this.properties = properties;
- }
-
- public String getEatHabit() {
- return eatHabit;
- }
-
- public void setEatHabit(String eatHabit) {
- this.eatHabit = eatHabit;
- }
-
- public String getLifeHabit() {
- return lifeHabit;
- }
-
- public void setLifeHabit(String lifeHabit) {
- this.lifeHabit = lifeHabit;
- }
-
- public String getDisEatHabit() {
- return disEatHabit;
- }
-
- public void setDisEatHabit(String disEatHabit) {
- this.disEatHabit = disEatHabit;
- }
-
- public String getDisLifeHabit() {
- return disLifeHabit;
- }
-
- public void setDisLifeHabit(String disLifeHabit) {
- this.disLifeHabit = disLifeHabit;
- }
-
- public String getAddress() {
- return address;
- }
-
- public void setAddress(String address) {
- this.address = address;
- }
-
- public String getDialect() {
- return dialect;
- }
-
- public void setDialect(String dialect) {
- this.dialect = dialect;
- }
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/PetMemoBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/PetMemoBean.java
new file mode 100644
index 0000000..1352ee8
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/PetMemoBean.java
@@ -0,0 +1,59 @@
+package com.application.zhangshi_app_android.bean;
+
+import java.io.Serializable;
+
+/**
+ * @author Ljj
+ * @date 2023.04.17. 18:52
+ * @desc
+ */
+public class PetMemoBean implements Serializable {
+ //棰樺悕
+ private String name;
+ //鏃ユ湡
+ private String time;
+ //鎻愰啋鏃堕棿
+ private String reminderTime;
+ private String remark;
+ private String url;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getTime() {
+ return time;
+ }
+
+ public void setTime(String time) {
+ this.time = time;
+ }
+
+ public String getReminderTime() {
+ return reminderTime;
+ }
+
+ public void setReminderTime(String reminderTime) {
+ this.reminderTime = reminderTime;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/PrivacyBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/PrivacyBean.java
new file mode 100644
index 0000000..1c58add
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/PrivacyBean.java
@@ -0,0 +1,121 @@
+package com.application.zhangshi_app_android.bean;
+
+import java.io.Serializable;
+
+/**
+ * @author Ljj
+ * @date 2023.04.28. 20:30
+ * @desc
+ */
+public class PrivacyBean implements Serializable {
+ //绫诲埆
+ private String type;
+ //鏃堕棿
+ private String time;
+ //璐﹀彿
+ private String account;
+ //瀵嗙爜
+ private String password;
+ //鏈夋晥鏃堕棿
+ private String effectiveTime;
+ //鏄惁寮�鍚寚绾�
+ private int isFingerprint;
+ //鏄惁寮�鍚汉鑴歌瘑鍒�
+ private int isFace;
+ //绉佹湁杩樻槸鍏湁
+ private int isPublic;
+ //瀛樻斁浣嶇疆
+ private String location;
+ //澶囨敞
+ private String remark;
+ //鐢靛瓙鏂囦欢
+ private String url;
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getTime() {
+ return time;
+ }
+
+ public void setTime(String time) {
+ this.time = time;
+ }
+
+ public String getAccount() {
+ return account;
+ }
+
+ public void setAccount(String account) {
+ this.account = account;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public String getEffectiveTime() {
+ return effectiveTime;
+ }
+
+ public void setEffectiveTime(String effectiveTime) {
+ this.effectiveTime = effectiveTime;
+ }
+
+ public int getIsFingerprint() {
+ return isFingerprint;
+ }
+
+ public void setIsFingerprint(int isFingerprint) {
+ this.isFingerprint = isFingerprint;
+ }
+
+ public int getIsFace() {
+ return isFace;
+ }
+
+ public void setIsFace(int isFace) {
+ this.isFace = isFace;
+ }
+
+ public int getIsPublic() {
+ return isPublic;
+ }
+
+ public void setIsPublic(int isPublic) {
+ this.isPublic = isPublic;
+ }
+
+ public String getLocation() {
+ return location;
+ }
+
+ public void setLocation(String location) {
+ this.location = location;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/TourismBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/TourismBean.java
new file mode 100644
index 0000000..e9372be
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/TourismBean.java
@@ -0,0 +1,122 @@
+package com.application.zhangshi_app_android.bean;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author Ljj
+ * @date 2023.04.28. 21:17
+ * @desc
+ */
+public class TourismBean implements Serializable {
+ //鏍囬
+ private String title;
+ //寮�濮嬫椂闂�
+ private String startTime;
+ //缁撴潫鏃堕棿
+ private String endTime;
+ //鎬诲ぉ鏁�
+ private String totalDay;
+ //鎬婚噾棰�
+ private String totalMoney;
+ //椁愯垂
+ private String mealMoney;
+ //浣忓璐�
+ private String hotelMoney;
+ //浜ら�氳垂
+ private String trafficMoney;
+ //璐墿
+ private String shoppingMoney;
+ //闂ㄧエ
+ private String ticketMoney;
+ //姣忔棩娑堣垂璇︾粏璁板綍
+ private List<DailyConsumeRecordBean> dailyConsumeRecordBeans;
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(String startTime) {
+ this.startTime = startTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
+ public String getTotalDay() {
+ return totalDay;
+ }
+
+ public void setTotalDay(String totalDay) {
+ this.totalDay = totalDay;
+ }
+
+ public String getTotalMoney() {
+ return totalMoney;
+ }
+
+ public void setTotalMoney(String totalMoney) {
+ this.totalMoney = totalMoney;
+ }
+
+ public String getMealMoney() {
+ return mealMoney;
+ }
+
+ public void setMealMoney(String mealMoney) {
+ this.mealMoney = mealMoney;
+ }
+
+ public String getHotelMoney() {
+ return hotelMoney;
+ }
+
+ public void setHotelMoney(String hotelMoney) {
+ this.hotelMoney = hotelMoney;
+ }
+
+ public String getTrafficMoney() {
+ return trafficMoney;
+ }
+
+ public void setTrafficMoney(String trafficMoney) {
+ this.trafficMoney = trafficMoney;
+ }
+
+ public String getShoppingMoney() {
+ return shoppingMoney;
+ }
+
+ public void setShoppingMoney(String shoppingMoney) {
+ this.shoppingMoney = shoppingMoney;
+ }
+
+ public String getTicketMoney() {
+ return ticketMoney;
+ }
+
+ public void setTicketMoney(String ticketMoney) {
+ this.ticketMoney = ticketMoney;
+ }
+
+ public List<DailyConsumeRecordBean> getDailyConsumeRecordBeans() {
+ return dailyConsumeRecordBeans;
+ }
+
+ public void setDailyConsumeRecordBeans(List<DailyConsumeRecordBean> dailyConsumeRecordBeans) {
+ this.dailyConsumeRecordBeans = dailyConsumeRecordBeans;
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/data/DataRepository.java b/app/src/main/java/com/application/zhangshi_app_android/data/DataRepository.java
index 8c17265..aa9e779 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/data/DataRepository.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/data/DataRepository.java
@@ -5,10 +5,16 @@
import com.android.app_base.base.model.BaseModel;
import com.android.app_base.http.ResultData;
import com.application.zhangshi_app_android.bean.CaptchaImageBean;
+import com.application.zhangshi_app_android.bean.ContactsBean;
import com.application.zhangshi_app_android.bean.FamilyAssetsResponseBean;
import com.application.zhangshi_app_android.bean.FamilyMemorabiliaBean;
-import com.application.zhangshi_app_android.bean.FamilyMemorabiliaRequestBean;
import com.application.zhangshi_app_android.bean.FamilyMemorabiliaResponseBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceAbroadConditionBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceAutobiographyBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceHolderConditionBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceInformationBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceRelationshipBean;
import com.application.zhangshi_app_android.bean.HomeDevicesResponseBean;
import com.application.zhangshi_app_android.bean.HonorCollectionResponseBean;
import com.application.zhangshi_app_android.bean.IncomeAndExpensesResponseBean;
@@ -21,15 +27,10 @@
import com.application.zhangshi_app_android.data.source.http.HttpDataSourceImpl;
import com.application.zhangshi_app_android.data.source.local.LocalDataSourceImpl;
-import java.io.File;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.function.DoubleUnaryOperator;
-import io.reactivex.Completable;
import io.reactivex.Observable;
-import io.reactivex.Observer;
import okhttp3.MultipartBody;
/**
@@ -139,6 +140,57 @@
public Observable<ResultData<HomeDevicesResponseBean>> getHomeDevices(Map<String, Object> paramsMap) {
return mHttpDataSource.getHomeDevices(paramsMap);
}
+ /**
+ * 鑾峰彇鎴愰暱缁忓巻
+ */
+ public Observable<ResultData<List<GrowthExperienceBean>>> getGrowthExperience() {
+ return mHttpDataSource.getGrowthExperience();
+ }
+ /**
+ * 鑾峰彇鎴愰暱缁忓巻涓汉淇℃伅
+ */
+ public Observable<ResultData<GrowthExperienceInformationBean>> getGrowthExperienceInformation() {
+ return mHttpDataSource.getGrowthExperienceInformation();
+ }
+
+ /**
+ * 鑾峰彇鎴愰暱缁忓巻鍏崇郴鎯呭喌
+ */
+ public Observable<ResultData<List<GrowthExperienceRelationshipBean>>> getGrowthExperienceRelationship() {
+ return mHttpDataSource.getGrowthExperienceRelationship();
+ }
+
+ /**
+ * 鑾峰彇鎴愰暱缁忓巻鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�
+ */
+ public Observable<ResultData<List<GrowthExperienceHolderConditionBean>>> getGrowthExperienceHolderCondition() {
+ return mHttpDataSource.getGrowthExperienceHolderCondition();
+ }
+
+ /**
+ * 鑾峰彇鎴愰暱缁忓巻鍑哄浗澧冩儏鍐�
+ */
+ public Observable<ResultData<List<GrowthExperienceAbroadConditionBean>>> getGrowthExperienceAbroadCondition() {
+ return mHttpDataSource.getGrowthExperienceAbroadCondition();
+ }
+
+
+ /**
+ * 鑾峰彇鑷紶
+ */
+ @Override
+ public Observable<ResultData<List<GrowthExperienceAutobiographyBean>>> getGrowthExperienceAutobiography() {
+ return mHttpDataSource.getGrowthExperienceAutobiography();
+ }
+
+
+
+ /**
+ * 鑾峰彇閫氳褰�
+ */
+ public Observable<ResultData<ContactsBean>> getFamilyContacts(Map<String, Object> paramsMap) {
+ return mHttpDataSource.getFamilyContacts(paramsMap);
+ }
/**
* 鑾峰彇瀹跺涵鑽ｈ獕
diff --git a/app/src/main/java/com/application/zhangshi_app_android/data/source/HttpDataSource.java b/app/src/main/java/com/application/zhangshi_app_android/data/source/HttpDataSource.java
index 7d9feeb..b0cf83e 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/data/source/HttpDataSource.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/data/source/HttpDataSource.java
@@ -3,9 +3,15 @@
import com.android.app_base.http.ResultData;
import com.application.zhangshi_app_android.bean.CaptchaImageBean;
import com.application.zhangshi_app_android.bean.FamilyAssetsResponseBean;
+import com.application.zhangshi_app_android.bean.ContactsBean;
import com.application.zhangshi_app_android.bean.FamilyMemorabiliaBean;
-import com.application.zhangshi_app_android.bean.FamilyMemorabiliaRequestBean;
import com.application.zhangshi_app_android.bean.FamilyMemorabiliaResponseBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceAbroadConditionBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceAutobiographyBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceHolderConditionBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceInformationBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceRelationshipBean;
import com.application.zhangshi_app_android.bean.HomeDevicesResponseBean;
import com.application.zhangshi_app_android.bean.HonorCollectionResponseBean;
import com.application.zhangshi_app_android.bean.IncomeAndExpensesResponseBean;
@@ -14,12 +20,10 @@
import com.application.zhangshi_app_android.bean.LoginResponseBean;
import com.application.zhangshi_app_android.bean.UploadFileResponseBean;
-import java.io.File;
import java.util.List;
import java.util.Map;
import io.reactivex.Observable;
-import io.reactivex.Observer;
import okhttp3.MultipartBody;
/**
@@ -89,4 +93,36 @@
* 鑾峰彇鏀舵敮
*/
Observable<ResultData<IncomeAndExpensesResponseBean>> getIncomeAndExpenses(Map<String, Object> map);
+ /**
+ * 鑾峰彇鎴愰暱缁忓巻
+ */
+ Observable<ResultData<List<GrowthExperienceBean>>> getGrowthExperience();
+ /**
+ * 鑾峰彇鎴愰暱缁忓巻涓汉淇℃伅
+ */
+ Observable<ResultData<GrowthExperienceInformationBean>> getGrowthExperienceInformation();
+ /**
+ * 鑾峰彇鎴愰暱缁忓巻鍏崇郴鎯呭喌
+ */
+ Observable<ResultData<List<GrowthExperienceRelationshipBean>>> getGrowthExperienceRelationship();
+
+ /**
+ * 鑾峰彇鎴愰暱缁忓巻鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�
+ */
+ Observable<ResultData<List<GrowthExperienceHolderConditionBean>>> getGrowthExperienceHolderCondition();
+
+ /**
+ * 鑾峰彇鎴愰暱缁忓巻鍑哄浗澧冩儏鍐�
+ */
+ Observable<ResultData<List<GrowthExperienceAbroadConditionBean>>> getGrowthExperienceAbroadCondition();
+ /**
+ * 鑾峰彇鑷紶
+ */
+ Observable<ResultData<List<GrowthExperienceAutobiographyBean>>> getGrowthExperienceAutobiography();
+ /**
+ * 鑾峰彇閫氳褰�
+ */
+ Observable<ResultData<ContactsBean>> getFamilyContacts(Map<String, Object> paramsMap);
}
+
+
diff --git a/app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java b/app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java
index 88fb3d8..0d78243 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java
@@ -3,9 +3,15 @@
import com.android.app_base.http.ResultData;
import com.application.zhangshi_app_android.bean.CaptchaImageBean;
import com.application.zhangshi_app_android.bean.FamilyAssetsResponseBean;
+import com.application.zhangshi_app_android.bean.ContactsBean;
import com.application.zhangshi_app_android.bean.FamilyMemorabiliaBean;
-import com.application.zhangshi_app_android.bean.FamilyMemorabiliaRequestBean;
import com.application.zhangshi_app_android.bean.FamilyMemorabiliaResponseBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceAbroadConditionBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceAutobiographyBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceHolderConditionBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceInformationBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceRelationshipBean;
import com.application.zhangshi_app_android.bean.HomeDevicesResponseBean;
import com.application.zhangshi_app_android.bean.HonorCollectionResponseBean;
import com.application.zhangshi_app_android.bean.IncomeAndExpensesResponseBean;
@@ -14,7 +20,6 @@
import com.application.zhangshi_app_android.bean.LoginResponseBean;
import com.application.zhangshi_app_android.bean.UploadFileResponseBean;
-import java.io.File;
import java.util.List;
import java.util.Map;
@@ -28,7 +33,6 @@
import retrofit2.http.PUT;
import retrofit2.http.Part;
import retrofit2.http.Path;
-import retrofit2.http.Query;
import retrofit2.http.QueryMap;
/**
@@ -96,6 +100,7 @@
Observable<ResultData<HomeDevicesResponseBean>> getHomeDevices(@QueryMap Map<String, Object> paramsMap);
/**
+<<<<<<< HEAD
* 鑾峰彇瀹跺涵鑽ｈ獕
*/
@GET("/zfCollection/all")
@@ -112,4 +117,45 @@
*/
@GET("/zfEconomy/all")
Observable<ResultData<IncomeAndExpensesResponseBean>> getIncomeAndExpenses(@QueryMap Map<String, Object> map);
+
+ /**
+ * 鑾峰彇鎴愰暱缁忓巻涓汉淇℃伅
+ */
+ @GET("/self/user")
+ Observable<ResultData<GrowthExperienceInformationBean>> getGrowthExperienceInformation();
+
+ /**
+ * 鑾峰彇鎴愰暱缁忓巻锛堜富瑕佸涔犲強宸ヤ綔缁忓巻锛�
+ */
+ @GET("/zExperience/all")
+ Observable<ResultData<List<GrowthExperienceBean>>> getGrowthExperience();
+
+ /**
+ * 鑾峰彇鎴愰暱缁忓巻锛堝搴垚鍛樺強涓昏绀句細鍏崇郴鎯呭喌锛�
+ */
+ @GET("/self/user/relation")
+ Observable<ResultData<List<GrowthExperienceRelationshipBean>>> getGrowthExperienceRelationship();
+
+ /**
+ * 鑾峰彇鎴愰暱缁忓巻锛堟寔鏈夊嚭鍏ュ璇佷欢鎯呭喌锛�
+ */
+ @GET("/zCertificate/all")
+ Observable<ResultData<List<GrowthExperienceHolderConditionBean>>> getGrowthExperienceHolderCondition();
+
+ /**
+ * 鑾峰彇鎴愰暱缁忓巻锛堝嚭鍥藉鎯呭喌锛�
+ */
+ @GET("/zAbroad/all")
+ Observable<ResultData<List<GrowthExperienceAbroadConditionBean>>> getGrowthExperienceAbroadCondition();
+ /**
+ * 鑾峰彇鑷紶
+ */
+ @GET("/zAutobiography/all")
+ Observable<ResultData<List<GrowthExperienceAutobiographyBean>>> getGrowthExperienceAutobiography();
+
+ /**
+ * 鑾峰彇閫氳褰�
+ */
+ @GET("/zAutobiography/all")
+ Observable<ResultData<ContactsBean>> getFamilyContacts(Map<String, Object> paramsMap);
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/data/source/http/HttpDataSourceImpl.java b/app/src/main/java/com/application/zhangshi_app_android/data/source/http/HttpDataSourceImpl.java
index 19950b0..b55f489 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/data/source/http/HttpDataSourceImpl.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/data/source/http/HttpDataSourceImpl.java
@@ -3,10 +3,16 @@
import com.android.app_base.http.ResultData;
import com.android.app_base.http.RetrofitManager;
import com.application.zhangshi_app_android.bean.CaptchaImageBean;
+import com.application.zhangshi_app_android.bean.ContactsBean;
import com.application.zhangshi_app_android.bean.FamilyAssetsResponseBean;
import com.application.zhangshi_app_android.bean.FamilyMemorabiliaBean;
-import com.application.zhangshi_app_android.bean.FamilyMemorabiliaRequestBean;
import com.application.zhangshi_app_android.bean.FamilyMemorabiliaResponseBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceAbroadConditionBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceAutobiographyBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceHolderConditionBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceInformationBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceRelationshipBean;
import com.application.zhangshi_app_android.bean.HomeDevicesResponseBean;
import com.application.zhangshi_app_android.bean.HonorCollectionResponseBean;
import com.application.zhangshi_app_android.bean.IncomeAndExpensesResponseBean;
@@ -17,6 +23,7 @@
import com.application.zhangshi_app_android.bean.UploadFileResponseBean;
import com.application.zhangshi_app_android.data.source.HttpDataSource;
+import java.util.List;
import java.util.Map;
import io.reactivex.Observable;
@@ -130,6 +137,7 @@
}
/**
+<<<<<<< HEAD
* 鑾峰彇瀹跺涵鑽ｈ獕
*/
@Override
@@ -152,4 +160,55 @@
public Observable<ResultData<IncomeAndExpensesResponseBean>> getIncomeAndExpenses(Map<String, Object> map) {
return apiService.getIncomeAndExpenses(map);
}
+
+ /**
+ * 鑾峰彇鎴愰暱缁忓巻
+ */
+ @Override
+ public Observable<ResultData<List<GrowthExperienceBean>>> getGrowthExperience() {
+ return apiService.getGrowthExperience();
+ }
+ /**
+ * 鑾峰彇鎴愰暱缁忓巻涓汉淇℃伅
+ */
+ @Override
+ public Observable<ResultData<GrowthExperienceInformationBean>> getGrowthExperienceInformation() {
+ return apiService.getGrowthExperienceInformation();
+ }
+ /**
+ * 鑾峰彇鎴愰暱缁忓巻鍏崇郴鎯呭喌
+ */
+ @Override
+ public Observable<ResultData<List<GrowthExperienceRelationshipBean>>> getGrowthExperienceRelationship() {
+ return apiService.getGrowthExperienceRelationship();
+ }
+
+ /**
+ * 鑾峰彇鎴愰暱缁忓巻鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�
+ */
+ @Override
+ public Observable<ResultData<List<GrowthExperienceHolderConditionBean>>> getGrowthExperienceHolderCondition() {
+ return apiService.getGrowthExperienceHolderCondition();
+ }
+ /**
+ * 鑾峰彇鎴愰暱缁忓巻鍑哄浗澧冩儏鍐�
+ */
+ @Override
+ public Observable<ResultData<List<GrowthExperienceAbroadConditionBean>>> getGrowthExperienceAbroadCondition() {
+ return apiService.getGrowthExperienceAbroadCondition();
+ }
+
+ /**
+ * 鑾峰彇鑷紶
+ */
+ @Override
+ public Observable<ResultData<List<GrowthExperienceAutobiographyBean>>> getGrowthExperienceAutobiography() {
+ return apiService.getGrowthExperienceAutobiography();
+ }
+
+ @Override
+ public Observable<ResultData<ContactsBean>> getFamilyContacts(Map<String, Object> paramsMap) {
+ return apiService.getFamilyContacts(paramsMap);
+ }
+
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java
index 3753b6d..bfa7809 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java
@@ -1,10 +1,13 @@
package com.application.zhangshi_app_android.ui;
import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
+import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
+import android.widget.PopupWindow;
import android.widget.TextView;
import androidx.annotation.Nullable;
@@ -16,10 +19,13 @@
import com.android.app_base.base.viewmodel.BaseViewModel;
import com.android.app_base.manager.AppManager;
import com.application.zhangshi_app_android.R;
+import com.application.zhangshi_app_android.ui.function.CertificateOfHonorActivity;
import com.application.zhangshi_app_android.ui.function.CleanStorageActivity;
+import com.application.zhangshi_app_android.ui.function.ContactsActivity;
import com.application.zhangshi_app_android.ui.function.FamilyAssetsActivity;
import com.application.zhangshi_app_android.ui.function.FamilyMemorabiliaActivity;
import com.application.zhangshi_app_android.ui.function.GrowthExperienceActivity;
+import com.application.zhangshi_app_android.ui.function.HealthCareActivity;
import com.application.zhangshi_app_android.ui.function.HomeDevicesActivity;
import com.application.zhangshi_app_android.ui.function.HonorCollectionActivity;
import com.application.zhangshi_app_android.ui.function.HundredWishActivity;
@@ -27,7 +33,9 @@
import com.application.zhangshi_app_android.ui.function.LittleDoctorActivity;
import com.application.zhangshi_app_android.ui.function.MarriageActivity;
import com.application.zhangshi_app_android.ui.function.PetActivity;
+import com.application.zhangshi_app_android.ui.function.PrivacyActivity;
import com.application.zhangshi_app_android.ui.function.PropertyActivity;
+import com.application.zhangshi_app_android.ui.function.TourismActivity;
import com.hjq.bar.TitleBar;
import java.util.HashMap;
@@ -95,16 +103,23 @@
classMap.put(MarriageActivity.class,(LinearLayout) findViewById(R.id.dl_marriage));
classMap.put(PropertyActivity.class,(LinearLayout) findViewById(R.id.dl_property));
classMap.put(HundredWishActivity.class,(LinearLayout) findViewById(R.id.dl_hundred_wish));
- classMap.put(null,(LinearLayout) findViewById(R.id.dl_health_care));
- classMap.put(null,(LinearLayout) findViewById(R.id.dl_certificate_of_honor));
- classMap.put(null,(LinearLayout) findViewById(R.id.dl_privacy));
+ classMap.put(HealthCareActivity.class,(LinearLayout) findViewById(R.id.dl_health_care));
+ classMap.put(CertificateOfHonorActivity.class,(LinearLayout) findViewById(R.id.dl_certificate_of_honor));
+ classMap.put(PrivacyActivity.class,(LinearLayout) findViewById(R.id.dl_privacy));
+ classMap.put(null,(LinearLayout) findViewById(R.id.dl_tourism));
+
setSelectItem(classMap.get(getClass()));
for (Map.Entry<Class, LinearLayout> set : classMap.entrySet()) {
- set.getValue().setOnClickListener(v -> {
- if (set.getKey() != null){
- AppManager.getAppManager().startActivity(set.getKey());
- }
- });
+ LinearLayout linearLayout = set.getValue();
+ if (linearLayout != null) {
+ linearLayout.setOnClickListener(v -> {
+ if (set.getKey() != null){
+ AppManager.getAppManager().startActivity(set.getKey());
+ }
+ });
+ } else {
+
+ }
}
mDrawerLayout.setScrimColor(getResources().getColor(R.color.color_shadow));
}
@@ -130,7 +145,27 @@
@Override
public void onLeftClick(TitleBar titleBar) {
- super.onRightClick(titleBar);
+ super.onLeftClick(titleBar);
mDrawerLayout.open();
}
+
+ public PopupWindow initPopUpWindow(View view){
+ PopupWindow popupWindow = new PopupWindow(this);
+ // 璁剧疆甯冨眬鏂囦欢
+ popupWindow.setContentView(view);
+ // 涓轰簡閬垮厤閮ㄥ垎鏈哄瀷涓嶆樉绀猴紝闇�瑕侀噸鏂拌缃竴涓嬪楂�
+ popupWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
+ popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+ // 璁剧疆pop閫忔槑鏁堟灉
+ popupWindow.setBackgroundDrawable(new ColorDrawable(0x0000));
+ // 璁剧疆pop鍑哄叆鍔ㄧ敾
+ popupWindow.setAnimationStyle(com.android.app_base.R.style.pop_operate);
+ // 璁剧疆pop鑾峰彇鐒︾偣锛屽鏋滀负false鐐瑰嚮杩斿洖鎸夐挳浼氶��鍑哄綋鍓岮ctivity锛屽鏋減op涓湁Editor鐨勮瘽锛宖ocusable蹇呴』瑕佷负true
+ popupWindow.setFocusable(true);
+ // 璁剧疆pop鍙偣鍑伙紝涓篺alse鐐瑰嚮浜嬩欢鏃犳晥锛岄粯璁や负true
+ popupWindow.setTouchable(true);
+ // 璁剧疆鐐瑰嚮pop澶栦晶娑堝け锛岄粯璁や负false锛涘湪focusable涓簍rue鏃剁偣鍑诲渚у缁堟秷澶�
+ popupWindow.setOutsideTouchable(false);
+ return popupWindow;
+ }
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/dialog/BigImageDialog.java b/app/src/main/java/com/application/zhangshi_app_android/ui/dialog/BigImageDialog.java
new file mode 100644
index 0000000..90230a2
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/dialog/BigImageDialog.java
@@ -0,0 +1,58 @@
+package com.application.zhangshi_app_android.ui.dialog;
+
+import static com.blankj.utilcode.util.StringUtils.getString;
+
+import android.content.Context;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.ImageView;
+
+import androidx.annotation.DrawableRes;
+import androidx.constraintlayout.utils.widget.ImageFilterView;
+import com.android.app_base.base.dialog.BaseDialog;
+import com.android.app_base.utils.GlideUtil;
+import com.application.zhangshi_app_android.R;
+
+/**
+ * @author Ljj
+ * @date 2023.04.25. 20:04
+ * @desc 鏌ョ湅澶у浘寮圭獥
+ */
+public final class BigImageDialog {
+ public static class Builder extends BaseDialog.Builder<BigImageDialog.Builder> {
+ private final ImageFilterView iv_big_image;
+ private final ImageView iv_dialog_close;
+ public Builder(Context context) {
+ super(context);
+ setContentView(R.layout.dialog_big_image);
+ setAnimStyle(BaseDialog.ANIM_IOS);
+ setBackgroundDimEnabled(false);
+ setCancelable(false);
+ setGravity(Gravity.CENTER);
+
+ iv_dialog_close = findViewById(R.id.iv_dialog_close);
+ iv_big_image = findViewById(R.id.iv_big_image);
+ setOnClickListener(iv_dialog_close);
+
+ }
+
+ public Builder setBigImage(String url) {
+ GlideUtil.loadImage(url,iv_big_image);
+ return this;
+ }
+ public Builder setBigImage(@DrawableRes int drawableId) {
+ iv_big_image.setBackgroundResource(drawableId);
+ return this;
+ }
+
+ @Override
+ public void onClick(View v) {
+ super.onClick(v);
+ if (v.getId() == R.id.iv_dialog_close){
+ if (getDialog() != null) {
+ getDialog().dismiss();
+ }
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/dialog/PetOwnerInfoDialog.java b/app/src/main/java/com/application/zhangshi_app_android/ui/dialog/PetOwnerInfoDialog.java
new file mode 100644
index 0000000..fea848d
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/dialog/PetOwnerInfoDialog.java
@@ -0,0 +1,46 @@
+package com.application.zhangshi_app_android.ui.dialog;
+
+import android.content.Context;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.ImageView;
+
+import androidx.annotation.DrawableRes;
+import androidx.constraintlayout.utils.widget.ImageFilterView;
+
+import com.android.app_base.base.dialog.BaseDialog;
+import com.android.app_base.utils.GlideUtil;
+import com.application.zhangshi_app_android.R;
+
+/**
+ * @author Ljj
+ * @date 2023.04.25. 20:46
+ * @desc
+ */
+public class PetOwnerInfoDialog {
+ public static class Builder extends BaseDialog.Builder<BigImageDialog.Builder> {
+ public Builder(Context context) {
+ super(context);
+ setContentView(R.layout.dialog_pet_owner_info);
+ setAnimStyle(BaseDialog.ANIM_IOS);
+ setBackgroundDimEnabled(false);
+ setCancelable(false);
+ setGravity(Gravity.CENTER);
+
+ ImageView iv_dialog_close = findViewById(R.id.iv_dialog_close);
+ setOnClickListener(iv_dialog_close);
+
+ }
+
+
+ @Override
+ public void onClick(View v) {
+ super.onClick(v);
+ if (v.getId() == R.id.iv_dialog_close){
+ if (getDialog() != null) {
+ getDialog().dismiss();
+ }
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/AnnualHealthStatusActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/AnnualHealthStatusActivity.java
new file mode 100644
index 0000000..a1e1bf6
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/AnnualHealthStatusActivity.java
@@ -0,0 +1,58 @@
+package com.application.zhangshi_app_android.ui.function;
+
+import com.android.app_base.widget.LinearItemDecoration;
+import com.application.zhangshi_app_android.BR;
+import com.application.zhangshi_app_android.R;
+import com.application.zhangshi_app_android.adapter.AnnualHealthStatusRvAdapter;
+import com.application.zhangshi_app_android.adapter.CleanStorageRvAdapter;
+import com.application.zhangshi_app_android.databinding.ActivityAnnualHealthStatusBinding;
+import com.application.zhangshi_app_android.databinding.ActivityCleanStorageBinding;
+import com.application.zhangshi_app_android.ui.DLBaseActivity;
+
+/**
+ * @author Ljj
+ * @date 2023.04.28. 19:18
+ * @desc 骞村害鍋ュ悍鐘跺喌 Activity
+ */
+public class AnnualHealthStatusActivity extends DLBaseActivity<ActivityAnnualHealthStatusBinding,AnnualHealthStatusActivityViewModel > {
+
+ private AnnualHealthStatusRvAdapter adapter;
+
+ @Override
+ public int getLayoutId() {
+ return R.layout.activity_annual_health_status;
+ }
+
+ @Override
+ public int getVariableId() {
+ return BR.viewModel;
+ }
+
+ @Override
+ public void initParam() {
+
+ }
+
+ @Override
+ public void initView() {
+ adapter = new AnnualHealthStatusRvAdapter(this);
+ LinearItemDecoration itemDecoration = new LinearItemDecoration();
+ itemDecoration.setBottomSpace((int) getResources().getDimension(com.android.app_base.R.dimen.dp_12));
+ itemDecoration.setHorizontalSpace((int) getResources().getDimension(com.android.app_base.R.dimen.dp_20));
+ itemDecoration.setFirstTop((int) getResources().getDimension(com.android.app_base.R.dimen.dp_20));
+ binding.recyclerView.addItemDecoration(itemDecoration);
+ binding.recyclerView.setAdapter(adapter);
+ }
+
+ @Override
+ public void initData() {
+ viewModel.getAnnualHealthStatus();
+ }
+
+ @Override
+ public void initLiveDataObserve() {
+ viewModel.getDataListLiveData().observe(this, dataList -> {
+ adapter.setData(dataList);
+ });
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/AnnualHealthStatusActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/AnnualHealthStatusActivityViewModel.java
new file mode 100644
index 0000000..e47e190
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/AnnualHealthStatusActivityViewModel.java
@@ -0,0 +1,62 @@
+package com.application.zhangshi_app_android.ui.function;
+
+import android.app.Application;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.MutableLiveData;
+
+import com.android.app_base.base.viewmodel.BaseViewModel;
+import com.application.zhangshi_app_android.bean.AnnualHealthStatusBean;
+import com.application.zhangshi_app_android.bean.CleanStorageBean;
+import com.application.zhangshi_app_android.data.DataRepository;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Ljj
+ * @date 2023.04.28. 19:19
+ * @desc
+ */
+public class AnnualHealthStatusActivityViewModel extends BaseViewModel<DataRepository> {
+ private MutableLiveData<List<AnnualHealthStatusBean>> dataListLiveData;
+
+ public AnnualHealthStatusActivityViewModel(@NonNull Application application) {
+ super(application);
+ }
+
+ @Override
+ protected DataRepository initModel() {
+ return DataRepository.getInstance();
+ }
+
+ public MutableLiveData<List<AnnualHealthStatusBean>> getDataListLiveData() {
+ if (dataListLiveData == null) {
+ dataListLiveData = new MutableLiveData<>();
+ }
+ return dataListLiveData;
+ }
+
+ public void setDataListLiveData(MutableLiveData<List<AnnualHealthStatusBean>> dataListLiveData) {
+ this.dataListLiveData = dataListLiveData;
+ }
+
+ /**
+ * 鑾峰彇骞村害鍋ュ悍鎯呭喌
+ */
+ public void getAnnualHealthStatus() {
+ List<AnnualHealthStatusBean> beans = new ArrayList<>();
+ for (int i = 0; i < 10; i++) {
+ AnnualHealthStatusBean bean = new AnnualHealthStatusBean();
+ bean.setId(i);
+ bean.setTime("2020-0" + i + "-01");
+ bean.setType("浣撴");
+ bean.setHospital("浜烘皯鍖婚櫌");
+ bean.setName("浣撴牸妫�鏌�");
+ bean.setAttention("娉ㄦ剰淇濆仴");
+ bean.setRemark("鍏ㄥ叏韬鏌�");
+ beans.add(bean);
+ }
+ dataListLiveData.setValue(beans);
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/AnnualHealthStatusDetailActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/AnnualHealthStatusDetailActivity.java
new file mode 100644
index 0000000..c589eba
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/AnnualHealthStatusDetailActivity.java
@@ -0,0 +1,102 @@
+package com.application.zhangshi_app_android.ui.function;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+
+import com.application.zhangshi_app_android.BR;
+import com.application.zhangshi_app_android.R;
+import com.application.zhangshi_app_android.adapter.ImageRvAdapter;
+import com.application.zhangshi_app_android.bean.AnnualHealthStatusBean;
+import com.application.zhangshi_app_android.bean.CertificateOfHonorBean;
+import com.application.zhangshi_app_android.databinding.ActivityAnnualHealthStatusDetailBinding;
+import com.application.zhangshi_app_android.databinding.ActivityCertificateOfHonorDetailBinding;
+import com.application.zhangshi_app_android.ui.DLBaseActivity;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author Ljj
+ * @date 2023.04.28. 19:48
+ * @desc
+ */
+public class AnnualHealthStatusDetailActivity extends DLBaseActivity<ActivityAnnualHealthStatusDetailBinding,AnnualHealthStatusDetailActivityViewModel> {
+
+ private ImageRvAdapter adapter;
+
+ @Override
+ public int getLayoutId() {
+ return R.layout.activity_annual_health_status_detail;
+ }
+
+ @Override
+ public int getVariableId() {
+ return BR.viewModel;
+ }
+
+ @Override
+ public void initParam() {
+ if (getIntent().hasExtra("bean")){
+ viewModel.getBeanLiveData().setValue((AnnualHealthStatusBean) getIntent().getSerializableExtra("bean"));
+ }
+ }
+
+ @Override
+ public void initView() {
+ adapter = new ImageRvAdapter(this);
+ GridLayoutManager gridLayoutManager = new GridLayoutManager(this, 3);
+ binding.rvImage.setLayoutManager(gridLayoutManager);
+ binding.rvImage.setNestedScrollingEnabled(false);
+ setIsEdited(false);
+ }
+
+ @Override
+ public void initData() {
+
+ }
+
+ @Override
+ public void initLiveDataObserve() {
+ viewModel.getBeanLiveData().observe(this,bean -> {
+ if (bean!=null){
+ String url = bean.getUrl();
+ if (url == null||url.isEmpty()){
+ return;
+ }
+ List<String> list;
+ if (url.contains(",")){
+ String[] split = url.split(",");
+ list = new ArrayList<>(Arrays.asList(split));
+ }else {
+ list = new ArrayList<>();
+ list.add(url);
+ }
+ adapter.setData(list);
+ }
+ });
+ }
+
+ public void setIsEdited(boolean isEdited){
+ disableAllEditText(getContentView(),isEdited);
+ adapter.setIsEdited(isEdited);
+ }
+ public void disableAllEditText(ViewGroup viewGroup, boolean isEdited) {
+ for (int i = 0; i < viewGroup.getChildCount(); i++) {
+ View child = viewGroup.getChildAt(i);
+ if (child instanceof ViewGroup) {
+ disableAllEditText((ViewGroup) child,isEdited);
+ } else if (child instanceof EditText) {
+ child.setEnabled(isEdited);
+ child.setFocusable(isEdited);
+ child.setFocusableInTouchMode(isEdited);
+ if (!isEdited){
+ child.clearFocus();
+ }
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/AnnualHealthStatusDetailActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/AnnualHealthStatusDetailActivityViewModel.java
new file mode 100644
index 0000000..91d1842
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/AnnualHealthStatusDetailActivityViewModel.java
@@ -0,0 +1,42 @@
+package com.application.zhangshi_app_android.ui.function;
+
+import android.app.Application;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.MutableLiveData;
+
+import com.android.app_base.base.viewmodel.BaseViewModel;
+import com.application.zhangshi_app_android.bean.AnnualHealthStatusBean;
+import com.application.zhangshi_app_android.bean.CertificateOfHonorBean;
+import com.application.zhangshi_app_android.data.DataRepository;
+
+/**
+ * @author Ljj
+ * @date 2023.04.28. 19:49
+ * @desc
+ */
+public class AnnualHealthStatusDetailActivityViewModel extends BaseViewModel<DataRepository> {
+
+ private MutableLiveData<AnnualHealthStatusBean> beanLiveData;
+
+ public AnnualHealthStatusDetailActivityViewModel(@NonNull Application application) {
+ super(application);
+ }
+
+ @Override
+ protected DataRepository initModel() {
+ return DataRepository.getInstance();
+ }
+
+
+ public MutableLiveData<AnnualHealthStatusBean> getBeanLiveData() {
+ if (beanLiveData == null) {
+ beanLiveData = new MutableLiveData<>();
+ }
+ return beanLiveData;
+ }
+
+ public void setBeanLiveData(MutableLiveData<AnnualHealthStatusBean> beanLiveData) {
+ this.beanLiveData = beanLiveData;
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/CertificateOfHonorActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/CertificateOfHonorActivity.java
index 4a72693..de202ac 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/CertificateOfHonorActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/CertificateOfHonorActivity.java
@@ -4,9 +4,7 @@
import com.application.zhangshi_app_android.BR;
import com.application.zhangshi_app_android.R;
import com.application.zhangshi_app_android.adapter.CertificateOfHonorRvAdapter;
-import com.application.zhangshi_app_android.adapter.HundredWishRvAdapter;
import com.application.zhangshi_app_android.databinding.ActivityCertificateOfHonorBinding;
-import com.application.zhangshi_app_android.databinding.ActivityHundredWishBinding;
import com.application.zhangshi_app_android.ui.DLBaseActivity;
/**
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/ContactsActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/ContactsActivity.java
new file mode 100644
index 0000000..d160297
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/ContactsActivity.java
@@ -0,0 +1,91 @@
+package com.application.zhangshi_app_android.ui.function;
+import android.graphics.drawable.ColorDrawable;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.PopupWindow;
+
+import androidx.databinding.library.baseAdapters.BR;
+
+import com.android.app_base.utils.ScreenSizeUtils;
+import com.android.app_base.widget.LinearItemDecoration;
+import com.application.zhangshi_app_android.R;
+
+import com.application.zhangshi_app_android.adapter.ContactsRvAdapter;
+import com.application.zhangshi_app_android.databinding.ActivityContactsBinding;
+;
+import com.application.zhangshi_app_android.ui.DLBaseActivity;
+
+/**
+ * @author Gss
+ * @date 2023.04.18. 20:33
+ * @desc 閫氳褰�
+ */
+public class ContactsActivity extends DLBaseActivity<ActivityContactsBinding,ContactsActivityViewModel> {
+ private ContactsRvAdapter adapter;
+ private PopupWindow mOperatePopupWindow;
+ @Override
+ public int getLayoutId() {
+ return R.layout.activity_contacts;
+ }
+
+ @Override
+ public int getVariableId() {
+ return BR.viewModel;
+ }
+
+ @Override
+ public void initParam() {
+
+ }
+
+ @Override
+ public void initView() {
+ adapter = new ContactsRvAdapter(this);
+ LinearItemDecoration itemDecoration = new LinearItemDecoration();
+ itemDecoration.setBottomSpace((int) getResources().getDimension(com.android.app_base.R.dimen.dp_12));
+ itemDecoration.setHorizontalSpace((int) getResources().getDimension(com.android.app_base.R.dimen.dp_20));
+ itemDecoration.setFirstTop((int) getResources().getDimension(com.android.app_base.R.dimen.dp_20));
+ binding.recyclerView.addItemDecoration(itemDecoration);
+ binding.recyclerView.setAdapter(adapter);
+
+ mOperatePopupWindow = initPopUpWindow(View.inflate(this,R.layout.pop_operate,null));
+ mOperatePopupWindow.getContentView().findViewById(R.id.layout_add).setVisibility(View.GONE);
+ mOperatePopupWindow.getContentView().findViewById(R.id.layout_select).setVisibility(View.GONE);
+
+ binding.ivOperate.setOnClickListener(v -> {
+ mOperatePopupWindow.showAsDropDown(binding.ivOperate,-ScreenSizeUtils.dip2px(this,85) +binding.ivOperate.getWidth(),0);
+ });
+ }
+
+ @Override
+ public void initData() {
+// viewModel.getFamilyContacts();
+ }
+
+ @Override
+ public void initLiveDataObserve() {
+// viewModel.getDataListLiveData().observe(this, familyContactsBeans -> {
+// adapter.setData(familyContactsBeans);
+// });
+ }
+
+ public PopupWindow initPopUpWindow(View view){
+ PopupWindow popupWindow = new PopupWindow(this);
+ // 璁剧疆甯冨眬鏂囦欢
+ popupWindow.setContentView(view);
+ // 涓轰簡閬垮厤閮ㄥ垎鏈哄瀷涓嶆樉绀猴紝闇�瑕侀噸鏂拌缃竴涓嬪楂�
+ popupWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
+ popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+ // 璁剧疆pop閫忔槑鏁堟灉
+ popupWindow.setBackgroundDrawable(new ColorDrawable(0x0000));
+ // 璁剧疆pop鍑哄叆鍔ㄧ敾
+ popupWindow.setAnimationStyle(com.android.app_base.R.style.pop_operate);
+ // 璁剧疆pop鑾峰彇鐒︾偣锛屽鏋滀负false鐐瑰嚮杩斿洖鎸夐挳浼氶��鍑哄綋鍓岮ctivity锛屽鏋減op涓湁Editor鐨勮瘽锛宖ocusable蹇呴』瑕佷负true
+ popupWindow.setFocusable(true);
+ // 璁剧疆pop鍙偣鍑伙紝涓篺alse鐐瑰嚮浜嬩欢鏃犳晥锛岄粯璁や负true
+ popupWindow.setTouchable(true);
+ // 璁剧疆鐐瑰嚮pop澶栦晶娑堝け锛岄粯璁や负false锛涘湪focusable涓簍rue鏃剁偣鍑诲渚у缁堟秷澶�
+ popupWindow.setOutsideTouchable(false);
+ return popupWindow;
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/ContactsActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/ContactsActivityViewModel.java
new file mode 100644
index 0000000..d73e419
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/ContactsActivityViewModel.java
@@ -0,0 +1,91 @@
+package com.application.zhangshi_app_android.ui.function;
+import static com.android.app_base.base.BaseConfig.CODE_SUCCESS;
+
+import android.app.Application;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.MutableLiveData;
+
+import com.android.app_base.base.StateViewEnum;
+import com.android.app_base.base.viewmodel.BaseViewModel;
+import com.android.app_base.http.ResultData;
+import com.android.app_base.utils.RxUtils;
+
+import com.application.zhangshi_app_android.bean.ContactsBean;
+
+import com.application.zhangshi_app_android.data.DataRepository;
+
+import java.util.HashMap;
+import java.util.List;
+
+import io.reactivex.Observer;
+import io.reactivex.disposables.Disposable;
+/**
+ * @author Gss
+ * @date 2023.04.18. 19:54
+ * @desc 閫氳褰� ViewModel
+ */
+public class ContactsActivityViewModel extends BaseViewModel<DataRepository> {
+
+ private MutableLiveData<List<ContactsBean>> dataListLiveData;//鎵�鏈夋暟鎹�
+
+
+ public ContactsActivityViewModel(@NonNull Application application) {
+ super(application);
+ }
+
+ @Override
+ protected DataRepository initModel() {
+ return DataRepository.getInstance();
+ }
+
+
+ public void getContacts(){
+// model.getFamilyContacts(new HashMap<>())
+// .compose(RxUtils.schedulersTransformer())
+// .subscribe(new Observer<ResultData<ContactsBean>>() {
+// @Override
+// public void onSubscribe(Disposable d) {
+// addSubscribe(d);
+// }
+//
+// @Override
+// public void onNext(ResultData<ContactsBean> data) {
+// if (data.getCode() == CODE_SUCCESS){
+// if (data.getData().getData().isEmpty()){
+// changeStateView(StateViewEnum.DATA_NULL);
+// }else {
+// changeStateView(StateViewEnum.HIDE);
+// dataListLiveData.postValue(data.getData().getData());
+// }
+// }else {
+// messageLiveData.postValue(data.getMsg());
+// }
+// }
+//
+// @Override
+// public void onError(Throwable e) {
+// messageLiveData.postValue(e.getMessage());
+// }
+//
+// @Override
+// public void onComplete() {
+//
+// }
+// });
+ }
+
+
+
+ public MutableLiveData<List<ContactsBean>> getDataListLiveData() {
+ if (dataListLiveData == null){
+ dataListLiveData = new MutableLiveData<>();
+ }
+ return dataListLiveData;
+ }
+ public void setDataListLiveData(MutableLiveData<List<ContactsBean>> dataListLiveData) {
+ this.dataListLiveData = dataListLiveData;
+ }
+
+}
+
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyAssetsActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyAssetsActivity.java
index 4e82550..4db7449 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyAssetsActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyAssetsActivity.java
@@ -85,7 +85,7 @@
adapter.setData(familyAssetsBeans);
});
}
- private PopupWindow initPopUpWindow(View view){
+ public PopupWindow initPopUpWindow(View view){
PopupWindow popupWindow = new PopupWindow(this);
// 璁剧疆甯冨眬鏂囦欢
popupWindow.setContentView(view);
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivity.java
index ef77b64..2ef8c27 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivity.java
@@ -199,7 +199,7 @@
}
- private PopupWindow initPopUpWindow(View view){
+ public PopupWindow initPopUpWindow(View view){
PopupWindow popupWindow = new PopupWindow(this);
// 璁剧疆甯冨眬鏂囦欢
popupWindow.setContentView(view);
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java
index 40fa8e2..00e8389 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java
@@ -98,6 +98,12 @@
binding.layoutMarriage.setOnClickListener(v->{
AppManager.getAppManager().startActivity(MarriageActivity.class);
});
+ binding.layoutHealthCare.setOnClickListener(v->{
+ AppManager.getAppManager().startActivity(HealthCareActivity.class);
+ });
+ binding.layoutPrivacy.setOnClickListener(v->{
+ AppManager.getAppManager().startActivity(PrivacyActivity.class);
+ });
}
@Override
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/GrowthExperienceActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/GrowthExperienceActivity.java
index 5f08ed5..c18bd94 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/GrowthExperienceActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/GrowthExperienceActivity.java
@@ -1,9 +1,36 @@
package com.application.zhangshi_app_android.ui.function;
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ValueAnimator;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.Transformation;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+
+
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.lifecycle.Observer;
+
+import com.android.app_base.utils.ToastUtils;
+import com.android.app_base.widget.LinearItemDecoration;
import com.application.zhangshi_app_android.BR;
import com.application.zhangshi_app_android.R;
+import com.application.zhangshi_app_android.adapter.GrowthExperienceAbroadConditionRvAdapter;
+import com.application.zhangshi_app_android.adapter.GrowthExperienceHolderConditionRvAdapter;
+import com.application.zhangshi_app_android.adapter.GrowthExperiencePrimaryRvAdapter;
+import com.application.zhangshi_app_android.adapter.GrowthExperienceRelationshipRvAdapter;
+import com.application.zhangshi_app_android.bean.GrowthExperienceAbroadConditionBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceAutobiographyBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceHolderConditionBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceRelationshipBean;
import com.application.zhangshi_app_android.databinding.ActivityGrowthExperienceBinding;
import com.application.zhangshi_app_android.ui.DLBaseActivity;
+import com.google.android.material.tabs.TabLayout;
+import java.util.List;
/**
* @author Gss
@@ -11,6 +38,10 @@
* @desc 鎴愰暱缁忓巻 GrowthExperienceActivity
*/
public class GrowthExperienceActivity extends DLBaseActivity<ActivityGrowthExperienceBinding,GrowthExperienceActivityViewModel> {
+ private GrowthExperiencePrimaryRvAdapter primaryRvAdapter;
+ private GrowthExperienceRelationshipRvAdapter relationshipRvAdapter;
+ private GrowthExperienceHolderConditionRvAdapter holderConditionRvAdapter;
+ private GrowthExperienceAbroadConditionRvAdapter abroadConditionRvAdapter;
@Override
public int getLayoutId() {
@@ -29,19 +60,201 @@
@Override
public void initView() {
+ primaryRvAdapter = new GrowthExperiencePrimaryRvAdapter(this);
+ relationshipRvAdapter = new GrowthExperienceRelationshipRvAdapter(this);
+ holderConditionRvAdapter = new GrowthExperienceHolderConditionRvAdapter(this );
+ abroadConditionRvAdapter = new GrowthExperienceAbroadConditionRvAdapter(this);
+
+ LinearItemDecoration itemDecoration = new LinearItemDecoration();
+ itemDecoration.setBottomSpace((int) getResources().getDimension(com.android.app_base.R.dimen.dp_12));
+
+ binding.rvPrimary.addItemDecoration(itemDecoration);
+ binding.rvPrimary.setNestedScrollingEnabled(false);
+ binding.rvPrimary.setAdapter(primaryRvAdapter);
+ binding.rvRelationship.addItemDecoration(itemDecoration);
+ binding.rvRelationship.setNestedScrollingEnabled(false);
+ binding.rvRelationship.setAdapter(relationshipRvAdapter);
+ binding.rvCertificates.addItemDecoration(itemDecoration);
+ binding.rvCertificates.setNestedScrollingEnabled(false);
+ binding.rvCertificates.setAdapter(holderConditionRvAdapter);
+ binding.rvAbroad.addItemDecoration(itemDecoration);
+ binding.rvAbroad.setNestedScrollingEnabled(false);
+ binding.rvAbroad.setAdapter(abroadConditionRvAdapter);
}
@Override
public void initData() {
-
+ viewModel.getInfo();
+ viewModel.getGrowthExperience();
+ viewModel.getRelation();
+ viewModel.getHolder();
+ viewModel.getAbroad();
+ viewModel.getGrowthExperienceAutobiography();
}
@Override
public void initLiveDataObserve() {
+ viewModel.getIsExperienceExpendedLiveData().observe(this, aBoolean -> {
+ if (aBoolean){
+ binding.ivExperienceFold.setOnClickListener(view -> {
+ collapseView(binding.layoutExperience,binding.layoutExperienceTitle);
+ viewModel.getIsExperienceExpendedLiveData().setValue(false);
+ });
+ }else {
+ binding.ivExperienceFold.setOnClickListener(view -> {
+ expendView(binding.layoutExperience);
+ viewModel.getIsExperienceExpendedLiveData().setValue(true);
+ });
+ }
+ });
+ viewModel.getIsRelationExpendedLiveData().observe(this, aBoolean -> {
+ if (aBoolean){
+ binding.ivRelationFold.setOnClickListener(view -> {
+ collapseView(binding.layoutRelation,binding.layoutRelationTitle);
+ viewModel.getIsRelationExpendedLiveData().setValue(false);
+ });
+ }else {
+ binding.ivRelationFold.setOnClickListener(view -> {
+ expendView(binding.layoutRelation);
+ viewModel.getIsRelationExpendedLiveData().setValue(true);
+ });
+ }
+ });
+ viewModel.getIsHolderExpendedLiveData().observe(this, aBoolean -> {
+ if (aBoolean){
+ binding.ivHolderFold.setOnClickListener(view -> {
+ collapseView(binding.layoutHolder,binding.layoutHolderTitle);
+ viewModel.getIsHolderExpendedLiveData().setValue(false);
+ });
+ }else {
+ binding.ivHolderFold.setOnClickListener(view -> {
+ expendView(binding.layoutHolder);
+ viewModel.getIsHolderExpendedLiveData().setValue(true);
+ });
+ }
+ });
+ viewModel.getIsAbroadExpendedLiveData().observe(this, aBoolean -> {
+ if (aBoolean){
+ binding.ivAbroadFold.setOnClickListener(view -> {
+ collapseView(binding.layoutAbroad,binding.layoutAbroadTitle);
+ viewModel.getIsAbroadExpendedLiveData().setValue(false);
+ });
+ }else {
+ binding.ivAbroadFold.setOnClickListener(view -> {
+ expendView(binding.layoutAbroad);
+ viewModel.getIsAbroadExpendedLiveData().setValue(true);
+ });
+ }
+ });
+ viewModel.getExperienceListLiveData().observe(this, new Observer<List<GrowthExperienceBean>>() {
+ @Override
+ public void onChanged(List<GrowthExperienceBean> growthExperienceBeans) {
+ primaryRvAdapter.setData(growthExperienceBeans);
+ }
+ });
+ viewModel.getRelationLiveData().observe(this, new Observer<List<GrowthExperienceRelationshipBean>>() {
+ @Override
+ public void onChanged(List<GrowthExperienceRelationshipBean> growthExperienceRelationshipBeans) {
+ relationshipRvAdapter.setData(growthExperienceRelationshipBeans);
+ }
+ });
+ viewModel.getHolderLiveData().observe(this, new Observer<List<GrowthExperienceHolderConditionBean>>() {
+ @Override
+ public void onChanged(List<GrowthExperienceHolderConditionBean> growthExperienceHolderConditionBeans) {
+ holderConditionRvAdapter.setData(growthExperienceHolderConditionBeans);
+ }
+ });
+ viewModel.getAbroadLiveData().observe(this, new Observer<List<GrowthExperienceAbroadConditionBean>>() {
+ @Override
+ public void onChanged(List<GrowthExperienceAbroadConditionBean> growthExperienceAbroadConditionBeans) {
+ abroadConditionRvAdapter.setData(growthExperienceAbroadConditionBeans);
+ }
+ });
+ viewModel.getAutobiographyLiveData().observe(this, new Observer<List<GrowthExperienceAutobiographyBean>>() {
+ @Override
+ public void onChanged(List<GrowthExperienceAutobiographyBean> beans) {
+ binding.tabLayout.removeAllTabs();
+ for (int i = 0; i < beans.size(); i++) {
+ GrowthExperienceAutobiographyBean bean = beans.get(i);
+ String tabText = bean.getAgeBegin()+"-"+bean.getAgeEnd()+"宀�("+bean.getTerm()+")";
+ TabLayout.Tab tab = binding.tabLayout.newTab().setText(tabText);
+ if (i % 2 == 0){
+ tab.view.setBackgroundResource(R.drawable.selector_tab_background_pink);
+ }else {
+ tab.view.setBackgroundResource(R.drawable.selector_tab_background_blue);
+ }
+ //鍙栨秷tab鐨勯暱鎸夋樉绀烘枃鏈�
+ tab.view.setOnLongClickListener(new View.OnLongClickListener() {
+ @Override
+ public boolean onLongClick(View v) {
+ return true;
+ }
+ });
+ binding.tabLayout.addTab(tab);
+ }
+ binding.tvFill.setText(beans.get(0).getContent());
+ binding.tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+ @Override
+ public void onTabSelected(TabLayout.Tab tab) {
+ binding.tvFill.setText(beans.get(tab.getPosition()).getContent());
+ }
+
+ @Override
+ public void onTabUnselected(TabLayout.Tab tab) {
+
+ }
+
+ @Override
+ public void onTabReselected(TabLayout.Tab tab) {
+
+ }
+ });
+ }
+ });
}
+ public void collapseView(View initialView,View collapsedView){
+ int initialHeight = initialView.getMeasuredHeight();
+ int collapsedHeight = collapsedView.getMeasuredHeight();
+ int distanceToCollapse = (int) (initialHeight - collapsedHeight);
+ Animation a = new Animation() {
+ @Override
+ protected void applyTransformation(float interpolatedTime, Transformation t) {
+ if (interpolatedTime == 1){
+ }
+ initialView.getLayoutParams().height = (int) (initialHeight - (distanceToCollapse * interpolatedTime));
+ initialView.requestLayout();
+ }
+
+ @Override
+ public boolean willChangeBounds() {
+ return true;
+ }
+ };
+ a.setDuration(500);
+ initialView.startAnimation(a);
+ }
+ public void expendView(View initialView){
+ int initialHeight = initialView.getMeasuredHeight();
+ initialView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
+ int targetHeight = initialView.getMeasuredHeight();
+ ValueAnimator animator = ValueAnimator.ofInt(initialHeight,targetHeight);
+ animator.addUpdateListener(animation -> {
+ initialView.getLayoutParams().height = (int) animation.getAnimatedValue();
+ initialView.requestLayout();
+ });
+ animator.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ initialView.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
+ initialView.setLayoutParams(initialView.getLayoutParams());
+ }
+ });
+ animator.setDuration(500);
+ animator.start();
+ }
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/GrowthExperienceActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/GrowthExperienceActivityViewModel.java
index 1ad74bc..0255a1b 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/GrowthExperienceActivityViewModel.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/GrowthExperienceActivityViewModel.java
@@ -3,19 +3,17 @@
import android.app.Application;
import androidx.annotation.NonNull;
-import androidx.databinding.DataBindingUtil;
-import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.ViewModelProvider;
import com.android.app_base.http.ResultData;
-import com.android.app_base.manager.AppManager;
import com.android.app_base.utils.RxUtils;
-import com.android.app_base.utils.ToastUtils;
import com.android.app_base.base.viewmodel.BaseViewModel;
-import com.application.zhangshi_app_android.R;
-import com.application.zhangshi_app_android.bean.FamilyMemorabiliaBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceAbroadConditionBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceAutobiographyBean;
import com.application.zhangshi_app_android.bean.GrowthExperienceBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceHolderConditionBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceInformationBean;
+import com.application.zhangshi_app_android.bean.GrowthExperienceRelationshipBean;
import com.application.zhangshi_app_android.data.DataRepository;
import java.util.List;
@@ -28,6 +26,16 @@
* @desc 鎴愰暱缁忓巻 viewModel
*/
public class GrowthExperienceActivityViewModel extends BaseViewModel<DataRepository> {
+ private MutableLiveData<List<GrowthExperienceBean>> experienceListLiveData;//鎴愰暱缁忓巻鍒楄〃
+ private MutableLiveData<GrowthExperienceInformationBean> infoLiveData;//涓汉淇℃伅
+ private MutableLiveData<List<GrowthExperienceAutobiographyBean>> autobiographyLiveData;//鑷紶鍒楄〃
+ private MutableLiveData<List<GrowthExperienceRelationshipBean>> relationLiveData;//鍏崇郴鍒楄〃
+ private MutableLiveData<List<GrowthExperienceHolderConditionBean>> holderLiveData;//鎸佽瘉鎯呭喌鍒楄〃
+ private MutableLiveData<List<GrowthExperienceAbroadConditionBean>> abroadLiveData;//鍑哄浗鎯呭喌鍒楄〃
+ private MutableLiveData<Boolean> isExperienceExpendedLiveData;//鎴愰暱缁忓巻鏄惁灞曞紑
+ private MutableLiveData<Boolean> isRelationExpendedLiveData;//鍏崇郴鏄惁灞曞紑
+ private MutableLiveData<Boolean> isHolderExpendedLiveData;//鎸佽瘉鎯呭喌鏄惁灞曞紑
+ private MutableLiveData<Boolean> isAbroadExpendedLiveData;//鍑哄浗鎯呭喌鏄惁灞曞紑
public GrowthExperienceActivityViewModel(@NonNull Application application) {
super(application);
@@ -37,4 +45,326 @@
return DataRepository.getInstance();
}
+
+ /**
+ * 鑾峰彇鎴愰暱缁忓巻
+ */
+ public void getGrowthExperience(){
+ model.getGrowthExperience()
+ .compose(RxUtils.schedulersTransformer())
+ .subscribe(new Observer<ResultData<List<GrowthExperienceBean>>>() {
+ @Override
+ public void onSubscribe(Disposable d) {
+ addSubscribe(d);
+ }
+
+ @Override
+ public void onNext(ResultData<List<GrowthExperienceBean>> data) {
+ if (data.getCode() == CODE_SUCCESS){
+ experienceListLiveData.postValue(data.getData());
+ }else {
+ messageLiveData.postValue(data.getMsg());
+ }
+ }
+
+
+ @Override
+ public void onError(Throwable e) {
+ messageLiveData.postValue(e.getMessage());
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+
+ }
+
+ /**
+ * 鑾峰彇涓汉淇℃伅
+ */
+ public void getInfo(){
+ model.getGrowthExperienceInformation()
+ .compose(RxUtils.schedulersTransformer())
+ .subscribe(new Observer<ResultData<GrowthExperienceInformationBean>>() {
+ @Override
+ public void onSubscribe(Disposable d) {
+ addSubscribe(d);
+ }
+
+ @Override
+ public void onNext(ResultData<GrowthExperienceInformationBean> data) {
+ if (data.getCode() == CODE_SUCCESS){
+ infoLiveData.postValue(data.getData());
+ }else {
+ messageLiveData.postValue(data.getMsg());
+ }
+ }
+
+
+ @Override
+ public void onError(Throwable e) {
+ messageLiveData.postValue(e.getMessage());
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+ }
+ /**
+ * 鑾峰彇鑷紶
+ */
+ public void getGrowthExperienceAutobiography(){
+ model.getGrowthExperienceAutobiography()
+ .compose(RxUtils.schedulersTransformer())
+ .subscribe(new Observer<ResultData<List<GrowthExperienceAutobiographyBean>>>() {
+ @Override
+ public void onSubscribe(Disposable d) {
+ addSubscribe(d);
+ }
+ @Override
+ public void onNext(ResultData<List<GrowthExperienceAutobiographyBean>> data) {
+ if (data.getCode() == CODE_SUCCESS) {
+ if (autobiographyLiveData != null) {
+ autobiographyLiveData.postValue(data.getData());
+ }
+ } else {
+ if (messageLiveData != null) {
+ messageLiveData.postValue(data.getMsg());
+ }
+ }
+ }
+ @Override
+ public void onError(Throwable e) {
+ messageLiveData.postValue(e.getMessage());
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+ }
+
+ /**
+ * 鑾峰彇鍏崇郴鎯呭喌
+ */
+ public void getRelation(){
+ model.getGrowthExperienceRelationship()
+ .compose(RxUtils.schedulersTransformer())
+ .subscribe(new Observer<ResultData<List<GrowthExperienceRelationshipBean>>>() {
+ @Override
+ public void onSubscribe(Disposable d) {
+ addSubscribe(d);
+ }
+
+ @Override
+ public void onNext(ResultData<List<GrowthExperienceRelationshipBean>> data) {
+ if (data.getCode() == CODE_SUCCESS){
+ relationLiveData.postValue(data.getData());
+ }else {
+ messageLiveData.postValue(data.getMsg());
+ }
+ }
+
+
+ @Override
+ public void onError(Throwable e) {
+ messageLiveData.postValue(e.getMessage());
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+ }
+ /**
+ * 鑾峰彇鎸佹湁鍑哄叆澧冭瘉浠舵儏鍐�
+ */
+ public void getHolder(){
+ model.getGrowthExperienceHolderCondition()
+ .compose(RxUtils.schedulersTransformer())
+ .subscribe(new Observer<ResultData<List<GrowthExperienceHolderConditionBean>>>() {
+ @Override
+ public void onSubscribe(Disposable d) {
+ addSubscribe(d);
+ }
+
+ @Override
+ public void onNext(ResultData<List<GrowthExperienceHolderConditionBean>> data) {
+ if (data.getCode() == CODE_SUCCESS){
+ holderLiveData.postValue(data.getData());
+ }else {
+ messageLiveData.postValue(data.getMsg());
+ }
+ }
+
+
+ @Override
+ public void onError(Throwable e) {
+ messageLiveData.postValue(e.getMessage());
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+ }
+
+
+ /**
+ * 鑾峰彇鍑哄浗澧冩儏鍐�
+ */
+ public void getAbroad(){
+ model.getGrowthExperienceAbroadCondition()
+ .compose(RxUtils.schedulersTransformer())
+ .subscribe(new Observer<ResultData<List<GrowthExperienceAbroadConditionBean>>>() {
+ @Override
+ public void onSubscribe(Disposable d) {
+ addSubscribe(d);
+ }
+
+ @Override
+ public void onNext(ResultData<List<GrowthExperienceAbroadConditionBean>> data) {
+ if (data.getCode() == CODE_SUCCESS){
+ abroadLiveData.postValue(data.getData());
+ }else {
+ messageLiveData.postValue(data.getMsg());
+ }
+ }
+
+
+ @Override
+ public void onError(Throwable e) {
+ messageLiveData.postValue(e.getMessage());
+ }
+
+ @Override
+ public void onComplete() {
+
+ }
+ });
+ }
+
+
+
+ public MutableLiveData<List<GrowthExperienceBean>> getExperienceListLiveData() {
+ if (experienceListLiveData == null){
+ experienceListLiveData = new MutableLiveData<>();
+ }
+ return experienceListLiveData;
+ }
+
+ public void setExperienceListLiveData(MutableLiveData<List<GrowthExperienceBean>> experienceListLiveData) {
+ this.experienceListLiveData = experienceListLiveData;
+ }
+
+ public MutableLiveData<List<GrowthExperienceRelationshipBean>> getRelationLiveData() {
+ if (relationLiveData == null){
+ relationLiveData = new MutableLiveData<>();
+ }
+ return relationLiveData;
+ }
+
+ public void setRelationLiveData(MutableLiveData<List<GrowthExperienceRelationshipBean>> relationLiveData) {
+ this.relationLiveData = relationLiveData;
+ }
+
+ public MutableLiveData<GrowthExperienceInformationBean> getInfoLiveData() {
+ if (infoLiveData == null){
+ infoLiveData = new MutableLiveData<>();
+ }
+ return infoLiveData;
+ }
+
+ public void setInfoLiveData(MutableLiveData<GrowthExperienceInformationBean> infoLiveData) {
+ this.infoLiveData = infoLiveData;
+ }
+ public void setHolderLiveData(MutableLiveData<List<GrowthExperienceHolderConditionBean>> holderLiveData) {
+ this.holderLiveData = holderLiveData;
+ }
+
+ public MutableLiveData<List<GrowthExperienceHolderConditionBean>> getHolderLiveData() {
+ if (holderLiveData == null){
+ holderLiveData = new MutableLiveData<>();
+ }
+ return holderLiveData;
+ }
+
+ public void setAbroadLiveData(MutableLiveData<List<GrowthExperienceAbroadConditionBean>> abroadLiveData) {
+ this.abroadLiveData = abroadLiveData;
+ }
+
+ public MutableLiveData<List<GrowthExperienceAbroadConditionBean>> getAbroadLiveData() {
+ if (abroadLiveData == null){
+ abroadLiveData = new MutableLiveData<>();
+ }
+ return abroadLiveData;
+ }
+
+
+
+ public MutableLiveData<List<GrowthExperienceAutobiographyBean>> getAutobiographyLiveData() {
+ if (autobiographyLiveData == null){
+ autobiographyLiveData = new MutableLiveData<>();
+ }
+ return autobiographyLiveData;
+ }
+
+ public void setAutobiographyLiveData(MutableLiveData<List<GrowthExperienceAutobiographyBean>> autobiographyLiveData) {
+ this.autobiographyLiveData = autobiographyLiveData;
+ }
+
+ public MutableLiveData<Boolean> getIsExperienceExpendedLiveData() {
+ if (isExperienceExpendedLiveData == null){
+ isExperienceExpendedLiveData = new MutableLiveData<>();
+ isExperienceExpendedLiveData.setValue(false);
+ }
+ return isExperienceExpendedLiveData;
+ }
+
+ public void setIsExperienceExpendedLiveData(MutableLiveData<Boolean> isExperienceExpendedLiveData) {
+ this.isExperienceExpendedLiveData = isExperienceExpendedLiveData;
+ }
+
+ public MutableLiveData<Boolean> getIsRelationExpendedLiveData() {
+ if (isRelationExpendedLiveData == null){
+ isRelationExpendedLiveData = new MutableLiveData<>();
+ isRelationExpendedLiveData.setValue(false);
+ }
+ return isRelationExpendedLiveData;
+ }
+
+ public void setIsRelationExpendedLiveData(MutableLiveData<Boolean> isRelationExpendedLiveData) {
+ this.isRelationExpendedLiveData = isRelationExpendedLiveData;
+ }
+
+ public MutableLiveData<Boolean> getIsHolderExpendedLiveData() {
+ if (isHolderExpendedLiveData == null){
+ isHolderExpendedLiveData = new MutableLiveData<>();
+ isHolderExpendedLiveData.setValue(false);
+ }
+ return isHolderExpendedLiveData;
+ }
+
+ public void setIsHolderExpendedLiveData(MutableLiveData<Boolean> isHolderExpendedLiveData) {
+ this.isHolderExpendedLiveData = isHolderExpendedLiveData;
+ }
+
+ public MutableLiveData<Boolean> getIsAbroadExpendedLiveData() {
+ if (isAbroadExpendedLiveData == null){
+ isAbroadExpendedLiveData = new MutableLiveData<>();
+ isAbroadExpendedLiveData.setValue(false);
+ }
+ return isAbroadExpendedLiveData;
+ }
+
+ public void setIsAbroadExpendedLiveData(MutableLiveData<Boolean> isAbroadExpendedLiveData) {
+ this.isAbroadExpendedLiveData = isAbroadExpendedLiveData;
+ }
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/HealthCareActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/HealthCareActivity.java
new file mode 100644
index 0000000..dd46dac
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/HealthCareActivity.java
@@ -0,0 +1,154 @@
+package com.application.zhangshi_app_android.ui.function;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ValueAnimator;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.Transformation;
+import android.widget.FrameLayout;
+import android.widget.PopupWindow;
+
+import com.android.app_base.manager.AppManager;
+import com.android.app_base.utils.ScreenSizeUtils;
+import com.application.zhangshi_app_android.BR;
+import com.application.zhangshi_app_android.R;
+import com.application.zhangshi_app_android.databinding.ActivityHealthCareBinding;
+import com.application.zhangshi_app_android.ui.DLBaseActivity;
+
+/**
+ * @author Ljj
+ * @date 2023.04.28. 13:51
+ * @desc 鍋ュ悍淇濆仴 Activity
+ */
+public class HealthCareActivity extends DLBaseActivity<ActivityHealthCareBinding,HealthCareActivityViewModel> {
+
+ private PopupWindow popupWindow;
+ private int popWidth;
+ @Override
+ public int getLayoutId() {
+ return R.layout.activity_health_care;
+ }
+
+ @Override
+ public int getVariableId() {
+ return BR.viewModel;
+ }
+
+ @Override
+ public void initParam() {
+
+ }
+
+ @Override
+ public void initView() {
+ View view = View.inflate(this,R.layout.pop_annual_health_status,null);
+ popupWindow = initPopUpWindow(view);
+
+ view.findViewById(R.id.tv_annual_health_status).setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ popupWindow.dismiss();
+ AppManager.getAppManager().startActivity(AnnualHealthStatusActivity.class);
+ }
+ });
+
+ binding.ivOperate.setOnClickListener(v -> {
+ popupWindow.showAsDropDown(binding.ivOperate,-ScreenSizeUtils.dip2px(this,118) +binding.ivOperate.getWidth(),0);
+ });
+
+
+ }
+
+ @Override
+ public void initData() {
+
+ }
+
+ @Override
+ public void initLiveDataObserve() {
+ viewModel.getIsLifeHabitsExpendedLiveData().observe(this, aBoolean -> {
+ if (aBoolean){
+ binding.ivLifeHabitsFold.setOnClickListener(view -> {
+ collapseView(binding.cardLifeHabits,binding.layoutTitleLifeHabits);
+ viewModel.getIsLifeHabitsExpendedLiveData().setValue(false);
+ });
+ }else {
+ binding.ivLifeHabitsFold.setOnClickListener(view -> {
+ expendView(binding.cardLifeHabits);
+ viewModel.getIsLifeHabitsExpendedLiveData().setValue(true);
+ });
+ }
+ });
+ viewModel.getIsHealthExpendedLiveData().observe(this, aBoolean -> {
+ if (aBoolean){
+ binding.ivHealthFold.setOnClickListener(view -> {
+ collapseView(binding.cardHealth,binding.layoutTitleHealth);
+ viewModel.getIsHealthExpendedLiveData().setValue(false);
+ });
+ }else {
+ binding.ivHealthFold.setOnClickListener(view -> {
+ expendView(binding.cardHealth);
+ viewModel.getIsHealthExpendedLiveData().setValue(true);
+ });
+ }
+ });
+ viewModel.getIsNursingExpendedLiveData().observe(this, aBoolean -> {
+ if (aBoolean){
+ binding.ivNursingFold.setOnClickListener(view -> {
+ collapseView(binding.cardNursing,binding.layoutTitleNursing);
+ viewModel.getIsNursingExpendedLiveData().setValue(false);
+ });
+ }else {
+ binding.ivNursingFold.setOnClickListener(view -> {
+ expendView(binding.cardNursing);
+ viewModel.getIsNursingExpendedLiveData().setValue(true);
+ });
+ }
+ });
+ }
+
+ public void collapseView(View initialView,View collapsedView){
+ int initialHeight = initialView.getMeasuredHeight();
+ int collapsedHeight = collapsedView.getMeasuredHeight();
+ int distanceToCollapse = (int) (initialHeight - collapsedHeight);
+
+ Animation a = new Animation() {
+ @Override
+ protected void applyTransformation(float interpolatedTime, Transformation t) {
+ if (interpolatedTime == 1){
+ }
+ initialView.getLayoutParams().height = (int) (initialHeight - (distanceToCollapse * interpolatedTime));
+ initialView.requestLayout();
+ }
+
+ @Override
+ public boolean willChangeBounds() {
+ return true;
+ }
+ };
+ a.setDuration(500);
+ initialView.startAnimation(a);
+ }
+ public void expendView(View initialView){
+ int initialHeight = initialView.getMeasuredHeight();
+ initialView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
+ int targetHeight = initialView.getMeasuredHeight();
+ ValueAnimator animator = ValueAnimator.ofInt(initialHeight,targetHeight);
+ animator.addUpdateListener(animation -> {
+ initialView.getLayoutParams().height = (int) animation.getAnimatedValue();
+ initialView.requestLayout();
+ });
+ animator.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ initialView.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
+ initialView.setLayoutParams(initialView.getLayoutParams());
+ }
+ });
+ animator.setDuration(500);
+ animator.start();
+ }
+
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/HealthCareActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/HealthCareActivityViewModel.java
new file mode 100644
index 0000000..bf13299
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/HealthCareActivityViewModel.java
@@ -0,0 +1,68 @@
+package com.application.zhangshi_app_android.ui.function;
+
+import android.app.Application;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.MutableLiveData;
+
+import com.android.app_base.base.viewmodel.BaseViewModel;
+import com.application.zhangshi_app_android.data.DataRepository;
+
+/**
+ * @author Ljj
+ * @date 2023.04.28. 13:53
+ * @desc 鍋ュ悍淇濆仴 ViewModel
+ */
+public class HealthCareActivityViewModel extends BaseViewModel<DataRepository> {
+
+ private MutableLiveData<Boolean> isLifeHabitsExpendedLiveData;
+ private MutableLiveData<Boolean> isNursingExpendedLiveData;
+ private MutableLiveData<Boolean> isHealthExpendedLiveData;
+
+
+
+ public HealthCareActivityViewModel(@NonNull Application application) {
+ super(application);
+ }
+
+ @Override
+ protected DataRepository initModel() {
+ return DataRepository.getInstance();
+ }
+
+ public MutableLiveData<Boolean> getIsLifeHabitsExpendedLiveData() {
+ if (isLifeHabitsExpendedLiveData == null){
+ isLifeHabitsExpendedLiveData = new MutableLiveData<>();
+ isLifeHabitsExpendedLiveData.setValue(false);
+ }
+ return isLifeHabitsExpendedLiveData;
+ }
+
+ public void setIsLifeHabitsExpendedLiveData(MutableLiveData<Boolean> isLifeHabitsExpendedLiveData) {
+ this.isLifeHabitsExpendedLiveData = isLifeHabitsExpendedLiveData;
+ }
+
+ public MutableLiveData<Boolean> getIsNursingExpendedLiveData() {
+ if (isNursingExpendedLiveData == null){
+ isNursingExpendedLiveData = new MutableLiveData<>();
+ isNursingExpendedLiveData.setValue(false);
+ }
+ return isNursingExpendedLiveData;
+ }
+
+ public void setIsNursingExpendedLiveData(MutableLiveData<Boolean> isNursingExpendedLiveData) {
+ this.isNursingExpendedLiveData = isNursingExpendedLiveData;
+ }
+
+ public MutableLiveData<Boolean> getIsHealthExpendedLiveData() {
+ if (isHealthExpendedLiveData == null){
+ isHealthExpendedLiveData = new MutableLiveData<>();
+ isHealthExpendedLiveData.setValue(false);
+ }
+ return isHealthExpendedLiveData;
+ }
+
+ public void setIsHealthExpendedLiveData(MutableLiveData<Boolean> isHealthExpendedLiveData) {
+ this.isHealthExpendedLiveData = isHealthExpendedLiveData;
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/HomeDevicesActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/HomeDevicesActivity.java
index 074df03..5cb3708 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/HomeDevicesActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/HomeDevicesActivity.java
@@ -75,7 +75,7 @@
adapter.setData(homeDevices);
});
}
- private PopupWindow initPopUpWindow(View view){
+ public PopupWindow initPopUpWindow(View view){
PopupWindow popupWindow = new PopupWindow(this);
// 璁剧疆甯冨眬鏂囦欢
popupWindow.setContentView(view);
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/MarriageActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/MarriageActivity.java
index cc69d3d..364ceeb 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/MarriageActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/MarriageActivity.java
@@ -1,5 +1,7 @@
package com.application.zhangshi_app_android.ui.function;
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
import android.animation.ValueAnimator;
import android.view.View;
import android.view.ViewGroup;
@@ -123,14 +125,22 @@
}
public void expendView(View initialView){
int initialHeight = initialView.getMeasuredHeight();
- initialView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
+ initialView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
int targetHeight = initialView.getMeasuredHeight();
ValueAnimator animator = ValueAnimator.ofInt(initialHeight,targetHeight);
animator.addUpdateListener(animation -> {
initialView.getLayoutParams().height = (int) animation.getAnimatedValue();
initialView.requestLayout();
});
+ animator.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ initialView.getLayoutParams().height = ViewGroup.LayoutParams.WRAP_CONTENT;
+ initialView.setLayoutParams(initialView.getLayoutParams());
+ }
+ });
animator.setDuration(500);
animator.start();
}
+
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/PetActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/PetActivity.java
index e07476a..d077d9b 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/PetActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/PetActivity.java
@@ -1,22 +1,29 @@
package com.application.zhangshi_app_android.ui.function;
-import com.android.app_base.widget.LinearItemDecoration;
+import android.view.View;
+import android.widget.PopupWindow;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+
+import com.android.app_base.manager.AppManager;
+import com.android.app_base.utils.ScreenSizeUtils;
import com.application.zhangshi_app_android.BR;
import com.application.zhangshi_app_android.R;
-import com.application.zhangshi_app_android.adapter.LittleDoctorRvAdapter;
-import com.application.zhangshi_app_android.adapter.PetRvAdapter;
-import com.application.zhangshi_app_android.databinding.ActivityLittleDoctorBinding;
+import com.application.zhangshi_app_android.adapter.PetImageRvAdapter;
+import com.application.zhangshi_app_android.databinding.ActivityPetBinding;
import com.application.zhangshi_app_android.ui.DLBaseActivity;
+import com.application.zhangshi_app_android.ui.dialog.PetOwnerInfoDialog;
+import com.hjq.bar.TitleBar;
/**
* @author Ljj
* @date 2023.04.17. 18:21
* @desc
*/
-public class PetActivity extends DLBaseActivity<ActivityLittleDoctorBinding,LittleDoctorActivityViewModel> {
+public class PetActivity extends DLBaseActivity<ActivityPetBinding,PetActivityViewModel> {
- private PetRvAdapter adapter;
-
+ private PetImageRvAdapter adapter;
+ private PopupWindow popupWindow;
@Override
public int getLayoutId() {
return R.layout.activity_pet;
@@ -34,13 +41,28 @@
@Override
public void initView() {
- adapter = new PetRvAdapter(this);
- LinearItemDecoration itemDecoration = new LinearItemDecoration();
- itemDecoration.setBottomSpace((int) getResources().getDimension(com.android.app_base.R.dimen.dp_12));
- itemDecoration.setHorizontalSpace((int) getResources().getDimension(com.android.app_base.R.dimen.dp_20));
- itemDecoration.setFirstTop((int) getResources().getDimension(com.android.app_base.R.dimen.dp_20));
- binding.recyclerView.addItemDecoration(itemDecoration);
+
+ adapter = new PetImageRvAdapter(this);
+ binding.recyclerView.setLayoutManager(new GridLayoutManager(this,3));
binding.recyclerView.setAdapter(adapter);
+ adapter.addItem("");
+ adapter.addItem("");
+ adapter.addItem("");
+ adapter.addItem("");
+
+ View view = View.inflate(this,R.layout.pop_operate_pet,null);
+ popupWindow = initPopUpWindow(view);
+ setOnClickListener(
+ view.findViewById(R.id.tv_owner_info),
+ view.findViewById(R.id.tv_another),
+ view.findViewById(R.id.tv_pet_memo)
+ );
+
+
+ binding.ivOperate.setOnClickListener(v -> {
+ popupWindow.showAsDropDown(binding.ivOperate,-ScreenSizeUtils.dip2px(this,85) +binding.ivOperate.getWidth(),0);
+ });
+
}
@Override
@@ -55,4 +77,19 @@
// });
}
+ @Override
+ public void onClick(View v) {
+ super.onClick(v);
+ int id = v.getId();
+ if (id == R.id.tv_owner_info){
+ popupWindow.dismiss();
+ PetOwnerInfoDialog.Builder builder = new PetOwnerInfoDialog.Builder(this);
+ builder.show();
+ }else if (id == R.id.tv_another){
+
+ }else if (id == R.id.tv_pet_memo){
+ popupWindow.dismiss();
+ AppManager.getAppManager().startActivity(PetMemoActivity.class);
+ }
+ }
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/PetMemoActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/PetMemoActivity.java
new file mode 100644
index 0000000..2d6219f
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/PetMemoActivity.java
@@ -0,0 +1,64 @@
+package com.application.zhangshi_app_android.ui.function;
+
+import com.android.app_base.widget.LinearItemDecoration;
+import com.application.zhangshi_app_android.BR;
+import com.application.zhangshi_app_android.R;
+import com.application.zhangshi_app_android.adapter.CleanStorageRvAdapter;
+import com.application.zhangshi_app_android.adapter.PetMemoRvAdapter;
+import com.application.zhangshi_app_android.databinding.ActivityCleanStorageBinding;
+import com.application.zhangshi_app_android.databinding.ActivityPetMemoBinding;
+import com.application.zhangshi_app_android.ui.DLBaseActivity;
+import com.hjq.bar.TitleBar;
+
+/**
+ * @author Ljj
+ * @date 2023.04.25. 21:24
+ * @desc
+ */
+public class PetMemoActivity extends DLBaseActivity<ActivityPetMemoBinding, PetMemoActivityViewModel> {
+
+ private PetMemoRvAdapter adapter;
+
+ @Override
+ public int getLayoutId() {
+ return R.layout.activity_pet_memo;
+ }
+
+ @Override
+ public int getVariableId() {
+ return BR.viewModel;
+ }
+
+ @Override
+ public void initParam() {
+
+ }
+
+ @Override
+ public void initView() {
+ adapter = new PetMemoRvAdapter(this);
+ LinearItemDecoration itemDecoration = new LinearItemDecoration();
+ itemDecoration.setBottomSpace((int) getResources().getDimension(com.android.app_base.R.dimen.dp_12));
+ itemDecoration.setHorizontalSpace((int) getResources().getDimension(com.android.app_base.R.dimen.dp_20));
+ itemDecoration.setFirstTop((int) getResources().getDimension(com.android.app_base.R.dimen.dp_20));
+ binding.recyclerView.addItemDecoration(itemDecoration);
+ binding.recyclerView.setAdapter(adapter);
+ }
+
+ @Override
+ public void initData() {
+ viewModel.getPetMemo();
+ }
+
+ @Override
+ public void initLiveDataObserve() {
+ viewModel.getDataListLiveData().observe(this, dataList -> {
+ adapter.setData(dataList);
+ });
+ }
+
+ @Override
+ public void onLeftClick(TitleBar titleBar) {
+ finish();
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/PetMemoActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/PetMemoActivityViewModel.java
new file mode 100644
index 0000000..b9f5c94
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/PetMemoActivityViewModel.java
@@ -0,0 +1,56 @@
+package com.application.zhangshi_app_android.ui.function;
+
+import android.app.Application;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.MutableLiveData;
+
+import com.android.app_base.base.viewmodel.BaseViewModel;
+import com.application.zhangshi_app_android.bean.CleanStorageBean;
+import com.application.zhangshi_app_android.bean.PetMemoBean;
+import com.application.zhangshi_app_android.data.DataRepository;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Ljj
+ * @date 2023.04.25. 21:25
+ * @desc
+ */
+public class PetMemoActivityViewModel extends BaseViewModel<DataRepository> {
+ private MutableLiveData<List<PetMemoBean>> dataListLiveData;
+
+ public PetMemoActivityViewModel(@NonNull Application application) {
+ super(application);
+ }
+
+ @Override
+ protected DataRepository initModel() {
+ return DataRepository.getInstance();
+ }
+
+ public MutableLiveData<List<PetMemoBean>> getDataListLiveData() {
+ if (dataListLiveData == null) {
+ dataListLiveData = new MutableLiveData<>();
+ }
+ return dataListLiveData;
+ }
+
+ public void setDataListLiveData(MutableLiveData<List<PetMemoBean>> dataListLiveData) {
+ this.dataListLiveData = dataListLiveData;
+ }
+
+ public void getPetMemo() {
+ List<PetMemoBean> beans = new ArrayList<>();
+ for (int i = 0; i < 10; i++) {
+ PetMemoBean bean = new PetMemoBean();
+ bean.setName("鎵撻闃查拡");
+ bean.setTime("2022-01-01");
+ bean.setReminderTime("2021-01-01");
+ bean.setRemark("甯︿笂璇佹槑");
+ beans.add(bean);
+ }
+ dataListLiveData.setValue(beans);
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/PetMemoDetailActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/PetMemoDetailActivity.java
new file mode 100644
index 0000000..dd427b2
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/PetMemoDetailActivity.java
@@ -0,0 +1,108 @@
+package com.application.zhangshi_app_android.ui.function;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+
+import com.application.zhangshi_app_android.BR;
+import com.application.zhangshi_app_android.R;
+import com.application.zhangshi_app_android.adapter.ImageRvAdapter;
+import com.application.zhangshi_app_android.bean.CertificateOfHonorBean;
+import com.application.zhangshi_app_android.bean.PetMemoBean;
+import com.application.zhangshi_app_android.databinding.ActivityCertificateOfHonorDetailBinding;
+import com.application.zhangshi_app_android.databinding.ActivityPetMemoDetailBinding;
+import com.application.zhangshi_app_android.ui.DLBaseActivity;
+import com.hjq.bar.TitleBar;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author Ljj
+ * @date 2023.04.25. 21:36
+ * @desc
+ */
+public class PetMemoDetailActivity extends DLBaseActivity<ActivityPetMemoDetailBinding,PetMemoDetailActivityViewModel> {
+
+ private ImageRvAdapter adapter;
+
+ @Override
+ public int getLayoutId() {
+ return R.layout.activity_pet_memo_detail;
+ }
+
+ @Override
+ public int getVariableId() {
+ return BR.viewModel;
+ }
+
+ @Override
+ public void initParam() {
+ if (getIntent().hasExtra("bean")){
+ viewModel.getBeanLiveData().setValue((PetMemoBean) getIntent().getSerializableExtra("bean"));
+ }
+ }
+
+ @Override
+ public void initView() {
+ adapter = new ImageRvAdapter(this);
+ GridLayoutManager gridLayoutManager = new GridLayoutManager(this, 3);
+ binding.rvImage.setLayoutManager(gridLayoutManager);
+ binding.rvImage.setNestedScrollingEnabled(false);
+ setIsEdited(false);
+ }
+
+ @Override
+ public void initData() {
+
+ }
+
+ @Override
+ public void initLiveDataObserve() {
+ viewModel.getBeanLiveData().observe(this,bean -> {
+ if (bean!=null){
+ String url = bean.getUrl();
+ if (url == null||url.isEmpty()){
+ return;
+ }
+ List<String> list;
+ if (url.contains(",")){
+ String[] split = url.split(",");
+ list = new ArrayList<>(Arrays.asList(split));
+ }else {
+ list = new ArrayList<>();
+ list.add(url);
+ }
+ adapter.setData(list);
+ }
+ });
+ }
+
+ public void setIsEdited(boolean isEdited){
+ disableAllEditText(getContentView(),isEdited);
+ adapter.setIsEdited(isEdited);
+ }
+ public void disableAllEditText(ViewGroup viewGroup, boolean isEdited) {
+ for (int i = 0; i < viewGroup.getChildCount(); i++) {
+ View child = viewGroup.getChildAt(i);
+ if (child instanceof ViewGroup) {
+ disableAllEditText((ViewGroup) child,isEdited);
+ } else if (child instanceof EditText) {
+ child.setEnabled(isEdited);
+ child.setFocusable(isEdited);
+ child.setFocusableInTouchMode(isEdited);
+ if (!isEdited){
+ child.clearFocus();
+ }
+ }
+ }
+ }
+
+ @Override
+ public void onLeftClick(TitleBar titleBar) {
+ finish();
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/PetMemoDetailActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/PetMemoDetailActivityViewModel.java
new file mode 100644
index 0000000..e631ed8
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/PetMemoDetailActivityViewModel.java
@@ -0,0 +1,42 @@
+package com.application.zhangshi_app_android.ui.function;
+
+import android.app.Application;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.MutableLiveData;
+
+import com.android.app_base.base.viewmodel.BaseViewModel;
+import com.application.zhangshi_app_android.bean.CertificateOfHonorBean;
+import com.application.zhangshi_app_android.bean.PetMemoBean;
+import com.application.zhangshi_app_android.data.DataRepository;
+
+/**
+ * @author Ljj
+ * @date 2023.04.25. 21:37
+ * @desc
+ */
+public class PetMemoDetailActivityViewModel extends BaseViewModel<DataRepository> {
+
+ private MutableLiveData<PetMemoBean> beanLiveData;
+
+ public PetMemoDetailActivityViewModel(@NonNull Application application) {
+ super(application);
+ }
+
+ @Override
+ protected DataRepository initModel() {
+ return DataRepository.getInstance();
+ }
+
+
+ public MutableLiveData<PetMemoBean> getBeanLiveData() {
+ if (beanLiveData == null) {
+ beanLiveData = new MutableLiveData<>();
+ }
+ return beanLiveData;
+ }
+
+ public void setBeanLiveData(MutableLiveData<PetMemoBean> beanLiveData) {
+ this.beanLiveData = beanLiveData;
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/PrivacyActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/PrivacyActivity.java
new file mode 100644
index 0000000..dc68dc6
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/PrivacyActivity.java
@@ -0,0 +1,56 @@
+package com.application.zhangshi_app_android.ui.function;
+
+import com.android.app_base.widget.LinearItemDecoration;
+import com.application.zhangshi_app_android.BR;
+import com.application.zhangshi_app_android.R;
+import com.application.zhangshi_app_android.adapter.PrivacyRvAdapter;
+import com.application.zhangshi_app_android.databinding.ActivityPrivacyBinding;
+import com.application.zhangshi_app_android.ui.DLBaseActivity;
+
+/**
+ * @author Ljj
+ * @date 2023.04.28. 20:29
+ * @desc
+ */
+public class PrivacyActivity extends DLBaseActivity<ActivityPrivacyBinding,PrivacyActivityViewModel > {
+
+ private PrivacyRvAdapter adapter;
+
+ @Override
+ public int getLayoutId() {
+ return R.layout.activity_privacy;
+ }
+
+ @Override
+ public int getVariableId() {
+ return BR.viewModel;
+ }
+
+ @Override
+ public void initParam() {
+
+ }
+
+ @Override
+ public void initView() {
+ adapter = new PrivacyRvAdapter(this);
+ LinearItemDecoration itemDecoration = new LinearItemDecoration();
+ itemDecoration.setBottomSpace((int) getResources().getDimension(com.android.app_base.R.dimen.dp_12));
+ itemDecoration.setHorizontalSpace((int) getResources().getDimension(com.android.app_base.R.dimen.dp_20));
+ itemDecoration.setFirstTop((int) getResources().getDimension(com.android.app_base.R.dimen.dp_20));
+ binding.recyclerView.addItemDecoration(itemDecoration);
+ binding.recyclerView.setAdapter(adapter);
+ }
+
+ @Override
+ public void initData() {
+ viewModel.getPrivacy();
+ }
+
+ @Override
+ public void initLiveDataObserve() {
+ viewModel.getDataListLiveData().observe(this, dataList -> {
+ adapter.setData(dataList);
+ });
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/PrivacyActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/PrivacyActivityViewModel.java
new file mode 100644
index 0000000..34deb74
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/PrivacyActivityViewModel.java
@@ -0,0 +1,64 @@
+package com.application.zhangshi_app_android.ui.function;
+
+import android.app.Application;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.MutableLiveData;
+
+import com.android.app_base.base.viewmodel.BaseViewModel;
+import com.application.zhangshi_app_android.bean.PrivacyBean;
+import com.application.zhangshi_app_android.data.DataRepository;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Ljj
+ * @date 2023.04.28. 20:30
+ * @desc
+ */
+public class PrivacyActivityViewModel extends BaseViewModel<DataRepository> {
+ private MutableLiveData<List<PrivacyBean>> dataListLiveData;
+
+ public PrivacyActivityViewModel(@NonNull Application application) {
+ super(application);
+ }
+
+ @Override
+ protected DataRepository initModel() {
+ return DataRepository.getInstance();
+ }
+
+ public MutableLiveData<List<PrivacyBean>> getDataListLiveData() {
+ if (dataListLiveData == null) {
+ dataListLiveData = new MutableLiveData<>();
+ }
+ return dataListLiveData;
+ }
+
+ public void setDataListLiveData(MutableLiveData<List<PrivacyBean>> dataListLiveData) {
+ this.dataListLiveData = dataListLiveData;
+ }
+
+ /**
+ * 鑾峰彇骞村害鍋ュ悍鎯呭喌
+ */
+ public void getPrivacy() {
+ List<PrivacyBean> beans = new ArrayList<>();
+ for (int i = 0; i < 10; i++) {
+ PrivacyBean bean = new PrivacyBean();
+ bean.setType("QQ鍙�");
+ bean.setTime("2020-01-01");
+ bean.setAccount("12345678");
+ bean.setPassword("000000");
+ bean.setEffectiveTime("2030-01-01");
+ bean.setIsFace(0);
+ bean.setIsFingerprint(0);
+ bean.setIsPublic(1);
+ bean.setLocation("鈥斺�斺�斺��");
+ bean.setRemark("鎴戠殑QQ鍙�");
+ beans.add(bean);
+ }
+ dataListLiveData.setValue(beans);
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/PrivacyDetailActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/PrivacyDetailActivity.java
new file mode 100644
index 0000000..de24035
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/PrivacyDetailActivity.java
@@ -0,0 +1,102 @@
+package com.application.zhangshi_app_android.ui.function;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+
+import com.application.zhangshi_app_android.BR;
+import com.application.zhangshi_app_android.R;
+import com.application.zhangshi_app_android.adapter.ImageRvAdapter;
+import com.application.zhangshi_app_android.bean.AnnualHealthStatusBean;
+import com.application.zhangshi_app_android.bean.PrivacyBean;
+import com.application.zhangshi_app_android.databinding.ActivityAnnualHealthStatusDetailBinding;
+import com.application.zhangshi_app_android.databinding.ActivityPrivacyDetailBinding;
+import com.application.zhangshi_app_android.ui.DLBaseActivity;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author Ljj
+ * @date 2023.04.28. 20:44
+ * @desc
+ */
+public class PrivacyDetailActivity extends DLBaseActivity<ActivityPrivacyDetailBinding,PrivacyDetailActivityViewModel> {
+
+ private ImageRvAdapter adapter;
+
+ @Override
+ public int getLayoutId() {
+ return R.layout.activity_privacy_detail;
+ }
+
+ @Override
+ public int getVariableId() {
+ return BR.viewModel;
+ }
+
+ @Override
+ public void initParam() {
+ if (getIntent().hasExtra("bean")){
+ viewModel.getBeanLiveData().setValue((PrivacyBean) getIntent().getSerializableExtra("bean"));
+ }
+ }
+
+ @Override
+ public void initView() {
+ adapter = new ImageRvAdapter(this);
+ GridLayoutManager gridLayoutManager = new GridLayoutManager(this, 3);
+ binding.rvImage.setLayoutManager(gridLayoutManager);
+ binding.rvImage.setNestedScrollingEnabled(false);
+ setIsEdited(false);
+ }
+
+ @Override
+ public void initData() {
+
+ }
+
+ @Override
+ public void initLiveDataObserve() {
+ viewModel.getBeanLiveData().observe(this,bean -> {
+ if (bean!=null){
+ String url = bean.getUrl();
+ if (url == null||url.isEmpty()){
+ return;
+ }
+ List<String> list;
+ if (url.contains(",")){
+ String[] split = url.split(",");
+ list = new ArrayList<>(Arrays.asList(split));
+ }else {
+ list = new ArrayList<>();
+ list.add(url);
+ }
+ adapter.setData(list);
+ }
+ });
+ }
+
+ public void setIsEdited(boolean isEdited){
+ disableAllEditText(getContentView(),isEdited);
+ adapter.setIsEdited(isEdited);
+ }
+ public void disableAllEditText(ViewGroup viewGroup, boolean isEdited) {
+ for (int i = 0; i < viewGroup.getChildCount(); i++) {
+ View child = viewGroup.getChildAt(i);
+ if (child instanceof ViewGroup) {
+ disableAllEditText((ViewGroup) child,isEdited);
+ } else if (child instanceof EditText) {
+ child.setEnabled(isEdited);
+ child.setFocusable(isEdited);
+ child.setFocusableInTouchMode(isEdited);
+ if (!isEdited){
+ child.clearFocus();
+ }
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/PrivacyDetailActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/PrivacyDetailActivityViewModel.java
new file mode 100644
index 0000000..352bd7d
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/PrivacyDetailActivityViewModel.java
@@ -0,0 +1,42 @@
+package com.application.zhangshi_app_android.ui.function;
+
+import android.app.Application;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.MutableLiveData;
+
+import com.android.app_base.base.viewmodel.BaseViewModel;
+import com.application.zhangshi_app_android.bean.AnnualHealthStatusBean;
+import com.application.zhangshi_app_android.bean.PrivacyBean;
+import com.application.zhangshi_app_android.data.DataRepository;
+
+/**
+ * @author Ljj
+ * @date 2023.04.28. 20:45
+ * @desc
+ */
+public class PrivacyDetailActivityViewModel extends BaseViewModel<DataRepository> {
+
+ private MutableLiveData<PrivacyBean> beanLiveData;
+
+ public PrivacyDetailActivityViewModel(@NonNull Application application) {
+ super(application);
+ }
+
+ @Override
+ protected DataRepository initModel() {
+ return DataRepository.getInstance();
+ }
+
+
+ public MutableLiveData<PrivacyBean> getBeanLiveData() {
+ if (beanLiveData == null) {
+ beanLiveData = new MutableLiveData<>();
+ }
+ return beanLiveData;
+ }
+
+ public void setBeanLiveData(MutableLiveData<PrivacyBean> beanLiveData) {
+ this.beanLiveData = beanLiveData;
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismActivity.java
new file mode 100644
index 0000000..1c7f49d
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismActivity.java
@@ -0,0 +1,57 @@
+package com.application.zhangshi_app_android.ui.function;
+
+import com.android.app_base.widget.LinearItemDecoration;
+import com.application.zhangshi_app_android.BR;
+import com.application.zhangshi_app_android.R;
+import com.application.zhangshi_app_android.adapter.PrivacyRvAdapter;
+import com.application.zhangshi_app_android.adapter.TourismRvAdapter;
+import com.application.zhangshi_app_android.databinding.ActivityTourismBinding;
+import com.application.zhangshi_app_android.ui.DLBaseActivity;
+
+/**
+ * @author Ljj
+ * @date 2023.04.28. 20:57
+ * @desc
+ */
+public class TourismActivity extends DLBaseActivity<ActivityTourismBinding,TourismActivityViewModel > {
+
+ private TourismRvAdapter adapter;
+
+ @Override
+ public int getLayoutId() {
+ return R.layout.activity_tourism;
+ }
+
+ @Override
+ public int getVariableId() {
+ return BR.viewModel;
+ }
+
+ @Override
+ public void initParam() {
+
+ }
+
+ @Override
+ public void initView() {
+ adapter = new TourismRvAdapter(this);
+ LinearItemDecoration itemDecoration = new LinearItemDecoration();
+ itemDecoration.setBottomSpace((int) getResources().getDimension(com.android.app_base.R.dimen.dp_12));
+ itemDecoration.setHorizontalSpace((int) getResources().getDimension(com.android.app_base.R.dimen.dp_20));
+ itemDecoration.setFirstTop((int) getResources().getDimension(com.android.app_base.R.dimen.dp_20));
+ binding.recyclerView.addItemDecoration(itemDecoration);
+ binding.recyclerView.setAdapter(adapter);
+ }
+
+ @Override
+ public void initData() {
+ viewModel.getTourism();
+ }
+
+ @Override
+ public void initLiveDataObserve() {
+ viewModel.getDataListLiveData().observe(this, dataList -> {
+ adapter.setData(dataList);
+ });
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismActivityViewModel.java
new file mode 100644
index 0000000..4d2a4c0
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismActivityViewModel.java
@@ -0,0 +1,56 @@
+package com.application.zhangshi_app_android.ui.function;
+
+import android.app.Application;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.MutableLiveData;
+
+import com.android.app_base.base.viewmodel.BaseViewModel;
+import com.application.zhangshi_app_android.bean.TourismBean;
+import com.application.zhangshi_app_android.data.DataRepository;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Ljj
+ * @date 2023.04.28. 21:15
+ * @desc
+ */
+public class TourismActivityViewModel extends BaseViewModel<DataRepository> {
+ private MutableLiveData<List<TourismBean>> dataListLiveData;
+
+ public TourismActivityViewModel(@NonNull Application application) {
+ super(application);
+ }
+
+ @Override
+ protected DataRepository initModel() {
+ return DataRepository.getInstance();
+ }
+
+ public MutableLiveData<List<TourismBean>> getDataListLiveData() {
+ if (dataListLiveData == null) {
+ dataListLiveData = new MutableLiveData<>();
+ }
+ return dataListLiveData;
+ }
+
+ public void setDataListLiveData(MutableLiveData<List<TourismBean>> dataListLiveData) {
+ this.dataListLiveData = dataListLiveData;
+ }
+
+ /**
+ * 鑾峰彇骞村害鍋ュ悍鎯呭喌
+ */
+ public void getTourism() {
+ List<TourismBean> beans = new ArrayList<>();
+ for (int i = 0; i < 10; i++) {
+ TourismBean bean = new TourismBean();
+
+ beans.add(bean);
+ }
+ dataListLiveData.setValue(beans);
+ }
+
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismDetailActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismDetailActivity.java
new file mode 100644
index 0000000..73e398f
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismDetailActivity.java
@@ -0,0 +1,93 @@
+package com.application.zhangshi_app_android.ui.function;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+
+import com.android.app_base.utils.ScreenSizeUtils;
+import com.android.app_base.widget.LinearItemDecoration;
+import com.application.zhangshi_app_android.BR;
+import com.application.zhangshi_app_android.R;
+import com.application.zhangshi_app_android.adapter.DailyConsumeRecordRvAdapter;
+import com.application.zhangshi_app_android.adapter.ImageRvAdapter;
+import com.application.zhangshi_app_android.bean.PrivacyBean;
+import com.application.zhangshi_app_android.bean.TourismBean;
+import com.application.zhangshi_app_android.databinding.ActivityPrivacyDetailBinding;
+import com.application.zhangshi_app_android.databinding.ActivityTourismDetailBinding;
+import com.application.zhangshi_app_android.ui.DLBaseActivity;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author Ljj
+ * @date 2023.04.28. 22:05
+ * @desc
+ */
+public class TourismDetailActivity extends DLBaseActivity<ActivityTourismDetailBinding,TourismDetailActivityViewModel> {
+
+ private DailyConsumeRecordRvAdapter adapter;
+
+ @Override
+ public int getLayoutId() {
+ return R.layout.activity_tourism_detail;
+ }
+
+ @Override
+ public int getVariableId() {
+ return BR.viewModel;
+ }
+
+ @Override
+ public void initParam() {
+ if (getIntent().hasExtra("bean")){
+ viewModel.getBeanLiveData().setValue((TourismBean) getIntent().getSerializableExtra("bean"));
+ }
+ }
+
+ @Override
+ public void initView() {
+ adapter = new DailyConsumeRecordRvAdapter(this);
+ LinearItemDecoration itemDecoration = new LinearItemDecoration();
+ itemDecoration.setBottomSpace(ScreenSizeUtils.dip2px(this,20));
+ binding.rvDailyConsumeRecord.addItemDecoration(itemDecoration);
+ binding.rvDailyConsumeRecord.setNestedScrollingEnabled(false);
+ setIsEdited(false);
+ }
+
+ @Override
+ public void initData() {
+
+ }
+
+ @Override
+ public void initLiveDataObserve() {
+ viewModel.getBeanLiveData().observe(this,bean -> {
+ if (bean!=null){
+ adapter.setData(bean.getDailyConsumeRecordBeans());
+ }
+ });
+ }
+
+ public void setIsEdited(boolean isEdited){
+ disableAllEditText(getContentView(),isEdited);
+ }
+ public void disableAllEditText(ViewGroup viewGroup, boolean isEdited) {
+ for (int i = 0; i < viewGroup.getChildCount(); i++) {
+ View child = viewGroup.getChildAt(i);
+ if (child instanceof ViewGroup) {
+ disableAllEditText((ViewGroup) child,isEdited);
+ } else if (child instanceof EditText) {
+ child.setEnabled(isEdited);
+ child.setFocusable(isEdited);
+ child.setFocusableInTouchMode(isEdited);
+ if (!isEdited){
+ child.clearFocus();
+ }
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismDetailActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismDetailActivityViewModel.java
new file mode 100644
index 0000000..d2d4af2
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismDetailActivityViewModel.java
@@ -0,0 +1,42 @@
+package com.application.zhangshi_app_android.ui.function;
+
+import android.app.Application;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.MutableLiveData;
+
+import com.android.app_base.base.viewmodel.BaseViewModel;
+import com.application.zhangshi_app_android.bean.PrivacyBean;
+import com.application.zhangshi_app_android.bean.TourismBean;
+import com.application.zhangshi_app_android.data.DataRepository;
+
+/**
+ * @author Ljj
+ * @date 2023.04.28. 22:08
+ * @desc
+ */
+public class TourismDetailActivityViewModel extends BaseViewModel<DataRepository> {
+
+ private MutableLiveData<TourismBean> beanLiveData;
+
+ public TourismDetailActivityViewModel(@NonNull Application application) {
+ super(application);
+ }
+
+ @Override
+ protected DataRepository initModel() {
+ return DataRepository.getInstance();
+ }
+
+
+ public MutableLiveData<TourismBean> getBeanLiveData() {
+ if (beanLiveData == null) {
+ beanLiveData = new MutableLiveData<>();
+ }
+ return beanLiveData;
+ }
+
+ public void setBeanLiveData(MutableLiveData<TourismBean> beanLiveData) {
+ this.beanLiveData = beanLiveData;
+ }
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceDetailActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceDetailActivity.java
new file mode 100644
index 0000000..ee1d93d
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/TourismExperienceDetailActivity.java
@@ -0,0 +1,9 @@
+package com.application.zhangshi_app_android.ui.function;
+
+/**
+ * @author Ljj
+ * @date 2023.04.28. 22:49
+ * @desc
+ */
+public class TourismExperienceDetailActivity {
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/home/HomeFragment.java b/app/src/main/java/com/application/zhangshi_app_android/ui/home/HomeFragment.java
index ed40d97..fff69fb 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/home/HomeFragment.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/home/HomeFragment.java
@@ -88,23 +88,23 @@
private boolean isShow = true;
@Override
public void onLeftClick(TitleBar titleBar) {
- if (isShow) {
-
- mPopupWindow.setHeight(binding.treeView.getHeight());
- mPopupWindow.showAsDropDown(binding.titleBar,0,0);
- isShow = false;
- }else {
- binding.rvHomeMember.setVisibility(View.VISIBLE);
- binding.treeView.setVisibility(View.GONE);
- binding.layoutHomeRootNet.setVisibility(View.GONE);
- homeMemberAdapter.addItem(new HomeMemberBean("绗竴浠�","寮犱笁","鐢�",null,"2023.09.09","2023.09.09","12345678901","寮犳皬鍏徃","寮犲洓"));
- homeMemberAdapter.addItem(new HomeMemberBean("绗竴浠�","寮犱笁","鐢�",null,"2023.09.09","2023.09.09","12345678901","寮犳皬鍏徃","寮犲洓"));
- homeMemberAdapter.addItem(new HomeMemberBean("绗竴浠�","寮犱笁","鐢�",null,"2023.09.09","2023.09.09","12345678901","寮犳皬鍏徃","寮犲洓"));
- homeMemberAdapter.addItem(new HomeMemberBean("绗竴浠�","寮犱笁","鐢�",null,"2023.09.09","2023.09.09","12345678901","寮犳皬鍏徃","寮犲洓"));
- homeMemberAdapter.addItem(new HomeMemberBean("绗竴浠�","寮犱笁","鐢�",null,"2023.09.09","2023.09.09","12345678901","寮犳皬鍏徃","寮犲洓"));
- homeMemberAdapter.addItem(new HomeMemberBean("绗竴浠�","寮犱笁","鐢�",null,"2023.09.09","2023.09.09","12345678901","寮犳皬鍏徃","寮犲洓"));
- isShow = true;
- }
+// if (isShow) {
+//
+// mPopupWindow.setHeight(binding.treeView.getHeight());
+// mPopupWindow.showAsDropDown(binding.titleBar,0,0);
+// isShow = false;
+// }else {
+// binding.rvHomeMember.setVisibility(View.VISIBLE);
+// binding.treeView.setVisibility(View.GONE);
+// binding.layoutHomeRootNet.setVisibility(View.GONE);
+// homeMemberAdapter.addItem(new HomeMemberBean("绗竴浠�","寮犱笁","鐢�",null,"2023.09.09","2023.09.09","12345678901","寮犳皬鍏徃","寮犲洓"));
+// homeMemberAdapter.addItem(new HomeMemberBean("绗竴浠�","寮犱笁","鐢�",null,"2023.09.09","2023.09.09","12345678901","寮犳皬鍏徃","寮犲洓"));
+// homeMemberAdapter.addItem(new HomeMemberBean("绗竴浠�","寮犱笁","鐢�",null,"2023.09.09","2023.09.09","12345678901","寮犳皬鍏徃","寮犲洓"));
+// homeMemberAdapter.addItem(new HomeMemberBean("绗竴浠�","寮犱笁","鐢�",null,"2023.09.09","2023.09.09","12345678901","寮犳皬鍏徃","寮犲洓"));
+// homeMemberAdapter.addItem(new HomeMemberBean("绗竴浠�","寮犱笁","鐢�",null,"2023.09.09","2023.09.09","12345678901","寮犳皬鍏徃","寮犲洓"));
+// homeMemberAdapter.addItem(new HomeMemberBean("绗竴浠�","寮犱笁","鐢�",null,"2023.09.09","2023.09.09","12345678901","寮犳皬鍏徃","寮犲洓"));
+// isShow = true;
+// }
}
diff --git a/app/src/main/res/drawable-xhdpi/ic_back.png b/app/src/main/res/drawable-xhdpi/ic_back.png
new file mode 100644
index 0000000..e2e1676
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_back.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_dialog_close.png b/app/src/main/res/drawable-xhdpi/ic_dialog_close.png
new file mode 100644
index 0000000..4efb3b6
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_dialog_close.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_radio_button_selected.png b/app/src/main/res/drawable-xhdpi/ic_radio_button_selected.png
new file mode 100644
index 0000000..f32acae
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_radio_button_selected.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_radio_button_unselected.png b/app/src/main/res/drawable-xhdpi/ic_radio_button_unselected.png
new file mode 100644
index 0000000..615fde4
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_radio_button_unselected.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_tourism_add.png b/app/src/main/res/drawable-xhdpi/ic_tourism_add.png
new file mode 100644
index 0000000..a2c9c1c
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_tourism_add.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_back.png b/app/src/main/res/drawable-xxhdpi/ic_back.png
new file mode 100644
index 0000000..05b3201
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_back.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_dialog_close.png b/app/src/main/res/drawable-xxhdpi/ic_dialog_close.png
new file mode 100644
index 0000000..bab2e37
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_dialog_close.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_radio_button_selected.png b/app/src/main/res/drawable-xxhdpi/ic_radio_button_selected.png
new file mode 100644
index 0000000..a587d3d
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_radio_button_selected.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_radio_button_unselected.png b/app/src/main/res/drawable-xxhdpi/ic_radio_button_unselected.png
new file mode 100644
index 0000000..8222aeb
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_radio_button_unselected.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_tourism_add.png b/app/src/main/res/drawable-xxhdpi/ic_tourism_add.png
new file mode 100644
index 0000000..3b6ed1a
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_tourism_add.png
Binary files differ
diff --git a/app/src/main/res/drawable/mail_list_pic.png b/app/src/main/res/drawable/mail_list_pic.png
new file mode 100644
index 0000000..e2b116f
--- /dev/null
+++ b/app/src/main/res/drawable/mail_list_pic.png
Binary files differ
diff --git a/app/src/main/res/drawable/selector_radio_button.xml b/app/src/main/res/drawable/selector_radio_button.xml
new file mode 100644
index 0000000..2d3e6c2
--- /dev/null
+++ b/app/src/main/res/drawable/selector_radio_button.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:drawable="@drawable/ic_radio_button_selected"
+ android:state_selected="true"
+ />
+ <item
+ android:drawable="@drawable/ic_radio_button_unselected"
+ android:state_selected="false"
+ android:state_focused="false"
+ android:state_pressed="false" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_tab_background_blue.xml b/app/src/main/res/drawable/selector_tab_background_blue.xml
new file mode 100644
index 0000000..c847927
--- /dev/null
+++ b/app/src/main/res/drawable/selector_tab_background_blue.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:drawable="@drawable/shape_ffe0eefe_10_10_0_0"
+ android:state_selected="true"
+ />
+ <item
+ android:drawable="@drawable/shape_ffe0eefe_10_10_0_0_weak"
+ android:state_selected="false"
+ android:state_focused="false"
+ android:state_pressed="false" />
+</selector>
diff --git a/app/src/main/res/drawable/selector_tab_background_pink.xml b/app/src/main/res/drawable/selector_tab_background_pink.xml
new file mode 100644
index 0000000..306df66
--- /dev/null
+++ b/app/src/main/res/drawable/selector_tab_background_pink.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:drawable="@drawable/shape_fffad1e0_10_10_0_0"
+ android:state_selected="true"
+ />
+ <item
+ android:drawable="@drawable/shape_fffad1e0_10_10_0_0_weak"
+ android:state_selected="false"
+ android:state_focused="false"
+ android:state_pressed="false" />
+</selector>
diff --git a/app/src/main/res/drawable/shape_ffe0eefe_10_10_0_0.xml b/app/src/main/res/drawable/shape_ffe0eefe_10_10_0_0.xml
new file mode 100644
index 0000000..969c246
--- /dev/null
+++ b/app/src/main/res/drawable/shape_ffe0eefe_10_10_0_0.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <solid android:color="#FFE0EEFE" />
+ <corners
+ android:topLeftRadius="10dp"
+ android:topRightRadius="10dp"
+ android:bottomLeftRadius="0dp"
+ android:bottomRightRadius="0dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_ffe0eefe_10_10_0_0_weak.xml b/app/src/main/res/drawable/shape_ffe0eefe_10_10_0_0_weak.xml
new file mode 100644
index 0000000..254647b
--- /dev/null
+++ b/app/src/main/res/drawable/shape_ffe0eefe_10_10_0_0_weak.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <solid android:color="#69E0EEFE" />
+ <corners
+ android:topLeftRadius="10dp"
+ android:topRightRadius="10dp"
+ android:bottomLeftRadius="0dp"
+ android:bottomRightRadius="0dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_fffad1e0_10_10_0_0.xml b/app/src/main/res/drawable/shape_fffad1e0_10_10_0_0.xml
new file mode 100644
index 0000000..4e424ce
--- /dev/null
+++ b/app/src/main/res/drawable/shape_fffad1e0_10_10_0_0.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <solid android:color="#fffad1e0" />
+ <corners
+ android:topLeftRadius="10dp"
+ android:topRightRadius="10dp"
+ android:bottomLeftRadius="0dp"
+ android:bottomRightRadius="0dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_fffad1e0_10_10_0_0_weak.xml b/app/src/main/res/drawable/shape_fffad1e0_10_10_0_0_weak.xml
new file mode 100644
index 0000000..b7c6d9f
--- /dev/null
+++ b/app/src/main/res/drawable/shape_fffad1e0_10_10_0_0_weak.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <solid
+ android:color="#69FAD1E0"
+ />
+ <corners
+ android:topLeftRadius="10dp"
+ android:topRightRadius="10dp"
+ android:bottomLeftRadius="0dp"
+ android:bottomRightRadius="0dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_fffad1e0_10_10_0_10.xml b/app/src/main/res/drawable/shape_fffad1e0_10_10_0_10.xml
index 1ef7b95..51061a0 100644
--- a/app/src/main/res/drawable/shape_fffad1e0_10_10_0_10.xml
+++ b/app/src/main/res/drawable/shape_fffad1e0_10_10_0_10.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#FFFAD1E0"/>
- <corners android:topLeftRadius="10dp" android:topRightRadius="10dp" android:bottomLeftRadius="10dp" android:bottomRightRadius="0dp" />
+ <corners
+ android:topLeftRadius="10dp"
+ android:topRightRadius="10dp"
+ android:bottomLeftRadius="0dp"
+ android:bottomRightRadius="10dp" />
</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_fffad1e0_stroke_0_10_10_10.xml b/app/src/main/res/drawable/shape_fffad1e0_stroke_0_10_10_10.xml
new file mode 100644
index 0000000..440a3b2
--- /dev/null
+++ b/app/src/main/res/drawable/shape_fffad1e0_stroke_0_10_10_10.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <corners
+ android:topLeftRadius="0dp"
+ android:topRightRadius="10dp"
+ android:bottomLeftRadius="10dp"
+ android:bottomRightRadius="10dp" />
+ <stroke android:width="1dp" android:color="#fffad1e0" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_annual_health_status.xml b/app/src/main/res/layout/activity_annual_health_status.xml
new file mode 100644
index 0000000..f9363d1
--- /dev/null
+++ b/app/src/main/res/layout/activity_annual_health_status.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
+
+ <data>
+ <variable
+ name="viewModel"
+ type="com.application.zhangshi_app_android.ui.function.AnnualHealthStatusActivityViewModel" />
+ </data>
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <com.android.app_base.widget.ExtendTitleBar
+ android:id="@+id/titleBar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toTopOf="parent"
+ >
+ <FrameLayout
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginHorizontal="16dp"
+ android:layout_gravity="center_vertical|end"
+ >
+ <ImageView
+ android:id="@+id/iv_operate"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:background="@drawable/ic_operate"
+ />
+ </FrameLayout>
+
+ <LinearLayout
+ android:id="@+id/layout_default"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginHorizontal="56dp"
+ android:gravity="center_vertical"
+ >
+ <TextView
+ android:id="@+id/tv_title"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="16dp"
+ android:text="骞村害鍋ュ悍鎯呭喌"
+ android:layout_weight="1"
+ android:textColor="@color/white"
+ android:textSize="@dimen/sp_20"
+ />
+ <ImageView
+ android:id="@+id/iv_search_default"
+ android:layout_width="@dimen/dp_24"
+ android:layout_height="@dimen/dp_24"
+ android:background="@drawable/ic_search"
+ />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/layout_search"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginVertical="4dp"
+ android:layout_marginHorizontal="56dp"
+ android:gravity="center_vertical"
+ android:background="@color/white"
+ android:paddingHorizontal="5dp"
+ android:visibility="gone"
+ >
+ <ImageView
+ android:id="@+id/iv_search"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="@drawable/ic_search_gray"
+ />
+ <EditText
+ android:id="@+id/et_search"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginStart="5dp"
+ android:textSize="14sp"
+ android:textColor="#61000000"
+ android:background="@null"
+ android:imeOptions="actionSearch"
+ android:text=""
+ android:singleLine="true"
+ android:hint="鍦ㄢ�滃澶т簨璁板唴鎼滅储鈥�"
+ />
+ <ImageView
+ android:id="@+id/iv_search_type"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="@drawable/ic_search_by"
+ />
+ </LinearLayout>
+
+ </com.android.app_base.widget.ExtendTitleBar>
+
+ <LinearLayout
+ android:id="@+id/layout_data_null"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:gravity="center"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/titleBar">
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/img_data_null"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="18dp"
+ android:text="鏆傛椂杩樻病鏈夋暟鎹摝~\n鐐瑰嚮鈥濓紜鈥濈珛鍗冲垱寤�"
+ android:textSize="14sp"
+ android:textColor="#73000000"
+ />
+ </LinearLayout>
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/recyclerView"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:background="@color/color_normal_background"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/titleBar"
+ app:layout_constraintVertical_bias="1.0"
+ tools:itemCount="20"
+ tools:layout_editor_absoluteX="-81dp"
+ tools:listitem="@layout/item_family_assets" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_annual_health_status_detail.xml b/app/src/main/res/layout/activity_annual_health_status_detail.xml
new file mode 100644
index 0000000..53366db
--- /dev/null
+++ b/app/src/main/res/layout/activity_annual_health_status_detail.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
+
+ <data>
+ <variable
+ name="viewModel"
+ type="com.application.zhangshi_app_android.ui.function.AnnualHealthStatusDetailActivityViewModel" />
+ </data>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/color_normal_background"
+ android:orientation="vertical">
+
+ <com.android.app_base.widget.ExtendTitleBar
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:title="骞村害鍋ュ悍鐘跺喌"
+ app:titleGravity="left"
+ />
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:paddingHorizontal="20dp"
+ android:paddingBottom="20dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="@dimen/dp_10"
+ android:layout_height="@dimen/dp_20"
+ android:text="搴忓彿"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+
+
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="text"
+ android:autofillHints="creditCardNumber"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:text="@{String.valueOf(viewModel.beanLiveData.id)}"
+ />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="浣撴鏃堕棿"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="text"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.time}"
+ android:textSize="16sp" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="绫诲埆"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:text="@={viewModel.beanLiveData.type}"
+ android:textColor="#DE000000"
+ android:textSize="16sp" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="灏辩梾鍖婚櫌"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.hospital}"
+ android:textSize="16sp" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="鎻愬悕"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.name}"
+ android:textSize="16sp" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="娉ㄦ剰浜嬮」"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.attention}"
+ android:textSize="16sp" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="澶囨敞"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.remark}"
+ android:textSize="16sp" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="鐢靛瓙鏂囦欢"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/shape_6b0000_stroke"
+ >
+ <com.android.app_base.widget.WrapRecyclerView
+ android:id="@+id/rv_image"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="10dp"
+ android:layout_marginTop="2sp"
+ android:paddingStart="10dp"
+ android:paddingEnd="5dp"
+ android:paddingVertical="10dp"
+ />
+
+ </RelativeLayout>
+
+
+ </LinearLayout>
+ </ScrollView>
+
+
+ </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_certificate_of_honor.xml b/app/src/main/res/layout/activity_certificate_of_honor.xml
index cbc1500..b234c6f 100644
--- a/app/src/main/res/layout/activity_certificate_of_honor.xml
+++ b/app/src/main/res/layout/activity_certificate_of_honor.xml
@@ -47,7 +47,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
- android:text="鐧惧勾蹇冩効(浠呬緵鍙傝��)"
+ android:text="鑽ｈ獕璇佷功锛堜粎渚涙煡鐪嬶級"
android:layout_weight="1"
android:textColor="@color/white"
android:textSize="@dimen/sp_20"
diff --git a/app/src/main/res/layout/activity_contacts.xml b/app/src/main/res/layout/activity_contacts.xml
new file mode 100644
index 0000000..bd7048d
--- /dev/null
+++ b/app/src/main/res/layout/activity_contacts.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
+
+ <data>
+ <variable
+ name="viewModel"
+ type="com.application.zhangshi_app_android.ui.function.ContactsActivityViewModel" />
+ </data>
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <com.android.app_base.widget.ExtendTitleBar
+ android:id="@+id/titleBar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toTopOf="parent"
+ >
+ <FrameLayout
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginHorizontal="16dp"
+ android:layout_gravity="center_vertical|end"
+ >
+ <ImageView
+ android:id="@+id/iv_operate"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:background="@drawable/ic_operate"
+ />
+ </FrameLayout>
+
+ <LinearLayout
+ android:id="@+id/layout_default"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginHorizontal="56dp"
+ android:gravity="center_vertical"
+ >
+ <TextView
+ android:id="@+id/tv_title"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="16dp"
+ android:text="閫氳褰�(浠呬緵鏌ョ湅)"
+ android:layout_weight="1"
+ android:textColor="@color/white"
+ android:textSize="@dimen/sp_20"
+ />
+ <ImageView
+ android:id="@+id/iv_search_default"
+ android:layout_width="@dimen/dp_24"
+ android:layout_height="@dimen/dp_24"
+ android:background="@drawable/ic_search"
+ />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/layout_search"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginVertical="4dp"
+ android:layout_marginHorizontal="56dp"
+ android:gravity="center_vertical"
+ android:background="@color/white"
+ android:paddingHorizontal="5dp"
+ android:visibility="gone"
+ >
+ <ImageView
+ android:id="@+id/iv_search"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="@drawable/ic_search_gray"
+ />
+ <EditText
+ android:id="@+id/et_search"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginStart="5dp"
+ android:textSize="14sp"
+ android:textColor="#61000000"
+ android:background="@null"
+ android:imeOptions="actionSearch"
+ android:text=""
+ android:singleLine="true"
+ android:hint="鍦ㄢ�滈�氳褰曞唴鎼滅储鈥�"
+ />
+ <ImageView
+ android:id="@+id/iv_search_type"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="@drawable/ic_search_by"
+ />
+ </LinearLayout>
+
+ </com.android.app_base.widget.ExtendTitleBar>
+
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/recyclerView"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:background="@color/color_normal_background"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/titleBar"
+ app:layout_constraintVertical_bias="1.0"
+ tools:itemCount="10"
+ tools:layout_editor_absoluteX="-81dp"
+ tools:listitem="@layout/item_contacts" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_family_memorabilia_create.xml b/app/src/main/res/layout/activity_family_memorabilia_create.xml
index 16cc68c..b48456f 100644
--- a/app/src/main/res/layout/activity_family_memorabilia_create.xml
+++ b/app/src/main/res/layout/activity_family_memorabilia_create.xml
@@ -119,7 +119,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_2"
- android:hint="璇疯緭鍏ユ椂闂�"
+ android:hint="璇疯緭鍏ユ椂闂�(鏍煎紡锛�2001-01-01)"
android:inputType="text"
android:textColorHint="#6b000000"
android:textColor="#DE000000"
diff --git a/app/src/main/res/layout/activity_growth_experience.xml b/app/src/main/res/layout/activity_growth_experience.xml
index df8eb8f..134d4aa 100644
--- a/app/src/main/res/layout/activity_growth_experience.xml
+++ b/app/src/main/res/layout/activity_growth_experience.xml
@@ -33,7 +33,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingBottom="@dimen/dp_10"
+ android:paddingBottom="20dp"
>
<TextView
android:id="@+id/tv_basic_information"
@@ -73,6 +73,7 @@
android:textColor="#DE000000"
android:textColorHint="#6b000000"
android:textSize="@dimen/sp_16"
+ android:text="@{viewModel.infoLiveData.nickName}"
tools:text="寮犱笁" />
<View
@@ -81,6 +82,7 @@
android:layout_marginTop="5dp"
android:background="#6B000000" />
</LinearLayout>
+
<LinearLayout
android:id="@+id/layout_2"
@@ -107,6 +109,7 @@
android:textColor="#DE000000"
android:textSize="@dimen/sp_16"
tools:text="寮犲洓"
+ android:text="@{viewModel.infoLiveData.oldName}"
/>
<View
@@ -152,6 +155,7 @@
android:textColorHint="#6b000000"
android:textSize="@dimen/sp_16"
tools:text="鐢�"
+ android:text="@{String.valueOf(viewModel.infoLiveData.sex)}"
/>
<View
@@ -172,7 +176,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20"
- android:text="鍚嶆棌"
+ android:text="姘戞棌"
android:textColor="#88000000"
android:textSize="@dimen/sp_12" />
@@ -184,6 +188,7 @@
android:textColorHint="#6b000000"
android:textSize="@dimen/sp_16"
tools:text="姹夋棌"
+ android:text="@{viewModel.infoLiveData.nationality}"
/>
<View
@@ -216,7 +221,9 @@
android:textColor="#DE000000"
android:textColorHint="#6b000000"
android:textSize="@dimen/sp_16"
- tools:text="涓浗" />
+ tools:text="涓浗"
+ android:text="@{viewModel.infoLiveData.nation}"
+ />
<View
android:layout_width="match_parent"
@@ -247,7 +254,8 @@
android:textColor="#DE000000"
android:textColorHint="#6b000000"
android:textSize="@dimen/sp_16"
- tools:text="鏈" />
+ tools:text="鏈"
+ android:text="@{String.valueOf(viewModel.infoLiveData.maritalStatus)}"/>
<View
android:layout_width="match_parent"
@@ -278,7 +286,8 @@
android:textColor="#DE000000"
android:textColorHint="#6b000000"
android:textSize="@dimen/sp_16"
- tools:text="1234567890" />
+ tools:text="1234567890"
+ android:text="@{viewModel.infoLiveData.phoneNumber}"/>
<View
android:layout_width="match_parent"
@@ -311,13 +320,15 @@
android:textColor="#DE000000"
android:textColorHint="#6b000000"
android:textSize="@dimen/sp_16"
- tools:text="缇や紬" />
+ tools:text="缇や紬"
+ android:text="@{viewModel.infoLiveData.politicalOutlook}"/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="5dp"
- android:background="#6B000000" />
+ android:background="#6B000000"
+ />
</LinearLayout>
<LinearLayout
@@ -343,7 +354,8 @@
android:textColor="#DE000000"
android:textColorHint="#6b000000"
android:textSize="@dimen/sp_16"
- tools:text="440000199801010001" />
+ tools:text="440000199801010001"
+ android:text="@{viewModel.infoLiveData.idNum}"/>
<View
android:layout_width="match_parent"
@@ -375,70 +387,72 @@
android:textColor="#DE000000"
android:textColorHint="#6b000000"
android:textSize="@dimen/sp_16"
- tools:text="骞夸笢鐪佸箍宸炲競鐣鍖哄皬璋峰洿琛楅亾" />
+ tools:text="骞夸笢鐪佸箍宸炲競鐣鍖哄皬璋峰洿琛楅亾"
+ android:text="@{viewModel.infoLiveData.locationAddress}" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="5dp"
android:background="#6B000000" />
+
</LinearLayout>
<LinearLayout
- android:id="@+id/layout_8"
+ android:id="@+id/layout_experience"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="50dp"
android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@id/layout_7"
- tools:layout_editor_absoluteX="0dp"
android:layout_marginTop="16dp"
+ tools:layout_height="wrap_content"
>
<LinearLayout
+ android:id="@+id/layout_experience_title"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="50dp"
+ android:gravity="center_vertical"
>
<TextView
android:id="@+id/tv_primary_experience"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:layout_marginTop="@dimen/dp_5"
android:text="涓昏瀛︿範鍙婂伐浣滅粡鍘�"
android:textColor="#ff000000"
android:textSize="@dimen/sp_20"
android:textStyle="bold" />
- <ImageButton
- android:id="@+id/iv_fold_1"
- android:layout_width="20dp"
- android:layout_height="20dp"
+ <ImageView
+ android:id="@+id/iv_experience_fold"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:contentDescription="@string/iv_fold_1_description"
- android:background="@drawable/ic_unfold"
+ android:background="@{viewModel.isExperienceExpendedLiveData ? @drawable/ic_unfold : @drawable/ic_fold}"
/>
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
- android:id="@+id/recyclerView"
+ android:id="@+id/rv_primary"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/color_normal_background"
- android:layout_marginTop="16dp"
+ android:layout_height="wrap_content"
tools:itemCount="3"
- tools:listitem="@layout/item_growth_experience_primary" />
-
+ tools:listitem="@layout/item_growth_experience_primary"
+ />
</LinearLayout>
<LinearLayout
- android:id="@+id/layout_9"
+ android:id="@+id/layout_relation"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- app:layout_constraintTop_toBottomOf="@id/layout_8"
- android:layout_marginTop="30dp"
+ android:layout_height="50dp"
+ android:orientation="vertical"
+ app:layout_constraintTop_toBottomOf="@id/layout_experience"
+ android:layout_marginTop="10dp"
>
<LinearLayout
+ android:id="@+id/layout_relation_title"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="50dp"
+ android:gravity="center_vertical"
>
<TextView
android:id="@+id/tv_relationship_condition"
@@ -449,23 +463,21 @@
android:textColor="#ff000000"
android:textSize="@dimen/sp_20"
android:textStyle="bold" />
- <ImageButton
- android:id="@+id/iv_fold_2"
- android:layout_width="20dp"
- android:layout_height="20dp"
- android:layout_gravity="center"
- android:contentDescription="@string/iv_fold_1_description"
- android:background="@drawable/ic_unfold" />
+ <ImageView
+ android:id="@+id/iv_relation_fold"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@{viewModel.isRelationExpendedLiveData ? @drawable/ic_unfold : @drawable/ic_fold}"
+ />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_relationship"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:background="@color/color_normal_background"
- android:layout_marginTop="16dp"
tools:itemCount="3"
- tools:listitem="@layout/item_growth_experience_primary" />
+ tools:listitem="@layout/item_growth_experience_relationship" />
</LinearLayout>
@@ -475,8 +487,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- app:layout_constraintTop_toBottomOf="@id/layout_9"
- android:layout_marginTop="30dp"
+ app:layout_constraintTop_toBottomOf="@id/layout_relation"
+ android:layout_marginTop="10dp"
>
<TextView
@@ -535,16 +547,18 @@
</LinearLayout>
<LinearLayout
- android:id="@+id/layout_11"
+ android:id="@+id/layout_holder"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="50dp"
android:orientation="vertical"
- android:layout_marginTop="30dp"
+ android:layout_marginTop="10dp"
app:layout_constraintTop_toBottomOf="@id/layout_10"
>
<LinearLayout
+ android:id="@+id/layout_holder_title"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="50dp"
+ android:gravity="center_vertical"
>
<TextView
android:id="@+id/tv_certificate_condition"
@@ -557,36 +571,37 @@
android:textStyle="bold" />
<ImageButton
- android:id="@+id/iv_fold_3"
- android:layout_width="20dp"
- android:layout_height="20dp"
+ android:id="@+id/iv_holder_fold"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:background="@drawable/ic_unfold" />
+ android:background="@{viewModel.isHolderExpendedLiveData ? @drawable/ic_unfold : @drawable/ic_fold}"
+ />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_certificates"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/color_normal_background"
- android:layout_marginTop="16dp"
+ android:layout_height="wrap_content"
tools:itemCount="3"
- tools:listitem="@layout/item_growth_experience_primary" />
+ tools:listitem="@layout/item_growth_experience_holder_condition" />
</LinearLayout>
<LinearLayout
- android:id="@+id/layout_12"
+ android:id="@+id/layout_abroad"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="50dp"
android:orientation="vertical"
- app:layout_constraintTop_toBottomOf="@id/layout_11"
- android:layout_marginTop="30dp"
+ app:layout_constraintTop_toBottomOf="@id/layout_holder"
+ android:layout_marginTop="10dp"
>
<LinearLayout
+ android:id="@+id/layout_abroad_title"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="50dp"
+ android:gravity="center_vertical"
>
<TextView
android:id="@+id/tv_abroad_condition"
@@ -599,36 +614,57 @@
android:textStyle="bold" />
<ImageButton
- android:id="@+id/iv_fold_4"
+ android:id="@+id/iv_abroad_fold"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="center_vertical"
- android:background="@drawable/ic_unfold"
+ android:background="@{viewModel.isAbroadExpendedLiveData ? @drawable/ic_unfold : @drawable/ic_fold}}"
/>
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_abroad"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/color_normal_background"
- android:layout_marginTop="16dp"
+ android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/layout_11"
tools:itemCount="3"
- tools:listitem="@layout/item_growth_experience_primary" />
+ tools:listitem="@layout/item_growth_experience_abroad_condition" />
</LinearLayout>
<TextView
android:id="@+id/tv_autobiography"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="30dp"
+ android:layout_marginTop="20dp"
android:text="鑷紶"
android:textColor="#ff000000"
android:textSize="@dimen/sp_20"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/layout_12" />
+ app:layout_constraintTop_toBottomOf="@+id/layout_abroad"
+ />
+ <com.google.android.material.tabs.TabLayout
+ android:id="@+id/tab_layout"
+ android:layout_width="match_parent"
+ android:layout_height="30dp"
+ android:layout_marginTop="16dp"
+ app:tabTextAppearance="@style/MyTabLayout"
+ app:tabTextColor="#88000000"
+ app:tabSelectedTextColor="#FF000000"
+ app:layout_constraintTop_toBottomOf="@+id/tv_autobiography"
+ app:tabMode="scrollable"
+ app:tabIndicatorHeight="0dp"
+ app:tabGravity="fill"
+ />
+ <TextView
+ android:id="@+id/tv_fill"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/shape_fffad1e0_stroke_0_10_10_10"
+ android:paddingHorizontal="16dp"
+ android:paddingVertical="10dp"
+ app:layout_constraintTop_toBottomOf="@id/tab_layout"
+ />
diff --git a/app/src/main/res/layout/activity_health_care.xml b/app/src/main/res/layout/activity_health_care.xml
new file mode 100644
index 0000000..53bd954
--- /dev/null
+++ b/app/src/main/res/layout/activity_health_care.xml
@@ -0,0 +1,3758 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ >
+
+ <data>
+ <variable
+ name="viewModel"
+ type="com.application.zhangshi_app_android.ui.function.HealthCareActivityViewModel" />
+ </data>
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/color_normal_background"
+ >
+
+ <com.android.app_base.widget.ExtendTitleBar
+ android:id="@+id/extendTitleBar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:elevation="10dp"
+ app:layout_constraintTop_toTopOf="parent"
+ app:title="鍋ュ悍淇濆仴"
+ app:titleGravity="left"
+ >
+ <FrameLayout
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginHorizontal="16dp"
+ android:layout_gravity="center_vertical|end"
+ >
+ <ImageView
+ android:id="@+id/iv_operate"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:background="@drawable/ic_operate"
+ />
+ </FrameLayout>
+ </com.android.app_base.widget.ExtendTitleBar>
+
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/extendTitleBar"
+ >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingBottom="20dp"
+ >
+ <LinearLayout
+ android:id="@+id/ll_basic_information"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:layout_marginHorizontal="20dp"
+ android:layout_marginVertical="16dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="XXX鐜扮姸鍋ュ悍鎯呭喌淇℃伅"
+ android:textColor="@color/black"
+ android:textSize="20sp"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍩烘湰淇℃伅"
+ android:textColor="@color/black"
+ android:textSize="20sp"
+ android:layout_marginTop="10dp"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="濮撳悕"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="寮犱笁"
+ android:textColor="#DE000000"
+ android:textSize="14sp"
+ android:layout_marginTop="5dp"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#6B000000"
+ android:layout_marginTop="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:layout_marginStart="40dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鎬у埆"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鐢�"
+ android:textColor="#DE000000"
+ android:textSize="14sp"
+ android:layout_marginTop="5dp"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#6B000000"
+ android:layout_marginTop="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="20dp"
+ >
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鏂囧寲绋嬪害"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鏈"
+ android:textColor="#DE000000"
+ android:textSize="14sp"
+ android:layout_marginTop="5dp"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#6B000000"
+ android:layout_marginTop="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:layout_marginStart="40dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鑱屼笟"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="缁忕悊"
+ android:textColor="#DE000000"
+ android:textSize="14sp"
+ android:layout_marginTop="5dp"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#6B000000"
+ android:layout_marginTop="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="20dp"
+ >
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鐢佃瘽"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="17818824255"
+ android:textColor="#DE000000"
+ android:textSize="14sp"
+ android:layout_marginTop="5dp"
+ android:ellipsize="marquee"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#6B000000"
+ android:layout_marginTop="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:layout_marginStart="40dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鐢靛瓙閭欢"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Zhang@123.com"
+ android:textColor="#DE000000"
+ android:textSize="14sp"
+ android:layout_marginTop="5dp"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#6B000000"
+ android:layout_marginTop="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="20dp"
+ >
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="浣忓潃"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="骞夸笢鐪佸箍宸炲競鐣鍖哄皬璋峰洿琛楅亾骞夸笢宸ヤ笟澶у"
+ android:textColor="#DE000000"
+ android:textSize="14sp"
+ android:layout_marginTop="5dp"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#6B000000"
+ android:layout_marginTop="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="20dp"
+ >
+ <TextView
+ android:id="@+id/tv_blood_type"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="琛�鍨�"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ />
+ <LinearLayout
+ android:id="@+id/layout_type_A"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ app:layout_constraintTop_toBottomOf="@id/tv_blood_type"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/layout_type_B"
+ android:layout_marginTop="10dp"
+ app:layout_constraintHorizontal_chainStyle="spread_inside"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="A鍨�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_type_B"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ app:layout_constraintTop_toTopOf="@id/layout_type_A"
+ app:layout_constraintStart_toEndOf="@id/layout_type_A"
+ app:layout_constraintEnd_toStartOf="@id/layout_type_C"
+ >
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="B鍨�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_type_C"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ app:layout_constraintTop_toTopOf="@id/layout_type_A"
+ app:layout_constraintStart_toEndOf="@id/layout_type_B"
+ app:layout_constraintEnd_toStartOf="@id/layout_type_RH"
+ >
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="C鍨�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_type_RH"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ app:layout_constraintTop_toTopOf="@id/layout_type_A"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@id/layout_type_C"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="RH闃村瀷"
+ android:textColor="#DE000000"
+ android:textSize="14sp"
+ android:layout_marginStart="8dp"
+ />
+
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_type_other"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ app:layout_constraintTop_toBottomOf="@id/layout_type_A"
+ app:layout_constraintStart_toStartOf="@id/layout_type_A"
+ android:layout_marginTop="10dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鍏朵粬鐗规畩琛�鍨�"
+ android:textColor="#DE000000"
+ android:textSize="14sp"
+ android:layout_marginStart="8dp"
+ />
+
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_type_unknow"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ app:layout_constraintTop_toTopOf="@id/layout_type_other"
+ app:layout_constraintStart_toStartOf="@id/layout_type_C"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="RH闃村瀷"
+ android:textColor="#DE000000"
+ android:textSize="14sp"
+ android:layout_marginStart="8dp"
+ />
+
+ </LinearLayout>
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="杩囨晱鍙�"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ android:layout_marginTop="20dp"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:id="@+id/layout_drugs"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鑽墿"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_food"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:layout_marginStart="20dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="椋熷搧"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_allergies_other"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:layout_marginStart="20dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鍏朵粬"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="閬椾紶鐥呭彶"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ android:layout_marginTop="20dp"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:id="@+id/layout_hypertension"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="楂樿鍘�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_diabetes"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="绯栧翱鐥�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_tumor"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鑲跨槫"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_genetic_other"
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鍏朵粬"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="20dp"
+ >
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="甯哥敤鑽墿"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="闃垮徃鍖规灄"
+ android:textColor="#DE000000"
+ android:textSize="14sp"
+ android:layout_marginTop="5dp"
+ android:ellipsize="marquee"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#6B000000"
+ android:layout_marginTop="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:layout_marginStart="40dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鐩墠鍩虹鐥�"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍐犲績鐥呫�佸摦鍠�"
+ android:textColor="#DE000000"
+ android:textSize="14sp"
+ android:layout_marginTop="5dp"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#6B000000"
+ android:layout_marginTop="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ </LinearLayout>
+ <androidx.cardview.widget.CardView
+ android:id="@+id/card_life_habits"
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:layout_marginHorizontal="14dp"
+ app:cardCornerRadius="10dp"
+ app:cardElevation="3dp"
+ tools:layout_height="wrap_content"
+ >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:layout_marginHorizontal="6dp"
+ >
+ <LinearLayout
+ android:id="@+id/layout_title_life_habits"
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:gravity="center_vertical"
+ >
+ <TextView
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:text="鐢熸椿涔犳儻"
+ android:textColor="@color/black"
+ android:textSize="20sp"
+ />
+ <ImageView
+ android:id="@+id/iv_life_habits_fold"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@{viewModel.isLifeHabitsExpendedLiveData?@drawable/ic_unfold:@drawable/ic_fold}"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_content_life_habits"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingBottom="14dp"
+ >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ >
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="楗锛堝枩锛�"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鐢滃搧銆佺偣蹇�"
+ android:textColor="#DE000000"
+ android:textSize="14sp"
+ android:layout_marginTop="5dp"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#6B000000"
+ android:layout_marginTop="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:layout_marginStart="40dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="楗锛堝繉锛�"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="杈涜荆銆佸喎鍐�"
+ android:textColor="#DE000000"
+ android:textSize="14sp"
+ android:layout_marginTop="5dp"
+ android:drawableStart="@drawable/ic_radio_button"
+ android:drawablePadding="8dp"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#6B000000"
+ android:layout_marginTop="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="20dp"
+ >
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鐖卞ソ"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鍠濊尪"
+ android:textColor="#DE000000"
+ android:textSize="14sp"
+ android:layout_marginTop="5dp"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#6B000000"
+ android:layout_marginTop="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:layout_marginStart="40dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鍡滃ソ"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鍚哥儫"
+ android:textColor="#DE000000"
+ android:textSize="14sp"
+ android:layout_marginTop="5dp"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#6B000000"
+ android:layout_marginTop="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鐫＄湢"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ android:layout_marginTop="20dp"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:id="@+id/layout_sleep_nice"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鑹ソ"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_sleep_soso"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:layout_marginStart="20dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="涓�鑸�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_sleep_easy_awake"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:layout_marginStart="20dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鏄撻啋"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_sleep_dreaminess"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:layout_marginStart="20dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="澶氭ⅵ"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:id="@+id/layout_sleep_insomnia"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="澶辩湢"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_sleep_snore"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:layout_marginStart="20dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鎵撻季"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_sleep_poor_sleep"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:layout_marginStart="20dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鐫′笉鐔�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="20dp"
+ >
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="澶т究"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="1娆�/d"
+ android:textColor="#DE000000"
+ android:textSize="14sp"
+ android:layout_marginTop="5dp"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#6B000000"
+ android:layout_marginTop="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:layout_marginStart="40dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="灏忎究"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="6娆�/d"
+ android:textColor="#DE000000"
+ android:textSize="14sp"
+ android:layout_marginTop="5dp"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#6B000000"
+ android:layout_marginTop="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="澶т究瑙勫緥"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ android:layout_marginTop="20dp"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="姝ｅ父"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:layout_marginStart="20dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="绉樼粨"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:layout_marginStart="20dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鑵规郴"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:layout_marginStart="20dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="澶辩"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="灏忎究瑙勫緥"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ android:layout_marginTop="20dp"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="姝ｅ父"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:layout_marginStart="20dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="澶滃翱娼寸暀"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:layout_marginStart="20dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="澶辩"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:layout_marginStart="20dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="閬楀翱"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="楗涔犳儻"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ android:layout_marginTop="20dp"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鑽ょ礌鍧囧寑"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:layout_marginStart="20dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鑽ら涓轰富"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:layout_marginStart="20dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="绱犻涓轰富"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鍡滅洂"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:layout_marginStart="20dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鍡滄补"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:layout_marginStart="20dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鍡滅硸"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:layout_marginStart="20dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鍏朵粬"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鐢熸椿浜嬩欢"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ android:layout_marginTop="20dp"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="涓у伓锛堜袱骞翠箣鍐咃級"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:layout_marginStart="20dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鐩墠鐙眳"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="涓�骞翠箣鍐呬綇闄㈡不鐤�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:layout_marginStart="20dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="瀛愬コ鍒嗗鐢熸椿"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ </LinearLayout>
+
+ </LinearLayout>
+
+ </androidx.cardview.widget.CardView>
+ <androidx.cardview.widget.CardView
+ android:id="@+id/card_nursing"
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:layout_marginHorizontal="14dp"
+ android:layout_marginTop="10dp"
+ app:cardCornerRadius="10dp"
+ app:cardElevation="2dp"
+ tools:layout_height="wrap_content"
+ >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:layout_marginHorizontal="6dp"
+ >
+ <LinearLayout
+ android:id="@+id/layout_title_nursing"
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:gravity="center_vertical"
+ >
+ <TextView
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:text="鎶ょ悊鏌ヤ綋"
+ android:textColor="#CC000000"
+ android:textSize="18sp"
+ />
+ <ImageView
+ android:id="@+id/iv_nursing_fold"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@{viewModel.isNursingExpendedLiveData?@drawable/ic_unfold:@drawable/ic_fold}"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_content_nursing"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingBottom="14dp"
+ >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ >
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="浣撴俯"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="26.5 掳C"
+ android:textColor="#B3000000"
+ android:textSize="16sp"
+ android:layout_marginTop="5dp"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#6B000000"
+ android:layout_marginTop="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:layout_marginStart="40dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鑴夋悘"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="60涓�/鍒�"
+ android:textColor="#B3000000"
+ android:textSize="16sp"
+ android:layout_marginTop="5dp"
+ android:drawableStart="@drawable/ic_radio_button"
+ android:drawablePadding="8dp"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#6B000000"
+ android:layout_marginTop="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="20dp"
+ >
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="琛�鍘�"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="120"
+ android:textColor="#B3000000"
+ android:textSize="16sp"
+ android:layout_marginTop="5dp"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#6B000000"
+ android:layout_marginTop="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:layout_marginStart="40dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="浣撻噸"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="65kg"
+ android:textColor="#B3000000"
+ android:textSize="16sp"
+ android:layout_marginTop="5dp"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#6B000000"
+ android:layout_marginTop="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鐨偆绮樿啘"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ android:layout_marginTop="20dp"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="闈掓槬鐥�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:layout_marginStart="20dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鐗涚毊钘�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:layout_marginStart="20dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鑹茬礌娌夌潃"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:layout_marginStart="20dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="姘磋偪"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鐨柟"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="娣ょ偣娣ゆ枒"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鐨笅缁撹妭鎴栬偪鍧�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="铚樿洓鐥�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:layout_marginStart="32dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="婧冪枴鎴栫櫆鐥�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="蹇冪悊鐘舵��"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ android:layout_marginTop="20dp"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="寮�鏈�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鐒﹁檻"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="蹇ф剚鎭愭儳"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鐚滅枒"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鍘嬫姂"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鎬濆康"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鐥呯悊鎬佸害"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ android:layout_marginTop="20dp"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鏄庢湕"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="涓嶄簡瑙�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="姝ｅ父"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="涓嶆甯�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍏ㄨ韩钀ュ吇鎯呭喌"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ android:layout_marginTop="20dp"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鑹ソ"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="涓瓑"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="娆犱匠"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鑲ヨ儢"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ </LinearLayout>
+
+ </LinearLayout>
+
+ </androidx.cardview.widget.CardView>
+ <androidx.cardview.widget.CardView
+ android:id="@+id/card_health"
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:layout_marginHorizontal="14dp"
+ android:layout_marginTop="10dp"
+ app:cardCornerRadius="10dp"
+ app:cardElevation="2dp"
+ tools:layout_height="wrap_content"
+ >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:layout_marginHorizontal="6dp"
+ >
+ <LinearLayout
+ android:id="@+id/layout_title_health"
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:gravity="center_vertical"
+ >
+ <TextView
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:text="鐜板瓨鍋ュ悍闂"
+ android:textColor="@color/black"
+ android:textSize="20sp"
+ />
+ <ImageView
+ android:id="@+id/iv_health_fold"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@{viewModel.isHealthExpendedLiveData?@drawable/ic_unfold:@drawable/ic_fold}"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_content_health"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingBottom="14dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鑴戣绠＄柧鐥�"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="缂鸿鎬у崚涓�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鑴戝嚭琛�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鍏朵粬"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="铔涚綉鑶滀笅鑵斿嚭琛� "
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鐭殏鎬ц剳缂鸿鍙戜綔"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="蹇冭剰鐤剧梾"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ android:layout_marginTop="20dp"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="蹇冭倢姊楀 "
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="蹇冪粸鐥�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鍏呰鎬у績鍔涜“绔�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鍐犵姸鍔ㄨ剦琛�杩愰噸寤�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="蹇冨墠鍖虹柤鐥�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鍏朵粬"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="琛�绠＄柧鐥�"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ android:layout_marginTop="20dp"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="澶瑰眰鍔ㄨ剦鐦�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鍔ㄨ剦闂鎬х柧鐥�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鍏跺畠"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="娑堝寲绯荤粺鐤剧梾"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ android:layout_marginTop="20dp"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鑳冨崄浜屾寚鑲犳簝鐤�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="杩旀祦鎬ч绠＄値"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鎱㈡�ц儍鐐�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鑲濈値"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鍏跺畠"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鑳嗗泭鐐�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鑳嗙煶鐥�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鑴傝偑鑲�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="楂樿剛琛�鐥�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鐥旂柈"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鍏跺畠"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍛煎惛绯荤粺鐤剧梾"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ android:layout_marginTop="20dp"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="COPD"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鑲虹値"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鏀皵绠＄値"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鏀皵绠″摦"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鑲虹粨鏍�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="涓婂懠鍚搁亾鎰熸煋"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鍏朵粬"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鑲捐剰鐤剧梾"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ android:layout_marginTop="20dp"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="绯栧翱鐥呰偩鐥� "
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鑲惧姛鑳借“绔�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <View
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ />
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鎬ユ�ц偩鐐�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鎱㈡�ц偩鐐� "
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="娉屽翱绯荤粺缁撶煶"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="娉屽翱绯荤粺鎰熸煋"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鍏朵粬"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍏跺畠鐤剧梾"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ android:layout_marginTop="20dp"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_weight="2"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="瀛曟湡涓変釜鏈堜互鍐呯殑瀛曞"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鐥呮瘨鎬ч噸鎰熷啋"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_weight="2"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="浼犳煋鎬х柧鐥�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鑲哄ぇ鐤�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="缁撴牳鎬х┖娲炲舰鎴愮殑鍜"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_weight="2"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="鏈粡澶勭悊鐨勬皵鑳�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_radio_button_selected"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:maxLines="1"
+ android:text="娲诲姩鎬у嚭琛�"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:layout_marginStart="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ </LinearLayout>
+
+ </LinearLayout>
+
+ </androidx.cardview.widget.CardView>
+
+ <com.google.android.material.tabs.TabLayout
+ android:id="@+id/tab_layout"
+ android:layout_width="match_parent"
+ android:layout_height="30dp"
+ android:layout_marginTop="20dp"
+ android:layout_marginHorizontal="20dp"
+ app:tabTextAppearance="@style/MyTabLayout"
+ app:tabTextColor="#88000000"
+ app:tabSelectedTextColor="#FF000000"
+ app:layout_constraintTop_toBottomOf="@+id/tv_autobiography"
+ app:tabMode="scrollable"
+ app:tabIndicatorHeight="0dp"
+ app:tabGravity="fill"
+ />
+ <TextView
+ android:id="@+id/tv_fill"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/shape_fffad1e0_stroke_0_10_10_10"
+ android:paddingHorizontal="16dp"
+ android:paddingVertical="10dp"
+ android:layout_marginHorizontal="20dp"
+ app:layout_constraintTop_toBottomOf="@id/tab_layout"
+ />
+
+ </LinearLayout>
+ </ScrollView>
+ </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_hundred_wish.xml b/app/src/main/res/layout/activity_hundred_wish.xml
index a9745a1..7ba9212 100644
--- a/app/src/main/res/layout/activity_hundred_wish.xml
+++ b/app/src/main/res/layout/activity_hundred_wish.xml
@@ -47,7 +47,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
- android:text="鐧惧勾蹇冩効(浠呬緵鍙傝��)"
+ android:text="鐧惧勾蹇冩効(浠呬緵鏌ョ湅)"
android:layout_weight="1"
android:textColor="@color/white"
android:textSize="@dimen/sp_20"
diff --git a/app/src/main/res/layout/activity_income_and_expenses.xml b/app/src/main/res/layout/activity_income_and_expenses.xml
index 2ad13d3..e1982a9 100644
--- a/app/src/main/res/layout/activity_income_and_expenses.xml
+++ b/app/src/main/res/layout/activity_income_and_expenses.xml
@@ -47,7 +47,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
- android:text="淇濇磥鏀剁撼"
+ android:text="鏀舵敮鍙拌处"
android:layout_weight="1"
android:textColor="@color/white"
android:textSize="@dimen/sp_20"
diff --git a/app/src/main/res/layout/activity_marriage.xml b/app/src/main/res/layout/activity_marriage.xml
index e984bc8..91fcba1 100644
--- a/app/src/main/res/layout/activity_marriage.xml
+++ b/app/src/main/res/layout/activity_marriage.xml
@@ -36,6 +36,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
+ android:paddingBottom="20dp"
>
<LinearLayout
android:id="@+id/ll_basic_information"
@@ -621,8 +622,8 @@
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="鍓嶄换"
- android:textColor="@color/black"
- android:textSize="20sp"
+ android:textColor="#CC000000"
+ android:textSize="18sp"
/>
<ImageView
android:id="@+id/iv_predecessor_fold"
@@ -661,8 +662,8 @@
android:layout_height="wrap_content"
android:maxLines="1"
android:text="寮犱笁"
- android:textColor="#DE000000"
- android:textSize="14sp"
+ android:textColor="#B3000000"
+ android:textSize="16sp"
android:layout_marginTop="5dp"
/>
<View
@@ -693,8 +694,8 @@
android:layout_height="wrap_content"
android:maxLines="1"
android:text="绂诲"
- android:textColor="#DE000000"
- android:textSize="14sp"
+ android:textColor="#B3000000"
+ android:textSize="16sp"
android:layout_marginTop="5dp"
android:drawableStart="@drawable/ic_radio_button"
android:drawablePadding="8dp"
@@ -732,8 +733,8 @@
android:layout_height="wrap_content"
android:maxLines="1"
android:text="2010-01-01"
- android:textColor="#DE000000"
- android:textSize="14sp"
+ android:textColor="#B3000000"
+ android:textSize="16sp"
android:layout_marginTop="5dp"
/>
<View
@@ -764,8 +765,8 @@
android:layout_height="wrap_content"
android:maxLines="1"
android:text="骞夸笢鐪佸箍宸炲競"
- android:textColor="#DE000000"
- android:textSize="14sp"
+ android:textColor="#B3000000"
+ android:textSize="16sp"
android:layout_marginTop="5dp"
/>
<View
@@ -802,8 +803,8 @@
android:layout_height="wrap_content"
android:maxLines="1"
android:text="寮犳皬鍏徃"
- android:textColor="#DE000000"
- android:textSize="14sp"
+ android:textColor="#B3000000"
+ android:textSize="16sp"
android:layout_marginTop="5dp"
android:ellipsize="marquee"
/>
@@ -1041,10 +1042,86 @@
</LinearLayout>
</androidx.cardview.widget.CardView>
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="闇�澹版槑鐨勬儏鍐�"
+ android:textColor="@color/black"
+ android:textSize="18sp"
+ android:layout_marginStart="20dp"
+ android:paddingVertical="5dp"
+ android:paddingHorizontal="3dp"
+ android:background="@drawable/shape_fffad1e0_10_10_0_0"
+ android:layout_marginTop="12dp"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="20dp"
+ android:background="@drawable/shape_fffad1e0_stroke_0_10_10_10"
+ android:paddingHorizontal="16dp"
+ android:paddingVertical="10dp"
+ android:orientation="vertical"
+ >
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="16sp"
+ android:textColor="#FF131215"
+ android:text="闇�澹版槑鐨勬儏鍐垫鏂囬渶澹版槑鐨勬儏鍐垫鏂囬渶澹版槑鐨勬儏鍐垫鏂囬渶澹版槑鐨勬儏鍐垫鏂囬渶澹版槑鐨勬儏鍐垫鏂囬渶澹版槑鐨勬儏鍐垫鏂囬渶澹版槑鐨勬儏鍐垫鏂囬渶澹版槑鐨勬儏鍐垫鏂囬渶澹版槑鐨勬儏鍐垫鏂囬渶澹版槑鐨勬儏鍐垫鏂囬渶澹版槑鐨勬儏鍐垫鏂囬渶澹版槑鐨勬儏鍐垫鏂囬渶澹版槑鐨勬儏鍐垫鏂�"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="16sp"
+ android:textColor="@color/black"
+ android:text="2005骞�12鏈�20鏃�"
+ android:layout_marginTop="12dp"
+ android:layout_gravity="end"
+ />
+ </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="澶囨敞"
+ android:textColor="@color/black"
+ android:textSize="18sp"
+ android:layout_marginStart="20dp"
+ android:paddingVertical="3dp"
+ android:paddingHorizontal="5dp"
+ android:background="@drawable/shape_fffad1e0_10_10_0_0"
+ android:layout_marginTop="12dp"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="20dp"
+ android:background="@drawable/shape_fffad1e0_stroke_0_10_10_10"
+ android:paddingHorizontal="16dp"
+ android:paddingVertical="10dp"
+ android:orientation="vertical"
+ >
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="16sp"
+ android:textColor="#FF131215"
+ android:text="澶囨敞姝ｆ枃澶囨敞姝ｆ枃澶囨敞姝ｆ枃澶囨敞姝ｆ枃澶囨敞姝ｆ枃澶囨敞姝ｆ枃澶囨敞姝ｆ枃澶囨敞姝ｆ枃澶囨敞姝ｆ枃澶囨敞姝ｆ枃澶囨敞姝ｆ枃澶囨敞姝ｆ枃澶囨敞姝ｆ枃澶囨敞姝ｆ枃澶囨敞姝ｆ枃澶囨敞姝ｆ枃澶囨敞姝ｆ枃澶囨敞姝ｆ枃澶囨敞姝ｆ枃澶囨敞姝ｆ枃澶囨敞姝ｆ枃澶囨敞姝ｆ枃澶囨敞姝ｆ枃澶囨敞姝ｆ枃"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textSize="16sp"
+ android:textColor="@color/black"
+ android:text="2005骞�12鏈�20鏃�"
+ android:layout_marginTop="12dp"
+ android:layout_gravity="end"
+ />
+ </LinearLayout>
+
+
</LinearLayout>
</ScrollView>
-
-
-
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_pet.xml b/app/src/main/res/layout/activity_pet.xml
index 2accf0d..43ef49b 100644
--- a/app/src/main/res/layout/activity_pet.xml
+++ b/app/src/main/res/layout/activity_pet.xml
@@ -12,13 +12,18 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:background="@color/color_normal_background"
+ >
<com.android.app_base.widget.ExtendTitleBar
- android:id="@+id/titleBar"
+ android:id="@+id/extendTitleBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:elevation="10dp"
app:layout_constraintTop_toTopOf="parent"
+ app:title="榄呭疇(浠呬緵鏌ョ湅)"
+ app:titleGravity="left"
>
<FrameLayout
android:layout_width="24dp"
@@ -34,71 +39,6 @@
android:background="@drawable/ic_operate"
/>
</FrameLayout>
-
- <LinearLayout
- android:id="@+id/layout_default"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginHorizontal="56dp"
- android:gravity="center_vertical"
- >
- <TextView
- android:id="@+id/tv_title"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_marginStart="16dp"
- android:text="榄呭疇"
- android:layout_weight="1"
- android:textColor="@color/white"
- android:textSize="@dimen/sp_20"
- />
- <ImageView
- android:id="@+id/iv_search_default"
- android:layout_width="@dimen/dp_24"
- android:layout_height="@dimen/dp_24"
- android:background="@drawable/ic_search"
- />
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/layout_search"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_marginVertical="4dp"
- android:layout_marginHorizontal="56dp"
- android:gravity="center_vertical"
- android:background="@color/white"
- android:paddingHorizontal="5dp"
- android:visibility="gone"
- >
- <ImageView
- android:id="@+id/iv_search"
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:background="@drawable/ic_search_gray"
- />
- <EditText
- android:id="@+id/et_search"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:layout_marginStart="5dp"
- android:textSize="14sp"
- android:textColor="#61000000"
- android:background="@null"
- android:imeOptions="actionSearch"
- android:text=""
- android:singleLine="true"
- android:hint="鍦ㄢ�滃澶т簨璁板唴鎼滅储鈥�"
- />
- <ImageView
- android:id="@+id/iv_search_type"
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:background="@drawable/ic_search_by"
- />
- </LinearLayout>
-
</com.android.app_base.widget.ExtendTitleBar>
<LinearLayout
@@ -107,10 +47,11 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center"
+ android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/titleBar">
+ app:layout_constraintTop_toBottomOf="@id/extendTitleBar">
<ImageView
android:layout_width="wrap_content"
@@ -127,17 +68,255 @@
/>
</LinearLayout>
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/recyclerView"
+ <androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
- android:background="@color/color_normal_background"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/titleBar"
- app:layout_constraintVertical_bias="1.0"
- tools:itemCount="20"
- tools:layout_editor_absoluteX="-81dp"
- tools:listitem="@layout/item_family_assets" />
+ app:layout_constraintTop_toBottomOf="@+id/extendTitleBar"
+ >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ >
+ <androidx.cardview.widget.CardView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="20dp"
+ android:layout_marginVertical="26dp"
+ app:cardBackgroundColor="#99FFE2EF"
+ app:cardCornerRadius="10dp"
+ app:cardElevation="0dp"
+ >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="40dp"
+ android:layout_marginVertical="20dp"
+ android:orientation="vertical"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="灏忛粍鐨勫熀鏈俊鎭�"
+ android:textColor="#66000000"
+ android:textSize="14sp"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="鐘悕锛氬皬榛�"
+ android:textColor="#FF000000"
+ android:textSize="14sp"
+ />
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="鐘锛氶噾姣�"
+ android:textColor="#FF000000"
+ android:textSize="14sp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="鎬у埆锛氶泴鎬�"
+ android:textColor="#FF000000"
+ android:textSize="14sp"
+ />
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="鐘彧棰滆壊锛氶噾榛勮壊"
+ android:textColor="#FF000000"
+ android:textSize="14sp"
+ />
+ </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍑虹敓鏃ユ湡锛�2010-03-01"
+ android:textColor="#FF000000"
+ android:textSize="14sp"
+ android:layout_marginTop="10dp"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鐘瘉鍙风爜锛�1234567891"
+ android:textColor="#FF000000"
+ android:textSize="14sp"
+ android:layout_marginTop="10dp"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="闃蹭吉鐮侊細1234567891"
+ android:textColor="#FF000000"
+ android:textSize="14sp"
+ android:layout_marginTop="10dp"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="楗涔犳儻锛堝枩锛夛細"
+ android:textColor="#FF000000"
+ android:textSize="14sp"
+ />
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="灏忕嫍绮�"
+ android:textColor="#FF000000"
+ android:textSize="14sp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="楗涔犳儻锛堟伓锛夛細"
+ android:textColor="#FF000000"
+ android:textSize="14sp"
+ />
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="灏忕嫍绮�"
+ android:textColor="#FF000000"
+ android:textSize="14sp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鐢熸椿涔犳儻锛堢埍濂斤級锛�"
+ android:textColor="#FF000000"
+ android:textSize="14sp"
+ />
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="灏忕嫍绮皬鐙楃伯"
+ android:textColor="#FF000000"
+ android:textSize="14sp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鐢熸椿涔犳儻锛堝棞濂斤級锛�"
+ android:textColor="#FF000000"
+ android:textSize="14sp"
+ />
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="灏忕嫍绮皬鐙楃伯灏忕嫍绮皬鐙楃伯灏忕嫍绮皬鐙楃伯灏忕嫍绮皬鐙楃伯灏忕嫍绮皬鐙楃伯灏忕嫍绮皬鐙楃伯灏忕嫍绮皬鐙楃伯灏忕嫍绮皬鐙楃伯灏忕嫍绮皬鐙楃伯灏忕嫍绮皬鐙楃伯灏忕嫍绮皬鐙楃伯灏忕嫍绮皬鐙楃伯灏忕嫍绮皬鐙楃伯灏忕嫍绮皬鐙楃伯"
+ android:textColor="#FF000000"
+ android:textSize="14sp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍚噦鏂硅█锛�"
+ android:textColor="#FF000000"
+ android:textSize="14sp"
+ />
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="绮よ銆佸瀹惰瘽"
+ android:textColor="#FF000000"
+ android:textSize="14sp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鐘眳浣忓湴鍧�锛�"
+ android:textColor="#FF000000"
+ android:textSize="14sp"
+ />
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="骞夸笢鐪佸箍宸炲競"
+ android:textColor="#FF000000"
+ android:textSize="14sp"
+ />
+ </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="榄呭疇鍏ㄨ韩鐓э細"
+ android:textColor="#FF000000"
+ android:textSize="14sp"
+ android:layout_marginTop="10dp"
+ />
+ <androidx.recyclerview.widget.RecyclerView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/recyclerView"
+ android:layout_marginTop="10dp"
+ />
+
+ </LinearLayout>
+ </androidx.cardview.widget.CardView>
+
+ </LinearLayout>
+
+ </androidx.core.widget.NestedScrollView>
+
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_pet_memo.xml b/app/src/main/res/layout/activity_pet_memo.xml
new file mode 100644
index 0000000..cd91d89
--- /dev/null
+++ b/app/src/main/res/layout/activity_pet_memo.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
+
+ <data>
+ <variable
+ name="viewModel"
+ type="com.application.zhangshi_app_android.ui.function.PetMemoActivityViewModel" />
+ </data>
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <com.android.app_base.widget.ExtendTitleBar
+ android:id="@+id/titleBar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toTopOf="parent"
+ app:leftIcon="@drawable/ic_back"
+ >
+ <FrameLayout
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginHorizontal="16dp"
+ android:layout_gravity="center_vertical|end"
+ >
+ <ImageView
+ android:id="@+id/iv_operate"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:background="@drawable/ic_operate"
+ />
+ </FrameLayout>
+
+ <LinearLayout
+ android:id="@+id/layout_default"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginHorizontal="56dp"
+ android:gravity="center_vertical"
+ >
+ <TextView
+ android:id="@+id/tv_title"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="16dp"
+ android:text="榄呭疇澶囧繕褰�(浠呬緵鏌ョ湅)"
+ android:layout_weight="1"
+ android:textColor="@color/white"
+ android:textSize="@dimen/sp_20"
+ />
+ <ImageView
+ android:id="@+id/iv_search_default"
+ android:layout_width="@dimen/dp_24"
+ android:layout_height="@dimen/dp_24"
+ android:background="@drawable/ic_search"
+ />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/layout_search"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginVertical="4dp"
+ android:layout_marginHorizontal="56dp"
+ android:gravity="center_vertical"
+ android:background="@color/white"
+ android:paddingHorizontal="5dp"
+ android:visibility="gone"
+ >
+ <ImageView
+ android:id="@+id/iv_search"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="@drawable/ic_search_gray"
+ />
+ <EditText
+ android:id="@+id/et_search"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginStart="5dp"
+ android:textSize="14sp"
+ android:textColor="#61000000"
+ android:background="@null"
+ android:imeOptions="actionSearch"
+ android:text=""
+ android:singleLine="true"
+ android:hint="鍦ㄢ�滃澶т簨璁板唴鎼滅储鈥�"
+ />
+ <ImageView
+ android:id="@+id/iv_search_type"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="@drawable/ic_search_by"
+ />
+ </LinearLayout>
+
+ </com.android.app_base.widget.ExtendTitleBar>
+
+ <LinearLayout
+ android:id="@+id/layout_data_null"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:gravity="center"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/titleBar">
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/img_data_null"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="18dp"
+ android:text="鏆傛椂杩樻病鏈夋暟鎹摝~\n鐐瑰嚮鈥濓紜鈥濈珛鍗冲垱寤�"
+ android:textSize="14sp"
+ android:textColor="#73000000"
+ />
+ </LinearLayout>
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/recyclerView"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:background="@color/color_normal_background"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/titleBar"
+ app:layout_constraintVertical_bias="1.0"
+ tools:itemCount="20"
+ tools:layout_editor_absoluteX="-81dp"
+ tools:listitem="@layout/item_family_assets" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_pet_memo_detail.xml b/app/src/main/res/layout/activity_pet_memo_detail.xml
new file mode 100644
index 0000000..39609c0
--- /dev/null
+++ b/app/src/main/res/layout/activity_pet_memo_detail.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
+
+ <data>
+ <variable
+ name="viewModel"
+ type="com.application.zhangshi_app_android.ui.function.PetMemoDetailActivityViewModel" />
+ </data>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/color_normal_background"
+ android:orientation="vertical">
+
+ <com.android.app_base.widget.ExtendTitleBar
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:leftIcon="@drawable/ic_back"
+ app:title="@{viewModel.beanLiveData.name+`(浠呬緵鏌ョ湅)`}"
+ app:titleGravity="left"
+ />
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:paddingHorizontal="20dp"
+ android:paddingBottom="20dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="@dimen/dp_10"
+ android:layout_height="@dimen/dp_20"
+ android:text="棰樺悕"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+
+
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="text"
+ android:autofillHints="creditCardNumber"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:text="@={viewModel.beanLiveData.name}"
+ />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="鏃ユ湡"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="text"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.time}"
+ android:textSize="16sp" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="鎻愰啋鏃堕棿"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:text="@={viewModel.beanLiveData.reminderTime}"
+ android:textColor="#DE000000"
+ android:textSize="16sp" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="澶囨敞"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.remark}"
+ android:textSize="16sp" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="鐢靛瓙鏂囦欢"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/shape_6b0000_stroke"
+ >
+ <com.android.app_base.widget.WrapRecyclerView
+ android:id="@+id/rv_image"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="10dp"
+ android:layout_marginTop="2sp"
+ android:paddingStart="10dp"
+ android:paddingEnd="5dp"
+ android:paddingVertical="10dp"
+ />
+
+ </RelativeLayout>
+
+
+ </LinearLayout>
+ </ScrollView>
+
+
+ </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
new file mode 100644
index 0000000..d0c5ea4
--- /dev/null
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
+
+ <data>
+ <variable
+ name="viewModel"
+ type="com.application.zhangshi_app_android.ui.function.PrivacyActivityViewModel" />
+ </data>
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <com.android.app_base.widget.ExtendTitleBar
+ android:id="@+id/titleBar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toTopOf="parent"
+ >
+ <FrameLayout
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginHorizontal="16dp"
+ android:layout_gravity="center_vertical|end"
+ >
+ <ImageView
+ android:id="@+id/iv_operate"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:background="@drawable/ic_operate"
+ />
+ </FrameLayout>
+
+ <LinearLayout
+ android:id="@+id/layout_default"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginHorizontal="56dp"
+ android:gravity="center_vertical"
+ >
+ <TextView
+ android:id="@+id/tv_title"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="16dp"
+ android:text="钘忓績瀵嗚锛堜粎渚涙煡鐪嬶級"
+ android:layout_weight="1"
+ android:textColor="@color/white"
+ android:textSize="@dimen/sp_20"
+ />
+ <ImageView
+ android:id="@+id/iv_search_default"
+ android:layout_width="@dimen/dp_24"
+ android:layout_height="@dimen/dp_24"
+ android:background="@drawable/ic_search"
+ />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/layout_search"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginVertical="4dp"
+ android:layout_marginHorizontal="56dp"
+ android:gravity="center_vertical"
+ android:background="@color/white"
+ android:paddingHorizontal="5dp"
+ android:visibility="gone"
+ >
+ <ImageView
+ android:id="@+id/iv_search"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="@drawable/ic_search_gray"
+ />
+ <EditText
+ android:id="@+id/et_search"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginStart="5dp"
+ android:textSize="14sp"
+ android:textColor="#61000000"
+ android:background="@null"
+ android:imeOptions="actionSearch"
+ android:text=""
+ android:singleLine="true"
+ android:hint="鍦ㄢ�滃澶т簨璁板唴鎼滅储鈥�"
+ />
+ <ImageView
+ android:id="@+id/iv_search_type"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="@drawable/ic_search_by"
+ />
+ </LinearLayout>
+
+ </com.android.app_base.widget.ExtendTitleBar>
+
+ <LinearLayout
+ android:id="@+id/layout_data_null"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:gravity="center"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/titleBar">
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/img_data_null"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="18dp"
+ android:text="鏆傛椂杩樻病鏈夋暟鎹摝~\n鐐瑰嚮鈥濓紜鈥濈珛鍗冲垱寤�"
+ android:textSize="14sp"
+ android:textColor="#73000000"
+ />
+ </LinearLayout>
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/recyclerView"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:background="@color/color_normal_background"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/titleBar"
+ app:layout_constraintVertical_bias="1.0"
+ tools:itemCount="20"
+ tools:layout_editor_absoluteX="-81dp"
+ tools:listitem="@layout/item_family_assets" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_privacy_detail.xml b/app/src/main/res/layout/activity_privacy_detail.xml
new file mode 100644
index 0000000..a612368
--- /dev/null
+++ b/app/src/main/res/layout/activity_privacy_detail.xml
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
+
+ <data>
+ <variable
+ name="viewModel"
+ type="com.application.zhangshi_app_android.ui.function.PrivacyDetailActivityViewModel" />
+ </data>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/color_normal_background"
+ android:orientation="vertical">
+
+ <com.android.app_base.widget.ExtendTitleBar
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:title="钘忓績瀵嗚锛堜粎渚涙煡鐪嬶級"
+ app:titleGravity="left"
+ />
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:paddingHorizontal="20dp"
+ android:paddingBottom="20dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="@dimen/dp_10"
+ android:layout_height="@dimen/dp_20"
+ android:text="绫诲埆"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+
+
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="text"
+ android:autofillHints="creditCardNumber"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:text="@{viewModel.beanLiveData.type}"
+ />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="鏃堕棿"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="text"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.time}"
+ android:textSize="16sp" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="璐﹀彿"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:text="@={viewModel.beanLiveData.account}"
+ android:textColor="#DE000000"
+ android:textSize="16sp" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="瀵嗙爜"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.password}"
+ android:textSize="16sp" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="鏈夋晥鏃堕棿"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.effectiveTime}"
+ android:textSize="16sp" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="鏄惁寮�鍚寚绾�"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@{viewModel.beanLiveData.isFingerprint==1?`鏄痐:`鍚}"
+ android:textSize="16sp" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="鏄惁寮�鍚汉鑴歌瘑鍒�"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@{viewModel.beanLiveData.isFace==1?`鏄痐:`鍚}"
+ android:textSize="16sp" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="绉佹湁/鍏湁"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@{viewModel.beanLiveData.isPublic==1?`鍏湁`:`绉佹湁`}"
+ android:textSize="16sp" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="瀛樻斁浣嶇疆"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.location}"
+ android:textSize="16sp" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="澶囨敞"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@{viewModel.beanLiveData.remark}"
+ android:textSize="16sp" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="鐢靛瓙鏂囦欢"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/shape_6b0000_stroke"
+ >
+ <com.android.app_base.widget.WrapRecyclerView
+ android:id="@+id/rv_image"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="10dp"
+ android:layout_marginTop="2sp"
+ android:paddingStart="10dp"
+ android:paddingEnd="5dp"
+ android:paddingVertical="10dp"
+ />
+
+ </RelativeLayout>
+
+
+ </LinearLayout>
+ </ScrollView>
+
+
+ </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_property.xml b/app/src/main/res/layout/activity_property.xml
index 9ccda7f..9e8db53 100644
--- a/app/src/main/res/layout/activity_property.xml
+++ b/app/src/main/res/layout/activity_property.xml
@@ -47,7 +47,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
- android:text="淇濇磥鏀剁撼"
+ android:text="涓汉璐骇锛堜粎渚涙煡鐪嬶級"
android:layout_weight="1"
android:textColor="@color/white"
android:textSize="@dimen/sp_20"
diff --git a/app/src/main/res/layout/activity_tourism.xml b/app/src/main/res/layout/activity_tourism.xml
new file mode 100644
index 0000000..d0c5ea4
--- /dev/null
+++ b/app/src/main/res/layout/activity_tourism.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
+
+ <data>
+ <variable
+ name="viewModel"
+ type="com.application.zhangshi_app_android.ui.function.PrivacyActivityViewModel" />
+ </data>
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <com.android.app_base.widget.ExtendTitleBar
+ android:id="@+id/titleBar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toTopOf="parent"
+ >
+ <FrameLayout
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_marginHorizontal="16dp"
+ android:layout_gravity="center_vertical|end"
+ >
+ <ImageView
+ android:id="@+id/iv_operate"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:background="@drawable/ic_operate"
+ />
+ </FrameLayout>
+
+ <LinearLayout
+ android:id="@+id/layout_default"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginHorizontal="56dp"
+ android:gravity="center_vertical"
+ >
+ <TextView
+ android:id="@+id/tv_title"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="16dp"
+ android:text="钘忓績瀵嗚锛堜粎渚涙煡鐪嬶級"
+ android:layout_weight="1"
+ android:textColor="@color/white"
+ android:textSize="@dimen/sp_20"
+ />
+ <ImageView
+ android:id="@+id/iv_search_default"
+ android:layout_width="@dimen/dp_24"
+ android:layout_height="@dimen/dp_24"
+ android:background="@drawable/ic_search"
+ />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/layout_search"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginVertical="4dp"
+ android:layout_marginHorizontal="56dp"
+ android:gravity="center_vertical"
+ android:background="@color/white"
+ android:paddingHorizontal="5dp"
+ android:visibility="gone"
+ >
+ <ImageView
+ android:id="@+id/iv_search"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="@drawable/ic_search_gray"
+ />
+ <EditText
+ android:id="@+id/et_search"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginStart="5dp"
+ android:textSize="14sp"
+ android:textColor="#61000000"
+ android:background="@null"
+ android:imeOptions="actionSearch"
+ android:text=""
+ android:singleLine="true"
+ android:hint="鍦ㄢ�滃澶т簨璁板唴鎼滅储鈥�"
+ />
+ <ImageView
+ android:id="@+id/iv_search_type"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:background="@drawable/ic_search_by"
+ />
+ </LinearLayout>
+
+ </com.android.app_base.widget.ExtendTitleBar>
+
+ <LinearLayout
+ android:id="@+id/layout_data_null"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:gravity="center"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/titleBar">
+
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/img_data_null"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="18dp"
+ android:text="鏆傛椂杩樻病鏈夋暟鎹摝~\n鐐瑰嚮鈥濓紜鈥濈珛鍗冲垱寤�"
+ android:textSize="14sp"
+ android:textColor="#73000000"
+ />
+ </LinearLayout>
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/recyclerView"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:background="@color/color_normal_background"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/titleBar"
+ app:layout_constraintVertical_bias="1.0"
+ tools:itemCount="20"
+ tools:layout_editor_absoluteX="-81dp"
+ tools:listitem="@layout/item_family_assets" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_tourism_detail.xml b/app/src/main/res/layout/activity_tourism_detail.xml
new file mode 100644
index 0000000..d0f9eb1
--- /dev/null
+++ b/app/src/main/res/layout/activity_tourism_detail.xml
@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
+
+ <data>
+ <variable
+ name="viewModel"
+ type="com.application.zhangshi_app_android.ui.function.TourismDetailActivityViewModel" />
+ </data>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/color_normal_background"
+ android:orientation="vertical">
+
+ <com.android.app_base.widget.ExtendTitleBar
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:title="@{viewModel.beanLiveData.title}"
+ app:titleGravity="left"
+ />
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingHorizontal="20dp"
+ android:paddingBottom="20dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="@dimen/dp_10"
+ android:layout_height="@dimen/dp_20"
+ android:text="鏍囬"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+
+
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="text"
+ android:autofillHints="creditCardNumber"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:textSize="16sp"
+ android:text="@{viewModel.beanLiveData.title}"
+ />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="寮�濮嬫椂闂�"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="text"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.startTime}"
+ android:textSize="16sp" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="缁撴潫鏃堕棿"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:text="@={viewModel.beanLiveData.endTime}"
+ android:textColor="#DE000000"
+ android:textSize="16sp" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="鎬诲ぉ鏁�"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.totalDay}"
+ android:textSize="16sp" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_marginTop="10dp"
+ android:layout_height="wrap_content"
+ android:text="鎬婚噾棰�"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="2dp"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.totalMoney}"
+ android:textSize="16sp" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="12dp"
+ >
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鎬婚噾棰�"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ tools:text="aaa"
+ android:text="@={viewModel.beanLiveData.totalMoney}"
+ android:textSize="16sp" />
+
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:layout_marginStart="40dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="椁愯垂"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.mealMoney}"
+ android:textSize="16sp" />
+
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="12dp"
+ >
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="浣忓"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ tools:text="aaa"
+ android:text="@={viewModel.beanLiveData.hotelMoney}"
+ android:textSize="16sp" />
+
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:layout_marginStart="40dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="浜ら��"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.trafficMoney}"
+ android:textSize="16sp" />
+
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="12dp"
+ >
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="闂ㄧエ"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ tools:text="aaa"
+ android:text="@={viewModel.beanLiveData.ticketMoney}"
+ android:textSize="16sp" />
+
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:layout_marginStart="40dp"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="璐墿"
+ android:textColor="#767375"
+ android:textSize="12sp"
+ />
+ <EditText
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="text"
+ android:textColorHint="#6b000000"
+ android:textColor="#DE000000"
+ android:text="@={viewModel.beanLiveData.shoppingMoney}"
+ android:textSize="16sp" />
+
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="14dp"
+ android:gravity="center_vertical"
+ >
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="姣忔棩璇︾粏娑堣垂璁板綍"
+ android:textSize="20sp"
+ android:textColor="@color/black"
+ />
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_tourism_add"
+ />
+
+ </LinearLayout>
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/rv_daily_consume_record"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp"
+ />
+
+
+ </LinearLayout>
+ </ScrollView>
+
+
+ </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_big_image.xml b/app/src/main/res/layout/dialog_big_image.xml
new file mode 100644
index 0000000..7ca8208
--- /dev/null
+++ b/app/src/main/res/layout/dialog_big_image.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="300dp"
+ android:layout_height="400dp"
+ app:cardBackgroundColor="#FFFFFCFC"
+ app:cardCornerRadius="5dp"
+ >
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ >
+
+ <ImageView
+ android:id="@+id/iv_dialog_close"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_dialog_close"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ android:layout_marginEnd="15dp"
+ android:layout_marginTop="15dp"
+ />
+
+ <androidx.constraintlayout.utils.widget.ImageFilterView
+ android:id="@+id/iv_big_image"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_marginHorizontal="10dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintDimensionRatio="1"
+ app:round="8dp"
+ />
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_pet_owner_info.xml b/app/src/main/res/layout/dialog_pet_owner_info.xml
new file mode 100644
index 0000000..34e69f7
--- /dev/null
+++ b/app/src/main/res/layout/dialog_pet_owner_info.xml
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:cardBackgroundColor="#FFFFFCFC"
+ app:cardCornerRadius="5dp"
+ android:layout_marginHorizontal="30dp"
+ >
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <ImageView
+ android:id="@+id/iv_dialog_close"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="15dp"
+ android:layout_marginEnd="15dp"
+ android:background="@drawable/ic_dialog_close"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="30dp"
+ android:layout_marginVertical="15dp"
+ android:orientation="vertical"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍏荤姮浜轰俊鎭�"
+ android:textColor="#66000000"
+ android:textSize="14sp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍏荤姮浜哄鍚嶏細"
+ android:textColor="@color/black"
+ android:textSize="14sp" />
+
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="寮犱笁"
+ android:textColor="@color/black"
+ android:textSize="14sp" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍥哄畾鐢佃瘽锛�"
+ android:textColor="@color/black"
+ android:textSize="14sp" />
+
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="12345678901"
+ android:textColor="@color/black"
+ android:textSize="14sp" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="绉诲姩鐢佃瘽锛�"
+ android:textColor="@color/black"
+ android:textSize="14sp" />
+
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="12345678901"
+ android:textColor="@color/black"
+ android:textSize="14sp" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="璇佷欢绫诲瀷锛�"
+ android:textColor="@color/black"
+ android:textSize="14sp" />
+
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="韬唤璇�"
+ android:textColor="@color/black"
+ android:textSize="14sp" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="璇佷欢鍙风爜锛�"
+ android:textColor="@color/black"
+ android:textSize="14sp" />
+
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="12345678901"
+ android:textColor="@color/black"
+ android:textSize="14sp" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鎷ユ湁鐘彧鏁伴噺锛�"
+ android:textColor="@color/black"
+ android:textSize="14sp" />
+
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="2"
+ android:textColor="@color/black"
+ android:textSize="14sp" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="浣忔墍璇︾粏鍦板潃锛�"
+ android:textColor="@color/black"
+ android:textSize="14sp" />
+
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="骞夸笢鐪佸箍宸炲競鐣鍖哄皬璋峰洿琛楅亾101鍙�"
+ android:textColor="@color/black"
+ android:textSize="14sp" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="浣忔墍鎬ц川锛�"
+ android:textColor="@color/black"
+ android:textSize="14sp" />
+
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="甯镐綇"
+ android:textColor="@color/black"
+ android:textSize="14sp" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="10dp">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鐢靛瓙閭欢锛�"
+ android:textColor="@color/black"
+ android:textSize="14sp" />
+
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="Zhang@123.com"
+ android:textColor="@color/black"
+ android:textSize="14sp" />
+ </LinearLayout>
+ </LinearLayout>
+
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_function.xml b/app/src/main/res/layout/fragment_function.xml
index 58f109f..18139a0 100644
--- a/app/src/main/res/layout/fragment_function.xml
+++ b/app/src/main/res/layout/fragment_function.xml
@@ -2,9 +2,9 @@
<layout
-xmlns:app="http://schemas.android.com/apk/res-auto"
-xmlns:android="http://schemas.android.com/apk/res/android"
->
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ >
<data>
<variable
@@ -19,11 +19,10 @@
android:orientation="vertical"
>
-
<com.hjq.bar.TitleBar
android:id="@+id/titleBar"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="@dimen/dp_55"
android:background="@color/color_title_bar_background"
app:layout_constraintTop_toTopOf="parent"
android:paddingHorizontal="@dimen/dp_16"
@@ -152,8 +151,8 @@
app:layout_constraintTop_toBottomOf="@id/tv_core_module">
<ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="@dimen/dp_24"
+ android:layout_height="@dimen/dp_24"
android:background="@drawable/function_family_root_net" />
<TextView
diff --git a/app/src/main/res/layout/item_annual_health_status.xml b/app/src/main/res/layout/item_annual_health_status.xml
new file mode 100644
index 0000000..bf09637
--- /dev/null
+++ b/app/src/main/res/layout/item_annual_health_status.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
+
+ <data>
+ <variable
+ name="bean"
+ type="com.application.zhangshi_app_android.bean.AnnualHealthStatusBean" />
+ </data>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ >
+ <androidx.cardview.widget.CardView
+ android:id="@+id/cardView"
+ android:layout_width="match_parent"
+ android:layout_height="40dp"
+ android:layout_margin="@dimen/dp_2"
+ app:cardCornerRadius="@dimen/dp_10"
+ app:cardBackgroundColor="@color/color_card_pink"
+ tools:layout_height="wrap_content"
+ >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ >
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/layout_title"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_40"
+ android:gravity="center_vertical">
+
+ <TextView
+ android:id="@+id/textView2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="24dp"
+ android:text="@{bean.type}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_16"
+ android:textStyle="bold"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:text="鎴夸骇璇�" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:gravity="center"
+ android:text="@{bean.hospital}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_16"
+ android:textStyle="bold"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.45"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:text="寮犱笁" />
+
+ <TextView
+ android:id="@+id/tv_time"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.time}"
+ android:textColor="@color/black"
+ android:textSize="16sp"
+ android:layout_marginEnd="20dp"
+ android:textStyle="bold"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:text="2019-01-12" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ <LinearLayout
+ android:id="@+id/layout_content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingHorizontal="@dimen/dp_24"
+ >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/dp_6"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="搴忓彿锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{String.valueOf(bean.id)}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/dp_6"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="浣撴鏃堕棿锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.time}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/dp_6"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鎻愬悕锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.name}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/dp_6"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="娉ㄦ剰浜嬮」锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.attention}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/dp_6"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="澶囨敞锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.remark}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/dp_6"
+ android:text="鐢靛瓙鏂囦欢锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/dp_15"
+ >
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/rv_image"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ tools:listitem="@layout/item_image"
+ tools:itemCount="3"
+ />
+
+ </LinearLayout>
+
+ </LinearLayout>
+ </LinearLayout>
+
+ </androidx.cardview.widget.CardView>
+
+ </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_contacts.xml b/app/src/main/res/layout/item_contacts.xml
new file mode 100644
index 0000000..0ecd349
--- /dev/null
+++ b/app/src/main/res/layout/item_contacts.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
+
+ <data>
+ <variable
+ name="bean"
+ type="com.application.zhangshi_app_android.bean.ContactsBean" />
+ </data>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ >
+ <androidx.cardview.widget.CardView
+ android:id="@+id/cardView"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="@dimen/dp_2"
+ app:cardCornerRadius="@dimen/dp_10"
+ app:cardBackgroundColor="@color/color_card_pink"
+ >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ >
+ <RelativeLayout
+ android:id="@+id/layout_title"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_40"
+ android:gravity="center_vertical|center_horizontal"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_gravity="center"
+ android:textSize="@dimen/sp_16"
+ android:textColor="@color/black"
+ android:gravity="center"
+ android:textStyle="bold"
+ tools:text="寮犱笁鐨勯�氳褰�"
+ />
+
+
+ </RelativeLayout>
+ <LinearLayout
+ android:id="@+id/layout_content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingHorizontal="@dimen/dp_24"
+ >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/dp_6"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="寮犱簩"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_14"
+ android:textStyle="bold"
+ />
+
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/dp_6"
+ >
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:text="鐖朵翰"
+ android:textColor="#80000000"
+ android:textSize="@dimen/sp_12"
+ android:layout_weight="1"
+
+ />
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:text="寮犳皬鍏徃"
+ android:textColor="#80000000"
+ android:textSize="@dimen/sp_12"
+ android:layout_weight="1"
+
+ />
+ <TextView
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:text="12345678901"
+ android:textColor="#80000000"
+ android:textSize="@dimen/sp_12"
+ android:layout_weight="1"
+
+ />
+ </LinearLayout>
+
+
+
+
+
+
+ </LinearLayout>
+ </LinearLayout>
+
+ </androidx.cardview.widget.CardView>
+
+ </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_daily_consume_record.xml b/app/src/main/res/layout/item_daily_consume_record.xml
new file mode 100644
index 0000000..113c791
--- /dev/null
+++ b/app/src/main/res/layout/item_daily_consume_record.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ >
+
+ <data>
+ <variable
+ name="bean"
+ type="com.application.zhangshi_app_android.bean.DailyConsumeRecordBean" />
+ </data>
+
+ <androidx.cardview.widget.CardView
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ app:cardBackgroundColor="@color/white"
+ app:cardCornerRadius="10dp"
+ app:cardElevation="3dp"
+ android:layout_margin="2dp"
+ tools:layout_height="wrap_content"
+ >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingHorizontal="5dp"
+ android:paddingBottom="15dp"
+ >
+ <LinearLayout
+ android:id="@+id/layout_title"
+ android:layout_width="match_parent"
+ android:layout_height="50dp"
+ android:gravity="center_vertical"
+ >
+ <TextView
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:textColor="#FF000000"
+ android:textSize="20sp"
+ android:text="@{bean.date}"
+ tools:text="5鏈�1鏃�"
+ />
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_tourism_add"
+ />
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_fold"
+ android:layout_marginStart="10dp"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ >
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/rv_consume_record"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="姣忔棩閲戦"
+ android:textColor="@color/black"
+ android:textSize="12sp"
+ android:alpha="0.54"
+ android:layout_marginTop="10dp"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.dailyMoney}"
+ android:textColor="#DE000000"
+ android:textSize="14sp"
+ android:layout_marginTop="5dp"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="#6B000000"
+ android:layout_marginTop="8dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+
+
+ </androidx.cardview.widget.CardView>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_family_memorabilia.xml b/app/src/main/res/layout/item_family_memorabilia.xml
index 20c06ff..be9ef3f 100644
--- a/app/src/main/res/layout/item_family_memorabilia.xml
+++ b/app/src/main/res/layout/item_family_memorabilia.xml
@@ -20,6 +20,7 @@
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
app:cardBackgroundColor="@color/color_card_pink"
+ tools:layout_height="wrap_content"
>
<LinearLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_growth_experiece_abroad_condition.xml b/app/src/main/res/layout/item_growth_experience_abroad_condition.xml
similarity index 85%
rename from app/src/main/res/layout/item_growth_experiece_abroad_condition.xml
rename to app/src/main/res/layout/item_growth_experience_abroad_condition.xml
index 5866693..e41a92c 100644
--- a/app/src/main/res/layout/item_growth_experiece_abroad_condition.xml
+++ b/app/src/main/res/layout/item_growth_experience_abroad_condition.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto">
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
<data>
<variable
name="bean"
- type="com.application.zhangshi_app_android.bean.GrowthExperienceBean" />
+ type="com.application.zhangshi_app_android.bean.GrowthExperienceAbroadConditionBean" />
</data>
<LinearLayout
@@ -19,6 +20,7 @@
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
app:cardBackgroundColor="@color/color_card_pink"
+ tools:layout_height="wrap_content"
>
<LinearLayout
android:layout_width="match_parent"
@@ -39,7 +41,9 @@
android:layout_marginStart="24dp"
android:textSize="@dimen/sp_16"
android:textColor="@color/black"
+ android:text="@{bean.destination}"
android:layout_weight="1"
+ tools:text="棣欐腐"
android:textStyle="bold"
/>
<TextView
@@ -47,13 +51,16 @@
android:layout_height="wrap_content"
android:textSize="@dimen/sp_16"
android:textColor="@color/black"
+ android:text="@{bean.startDate}"
android:textStyle="bold"
android:layout_marginEnd="24dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
+ tools:text="2010.01-2020.01"
/>
</RelativeLayout>
<LinearLayout
+ android:id="@+id/layout_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
@@ -63,7 +70,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layout_marginBottom="@dimen/dp_6"
+ android:layout_marginBottom="10dp"
>
<TextView
android:layout_width="wrap_content"
@@ -76,7 +83,8 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鎺翰"
+ tools:text="鎺翰"
+ android:text="@{bean.cause}"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
diff --git a/app/src/main/res/layout/item_growth_experience_holder_condition.xml b/app/src/main/res/layout/item_growth_experience_holder_condition.xml
index 8af7f84..1e58bbd 100644
--- a/app/src/main/res/layout/item_growth_experience_holder_condition.xml
+++ b/app/src/main/res/layout/item_growth_experience_holder_condition.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto">
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
<data>
<variable
name="bean"
- type="com.application.zhangshi_app_android.bean.GrowthExperienceBean" />
+ type="com.application.zhangshi_app_android.bean.GrowthExperienceHolderConditionBean" />
</data>
<LinearLayout
@@ -15,10 +16,11 @@
<androidx.cardview.widget.CardView
android:id="@+id/cardView"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
app:cardBackgroundColor="@color/color_card_pink"
+ tools:layout_height="wrap_content"
>
<LinearLayout
android:layout_width="match_parent"
@@ -38,7 +40,9 @@
android:layout_marginStart="24dp"
android:textSize="@dimen/sp_16"
android:textColor="@color/black"
+ android:text="@{bean.cerName}"
android:layout_weight="1"
+ tools:text="鎶ょ収"
android:textStyle="bold"
/>
<TextView
@@ -46,13 +50,16 @@
android:layout_height="wrap_content"
android:textSize="@dimen/sp_16"
android:textColor="@color/black"
+ android:text="@{bean.validityDate}"
android:textStyle="bold"
android:layout_marginEnd="24dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
+ tools:text="2010.01-2020.01"
/>
</RelativeLayout>
<LinearLayout
+ android:id="@+id/layout_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
@@ -75,17 +82,17 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="鎸佹湁"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
+ android:text="@{bean.ownStatus}"
/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layout_marginBottom="@dimen/dp_6"
+ android:layout_marginBottom="10dp"
>
<TextView
android:layout_width="wrap_content"
@@ -99,8 +106,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
+ android:text="@{bean.idNo}"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
+ tools:text="123456789012345"
/>
</LinearLayout>
diff --git a/app/src/main/res/layout/item_growth_experience_primary.xml b/app/src/main/res/layout/item_growth_experience_primary.xml
index 85ec1c7..7f56b53 100644
--- a/app/src/main/res/layout/item_growth_experience_primary.xml
+++ b/app/src/main/res/layout/item_growth_experience_primary.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto">
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
<data>
<variable
@@ -16,6 +17,7 @@
android:id="@+id/cardView"
android:layout_width="match_parent"
android:layout_height="40dp"
+ tools:layout_height="wrap_content"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
app:cardBackgroundColor="@color/color_card_pink"
@@ -38,7 +40,9 @@
android:layout_marginStart="24dp"
android:textSize="@dimen/sp_16"
android:textColor="@color/black"
+ android:text="@{bean.startDate}"
android:layout_weight="1"
+ tools:text="2010-2016"
android:textStyle="bold"
/>
<TextView
@@ -46,13 +50,16 @@
android:layout_height="wrap_content"
android:textSize="@dimen/sp_16"
android:textColor="@color/black"
+ android:text="@{bean.content}"
android:textStyle="bold"
android:layout_marginEnd="24dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
+ tools:text="**灏忓"
/>
</RelativeLayout>
<LinearLayout
+ android:id="@+id/layout_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
@@ -62,7 +69,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layout_marginBottom="@dimen/dp_6"
+ android:layout_marginBottom="10dp"
>
<TextView
android:layout_width="wrap_content"
@@ -75,6 +82,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:text="@{bean.witness}"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
diff --git a/app/src/main/res/layout/item_growth_experience_relationship.xml b/app/src/main/res/layout/item_growth_experience_relationship.xml
index a90a5c3..ceb086f 100644
--- a/app/src/main/res/layout/item_growth_experience_relationship.xml
+++ b/app/src/main/res/layout/item_growth_experience_relationship.xml
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto">
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
<data>
<variable
name="bean"
- type="com.application.zhangshi_app_android.bean.GrowthExperienceBean" />
+ type="com.application.zhangshi_app_android.bean.GrowthExperienceRelationshipBean" />
</data>
<LinearLayout
@@ -19,6 +20,7 @@
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
app:cardBackgroundColor="@color/color_card_pink"
+ tools:layout_height="wrap_content"
>
<LinearLayout
android:layout_width="match_parent"
@@ -38,7 +40,9 @@
android:layout_marginStart="24dp"
android:textSize="@dimen/sp_16"
android:textColor="@color/black"
+ android:text="@{bean.relation}"
android:layout_weight="1"
+ tools:text="澶"
android:textStyle="bold"
/>
<TextView
@@ -46,13 +50,16 @@
android:layout_height="wrap_content"
android:textSize="@dimen/sp_16"
android:textColor="@color/black"
+ android:text="@{bean.nickName}"
android:textStyle="bold"
android:layout_marginEnd="24dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
+ tools:text="寮犱笁"
/>
</RelativeLayout>
<LinearLayout
+ android:id="@+id/layout_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
@@ -75,7 +82,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="寮犳皬鍏徃"
+ android:text="@{bean.unit}"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
@@ -98,7 +105,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="缁忕悊"
+ android:text="@{bean.position}"
android:textColor="@color/black"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
@@ -108,7 +115,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:layout_marginBottom="@dimen/dp_6"
+ android:layout_marginBottom="10dp"
>
<TextView
android:layout_width="wrap_content"
@@ -122,6 +129,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
+ android:text="@{bean.politicalOutlook}"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
/>
diff --git a/app/src/main/res/layout/item_hundred_wish.xml b/app/src/main/res/layout/item_hundred_wish.xml
index cf13af9..cc726c8 100644
--- a/app/src/main/res/layout/item_hundred_wish.xml
+++ b/app/src/main/res/layout/item_hundred_wish.xml
@@ -37,7 +37,7 @@
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="24dp"
+ android:layout_marginStart="25dp"
android:text="@{bean.title}"
android:textColor="@color/black"
android:textSize="@dimen/sp_16"
@@ -54,7 +54,7 @@
android:text="@{bean.createTime}"
android:textColor="@color/black"
android:textSize="16sp"
- android:layout_marginEnd="20dp"
+ android:layout_marginEnd="25dp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -68,7 +68,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:paddingHorizontal="@dimen/dp_24"
+ android:paddingHorizontal="35dp"
>
<LinearLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_pet.xml b/app/src/main/res/layout/item_pet.xml
deleted file mode 100644
index acbf85c..0000000
--- a/app/src/main/res/layout/item_pet.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools">
-
- <data>
- <variable
- name="bean"
- type="com.application.zhangshi_app_android.bean.PetBean" />
- </data>
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- >
- <androidx.cardview.widget.CardView
- android:id="@+id/cardView"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_margin="@dimen/dp_2"
- app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
- >
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- >
- <androidx.constraintlayout.widget.ConstraintLayout
- android:id="@+id/layout_title"
- android:layout_width="match_parent"
- android:layout_height="@dimen/dp_40"
- android:gravity="center_vertical">
-
- <TextView
- android:id="@+id/textView2"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="40dp"
- android:text="@{bean.name}"
- android:textColor="@color/black"
- android:textSize="@dimen/sp_16"
- android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:text="灏忛粍" />
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerInParent="true"
- android:gravity="center"
- android:text="@{bean.type}"
- android:textColor="@color/black"
- android:textSize="@dimen/sp_16"
- android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.5"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:text="閲戞瘺" />
-
- <TextView
- android:id="@+id/tv_time"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@{bean.sex == 1?`闆勬� : `闆屾�}"
- android:textColor="@color/black"
- android:textSize="16sp"
- android:layout_marginEnd="40dp"
- android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:text="闆勬��" />
-
- </androidx.constraintlayout.widget.ConstraintLayout>
-
- <LinearLayout
- android:id="@+id/layout_content"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingHorizontal="@dimen/dp_24"
- >
- <View
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="#FFFFFFFF"
- />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@{bean.name+`鐨勫熀鏈俊鎭痐}"
- android:textColor="@color/black"
- android:textSize="14sp"
- tools:text="灏忛粍鐨勫熀鏈俊鎭�"
- android:layout_marginTop="8dp"
- android:layout_marginStart="16dp"
- />
- <androidx.constraintlayout.widget.ConstraintLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:layout_marginTop="8dp"
- >
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="16dp"
- android:text="@{bean.color}"
- android:textColor="#80000000"
- android:textSize="10sp"
- android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:text="閲戦粍鑹�" />
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerInParent="true"
- android:gravity="center"
- android:text="@{bean.birth.substring(0,10)}"
- android:textColor="#80000000"
- android:textSize="10sp"
- android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.5"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:text="2010-03-01" />
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@{bean.dialect}"
- android:textColor="#80000000"
- android:textSize="10sp"
- android:layout_marginEnd="40dp"
- android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- tools:text="闆勬��" />
-
- </androidx.constraintlayout.widget.ConstraintLayout>
- <View
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="#FFFFFFFF"
- />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@{bean.name+`鐨勫熀鏈俊鎭痐}"
- android:textColor="@color/black"
- android:textSize="14sp"
- tools:text="灏忛粍鐨勫熀鏈俊鎭�"
- android:layout_marginTop="8dp"
- android:layout_marginStart="16dp"
- />
-
- </LinearLayout>
- </LinearLayout>
-
- </androidx.cardview.widget.CardView>
-
- </LinearLayout>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_pet_image.xml b/app/src/main/res/layout/item_pet_image.xml
new file mode 100644
index 0000000..ca4df99
--- /dev/null
+++ b/app/src/main/res/layout/item_pet_image.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ >
+ <data>
+ <variable
+ name="url"
+ type="String" />
+ </data>
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingBottom="10dp"
+ >
+ <androidx.constraintlayout.utils.widget.ImageFilterView
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ app:layout_constraintDimensionRatio="1:1"
+ app:layout_constraintWidth_percent="0.8"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:round="10dp"
+ android:background="@drawable/img_lotus"
+ />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_pet_memo.xml b/app/src/main/res/layout/item_pet_memo.xml
new file mode 100644
index 0000000..5e277d5
--- /dev/null
+++ b/app/src/main/res/layout/item_pet_memo.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
+
+ <data>
+ <variable
+ name="bean"
+ type="com.application.zhangshi_app_android.bean.PetMemoBean" />
+ </data>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ >
+ <androidx.cardview.widget.CardView
+ android:id="@+id/cardView"
+ android:layout_width="match_parent"
+ android:layout_height="40dp"
+ android:layout_margin="@dimen/dp_2"
+ tools:layout_height="wrap_content"
+ app:cardCornerRadius="@dimen/dp_10"
+ app:cardBackgroundColor="@color/color_card_pink"
+ >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ >
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/layout_title"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_40"
+ android:gravity="center_vertical">
+
+ <TextView
+ android:id="@+id/textView2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="45dp"
+ android:text="@{bean.name}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_16"
+ android:textStyle="bold"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:text="鎴夸骇璇�" />
+
+
+
+ <TextView
+ android:id="@+id/tv_time"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.time}"
+ android:textColor="@color/black"
+ android:textSize="16sp"
+ android:layout_marginEnd="45dp"
+ android:textStyle="bold"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:text="2019-01-12" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ <LinearLayout
+ android:id="@+id/layout_content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingHorizontal="35dp"
+ >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/dp_6"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鎻愰啋鏃堕棿锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.reminderTime}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/dp_6"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="澶囨敞锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.remark}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/dp_6"
+ android:text="鐢靛瓙鏂囦欢锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/dp_15"
+ >
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/rv_image"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ tools:listitem="@layout/item_image"
+ tools:itemCount="3"
+ />
+
+ </LinearLayout>
+
+ </LinearLayout>
+ </LinearLayout>
+
+ </androidx.cardview.widget.CardView>
+
+ </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_privacy.xml b/app/src/main/res/layout/item_privacy.xml
new file mode 100644
index 0000000..30778e5
--- /dev/null
+++ b/app/src/main/res/layout/item_privacy.xml
@@ -0,0 +1,304 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
+
+ <data>
+ <variable
+ name="bean"
+ type="com.application.zhangshi_app_android.bean.PrivacyBean" />
+ </data>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ >
+ <androidx.cardview.widget.CardView
+ android:id="@+id/cardView"
+ android:layout_width="match_parent"
+ android:layout_height="40dp"
+ android:layout_margin="@dimen/dp_2"
+ app:cardCornerRadius="@dimen/dp_10"
+ app:cardBackgroundColor="@color/color_card_pink"
+ tools:layout_height="wrap_content"
+ >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ >
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/layout_title"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_40"
+ android:gravity="center_vertical">
+
+ <TextView
+ android:id="@+id/textView2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="24dp"
+ android:text="@{bean.type}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_16"
+ android:textStyle="bold"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:text="鎴夸骇璇�" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:gravity="center"
+ android:text="@{bean.account}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_16"
+ android:textStyle="bold"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.45"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:text="寮犱笁" />
+
+ <TextView
+ android:id="@+id/tv_time"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.time}"
+ android:textColor="@color/black"
+ android:textSize="16sp"
+ android:layout_marginEnd="20dp"
+ android:textStyle="bold"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:text="2019-01-12" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ <LinearLayout
+ android:id="@+id/layout_content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingHorizontal="@dimen/dp_24"
+ >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/dp_6"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="璐﹀彿锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.account}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/dp_6"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="瀵嗙爜锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.password}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/dp_6"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鏈夋晥鏃堕棿锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.effectiveTime}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/dp_6"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鏄惁寮�鍚寚绾癸細"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.isFingerprint==1?`鏄痐:`鍚}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/dp_6"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鏄惁寮�鍚汉鑴歌瘑鍒細"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.isFace==1?`鏄痐:`鍚}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/dp_6"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="绉佹湁/鍏湁锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.isPublic==1?`鍏湁`:`绉佹湁`}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/dp_6"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="瀛樻斁浣嶇疆锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.location}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/dp_6"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="澶囨敞锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.remark}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ </LinearLayout>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/dp_6"
+ android:text="鐢靛瓙鏂囦欢锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/dp_15"
+ >
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/rv_image"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ tools:listitem="@layout/item_image"
+ tools:itemCount="3"
+ />
+
+ </LinearLayout>
+
+ </LinearLayout>
+ </LinearLayout>
+
+ </androidx.cardview.widget.CardView>
+
+ </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_tourism.xml b/app/src/main/res/layout/item_tourism.xml
new file mode 100644
index 0000000..4c5b2b7
--- /dev/null
+++ b/app/src/main/res/layout/item_tourism.xml
@@ -0,0 +1,363 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools">
+
+ <data>
+ <variable
+ name="bean"
+ type="com.application.zhangshi_app_android.bean.TourismBean" />
+ </data>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ >
+ <androidx.cardview.widget.CardView
+ android:id="@+id/cardView"
+ android:layout_width="match_parent"
+ android:layout_height="40dp"
+ android:layout_margin="@dimen/dp_2"
+ app:cardCornerRadius="@dimen/dp_10"
+ app:cardBackgroundColor="@color/color_card_pink"
+ tools:layout_height="wrap_content"
+ >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ >
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/layout_title"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_40"
+ android:gravity="center_vertical">
+
+ <TextView
+ android:id="@+id/textView2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="25dp"
+ android:text="@{bean.title}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_16"
+ android:textStyle="bold"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:text="鎴夸骇璇�" />
+
+
+
+ <TextView
+ android:id="@+id/tv_time"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.startTime}"
+ android:textColor="@color/black"
+ android:textSize="16sp"
+ android:layout_marginEnd="25dp"
+ android:textStyle="bold"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ tools:text="2019-01-12" />
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ <LinearLayout
+ android:id="@+id/layout_content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingHorizontal="@dimen/dp_35"
+ >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/dp_6"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="寮�濮嬫椂闂达細"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.startTime}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/dp_6"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="缁撴潫鏃堕棿锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.endTime}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/dp_6"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鎬诲ぉ鏁帮細"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.totalDay}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_marginBottom="@dimen/dp_6"
+ >
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鎬婚噾棰濓細"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.totalMoney}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold"
+ />
+ </LinearLayout>
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/dp_6"
+ >
+ <LinearLayout
+ android:id="@+id/layout_1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toStartOf="@id/layout_2"
+ app:layout_constraintHorizontal_chainStyle="spread_inside"
+ app:layout_constraintTop_toTopOf="parent"
+ >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="椁愯垂锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.mealMoney}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold" />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintEnd_toStartOf="@id/layout_3"
+ app:layout_constraintStart_toEndOf="@id/layout_1"
+ app:layout_constraintTop_toTopOf="parent"
+ >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="浣忓锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.hotelMoney}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold" />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_3"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toEndOf="@id/layout_2"
+ app:layout_constraintTop_toTopOf="parent"
+ >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="浜ら�氾細"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.trafficMoney}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold" />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_4"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toBottomOf="@id/layout_1"
+ app:layout_constraintStart_toStartOf="@id/layout_1"
+ android:layout_marginTop="6dp"
+ >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="闂ㄧエ锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.ticketMoney}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold" />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_5"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toTopOf="@id/layout_4"
+ app:layout_constraintStart_toStartOf="@id/layout_2"
+ >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="璐墿锛�"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@{bean.shoppingMoney}"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_12"
+ android:textStyle="bold" />
+ </LinearLayout>
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:layout_marginBottom="@dimen/dp_12"
+ android:layout_marginTop="6dp"
+ >
+ <LinearLayout
+ android:id="@+id/layout_modify"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_modify"
+ android:layout_gravity="center"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="淇敼"
+ android:textColor="@color/black"
+ android:textSize="@dimen/sp_14"
+ android:layout_marginStart="@dimen/dp_4"
+ />
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/layout_delete"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="20dp"
+ >
+ <ImageView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@drawable/ic_delete"
+ android:layout_gravity="center"
+ />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鍒犻櫎"
+ android:textColor="#FFE86F72"
+ android:textSize="@dimen/sp_14"
+
+ android:layout_marginStart="@dimen/dp_4"
+ />
+ </LinearLayout>
+ <TextView
+ android:id="@+id/tv_detail"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="鏌ョ湅璇︽儏"
+ android:textColor="@color/black"
+ android:textSize="14sp"
+ android:layout_marginStart="20dp"
+ />
+ </LinearLayout>
+ </LinearLayout>
+ </LinearLayout>
+
+ </androidx.cardview.widget.CardView>
+
+ </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_drawer.xml b/app/src/main/res/layout/layout_drawer.xml
index 7c1f52b..2982748 100644
--- a/app/src/main/res/layout/layout_drawer.xml
+++ b/app/src/main/res/layout/layout_drawer.xml
@@ -461,6 +461,7 @@
/>
</LinearLayout>
<LinearLayout
+ android:id="@+id/dl_hundred_wish"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
@@ -488,7 +489,7 @@
/>
</LinearLayout>
<LinearLayout
- android:id="@+id/dl_hundred_wish"
+ android:id="@+id/dl_tourism"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
diff --git a/app/src/main/res/layout/pop_annual_health_status.xml b/app/src/main/res/layout/pop_annual_health_status.xml
new file mode 100644
index 0000000..6e41204
--- /dev/null
+++ b/app/src/main/res/layout/pop_annual_health_status.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:orientation="vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:cardBackgroundColor="#FFFAD1E0"
+ app:cardCornerRadius="10dp"
+ app:cardElevation="0dp"
+ >
+ <LinearLayout
+ android:layout_width="118dp"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:gravity="center"
+ >
+ <TextView
+ android:id="@+id/tv_annual_health_status"
+ android:layout_width="wrap_content"
+ android:layout_height="30dp"
+ android:gravity="center"
+ android:text="骞村害鍋ュ悍鎯呭喌"
+ android:textColor="#FF333333"
+ android:textSize="12sp"
+ android:layout_marginHorizontal="10dp"
+ />
+ </LinearLayout>
+
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/pop_operate_pet.xml b/app/src/main/res/layout/pop_operate_pet.xml
new file mode 100644
index 0000000..2524c41
--- /dev/null
+++ b/app/src/main/res/layout/pop_operate_pet.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:orientation="vertical"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:cardBackgroundColor="#FFFAD1E0"
+ app:cardCornerRadius="10dp"
+ app:cardElevation="0dp"
+ >
+ <LinearLayout
+ android:layout_width="85dp"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:gravity="center_vertical"
+ >
+ <TextView
+ android:id="@+id/tv_owner_info"
+ android:layout_width="wrap_content"
+ android:layout_height="30dp"
+ android:gravity="center"
+ android:text="鍏荤姮浜轰俊鎭�"
+ android:textColor="#FF333333"
+ android:textSize="12sp"
+ android:layout_marginHorizontal="10dp"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0.3dp"
+ android:background="#FF939393"
+ />
+ <TextView
+ android:id="@+id/tv_pet_memo"
+ android:layout_width="wrap_content"
+ android:layout_height="30dp"
+ android:text="榄呭疇澶囧繕鏈�"
+ android:gravity="center"
+ android:textColor="#FF333333"
+ android:textSize="12sp"
+ android:layout_marginHorizontal="10dp"
+ />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="0.3dp"
+ android:background="#FF939393"
+ />
+
+ <TextView
+ android:id="@+id/tv_another"
+ android:layout_width="wrap_content"
+ android:layout_height="30dp"
+ android:text="鏃鸿储"
+ android:gravity="center"
+ android:textColor="#FF333333"
+ android:textSize="12sp"
+ app:drawableStartCompat="@drawable/ic_operate_order"
+ android:drawablePadding="3dp"
+ android:layout_marginHorizontal="10dp"
+ />
+ </LinearLayout>
+
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 41d3aed..a0147b3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -23,6 +23,7 @@
<color name="color_FF666666_text_default">#FF666666</color>
<color name="color_card_pink">#FFFFE2EF</color>
<color name="color_card_blue">#FFE0EEFE</color>
+ <color name="color_card_green">#FFEBFFF2</color>
<color name="color_shadow">#88666666</color>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f2a8e09..16c9971 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -13,4 +13,9 @@
<item name="android:textColor">@color/color_FF666666_text_default</item>
</style>
+ <style name= "MyTabLayout">
+ <item name= "android:textSize">18sp</item>
+ <item name="android:textColor">#FF000000</item>
+ </style>
+
</resources>
\ No newline at end of file
diff --git a/zhangshiapp.keystore.jks b/zhangshiapp.keystore.jks
new file mode 100644
index 0000000..f32eaa1
--- /dev/null
+++ b/zhangshiapp.keystore.jks
Binary files differ
--
Gitblit v1.9.1