1、调整成长经历页面\n2、删除婚姻个人信息

Linjiajia

2024-01-29 b17b9aa59bae6d03055f14d937821655dfaffa1f

1、调整成长经历页面\n2、删除婚姻个人信息

 app/build.gradle

@@ -8,8 +8,8 @@
        applicationId "com.application.zhangshi_app_android"
        minSdk 24
        targetSdk 33
        versionCode 5
        versionName "1.0.4"
        versionCode 7
        versionName "1.0.6"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        ndk {
            //APP的build.gradle设置支持的SO库架构

 app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java

@@ -39,6 +39,7 @@
import com.application.zhangshi_app_android.ui.function.IncomeAndExpensesActivity;
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.PersonalNotepadActivity;
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;
@@ -127,7 +128,7 @@
            classMap.put(ContactsActivity.class,(LinearLayout) findViewById(R.id.dl_contacts));
            classMap.put(PetActivity.class,(LinearLayout) findViewById(R.id.dl_pet));
            classMap.put(IncomeAndExpensesActivity.class,(LinearLayout) findViewById(R.id.dl_income_and_expenses));
            classMap.put(GrowthExperienceActivity.class,(LinearLayout) findViewById(R.id.dl_growing_up));
            classMap.put(PersonalNotepadActivity.class,(LinearLayout) findViewById(R.id.dl_growing_up));
            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));

 app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseFragment.java

@@ -40,6 +40,7 @@
import com.application.zhangshi_app_android.ui.function.IncomeAndExpensesActivity;
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.PersonalNotepadActivity;
import com.application.zhangshi_app_android.ui.function.PetDetailActivity;
import com.application.zhangshi_app_android.ui.function.PrivacyActivity;
import com.application.zhangshi_app_android.ui.function.PropertyActivity;
@@ -127,7 +128,7 @@
            classMap.put(ContactsActivity.class,(LinearLayout) findViewById(R.id.dl_contacts));
            classMap.put(PetDetailActivity.class,(LinearLayout) findViewById(R.id.dl_pet));
            classMap.put(IncomeAndExpensesActivity.class,(LinearLayout) findViewById(R.id.dl_income_and_expenses));
            classMap.put(GrowthExperienceActivity.class,(LinearLayout) findViewById(R.id.dl_growing_up));
            classMap.put(PersonalNotepadActivity.class,(LinearLayout) findViewById(R.id.dl_growing_up));
            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));

 app/src/main/java/com/application/zhangshi_app_android/ui/dialog/UpdateDialog.java

@@ -145,8 +145,7 @@
//                mApkFile = new File(getContext().getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), fileName);
                String pathname = Environment.getExternalStorageDirectory().getPath() + "/" + Environment.DIRECTORY_DOWNLOADS + "/" + fileName;
                mApkFile = new File(pathname);

                if (mApkFile.isFile()) {
                if (mApkFile.exists() && mApkFile.isFile()) {
                    // 如果有设置MD5，则判断MD5是否一致
                    if (TextUtils.isEmpty(mFileMd5)) {
                        // 没有设置MD5，直接安装

 app/src/main/java/com/application/zhangshi_app_android/ui/function/GrowthExperienceActivity.java

@@ -33,6 +33,8 @@
import com.application.zhangshi_app_android.databinding.ActivityGrowthExperienceBinding;
import com.application.zhangshi_app_android.ui.DLBaseActivity;
import com.google.android.material.tabs.TabLayout;
import com.hjq.bar.TitleBar;

import java.util.List;

/**
@@ -301,4 +303,9 @@
        animator.start();
    }

    @Override
    public void onLeftClick(TitleBar titleBar) {
        finish();
    }

}

 app/src/main/java/com/application/zhangshi_app_android/ui/function/HomeFragment.java

@@ -76,7 +76,7 @@
        binding.layoutGrowingUp.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View view) {
                AppManager.getAppManager().startActivity(GrowthExperienceActivity.class);
                AppManager.getAppManager().startActivity(PersonalNotepadActivity.class);
            }
        });
        binding.layoutFamilyAssets.setOnClickListener(new View.OnClickListener() {
@@ -89,7 +89,7 @@
            AppManager.getAppManager().startActivity(HomeDevicesActivity.class);
        });
        binding.layoutGrowingUp.setOnClickListener(view -> {
            AppManager.getAppManager().startActivity(GrowthExperienceActivity.class);
            AppManager.getAppManager().startActivity(PersonalNotepadActivity.class);
        });
        binding.layoutHonorCollection.setOnClickListener(v->{
            AppManager.getAppManager().startActivity(HonorCollectionActivity.class);

 app/src/main/java/com/application/zhangshi_app_android/ui/function/PersonalNotepadActivity.java

@@ -68,12 +68,13 @@
        binding.recyclerView.addItemDecoration(itemDecoration);
        binding.recyclerView.setAdapter(adapter);
        //右上角操作弹窗
        mOperatePopupWindow = initPopUpWindow(View.inflate(this,R.layout.pop_operate,null));
        mOperatePopupWindow = initPopUpWindow(View.inflate(this,R.layout.pop_operate_personal_notepad,null));
        setOnClickListener(
                mOperatePopupWindow.getContentView().findViewById(R.id.tv_add),
                mOperatePopupWindow.getContentView().findViewById(R.id.tv_select),
                mOperatePopupWindow.getContentView().findViewById(R.id.tv_from_new_to_old),
                mOperatePopupWindow.getContentView().findViewById(R.id.tv_from_old_to_new)
                mOperatePopupWindow.getContentView().findViewById(R.id.tv_from_old_to_new),
                mOperatePopupWindow.getContentView().findViewById(R.id.layout_growth_experience)
        );
        //点击放大镜按钮显示出搜索框
        binding.ivSearchDefault.setOnClickListener(v -> {
@@ -310,6 +311,9 @@
        } else if (id == R.id.tv_from_old_to_new) {
            viewModel.changeOrder(false);
            mOperatePopupWindow.dismiss();
        } else if (id == R.id.layout_growth_experience) {
            AppManager.getAppManager().startActivity(GrowthExperienceActivity.class);
            mOperatePopupWindow.dismiss();
        }
    }

@@ -333,10 +337,5 @@
            }
        }
        return super.dispatchTouchEvent(event);
    }

    @Override
    public void onLeftClick(TitleBar titleBar) {
        finish();
    }
}

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

@@ -21,12 +21,14 @@
            app:layout_constraintTop_toTopOf="parent"
            app:title="成长经历（仅供查看）"
            app:titleGravity="left"
            app:leftIcon="@drawable/ic_back"
            >
            <FrameLayout
                android:layout_width="24dp"
                android:layout_height="24dp"
                android:layout_marginHorizontal="16dp"
                android:layout_gravity="center_vertical|end"
                android:visibility="gone"
                >
                <ImageView
                    android:id="@+id/iv_operate"

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

@@ -46,6 +46,7 @@
                    android:orientation="vertical"
                    android:layout_marginHorizontal="20dp"
                    android:layout_marginVertical="16dp"
                    android:visibility="gone"
                    >
                    <TextView
                        android:layout_width="wrap_content"
@@ -375,6 +376,7 @@
                    android:layout_width="match_parent"
                    android:layout_height="50dp"
                    android:layout_marginHorizontal="14dp"
                    android:layout_marginTop="16dp"
                    app:cardCornerRadius="10dp"
                    app:cardElevation="3dp"
                    app:cardBackgroundColor="@color/white"
@@ -423,6 +425,7 @@
                            <LinearLayout
                                android:layout_width="match_parent"
                                android:layout_height="wrap_content"
                                android:layout_marginBottom="20dp"
                                >
                                <LinearLayout
                                    android:layout_width="0dp"
@@ -493,7 +496,7 @@
                            <LinearLayout
                                android:layout_width="match_parent"
                                android:layout_height="wrap_content"
                                android:layout_marginTop="20dp"
                                android:layout_marginBottom="20dp"
                                >
                                <LinearLayout
                                    android:layout_width="0dp"

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

@@ -20,7 +20,6 @@
            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"

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

New file
@@ -0,0 +1,143 @@
<?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="?attr/popupWindowBackgroundColor"
    app:cardCornerRadius="10dp"
    app:cardElevation="0dp"
    >
    <LinearLayout
        android:layout_width="85dp"
        android:layout_height="wrap_content"
        android:orientation="vertical"
        android:gravity="center_horizontal"
        >
        <LinearLayout
            android:id="@+id/layout_add"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="vertical"
            android:gravity="center_horizontal"
            >
            <TextView
                android:id="@+id/tv_add"
                android:layout_width="wrap_content"
                android:layout_height="32dp"
                android:gravity="center"
                android:text="新建"
                android:textColor="#FF333333"
                android:textSize="12sp"
                app:drawableStartCompat="@drawable/ic_operate_add"
                android:drawablePadding="5dp"
                />
            <View
                android:layout_width="match_parent"
                android:layout_height="0.3dp"
                android:background="#FF939393"
                />
        </LinearLayout>
        <LinearLayout
            android:id="@+id/layout_select"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="vertical"
            android:gravity="center_horizontal"
            >
            <TextView
                android:id="@+id/tv_select"
                android:layout_width="wrap_content"
                android:layout_height="32dp"
                android:text="选择"
                android:gravity="center"
                android:textColor="#FF333333"
                android:textSize="12sp"
                app:drawableStartCompat="@drawable/ic_operate_select"
                android:drawablePadding="5dp"
                />
            <View
                android:id="@+id/view_select_underline"
                android:layout_width="match_parent"
                android:layout_height="0.3dp"
                android:background="#FF939393"
                />
        </LinearLayout>

        <TextView
            android:id="@+id/tv_from_new_to_old"
            android:layout_width="wrap_content"
            android:layout_height="32dp"
            android:text="由新到旧"
            android:gravity="center"
            android:textColor="#FF333333"
            android:textSize="12sp"
            app:drawableStartCompat="@drawable/ic_operate_order"
            android:drawablePadding="3dp"
            />
        <View
            android:layout_width="match_parent"
            android:layout_height="0.3dp"
            android:background="#FF939393"
            />
        <TextView
            android:id="@+id/tv_from_old_to_new"
            android:layout_width="wrap_content"
            android:layout_height="32dp"
            android:text="由旧到新"
            android:gravity="center"
            android:textColor="#FF333333"
            android:textSize="12sp"
            app:drawableStartCompat="@drawable/ic_operate_order"
            android:drawablePadding="3dp"
            />
        <LinearLayout
            android:id="@+id/layout_own_top"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="vertical"
            android:gravity="center_horizontal"
            >
            <View
                android:layout_width="match_parent"
                android:layout_height="0.3dp"
                android:background="#FF939393"
                />
            <TextView
                android:id="@+id/tv_own_top"
                android:layout_width="wrap_content"
                android:layout_height="32dp"
                android:text="本家置顶"
                android:gravity="center"
                android:textColor="#FF333333"
                android:textSize="12sp"
                app:drawableStartCompat="@drawable/ic_operate_order"
                android:drawablePadding="3dp"
                />
        </LinearLayout>
        <LinearLayout
            android:id="@+id/layout_growth_experience"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="vertical"
            android:gravity="center_horizontal"
            >
            <View
                android:layout_width="match_parent"
                android:layout_height="0.3dp"
                android:background="#FF939393"
                />
            <TextView
                android:id="@+id/tv_growth_experience"
                android:layout_width="wrap_content"
                android:layout_height="32dp"
                android:text="成长经历"
                android:gravity="center"
                android:textColor="#FF333333"
                android:textSize="12sp"
                />
        </LinearLayout>

    </LinearLayout>

</androidx.cardview.widget.CardView>