From 5ae72cdf047f24042b179740e6f879267f9022c4 Mon Sep 17 00:00:00 2001
From: zxj <275873859@qq.com>
Date: Fri, 1 Aug 2025 18:14:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=83=AD=E9=87=8F=E4=BF=A1=E6=81=AF=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sw/dualscreen/activity/MainActivity.kt    |   6 +-
 .../SecondaryScreenPresentation.kt            |  17 +-
 .../sw/dualscreen/view/CustomImageView.java   |   8 +
 .../res/drawable/ic_cylinder_green_big.png    | Bin 7330 -> 0 bytes
 .../res/drawable/ic_cylinder_green_small.png  | Bin 4159 -> 0 bytes
 .../main/res/drawable/ic_cylinder_red_big.png | Bin 6717 -> 0 bytes
 .../res/drawable/ic_cylinder_red_small.png    | Bin 3724 -> 0 bytes
 .../res/drawable/img_big_green_column.9.png   | Bin 0 -> 1469 bytes
 .../res/drawable/img_big_red_column.9.png     | Bin 0 -> 1342 bytes
 .../main/res/drawable/img_green_column.9.png  | Bin 0 -> 929 bytes
 .../main/res/drawable/img_red_column.9.png    | Bin 0 -> 815 bytes
 .../main/res/layout/item_user_nutrition.xml   | 159 +++++++++++-------
 app/src/main/res/layout/view_cylinder.xml     |   2 +-
 app/src/main/res/values/dimens.xml            |  14 +-
 app/src/main/res/values/themes.xml            |  23 +--
 .../java/com/sw/plate/ExampleUnitTest.java    |   2 +
 16 files changed, 147 insertions(+), 84 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_cylinder_green_big.png
 delete mode 100644 app/src/main/res/drawable/ic_cylinder_green_small.png
 delete mode 100644 app/src/main/res/drawable/ic_cylinder_red_big.png
 delete mode 100644 app/src/main/res/drawable/ic_cylinder_red_small.png
 create mode 100644 app/src/main/res/drawable/img_big_green_column.9.png
 create mode 100644 app/src/main/res/drawable/img_big_red_column.9.png
 create mode 100644 app/src/main/res/drawable/img_green_column.9.png
 create mode 100644 app/src/main/res/drawable/img_red_column.9.png

diff --git a/app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt b/app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt
index 0ba683f..670d422 100644
--- a/app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt
+++ b/app/src/main/java/com/sw/dualscreen/activity/MainActivity.kt
@@ -121,7 +121,11 @@ class MainActivity : AppCompatActivity() {
         )
         binding.recyclerview.adapter = adapter
         binding.tvFoodName.setOnClickListener {
-            presentation.step3()
+            if (presentation.currentStep == 2) {
+                presentation.step3()
+            } else {
+                presentation.step1()
+            }
         }
         registerDataChange()
     }
diff --git a/app/src/main/java/com/sw/dualscreen/presentation/SecondaryScreenPresentation.kt b/app/src/main/java/com/sw/dualscreen/presentation/SecondaryScreenPresentation.kt
index a18cbe9..f9e80d7 100644
--- a/app/src/main/java/com/sw/dualscreen/presentation/SecondaryScreenPresentation.kt
+++ b/app/src/main/java/com/sw/dualscreen/presentation/SecondaryScreenPresentation.kt
@@ -95,6 +95,11 @@ class SecondaryScreenPresentation(
                 itemUserNutritionBinding.tvUserName.text = it.userName.maskName()
                 itemUserNutritionBinding.tvRecommendHeat.text =
                     "推荐热量：${it.recommendMin}-${it.recommendMax}"
+
+                itemUserNutritionBinding.customKcalColumn.setCustomHeight(280, true)
+                itemUserNutritionBinding.customFoodColumn.setCustomHeightPercent(1f, true)
+                itemUserNutritionBinding.customVegetableColumn.setCustomHeightPercent(0.5f, true)
+                itemUserNutritionBinding.customMeatColumn.setCustomHeightPercent(0f, true)
             }
         }
     }
@@ -150,8 +155,8 @@ class SecondaryScreenPresentation(
         currentStep = 1
         stepChangeCallback(currentStep)
         binding.tvFoodInfo.text = "菜品识别中"
+        binding.ivFaceBg.visibility = View.GONE
         binding.flPreview.visibility = View.VISIBLE
-//        binding.previewView.visibility = View.VISIBLE
         binding.ivImg.visibility = View.VISIBLE
         binding.flFace.visibility = View.GONE
         pauseCamera()
@@ -171,6 +176,7 @@ class SecondaryScreenPresentation(
         resumeCamera()
         binding.tvFoodInfo.text = foodInfo.foodName
 
+        binding.ivFaceBg.visibility = View.VISIBLE
         binding.flPreview.visibility = View.GONE
 
         binding.flFace.visibility = View.VISIBLE
@@ -205,9 +211,6 @@ class SecondaryScreenPresentation(
         }
         binding.tvFoodInfo.text = currentFood!!.foodName
 
-        binding.flPreview.visibility = View.VISIBLE
-//        binding.previewView.visibility = View.GONE
-        binding.ivImg.visibility = View.VISIBLE
 
         GlideUtils.loadRoundCornerImage(
             context,
@@ -215,7 +218,9 @@ class SecondaryScreenPresentation(
             imageView = binding.ivImg,
             radius = 12
         )
-
+        binding.flPreview.visibility = View.VISIBLE
+//        binding.previewView.visibility = View.GONE
+        binding.ivImg.visibility = View.VISIBLE
         binding.flFace.visibility = View.GONE
         binding.ivFaceBg.visibility = View.GONE
         binding.tvFaceTip.visibility = View.GONE
@@ -317,7 +322,7 @@ class SecondaryScreenPresentation(
         recognizeViewModel.recognizeNotice.observe(activity, Observer { notice: String? ->
             Timber.i("recognizeNotice observe notice = $notice")
             if (currentStep == 3 && notice == "leave") {
-                step1()
+//                step1()
             }
         })
 
diff --git a/app/src/main/java/com/sw/dualscreen/view/CustomImageView.java b/app/src/main/java/com/sw/dualscreen/view/CustomImageView.java
index 6e12a2e..6fc0ab2 100644
--- a/app/src/main/java/com/sw/dualscreen/view/CustomImageView.java
+++ b/app/src/main/java/com/sw/dualscreen/view/CustomImageView.java
@@ -17,6 +17,10 @@ public class CustomImageView extends androidx.appcompat.widget.AppCompatImageVie
     private String textToDraw;
     private Paint mPaint;
     private int mTextSize = dpToPixels(26);
+    /**
+     * 最大高度
+     */
+    private static final int MAX_HEIGHT = 280;
 
     private boolean isDrawText = false;
 
@@ -65,6 +69,10 @@ public class CustomImageView extends androidx.appcompat.widget.AppCompatImageVie
         }
     }
 
+    public void setCustomHeightPercent(float percent, boolean isAnimation) {
+        setCustomHeight((int) (percent * MAX_HEIGHT), isAnimation);
+    }
+
     // 用于设置自定义高度的方法
     public void setCustomHeight(int height, boolean isAnimation) {
         ViewGroup.LayoutParams layoutParams = getLayoutParams();
diff --git a/app/src/main/res/drawable/ic_cylinder_green_big.png b/app/src/main/res/drawable/ic_cylinder_green_big.png
deleted file mode 100644
index f6dac38cc3e3ed246618e04902e6ef3b17d056d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7330
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

diff --git a/app/src/main/res/drawable/ic_cylinder_green_small.png b/app/src/main/res/drawable/ic_cylinder_green_small.png
deleted file mode 100644
index f719e30702821a074bab731ca50b5d49e8c58389..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4159
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

diff --git a/app/src/main/res/drawable/ic_cylinder_red_big.png b/app/src/main/res/drawable/ic_cylinder_red_big.png
deleted file mode 100644
index 590dc97a8127bf7b91ec4475489472222d1eb9fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6717
zcmd6Mi#yZr|Nl0_W)5>+5hK%Nm_v@KAvqt4oYPjwA%}O4AvR`Gk>pGvhn#5<$zi76
zL^OotG{u{eLnnmzZG67}!|%Fw?Qq?%`@Wxt$Mf;HpZAh%txfoN4)Xv206sI*Gv@&S
zAcgh40m8+4Pc^=?!TJCOpEofC)DB2~0RRqdn4K}Ok8odp2ut<2aHBgmT<YaBm31Ip
z`5ounQzY52*gmf8R?@k?O$gU{^XRq1Ag*KuWYW_~bIbRsw`9tBzi}NOC)W$gC3Tjo
zI`CfLkw?QYtD%H(?&fc>^%Hu-T7L_oRDSWRPYh2ry<GhqTNx1gE@UQZ;Lk(7jngxK
z1~wi7#Dy0@qzuMO;jM6k8OucpO1lrE3AT0Bur5X#7bx&+oqiYopChwSN*j`0Rlt!g
zN|(gD0D=v(OE+ki_(%u`&~hva3Gf2k{90Rk<m}Aw>apVlz)M3!@@Yw67>7)~7P$@B
zTE0Ph1P@z3Q@1s+0tj0Qr#%Ne7rYrB1#mSXgmaz^UCzN$VQ05-V>4PxTQ|;h6mV`2
zM3wF;-%YE+D3adnqI-M0{#uiWQd@b&+?zY@*<&0(e<ANlF9wswfp1f!zdj@BoH)JI
zCbb#qy<~7I_2gSSZx;t;8Nm<2uv@Q8K(ezD3Nc5bRA!;YGhhC$pK&@~@2?@0SCdHN
zzhmM+Y1Ce>$BJCV=zV;kLccp6WDn@JXF4&xnLPl00RmwMw|Z|cZ&jdpZ|?Uq{=Z`@
zQGvck<zb$0a~XoPAVkNpNR>WM;d-eEv4}G6n8Wm8nUi{umt_vg9iE^%_?q;SRZ13=
z*C1A!_Zyisy$Qh^0J<qbprB|-H)qhvAOyoNI!C_Hr+&dO;yCdH%}#&KgL9Nz?<umr
zn9Uh=7XJ<}r>!i{-22!YDd5KalZ)B&X!G<AfFFi0+MO6H+W6je$quLQId9L1ah%%*
zXeQK~i6y3Bh3-Gy5d8qBZ}k!U3=TEBawG9~ioi|XS%k3D7~lZF8a5k(zn|YA^A_^>
zMzoH1x8yVBQdFUWqR!|>&kZTP2`z9vPehQ2R5|UdqHIT^1qtee;K4TMf`*LR1-zE;
zIQ-|`zQ+e_ePjwwxwEhiW4MMF^?@~}N_;9V$m}4RZDNvRKIjPP42It@uk1UTZunb_
zB7zLt5~2dO9^cq|P5UI}gyF82>;z)?2?kFl=C*n*kVGY!>WnVelt8@F+Aq^zFHbzj
z{s<3rLR`ms&BV8NGvC9fCpoTi)C~{W$SxtBUlznaYEDAQU@blL7a3|3iN}L%0DHkg
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

diff --git a/app/src/main/res/drawable/ic_cylinder_red_small.png b/app/src/main/res/drawable/ic_cylinder_red_small.png
deleted file mode 100644
index 9bea2e7b0ea448934a34367c32d209758de82f18..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3724
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
N%-+`7=7ANF`9GsS-d+Fz

diff --git a/app/src/main/res/drawable/img_big_green_column.9.png b/app/src/main/res/drawable/img_big_green_column.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa16165854f611f974b14a56d4c4d22a598e6a15
GIT binary patch
literal 1469
zcmV;u1w#6XP)<h;3K|Lk000e1NJLTq004vl002G+1^@s6>J_uJ000GqNkl<ZcwX(A
z-ES0C7{+TNCdL@N=p9O8y!0RNk_*GNH;Y$5ftjK00u2R9DTx#a0U>Ciw6j~GD)<TN
zMZu3~#P9k=@J?ei!3f+b-Vmcz9G_>pyPZ8}w!7V(ot>HUp5&LAcF&yip7(in=A5(B
z)iqx{!FaM!R*kN@+bKFLtx4-K9G|cYb}x7ejN$Kd;1bS1wTt$5IR6>Pn>hZC<82)O
z!tq}mJyJU7|86@4=QnTz=RfgUw!ya8CfjBomTUE~&r;tj8H*ZU%1SznksHn3V^7(S
zBI!A+XpKOqX`Fw8<F7$MJB=R;VshqVoAzTx%#595P{)<Pk~~8ofy<G=#~s%h!ng1h
zB>8*%Z%$2q3Yp_rI3}DA`D4Ub)$w<@blwo_i|Ze;UAqU#I#Uw=PDnDd${pNEe(=YR
z955GZeqt{18^Yloz_r)ln{pcG*FutHI@g#R+(Fj#Jlpetn!h%ecno1ZXFZ5P4uFrG
zY~23iVvadu?lw$pcu37_8%p~Ofx&cRApN){&N^m22HFK5FSD4a=5gMw<~yPiu_3&!
zyAbSZa30Uaze5HkL;!P(FWUv2uV&6w8CodO7-H?&wf7;oJOceu4PIz3rJU!ffvQUr
zr8Prv(!&iJe-kGpSRqEB0kvpxBHElGa?j-M#j|V}f!xvp6FSW;YD0}w-5MxMH^ipm
zrW|flzk~!LB#4qmIaR+prEx=)mW~(Ij)i1H&8VHKXN}UBA*_P+BpmmL+L@3Js2w#_
zbqy(t8v>0j1C!uCwG$zAP(y0DOw~D1Y8wI<E(e!G8WvJaX}7r6k80tDzy;k{##~h!
z6EecQwqd)Sx*;|`z43lLbFOHO2$_N!Q)@+j#Sq+jE;uvl#X@G8QMSIT4Pj5&gCQ3Q
z8OADFI|3G1FoZR3J&e1<pXvod#)0P4UNZzf;0vkx1%e5jt1`qocijpY;-8R;f(bzT
zUblBe#SoTj?a(R-MnMl$3;~C{t5y&U10Gl~MA5mfRS?Xg;M@orLSB3|9n2#Z3^64?
zUKtNOP%%V)I<Hp{jDjAh7-HwEJGBaeS<nL&L+rn_U#lRP1wBwP#Q5yERzWZedZ1#6
z;+3Me`}}ULl3)hZo*t+&#K|vCdYh*<Yn6p;L(QqZW(Xp43G<-lW&Jfn6uvEZyI$L+
zT_j`^YE8{+8iGuIJ?Rac9ndZovIRA!)<Nw<4M9$Qc}h%?VW=%NR&}pw2r}{2gg5x|
zpw^g>Zm21>RrRiG2;zR@dLwU+XpIW#gj!NlRp*8cQReXbhrPbjeOd=XI-qvcP}NnX
zVM7q^WXW$H>4Tb4J5|pxmShORB?_Ik<@qgI$3n8;ub0#+xU8(lk_}OY&!N$aqw*L@
zAk>7~EH+oDMbm~T!`bS-nSEl61V9a_MXeP?BeZOYGTh)e_|8FZ>kC`8K!x_goHO_8
zCQ~y+W{5I;ULF1Ls5kWbko-{AMwnaXn7Llc9HAbO8zKmI!sy)XFKyQbBs2$e$()Am
zGDbmL4H1OPo&#?mke$yaV9uDkMwgDQ5St-_aMHu&(4IH;$nrG==7hOnj#`-@HbX}Y
zp>pE$6W*cs4*5wiaZ<`LbL`9kbD`!ZP7+}V6@Dv@T|VZ&xWQMuw!OGbOJZ8#SU4t*
zjbn`a4p5Io8X^pCvW$H;=HEuS>B4UmpRGxJ<S-`2#uynZV`l8lY!t;!Y7DU$Tz2uD
zz~dhu_l|sU#Gi$8gJ$nrd%fWc!~R}AXXktefMWHZ>GwBr7F!ncGuGkuFR$UXY=dpF
zO}5QG*cba`-;5#3C15AWgdv3J5JL!6lntSMAef05La0I>8A26e2%(CKAxbBL+4$vu
XDc}uCa}D(?00000NkvXXu0mjfA+xKH

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/img_big_red_column.9.png b/app/src/main/res/drawable/img_big_red_column.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ef3f87c4a12cf5ce6308e84c2e7b9503108b5bd
GIT binary patch
literal 1342
zcmV-E1;P4>P)<h;3K|Lk000e1NJLTq004vl002G+1^@s6>J_uJ000FANkl<ZcwX(B
zO^*~+6o!w9m>6Tm1v{0*u=Ef30}N|6gIkv>3lm8QVPV+1Q4=Ff&oF*4@e?CBKu7=~
z7&V$qBx)RNF~KPAP&UK}g7`jEby<Du_Vjmmb=A4aldA5yALpL;?W(%Bd(4t@$EiKl
zDErLrZJ2G@Z}x<a+ZW895ig2Y^?F4d*ZF5UUJyTv-^Cx|y7*h%5_eKK=e_G{b5&f?
z`6b$>eH<4n^vxIt%%0Wj?djNCh$W2A%NWW&v-=j!9#_)m#a@Z=hK}cT{524C+T2QG
zA~s^&E9QxvIfU~nVJY90LJ6Ex0-w~UZ?}^Au3oQ;n~~(t8q8rmozrgSsN-BX|0$R0
z8$wChD)FDzahZgP+mU2emD@7NMID#Z9Bd8qGvP9MLuk@-n*0tW;-JniN0L-`E|VKw
zL3X@i_E4C=F_+00V#(|gP4anhu2GH4|D?D{&dA;CW{-w>9YYzPAvBrIn#gnF%SOF!
z1LK0*3%T4WHi!8hQ5mfv)Z0A@cANN6+=xud84WjNj>9@`Bj=$GLzK}N;*i+`jl{Xl
zNbt^hA?G{MAk<}mGMpiJ=vhcMfv!dZbtVWJpv906qJtUYWwZMg#2)cy7??A4&}0u9
zg}U`n`Zq))*)9Af5{OeS&}cr?uS@CO5b4tKSY%+Q#Go14g?e@<y%|ECKBdmDg@ZXW
z!!<Mvb&Zsb4WW)UiT&c=$RN&afre<gDbzVvIvYX_=fv4a$Ic9s?iP3YQY~(XMzYKJ
zP1u=J4N`4myPZWtykz#EDzAl|IF(}!tpoYn4Z$|3+_M^K>{OH0VC%cx5Q}CnL>f8O
zW>?Mv{~O{pv&VFG_$$)DsW51c_60*MBtJ+kG;nIcN}C}Lm^~~*{1d6@)Bv={19?O2
z3M)DF0uN+{kV8&}6`Xp32QowGjo-owPQ8#JuH+5jKYXn@JV#`PSoANiY7ZXB4Dn{9
zf>ST>KxT-;kqS<|zyp~f&O|CW^#TuMhWOs@-a`tNoO*!vcpx*xC7m3NRCMYA+T(#X
zLwqNeB9)zLgXU;oFa&%WY2Z{FG;ir&FvL&dqevsCnxHkBcQgcC6z@bDJJkY>(K@ev
z)DZAP+92%2sRn3^#-Z*V4bi$%e30wJsRn2oUKx5a1T@7lD|YJ4CTQ8TqRu@VqQ&Rp
zpcMyjW&^ZC!%)|do(%!)WcdnY_CPbV3-yfAmmz>93Ql{=iUT|40*%lrzpU&=--c-M
zqc|;=tr&<iUC;z=&?wZc8v`4n#kx3UZj3U3255mMp-#Orv>{rsj5#X~Sus#&ypVHp
z-)Sk?4<j=~3+`86iI2^{P9G=amK>Aoex4D!F>*uXVJGaIc+ZLxat4E3lGE5O<0u%b
zA@Z>7;afF!$^6REJLHO-k-J`(j>9l9L*(J1hvm?!`SLXeIUzUXXqX4YL70jmLcSH}
z#V2CLiV3PZ%$d2919B1OXOfh{5FvajzP4m7eZ-Q4RpB<n9GDApVs6ZF(pP|Pl+q9}
zn&N^bm(kOfe4^gBa^7-?iP(sdSc#d~n^v4x*_ataYy`_L9=O)T7nVGQvq5vhk{^$<
zmybaF2H<T={vm};oF$82d3cY%QHQ#;p)GyT7k$z<V=xwDGBz>Hg6JDj2}3xeqh*M~
zADnvPhH%<&LpW{tGlbKI8^UQLGemmg)SJ8IKa2a?vXhzQF#rGn07*qoM6N<$f?yDS
AMF0Q*

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/img_green_column.9.png b/app/src/main/res/drawable/img_green_column.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..3067c9275eff1c7ab79f6ba98e00174fdcf8a2f9
GIT binary patch
literal 929
zcmV;S177@zP)<h;3K|Lk000e1NJLTq002?|001fo1^@s6AYBYM000AMNkl<ZcwX(8
z%TE(g6o<i`EB^ww5{+@=QvU-IHl~RSH*IGID38(*Ai#nN2?U|avoI})FJi=~F&Yw;
zs0*KoB(B(zuySE=r)&_tp5M?;+k2<&w4F9Bb8qscP3PQm&-rNYouQ%OXfR1xRCoB|
zzEjGga#2mFSG2emA)>0Gt`V=*xVlB`&}TpB^*6o#Ay_8#`C;-JVs^|qm`gd33ptS+
zYhW#Y{R)nX$!w&C&M1a*jhehc4Q^7?--&;`oJxVUu%?E!sRq;%SPV3wHojOFhI=CY
zhW{KD944Mo@q2t@HG`r3M2)BwHS>LxILZ>)7+eWnqT;5hxLu*(df}+{=|DVi89nh$
zIvmA|^vC?CX<?l}0b*hG%`Ty%N51a@!?{TFkTBGB`U?t&z_EjRM6c+X_mE>07OBLP
zv*w;s#e<?&Fb^#19S(Re+{i7`chh&05?!Z+2mAsa<Nz+<g!hyj_9BBz!SghE+a{sc
z*@he5SA(5M3T`HT*(8x10XNN@wrr7sM4&~JKV>Hz&;v(HhPt#!Wm&mE0sA(SB=+pX
zS(Zp$*H6%9`pqU-k_R}0J4>Xxq+aENB+h`lv`9nU-~%MifICa1R?GinsD1X*A`{x7
zO@PE1e=U)r)sW{N|J(xZERlT=`-A|AGvLk=Ik7n*1W23#ca})wtHB~`5g|yDA2@?M
zOJsa2&SpQ%vi6mBAy{G$T)`RKWr+k+Z>LymqE(nA$p((#D&<WO38L?!@|&3lxPhZg
zXSO22+{ZcAbH7JO;&tEzZg^igMFMQ1`U{=4Ew>2?y#^e>1)T7n3W`iI|7o5LJ{}a3
zdj<3k2fUY}MW(<BHS}c26W>tuh+b2tav_QmnIiTj#zr?rS@>R9D4^a!Pv{Lj@_px{
zB$1iSyq{qs&qwN7Dr!d$=!NgkDP@by1pCPNt8sHr>AKS;6kIEG-tIJOM6HGPKBu@U
zl4s%b0-Jm@X`Xid>;0_zZg*90_OTY$#M-C<wV)=xPB*BiNIP)*fcr2!6^y+cGaDR!
zI?M(h4Y1w^z2<!yzRex09p;TMz{U^oK6EQ&UPBCGF$Z&z1G$hBxv@sBTa`*sb&<yv
zDbgiUB83Z*;*cU;LW*<=xktK$6zLL{$mAPIX_(_b5b-_nSJ1as00000NkvXXu0mjf
DD_O5%

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/img_red_column.9.png b/app/src/main/res/drawable/img_red_column.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..694aeed64afb26136a571d364989da70f659317e
GIT binary patch
literal 815
zcmV+~1JL}5P)<h;3K|Lk000e1NJLTq002?|001fo1^@s6AYBYM0008^Nkl<ZcwX(8
zOKTHR7>2*PbJbtqR<Vd1m--J1Zrr%=KS=*Uwgt5-wMpv@Zzy;}-L&Asg@P1<mk3p%
zD;H9C+D+Bg_i-*JXHJqyG6_lN9C+Z6`R1JOeUi*fVit|vz(9<4RL!O@nH{T{ozi?x
zoLe-zB~~<F6JNwP@l*T~yAHqOW7JT)#<{G)T4Ij1*+cVbcmE-dp~;+5po0o{Mx0lu
zRq<8qc;pNV_F~UfdY~5xK16SBvjvReM5@slaaKH5^P8SvV}bhnPLFY~Gj5JP$3P;d
zmd%c<xdk<};Wj)e#Jw+w6J&Bj<{Z6?yl8enn^vk5EUyC_qC!SDcbAc0Bo}bKd-oRo
zH-S9`8Ocg!*F&4pU8LTf!|`=*lsAfTVTbHEaJ@LAy~qn@`?b)#*!FBtHgGVH6W3Eb
z{30)#9npym&w^#Afg9JCMpmSXXT=ZCB7q3p%sSdyMd~5?WHo%1^RSJpCUyTsE}0!w
z!ItNwfS)a#wTP^k?bCs}r#R4=I_^@Dx`3Yc6a{jCyHuo}m7co=fqdXD6<HnQKN%)~
z%~WJ9`k&7&2;}2WD)L%6fBqE$?oyEtJOzP#;4T&U%2N=?2kuglpESAaDGGE3XShp6
ze%9ozxZ)`e_`wy<aMvOd-iRg7Nr6^ygsa3`Mr0y0d@|dEn`Vh^MZ!CA$FoS;!3l0$
zUu{Lgx>&XFRR<j4V%@Tyx{6GAFP>O-@v=a69JpS37MZ{u>Zz6E6G}$1CU@m-^dvIj
zqj({1Teg8ohfHK6qno=EeTi(QE>>)^rP4bY$l~V9%fKR=`5<0ebWOQo*@njjdZR~r
zrDr!sKNKp`r6FEh^lm>CH$}~|!G;BUu_t@e1HI6b+h-9BRiqDom+~CO11+Bj0zMOu
z#C?mN(+GcET(#)ocR7YRuW^hTYB`5<S%bA$leO7{z1;nW#mGhORf5QZ2qFt25t%s<
t=#3z<Ai`I>AcDw(NJYkzK!5xje*vN8=Nq^p0TciL002ovPDHLkV1jNhdh7rI

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/item_user_nutrition.xml b/app/src/main/res/layout/item_user_nutrition.xml
index aef8a81..a4387ac 100644
--- a/app/src/main/res/layout/item_user_nutrition.xml
+++ b/app/src/main/res/layout/item_user_nutrition.xml
@@ -32,7 +32,7 @@
         android:id="@+id/divider"
         android:layout_width="match_parent"
         android:layout_height="2dp"
-        android:layout_marginTop="40dp"
+        android:layout_marginTop="26dp"
         android:background="#19ECE7D0"
         app:layout_constraintTop_toBottomOf="@id/tv_user_name" />
 
@@ -42,13 +42,17 @@
         android:layout_marginTop="20dp"
         android:orientation="horizontal">
 
-        <RelativeLayout
+        <!-- 热量 -->
+        <androidx.constraintlayout.widget.ConstraintLayout
             style="@style/takeFoodLayout"
-            android:layout_weight="2">
+            android:layout_weight="1.7">
 
             <LinearLayout
+                android:id="@+id/kcalValueLayout"
                 style="@style/takeFoodWeightLayout"
-                android:layout_above="@id/divKcalView">
+                app:layout_constraintBottom_toTopOf="@id/divKcalView"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent">
 
                 <TextView
                     android:id="@+id/totalKcalTv"
@@ -58,47 +62,57 @@
                 <TextView
                     style="@style/takeFoodValueTv"
                     android:text="千卡"
-                    android:textSize="@dimen/sp16" />
+                    android:textSize="@dimen/sp11" />
             </LinearLayout>
 
             <View
                 android:id="@+id/divKcalView"
                 android:layout_width="1dp"
-                android:layout_height="@dimen/dp28"
-                android:layout_above="@id/customKcalColumn"
-                android:layout_centerHorizontal="true" />
+                android:layout_height="@dimen/dp16"
+                app:layout_constraintBottom_toTopOf="@id/customKcalColumn"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent" />
 
             <com.sw.dualscreen.view.CustomImageView
                 android:id="@+id/customKcalColumn"
-                android:layout_width="@dimen/dp130"
-                android:layout_height="100dp"
-                android:layout_above="@id/imgKcal"
-                android:layout_centerHorizontal="true"
-                android:layout_marginBottom="-36dp"
+                android:layout_width="@dimen/dp87"
+                android:layout_height="10dp"
+                android:layout_marginBottom="6dp"
                 android:scaleType="fitXY"
-                android:src="@drawable/ic_cylinder_red_big" />
+                android:src="@drawable/img_big_red_column"
+                app:layout_constraintBottom_toBottomOf="@id/imgKcal"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent" />
 
             <ImageView
                 android:id="@+id/imgKcal"
-                android:layout_width="@dimen/dp160"
-                android:layout_height="@dimen/dp66"
-                android:layout_above="@id/kcalTv"
-                android:layout_centerHorizontal="true"
+                android:layout_width="@dimen/dp107"
+                android:layout_height="@dimen/dp44"
                 android:scaleType="fitXY"
-                android:src="@drawable/ic_heat" />
+                android:src="@drawable/ic_heat"
+                app:layout_constraintBottom_toTopOf="@id/kcalTv"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent" />
 
             <TextView
                 android:id="@+id/kcalTv"
                 style="@style/takeFoodNameTv"
-                android:text="热量" />
+                android:text="热量"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent" />
 
-        </RelativeLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <RelativeLayout style="@style/takeFoodLayout">
+        <!-- 主食 -->
+        <androidx.constraintlayout.widget.ConstraintLayout style="@style/takeFoodLayout">
 
             <LinearLayout
+                android:id="@+id/foodValueLayout"
                 style="@style/takeFoodWeightLayout"
-                android:layout_above="@id/divTotalFoodView">
+                app:layout_constraintBottom_toTopOf="@id/divTotalFoodView"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent">
 
                 <TextView
                     android:id="@+id/totalFoodTv"
@@ -108,40 +122,50 @@
                 <TextView
                     style="@style/takeFoodValueTv"
                     android:text="克"
-                    android:textSize="@dimen/sp16" />
+                    android:textSize="@dimen/sp11" />
             </LinearLayout>
 
             <View
                 android:id="@+id/divTotalFoodView"
                 android:layout_width="1dp"
-                android:layout_height="@dimen/dp28"
-                android:layout_above="@id/customFoodColumn"
-                android:layout_centerHorizontal="true" />
+                android:layout_height="@dimen/dp16"
+                app:layout_constraintBottom_toTopOf="@id/customFoodColumn"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent" />
 
             <com.sw.dualscreen.view.CustomImageView
                 android:id="@+id/customFoodColumn"
                 style="@style/takeFoodCustomColumn"
-                android:layout_above="@id/imgFood" />
+                app:layout_constraintBottom_toBottomOf="@id/imgFood"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent" />
 
             <ImageView
                 android:id="@+id/imgFood"
-                android:layout_width="wrap_content"
-                android:layout_height="100dp"
-                android:scaleType="fitXY"
-                android:layout_above="@id/foodTv"
-                android:src="@drawable/ic_staple_food" />
+                style="@style/takeFoodImg"
+                android:src="@drawable/ic_staple_food"
+                app:layout_constraintBottom_toTopOf="@id/foodTv"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent" />
 
             <TextView
                 android:id="@+id/foodTv"
                 style="@style/takeFoodNameTv"
-                android:text="主食" />
-        </RelativeLayout>
+                android:text="主食"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <RelativeLayout style="@style/takeFoodLayout">
+        <!-- 果蔬 -->
+        <androidx.constraintlayout.widget.ConstraintLayout style="@style/takeFoodLayout">
 
             <LinearLayout
+                android:id="@+id/vegetableValueLayout"
                 style="@style/takeFoodWeightLayout"
-                android:layout_above="@id/divVegetableView">
+                app:layout_constraintBottom_toTopOf="@id/divVegetableView"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent">
 
                 <TextView
                     android:id="@+id/totalVegetableTv"
@@ -151,38 +175,50 @@
                 <TextView
                     style="@style/takeFoodValueTv"
                     android:text="克"
-                    android:textSize="@dimen/sp16" />
+                    android:textSize="@dimen/sp11" />
             </LinearLayout>
 
             <View
                 android:id="@+id/divVegetableView"
                 android:layout_width="1dp"
-                android:layout_height="@dimen/dp28"
-                android:layout_above="@id/customVegetableColumn"
-                android:layout_centerHorizontal="true" />
+                android:layout_height="@dimen/dp16"
+                app:layout_constraintBottom_toTopOf="@id/customVegetableColumn"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent" />
 
             <com.sw.dualscreen.view.CustomImageView
                 android:id="@+id/customVegetableColumn"
                 style="@style/takeFoodCustomColumn"
-                android:layout_above="@id/imgVegetable" />
+                app:layout_constraintBottom_toBottomOf="@id/imgVegetable"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent" />
 
             <ImageView
                 android:id="@+id/imgVegetable"
                 style="@style/takeFoodImg"
-                android:layout_above="@id/vegetableTv"
-                android:src="@drawable/ic_fruits_vegetables" />
+                android:src="@drawable/ic_fruits_vegetables"
+                app:layout_constraintBottom_toTopOf="@id/vegetableTv"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent" />
 
             <TextView
                 android:id="@+id/vegetableTv"
                 style="@style/takeFoodNameTv"
-                android:text="果蔬" />
-        </RelativeLayout>
+                android:text="果蔬"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <RelativeLayout style="@style/takeFoodLayout">
+        <!-- 蛋肉 -->
+        <androidx.constraintlayout.widget.ConstraintLayout style="@style/takeFoodLayout">
 
             <LinearLayout
+                android:id="@+id/meatValueLayout"
                 style="@style/takeFoodWeightLayout"
-                android:layout_above="@id/divMeatView">
+                app:layout_constraintBottom_toTopOf="@id/divMeatView"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent">
 
                 <TextView
                     android:id="@+id/totalMeatTv"
@@ -192,33 +228,40 @@
                 <TextView
                     style="@style/takeFoodValueTv"
                     android:text="克"
-                    android:textSize="@dimen/sp16" />
+                    android:textSize="@dimen/sp11" />
             </LinearLayout>
 
             <View
                 android:id="@+id/divMeatView"
                 android:layout_width="1dp"
-                android:layout_height="@dimen/dp28"
-                android:layout_above="@id/customMeatColumn"
-                android:layout_centerHorizontal="true" />
+                android:layout_height="@dimen/dp16"
+                app:layout_constraintBottom_toTopOf="@id/customMeatColumn"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent" />
 
             <com.sw.dualscreen.view.CustomImageView
                 android:id="@+id/customMeatColumn"
                 style="@style/takeFoodCustomColumn"
-                android:layout_above="@id/imgMeat" />
+                app:layout_constraintBottom_toBottomOf="@id/imgMeat"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent" />
 
             <ImageView
                 android:id="@+id/imgMeat"
                 style="@style/takeFoodImg"
-                android:layout_above="@id/meatTv"
-                android:src="@drawable/ic_meat_eggs" />
+                android:src="@drawable/ic_meat_eggs"
+                app:layout_constraintBottom_toTopOf="@id/meatTv"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent" />
 
             <TextView
                 android:id="@+id/meatTv"
                 style="@style/takeFoodNameTv"
-                android:text="蛋肉" />
-
-        </RelativeLayout>
+                android:text="蛋肉"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_cylinder.xml b/app/src/main/res/layout/view_cylinder.xml
index e362208..058baec 100644
--- a/app/src/main/res/layout/view_cylinder.xml
+++ b/app/src/main/res/layout/view_cylinder.xml
@@ -49,7 +49,7 @@
             android:layout_width="match_parent"
             android:layout_height="50dp"
             android:layout_gravity="top|center_horizontal"
-            android:background="@drawable/ic_cylinder_red_small" />
+            android:background="@drawable/img_red_column" />
         <!-- 底部火焰图片（覆盖圆柱底部） -->
         <ImageView
             android:id="@+id/bottomImage"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index bc7e941..4c21904 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="bottom_sheet_height">1000dp</dimen>
-    <dimen name="sp16">16sp</dimen>
-    <dimen name="sp30">30sp</dimen>
-    <dimen name="dp28">28dp</dimen>
-    <dimen name="dp120">120dp</dimen>
-    <dimen name="dp130">130dp</dimen>
-    <dimen name="dp160">160dp</dimen>
-    <dimen name="dp66">66dp</dimen>
+    <dimen name="sp11">11sp</dimen>
+    <dimen name="sp20">20sp</dimen>
+    <dimen name="dp16">16dp</dimen>
     <dimen name="dp80">80dp</dimen>
+    <dimen name="dp87">87dp</dimen>
+    <dimen name="dp107">107dp</dimen>
+    <dimen name="dp44">44dp</dimen>
+    <dimen name="dp53">53dp</dimen>
 </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 fde0916..04c49cb 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -79,40 +79,41 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_centerHorizontal">true</item>
         <item name="android:gravity">bottom</item>
-        <item name="android:layout_marginBottom">20dp</item>
+        <!--        <item name="android:layout_marginBottom">20dp</item>-->
         <item name="android:orientation">horizontal</item>
     </style>
 
     <style name="takeFoodValueTv">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:textSize">@dimen/sp30</item>
+        <item name="android:textSize">@dimen/sp20</item>
         <item name="android:textColor">#F0E6DC</item>
     </style>
 
     <style name="takeFoodCustomColumn">
-        <item name="android:layout_width">@dimen/dp80</item>
-        <item name="android:layout_height">100dp</item>
+        <item name="android:layout_width">@dimen/dp53</item>
+        <item name="android:layout_height">10dp</item>
         <item name="android:layout_centerHorizontal">true</item>
-        <item name="android:layout_marginBottom">-36dp</item>
+        <!--        <item name="android:layout_marginBottom">-36dp</item>-->
         <item name="android:scaleType">fitXY</item>
-        <item name="android:src">@drawable/ic_cylinder_green_big</item>
+        <item name="android:layout_marginBottom">6dp</item>
+        <item name="android:src">@drawable/img_green_column</item>
     </style>
 
     <style name="takeFoodImg">
-        <item name="android:layout_width">@dimen/dp120</item>
-        <item name="android:layout_height">@dimen/dp66</item>
+        <item name="android:layout_width">@dimen/dp80</item>
+        <item name="android:layout_height">@dimen/dp44</item>
         <item name="android:layout_centerHorizontal">true</item>
         <item name="android:scaleType">fitXY</item>
     </style>
 
     <style name="takeFoodNameTv">
         <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_height">36dp</item>
+        <item name="android:gravity">bottom</item>
         <item name="android:textColor">#F0E6DC</item>
-        <item name="android:textSize">@dimen/sp30</item>
+        <item name="android:textSize">@dimen/sp20</item>
         <item name="android:textStyle">bold</item>
-        <item name="android:layout_marginTop">50dp</item>
         <item name="android:layout_centerHorizontal">true</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/lib_face/src/test/java/com/sw/plate/ExampleUnitTest.java b/lib_face/src/test/java/com/sw/plate/ExampleUnitTest.java
index 2336216..44a803e 100644
--- a/lib_face/src/test/java/com/sw/plate/ExampleUnitTest.java
+++ b/lib_face/src/test/java/com/sw/plate/ExampleUnitTest.java
@@ -13,5 +13,7 @@ public class ExampleUnitTest {
     @Test
     public void addition_isCorrect() {
         assertEquals(4, 2 + 2);
+        int i1 = (int) (0.5f * 280);
+        System.err.println("");
     }
 }
\ No newline at end of file