From 506b7ad01d2663503a0149f110c95b5c96311e6b Mon Sep 17 00:00:00 2001 From: Michael <66694@msn.com> Date: Thu, 23 Jun 2022 03:16:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E6=88=91=E7=9A=84=20?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=20=E5=92=8C=20=E6=B7=BB=E5=8A=A0=20=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E5=9C=B0=E5=9D=80=20=E5=8A=9F=E8=83=BD=20=E4=B8=8B?= =?UTF-8?q?=E4=B8=80=E6=AD=A5=E5=8F=AF=E4=BB=A5=E5=AE=8C=E5=96=84=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E5=9C=B0=E5=9D=80=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 39 ++-- app/build.gradle | 2 +- .../activity/fragment/MyPageFragment.java | 7 +- app/src/main/res/drawable/bg_layout_shape.xml | 7 + app/src/main/res/drawable/btn_normal.xml | 12 ++ app/src/main/res/drawable/btn_pressed.xml | 12 ++ app/src/main/res/drawable/btn_selector.xml | 10 + .../main/res/drawable/custom_rc_divider.xml | 8 + app/src/main/res/drawable/divider.xml | 6 + app/src/main/res/drawable/receivegoods.png | Bin 0 -> 895 bytes app/src/main/res/drawable/setting_arrow.xml | 4 + app/src/main/res/layout/activity_delivery.xml | 32 +++ .../res/layout/activity_delivery_detail.xml | 142 ++++++++++++++ app/src/main/res/layout/fragment_my_page.xml | 183 +++++++++++++++++- app/src/main/res/layout/item_book_info.xml | 121 ++++++++++++ app/src/main/res/layout/item_delivery.xml | 100 ++++++++++ .../main/res/layout/item_delivery_select.xml | 100 ++++++++++ app/src/main/res/values/colors.xml | 49 ++++- app/src/main/res/values/styles.xml | 67 +++++++ 19 files changed, 866 insertions(+), 35 deletions(-) create mode 100644 app/src/main/res/drawable/bg_layout_shape.xml create mode 100644 app/src/main/res/drawable/btn_normal.xml create mode 100644 app/src/main/res/drawable/btn_pressed.xml create mode 100644 app/src/main/res/drawable/btn_selector.xml create mode 100644 app/src/main/res/drawable/custom_rc_divider.xml create mode 100644 app/src/main/res/drawable/divider.xml create mode 100644 app/src/main/res/drawable/receivegoods.png create mode 100644 app/src/main/res/drawable/setting_arrow.xml create mode 100644 app/src/main/res/layout/activity_delivery.xml create mode 100644 app/src/main/res/layout/activity_delivery_detail.xml create mode 100644 app/src/main/res/layout/item_book_info.xml create mode 100644 app/src/main/res/layout/item_delivery.xml create mode 100644 app/src/main/res/layout/item_delivery_select.xml create mode 100644 app/src/main/res/values/styles.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index b2e8ffe..7222c2e 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,11 +3,28 @@ diff --git a/app/build.gradle b/app/build.gradle index ab5dbe7..4862c56 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,7 +38,7 @@ dependencies { testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' - + implementation 'com.android.support:recyclerview-v7:27.1.1' def fragment_version = "1.4.1" // okhttp implementation('com.squareup.okhttp3:okhttp:5.0.0-alpha.7') diff --git a/app/src/main/java/com/android/activity/fragment/MyPageFragment.java b/app/src/main/java/com/android/activity/fragment/MyPageFragment.java index 1b3cad7..5df3a80 100644 --- a/app/src/main/java/com/android/activity/fragment/MyPageFragment.java +++ b/app/src/main/java/com/android/activity/fragment/MyPageFragment.java @@ -100,10 +100,11 @@ public class MyPageFragment extends Fragment { Bundle savedInstanceState) { // Inflate the layout for this fragment - rootView = inflater.inflate(R.layout.fragment_my_page, container, false); - textView = rootView.findViewById(R.id.tv_my); +// rootView = inflater.inflate(R.layout.fragment_my_page, container, false); +// textView = rootView.findViewById(R.id.tv_my); - return rootView; + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_my_page, container, false); } @Subscribe(threadMode = ThreadMode.POSTING,sticky = true) diff --git a/app/src/main/res/drawable/bg_layout_shape.xml b/app/src/main/res/drawable/bg_layout_shape.xml new file mode 100644 index 0000000..d947a40 --- /dev/null +++ b/app/src/main/res/drawable/bg_layout_shape.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/app/src/main/res/drawable/btn_normal.xml b/app/src/main/res/drawable/btn_normal.xml new file mode 100644 index 0000000..4fcd5f0 --- /dev/null +++ b/app/src/main/res/drawable/btn_normal.xml @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/app/src/main/res/drawable/btn_pressed.xml b/app/src/main/res/drawable/btn_pressed.xml new file mode 100644 index 0000000..32d8b7c --- /dev/null +++ b/app/src/main/res/drawable/btn_pressed.xml @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/app/src/main/res/drawable/btn_selector.xml b/app/src/main/res/drawable/btn_selector.xml new file mode 100644 index 0000000..5259843 --- /dev/null +++ b/app/src/main/res/drawable/btn_selector.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/app/src/main/res/drawable/custom_rc_divider.xml b/app/src/main/res/drawable/custom_rc_divider.xml new file mode 100644 index 0000000..9c6b5b8 --- /dev/null +++ b/app/src/main/res/drawable/custom_rc_divider.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/divider.xml b/app/src/main/res/drawable/divider.xml new file mode 100644 index 0000000..759edc3 --- /dev/null +++ b/app/src/main/res/drawable/divider.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/receivegoods.png b/app/src/main/res/drawable/receivegoods.png new file mode 100644 index 0000000000000000000000000000000000000000..7841377f0b7e2623fc319c907c1e9b2b9244602f GIT binary patch literal 895 zcmV-_1AzRAP)Px&IY~r8R9HvF*Lmn>V-yGQ&lHLLVVxu?jIl4-lE@Yf$&|ImAC^CCStBBaB1uGq zBqK$PEM=#JNVX|ESsO`1F+?du-#Twyci#6d)70FvGuJm>j7=lP!H&NIg{Z;to3 zrT{j>o~1wH!_vRU9%w9pvvDqVtBsap3v7ws@d2*Ii$j471+XFR#mTk7n~45a8*PVu zaSTqumAGLDh#>%Wz-RaviNNbUj<3cwWz*}w*8tz+37j|NL=BsN@k~W!=F&a@_uy!3 zHO0dM9EI=j3Rbmjj>HSanY(5o=mKy=k?D9m-g0mwE^9nnftzqg%kE~JfSvKjG!R_? zF2*@n*jkv=?1)E8cgGT(QTBH??2|3YjQ#P}SO810K{0=_c0N|(dR*0V_zix-ey!(; zPDpv*SOA|O9JsZyFsb%7w!yb8ho{vQBxRct0{>84SPeth75s`*@nmDww)hICET@gqn%ZUzd zISlFEuPb;OyW)_tY5Q9jKO@)k*w_f9q=wN+q2zi~Ho+Cx1-YuvXPhtxNCe{J)3E?H zuf@;eqG^i8ImkX-v6_<0L0Iw)o=nP z)oq%jZe%P=Z%D1^m7x)sIJ&bM&f$2ufu?JFwCXzbwQ2hx} z)BhtWJc&f~DLmhWqzgbcj_y?9Od*LTwAuW`YQdR~!;N&ubi~+4Q+)FK0FshlOan3t zz}`sBf20P?ucs_tRv_{!lk&8wCw?wRirS%L00e!8(35KDm=(n|m<+5B&oJ1!O7@~^ z;j5W-T|uVX3z2~$Ejg)`=_c*COG3n){GiH)^pRvxcrpq=jMLi#;;=@a|Eq`=vPIX! zMh#8v&-cQYRSj>OH4kQkAz3g%y*{?Dub_=F(Uj?58XCSNYJ+49fI$w&8qGO?{{T$k Vr6D_;NDu%3002ovPDHLkV1l>Ftbzal literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/setting_arrow.xml b/app/src/main/res/drawable/setting_arrow.xml new file mode 100644 index 0000000..a8b409b --- /dev/null +++ b/app/src/main/res/drawable/setting_arrow.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_delivery.xml b/app/src/main/res/layout/activity_delivery.xml new file mode 100644 index 0000000..08c978a --- /dev/null +++ b/app/src/main/res/layout/activity_delivery.xml @@ -0,0 +1,32 @@ + + + + + + +