From 084a575a73775b22d1659fb3b3661e588f37b4bc Mon Sep 17 00:00:00 2001
From: Guo_shaoshan <2055829622@qq.com>
Date: 星期一, 27 三月 2023 17:35:15 +0800
Subject: [PATCH] 提交本地代码并且获取最新代码
---
app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivityViewModel.java | 19 ++
app/src/main/res/layout/item_family_create.xml | 242 ++++++++++++++++++++++++++++++++++
app/src/main/res/drawable/shape_6b0000_stroke.xml | 5
app/src/main/res/values/strings.xml | 2
app/src/main/res/layout/fragment_function.xml | 30 ++++
app/src/main/res/values/themes.xml | 2
app/src/main/res/layout/item_family_memorabilia.xml | 14 ++
app/src/main/res/drawable/shape_73fab4cd_solid.xml | 8 +
app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivity.java | 72 ++++++++++
9 files changed, 393 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivity.java
new file mode 100644
index 0000000..3e07dd7
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivity.java
@@ -0,0 +1,72 @@
+package com.application.zhangshi_app_android.ui.function;
+
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+
+import com.android.app_base.base.view.BaseActivity;
+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.bean.FamilyMemorabiliaBean;
+import com.application.zhangshi_app_android.databinding.ItemFamilyCreateBinding;
+
+/**
+ * @author Gss
+ * @date 2023.03.25. 16:00
+ * @desc 瀹跺ぇ浜嬭 CreateFamilyProjectActivity
+ */
+public class CreateFamilyProjectActivity extends BaseActivity<ItemFamilyCreateBinding,CreateFamilyProjectActivityViewModel> {
+ ItemFamilyCreateBinding binding;
+
+ @Override
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ binding=DataBindingUtil.setContentView(this,R.layout.item_family_create);
+
+
+ }
+public class Myclick{public void onClick(View view){
+
+ }
+ }
+ @Override
+ public int getLayoutId() {
+ return R.layout.item_family_create;
+ }
+
+ @Override
+ public int getVariableId() {
+ return BR.CreateFamilyActivityViewModel;
+ }
+
+ @Override
+ public void initParam() {
+
+ }
+
+ @Override
+ public void initView() {
+
+ 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));
+
+ }
+
+ @Override
+ public void initData() {
+
+ }
+
+
+ @Override
+ public void initLiveDataObserve() {
+
+ }
+
+
+}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivityViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivityViewModel.java
new file mode 100644
index 0000000..2a81638
--- /dev/null
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/CreateFamilyProjectActivityViewModel.java
@@ -0,0 +1,19 @@
+package com.application.zhangshi_app_android.ui.function;
+
+import android.app.Application;
+
+import androidx.annotation.NonNull;
+
+import com.android.app_base.base.viewmodel.BaseViewModel;
+import com.application.zhangshi_app_android.data.DataRepository;
+
+public class CreateFamilyProjectActivityViewModel extends BaseViewModel<DataRepository> {
+ public CreateFamilyProjectActivityViewModel(@NonNull Application application) {
+ super(application);
+ }
+
+ @Override
+ protected DataRepository initModel() {
+ return DataRepository.getInstance();
+ }
+}
diff --git a/app/src/main/res/drawable/shape_6b0000_stroke.xml b/app/src/main/res/drawable/shape_6b0000_stroke.xml
new file mode 100644
index 0000000..8e092d7
--- /dev/null
+++ b/app/src/main/res/drawable/shape_6b0000_stroke.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <corners android:topLeftRadius="4dp" android:topRightRadius="4dp" android:bottomLeftRadius="4dp" android:bottomRightRadius="4dp" />
+ <stroke android:width="1dp" android:color="#6b000000" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_73fab4cd_solid.xml b/app/src/main/res/drawable/shape_73fab4cd_solid.xml
new file mode 100644
index 0000000..7c318ce
--- /dev/null
+++ b/app/src/main/res/drawable/shape_73fab4cd_solid.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:shape="rectangle">
+ <solid android:color="#73fab4cd" />
+ <corners android:topLeftRadius="10dp" android:topRightRadius="10dp" android:bottomLeftRadius="10dp" android:bottomRightRadius="10dp" />
+
+</shape>
\ 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 312a12c..2a747d5 100644
--- a/app/src/main/res/layout/fragment_function.xml
+++ b/app/src/main/res/layout/fragment_function.xml
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
+<<<<<<< Updated upstream
<layout
+=======
+<layout xmlns:tools="http://schemas.android.com/tools"
+>>>>>>> Stashed changes
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android">
@@ -20,7 +24,13 @@
android:id="@+id/titleBar"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_55"
+<<<<<<< Updated upstream
android:background="@color/color_title_bar_background"
+=======
+ android:id="@+id/title_t_bar"
+ app:layout_constraintTop_toTopOf="parent"
+ android:background="@color/color_title_background"
+>>>>>>> Stashed changes
android:paddingHorizontal="@dimen/dp_16"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -72,6 +82,7 @@
</com.hjq.bar.TitleBar>
+<<<<<<< Updated upstream
<ImageView
android:id="@+id/iv_group_photo"
@@ -565,5 +576,24 @@
+=======
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ >
+ <ImageView
+ android:id="@+id/imageView_m/argin_pic"
+ android:layout_width="@dimen/dp_360"
+ android:layout_height="@dimen/dp_202"
+ app:srcCompat="@drawable/margin_pic"
+</LinearLayout>
+ </LinearLayout>
+>>>>>>> Stashed changes
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_family_create.xml b/app/src/main/res/layout/item_family_create.xml
new file mode 100644
index 0000000..5793d06
--- /dev/null
+++ b/app/src/main/res/layout/item_family_create.xml
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools">
+
+ <data>
+ <variable
+ name="CreateFamilyActivityViewModel"
+ type="com.application.zhangshi_app_android.ui.function.CreateFamilyProjectActivityViewModel" />
+ <variable
+ name="myclick"
+ type="com.application.zhangshi_app_android.ui.function.CreateFamilyProjectActivity.Myclick"/>
+ </data>
+
+ <LinearLayout
+ tools:context=".ui.function.CreateFamilyProjectActivity"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+
+ <com.hjq.bar.TitleBar
+ android:id="@+id/titleBar"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/dp_55"
+ android:background="@color/color_title_bar_background"
+ android:paddingHorizontal="@dimen/dp_16"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:leftIcon="@null"
+ app:rightIcon="@null">
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="start|center_vertical"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:id="@+id/menu"
+ android:layout_width="@dimen/dp_24"
+ android:layout_height="@dimen/dp_24"
+ android:layout_gravity="center"
+ android:background="@drawable/ic_menu" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/dp_32"
+ android:text="@string/title_family_create_project"
+ android:textColor="@color/white"
+ android:textSize="@dimen/sp_20" />
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="end|center_vertical"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:layout_width="@dimen/dp_24"
+ android:layout_height="@dimen/dp_24"
+ android:background="@drawable/ic_search" />
+
+ <ImageView
+ android:layout_width="@dimen/dp_24"
+ android:layout_height="@dimen/dp_24"
+ android:layout_marginStart="@dimen/dp_16"
+ android:background="@drawable/ic_operate" />
+
+ </LinearLayout>
+
+ </com.hjq.bar.TitleBar>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ app:layout_constraintTop_toBottomOf="@id/titleBar" >
+ <TextView
+ android:id="@+id/textview_sequence"
+ android:layout_width="@dimen/dp_320"
+ android:layout_marginHorizontal="@dimen/dp_20"
+ android:layout_marginTop="@dimen/dp_10"
+ android:layout_height="@dimen/dp_20"
+ android:text="搴忓彿"
+ android:textColor="#ff000000"
+ android:textSize="@dimen/sp_12"
+ />
+
+
+ <EditText
+ android:id="@+id/editTextsequence"
+ android:layout_width="@dimen/dp_320"
+ android:layout_height="@dimen/dp_30"
+ android:layout_marginTop="@dimen/dp_2"
+ android:layout_marginHorizontal="@dimen/dp_20"
+ android:hint="璇疯緭鍏ュ簭鍙�"
+ android:inputType="number"
+ android:autofillHints="creditCardNumber"
+ android:textColor="#6b000000"
+ android:textSize="@dimen/sp_16" />
+
+ <TextView
+ android:id="@+id/textview_time"
+ android:layout_width="@dimen/dp_320"
+ android:layout_marginHorizontal="@dimen/dp_20"
+ android:layout_marginTop="@dimen/dp_10"
+ android:layout_height="@dimen/dp_20"
+ android:text="鏃堕棿"
+ android:textColor="#ff000000"
+ android:textSize="@dimen/sp_12"
+ />
+
+ <EditText
+ android:id="@+id/editTextTime"
+ android:layout_width="@dimen/dp_320"
+ android:layout_height="@dimen/dp_30"
+ android:layout_marginTop="@dimen/dp_2"
+ android:layout_marginHorizontal="@dimen/dp_20"
+ android:hint="璇疯緭鍏ユ椂闂�"
+ android:inputType="number"
+ android:textColor="#6b000000"
+ android:textSize="@dimen/sp_16" />
+ <TextView
+ android:id="@+id/textview_figure_1"
+ android:layout_width="@dimen/dp_320"
+ android:layout_marginHorizontal="@dimen/dp_20"
+ android:layout_marginTop="@dimen/dp_10"
+ android:layout_height="@dimen/dp_20"
+ android:text="浜虹墿"
+ android:textColor="#ff000000"
+ android:textSize="@dimen/sp_12"
+ />
+
+
+ <EditText
+ android:id="@+id/editTextFigure1"
+ android:layout_width="@dimen/dp_320"
+ android:layout_height="@dimen/dp_30"
+ android:layout_marginTop="@dimen/dp_2"
+ android:layout_marginHorizontal="@dimen/dp_20"
+ android:hint="璇疯緭鍏ヤ汉鐗�"
+ android:inputType="number"
+ android:textColor="#6b000000"
+ android:textSize="@dimen/sp_16" />
+ <TextView
+ android:id="@+id/textview_spot"
+ android:layout_width="@dimen/dp_320"
+ android:layout_marginHorizontal="@dimen/dp_20"
+ android:layout_marginTop="@dimen/dp_10"
+ android:layout_height="@dimen/dp_20"
+ android:text="鍦扮偣"
+ android:textColor="#ff000000"
+ android:textSize="@dimen/sp_12"
+ />
+
+
+ <EditText
+ android:id="@+id/editTextSpot"
+ android:layout_width="@dimen/dp_320"
+ android:layout_height="@dimen/dp_30"
+ android:layout_marginTop="@dimen/dp_2"
+ android:layout_marginHorizontal="@dimen/dp_20"
+ android:hint="璇疯緭鍏ュ湴鐐�"
+ android:inputType="number"
+ android:textColor="#6b000000"
+ android:textSize="@dimen/sp_16" />
+ <TextView
+ android:id="@+id/textview_figure_2"
+ android:layout_width="@dimen/dp_320"
+ android:layout_marginHorizontal="@dimen/dp_20"
+ android:layout_marginTop="@dimen/dp_10"
+ android:layout_height="@dimen/dp_20"
+ android:text="浜虹墿"
+ android:textColor="#ff000000"
+ android:textSize="@dimen/sp_12"
+ />
+
+
+ <EditText
+ android:id="@+id/editTextFigure2"
+ android:layout_width="@dimen/dp_320"
+ android:layout_height="@dimen/dp_30"
+ android:layout_marginTop="@dimen/dp_2"
+ android:layout_marginHorizontal="@dimen/dp_20"
+ android:hint="璇疯緭鍏ヤ汉鐗�"
+ android:inputType="number"
+ android:textColor="#6b000000"
+ android:textSize="@dimen/sp_16" />
+ <TextView
+ android:id="@+id/textview_elecfile"
+ android:layout_width="@dimen/dp_320"
+ android:layout_marginHorizontal="@dimen/dp_20"
+ android:layout_marginTop="@dimen/dp_10"
+ android:layout_height="@dimen/dp_20"
+ android:text="鐢靛瓙鏂囦欢"
+ android:textColor="#ff000000"
+ android:textSize="@dimen/sp_12"
+ />
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="@dimen/dp_320"
+ android:layout_height="@dimen/dp_180"
+ android:layout_marginTop="@dimen/dp_2"
+ android:layout_marginHorizontal="@dimen/dp_20"
+ android:background="@drawable/shape_6b0000_stroke"
+ android:textColor="#6b000000"
+ android:textSize="@dimen/sp_16">
+
+ <Button
+ android:id="@+id/button_add"
+ android:layout_width="@dimen/dp_85"
+ android:layout_height="@dimen/dp_85"
+ android:text="+"
+ android:textColor="@color/black"
+ android:textSize="@dimen/dp_35"
+ android:gravity="center"
+ android:layout_marginLeft="@dimen/dp_10"
+ android:layout_marginTop="@dimen/dp_10"
+ app:srcCompat="@drawable/shape_73fab4cd_solid"
+ android:background="@drawable/shape_73fab4cd_solid"
+ android:onClick="@{myclick.onClick}"
+ />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="瀵煎叆"
+ android:textColor="#6b000000"
+ android:textSize="@dimen/sp_12"
+ android:layout_marginLeft="@dimen/dp_40"
+ />
+
+ </LinearLayout>
+ </LinearLayout>
+
+
+ </LinearLayout>
+</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 8d68bc2..a591681 100644
--- a/app/src/main/res/layout/item_family_memorabilia.xml
+++ b/app/src/main/res/layout/item_family_memorabilia.xml
@@ -12,6 +12,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
+
<androidx.cardview.widget.CardView
android:id="@+id/cardView"
android:layout_width="match_parent"
@@ -280,4 +281,17 @@
</androidx.cardview.widget.CardView>
</LinearLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ >
+<LinearLayout
+ android:layout_width="@dimen/dp_56"
+ android:layout_height="@dimen/dp_56"
+
+ >
+
+</LinearLayout>
+ </LinearLayout>
+
</layout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e23b5a1..26a061b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,7 +3,9 @@
<string name="title_home">棣栭〉</string>
<string name="title_function">鍔熻兘</string>
+ <string name="title_family_memorabilia">瀹跺ぇ浜嬭</string>
<string name="title_personal_center">涓汉涓績</string>
+ <string name="title_family_create_project">寮犳皬app绔嬮」</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 3fd4c64..6ab59aa 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
- <style name="Theme.Zhangshi_app_android" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+ <style name="Theme.Zhangshi_app_android" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/purple_500</item>
<item name="colorPrimaryVariant">@color/purple_700</item>
--
Gitblit v1.9.1