From 3eee8a8efaf73860a5c95b17bbba1db00b347a0b Mon Sep 17 00:00:00 2001 From: JiYumeng Date: Thu, 28 Aug 2014 19:02:08 +0800 Subject: [PATCH 01/33] change the entry of adding new diary; add layout of unfinished diary; --- .settings/org.eclipse.core.resources.prefs | 2 + AndroidManifest.xml | 44 ++++ libs/w.song.android.widget-1.0.4.jar | Bin 0 -> 34529 bytes .../btn_big_popsubmit_disable.9.png | Bin 0 -> 542 bytes res/drawable-hdpi/nav_menu_bg.png | Bin 0 -> 1009 bytes res/drawable-hdpi/nav_menu_home.png | Bin 0 -> 1249 bytes res/drawable-hdpi/nav_menu_home_selected.png | Bin 0 -> 1591 bytes res/drawable-hdpi/nav_menu_hot.png | Bin 0 -> 1059 bytes res/drawable-hdpi/nav_menu_hot_selected.png | Bin 0 -> 1178 bytes res/drawable-hdpi/publish_input_bg.9.png | Bin 0 -> 482 bytes res/drawable-hdpi/slash_line.png | Bin 0 -> 119 bytes res/drawable/i_shade.xml | 10 + res/drawable/slash_bg.xml | 3 + res/layout/activity_head_diary_form.xml | 44 ++-- res/layout/activity_main_analysis.xml | 99 ++++++++- res/layout/activity_start_time_dialog.xml | 26 ++- res/layout/activity_unfinished_diary.xml | 138 +++++++++++++ res/layout/item.xml | 24 +++ res/layout/uiademo_ui.xml | 95 +++++++++ res/values/strings.xml | 2 + .../strings_activity_new_head_diary.xml | 2 + src/com/example/headdiary/HomeActivity.java | 15 +- .../headdiary/MainAnalysisActivity.java | 145 ++++++++++++- .../example/headdiary/UIADemoActivity.java | 162 +++++++++++++++ .../headdiary/hddialog/AcheDegreeDialog.java | 3 +- .../hddialog/AcheDegreeQuestion.java | 174 ++++++++++++++++ .../hddialog/AchePositionDialog.java | 3 +- .../hddialog/AchePositionQuestion.java | 97 +++++++++ .../headdiary/hddialog/AcheTypeDialog.java | 5 +- .../headdiary/hddialog/AcheTypeQuestion.java | 102 +++++++++ .../hddialog/ActivityAggravateDialog.java | 3 +- .../hddialog/ActivityAggravateQuestion.java | 73 +++++++ .../headdiary/hddialog/CompanionDialog.java | 6 +- .../headdiary/hddialog/CompanionQuestion.java | 125 +++++++++++ .../headdiary/hddialog/EndTimeDialog.java | 8 +- .../headdiary/hddialog/EndTimeQuestion.java | 190 +++++++++++++++++ .../headdiary/hddialog/ProdromeDialog.java | 6 +- .../headdiary/hddialog/ProdromeQuestion.java | 114 ++++++++++ .../headdiary/hddialog/StartTimeDialog.java | 5 +- .../headdiary/hddialog/StartTimeQuestion.java | 194 ++++++++++++++++++ 40 files changed, 1867 insertions(+), 52 deletions(-) create mode 100644 libs/w.song.android.widget-1.0.4.jar create mode 100644 res/drawable-hdpi/btn_big_popsubmit_disable.9.png create mode 100644 res/drawable-hdpi/nav_menu_bg.png create mode 100644 res/drawable-hdpi/nav_menu_home.png create mode 100644 res/drawable-hdpi/nav_menu_home_selected.png create mode 100644 res/drawable-hdpi/nav_menu_hot.png create mode 100644 res/drawable-hdpi/nav_menu_hot_selected.png create mode 100644 res/drawable-hdpi/publish_input_bg.9.png create mode 100644 res/drawable-hdpi/slash_line.png create mode 100644 res/drawable/i_shade.xml create mode 100644 res/drawable/slash_bg.xml create mode 100644 res/layout/activity_unfinished_diary.xml create mode 100644 res/layout/item.xml create mode 100644 res/layout/uiademo_ui.xml create mode 100644 src/com/example/headdiary/UIADemoActivity.java create mode 100644 src/com/example/headdiary/hddialog/AcheDegreeQuestion.java create mode 100644 src/com/example/headdiary/hddialog/AchePositionQuestion.java create mode 100644 src/com/example/headdiary/hddialog/AcheTypeQuestion.java create mode 100644 src/com/example/headdiary/hddialog/ActivityAggravateQuestion.java create mode 100644 src/com/example/headdiary/hddialog/CompanionQuestion.java create mode 100644 src/com/example/headdiary/hddialog/EndTimeQuestion.java create mode 100644 src/com/example/headdiary/hddialog/ProdromeQuestion.java create mode 100644 src/com/example/headdiary/hddialog/StartTimeQuestion.java diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index 91d517d..2b20e77 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,5 @@ eclipse.preferences.version=1 encoding//src/com/example/headdiary/hddialog/EndTimeDialog.java=UTF-8 +encoding//src/com/example/headdiary/hddialog/EndTimeQuestion.java=UTF-8 encoding//src/com/example/headdiary/hddialog/StartTimeDialog.java=UTF-8 +encoding//src/com/example/headdiary/hddialog/StartTimeQuestion.java=UTF-8 diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f38ef08..418344d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -49,42 +49,82 @@ android:name="com.example.headdiary.hddialog.StartTimeDialog" android:label="@string/title_activity_start_time_diaglog" android:theme="@style/MyDialogStyle" > + + + + + + + + + + + + + + + + + + 5ITVOGx#mvmiEoNr6nECfNv-@^;-t6w1 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 literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/nav_menu_bg.png b/res/drawable-hdpi/nav_menu_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..9f12797e6f2928e379f8fac4c37e688de50cff30 GIT binary patch literal 1009 zcmeAS@N?(olHy`uVBq!ia0vp^2|#Sb!3-p)Fz9__U|@_4@CkAKU%l#o?dtz^tN%Bx z`QN+-M7FH`-wH-R@dmIUgbP&JxCSHzB!Ma+47mEXwg21J{ci`N^&qkZtfm=g?CSrG zKyz08uUq-QcE$hd<^L;}{x4thzjX2c(nbHv7XPnW`oCuR|GE_*l^yH(~`mFzHU^O)>{ueL&pFADJtzY@SWYPcZx&Jd}|F2p0KYzjh zlDhc|A7EZfEaLqDS}W0l0%n&@L;3gU5<(m3|tML8H4uy z6qtYK>$f$h9Bu;R_==~CV@Sl|w->|14;e7DJ=}31v@mIMmMe=3>p@nr%r4=@O%|`> zEMCd|_^+RH>+wept**1N_fN;v`1>(2tXQ>f<=SG4*K@_f-j`gtdMzZJG0HhP*!cK@ zXUmSU?YjRc>#4-mS6Pe;*6wXi4s)-Teo<1uQ(V%dXYPIAF6%DKWu>f@D}Y&n!o(M^@GpsOpOO0TzKBbtgNgUf8)0Ouj~eQji!W> zHRU#M=1a_(({*(D(jz`W(+qtzIUi5aQBO}h&Ag}b^~S>ccm5oD6jW6?^TBuCSw6}~ zU%IpH{iG~lD(C!Vo!^?HOIS{(oVj>u=lj!j{2x3T9{q~Z+qTiO=l8$V?K}(YIeV(M zwQWUT8TkoUk)t3v$1u5 z6w@3QbK^75Gz(@OYT3ZDsRbAsHyE-X^yn6_eR{6*{ru+#k3MzX{de^#>xFgsd694L z-;2q1xcu&&yjbP0l+XkKl4DE! literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/nav_menu_home.png b/res/drawable-hdpi/nav_menu_home.png new file mode 100644 index 0000000000000000000000000000000000000000..0abd4e5f03e10c1b94d897570954aba8fbf75f80 GIT binary patch literal 1249 zcmb7?drVtZ9LLLr@@R#XgvZztM^U!Y0o%v|+tLtJ^J1;QT|Tqut_q?czmvk0Zq-j=64+7*yetTdR&aF_*&#~&qG=%0RW&hMW4J>T=Y zzx%tVPMG!j-hI$1w8g@pQE=ooSfpVPi@bKf0Wo2a+ zi^XU(#>K@Q*E>2o*4Nh^4#(Ekmf38suC9K$Iy^kQv9Ynaxe3u`v)S!-tJT`q*LP%y zii(@+!n0#;U5Ae%%YVKSK`BO^;oOUuj4v$L~}jg3csKA*4AXdoLfFfb4n76!UhDy1lD zZfZCnX$1k zold9M>$O@f2d|SbespSw7c@1 zE6Q%{7x@06;;hWKXtWbPSP(Db70;9S92p<%?scZ*8A2w>t4yx^01gs*QOEJSGKi2m zg&vqWgOIi0bioEf2aOke-CnQT1BWK2EN~AkTJLSoD2_ zI(cK@Gr>^qpHk+qVIQ7*w;u&be9;xd`?w+oPok$A^D)ym zs(w->Wr=>)Yo|1Z$qVK0wkq!R*LJmxRzC=h&&`^TA&YhyUtOoTJ)`nV-QDN&^RWt9 z<+riTexKz=KKf#R*Heb$3dskN6ZILb4RzhE?dqDV0Vi{E#1_+goF;OhA|UYGt%yG3_7E6+&5-G8cLBx&#HK}r;sVaZJwi~KSukUap|@D Sxq?sON74kznMr+#c;$b*ONxpB literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/nav_menu_home_selected.png b/res/drawable-hdpi/nav_menu_home_selected.png new file mode 100644 index 0000000000000000000000000000000000000000..dce49bcb9159ab13801d74ad8adc6681ffe84c50 GIT binary patch literal 1591 zcma)5X;4#F6b@S(*<_Q7VnMX1DAl9{*(_lbVj+nb5@oRnrr=mm7-bhBqbwyr69h#f zDkvl3P!J4+L6BfYLjfrewqZ#C!@kRIUXM+O@n`SMyZ1Za`OZDdotI1|I;$z~P)4Cp zY6KTYcQ}pVJAhVzJ@`ct0fmweBfCg?>4l?oGp0wyOXr>3T4 zm4K$ZyBlgKDk|F4%YdJsUsqQbv=33x@efRF&z`(%J&`@=CH6D*oOG|@MH#9WBOZD~jRaI3n znM}}t9>OCdBa@SpV`F2ZqM`s_zkWR>B_${*NKsMI$;k;~RB;b6GtNQ5i;&;!y|{dh^flTF@e#+>F<0Uew&|N$+5BLJYCMeL8<8t359ay=vd^~&`si8 zbG|jq!DvU^!S!A;5BPrj`TiK&ZpKYtbc*i!+pHULqC-AQG;WO2Y@NWvp{(O#97$Nb z&@8-!itVZ#BXJ{D(D=91Qis-{UORl)qz+cKPl-{oleIha3aRAR!;C$ORfkV=4R&j= ztu7xiQ{BIT;@fZCRSe;$h1KZx`WXn-O}dF}8N_x4ofi zmZ8MEg(aTnSel_9?-pA0Q}WDz4p;F%`7i*t`ykHK@Mtibu2?_X7~Ge2b}nYej34QZyg;B4nnp4*Ub03qaz^;U7vAs>8=mcIzzLVEmzidK}y%E(X;cl z_^G>tSf_fc5}hrvYDBaBJxsFl&wUqWR_LCbpkuOlA9-IZM=G$Cy!Un%eg0($PDICI Hdtb&s(|0K( literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/nav_menu_hot.png b/res/drawable-hdpi/nav_menu_hot.png new file mode 100644 index 0000000000000000000000000000000000000000..0817773c9ee005c2f268bca99655284c80c19156 GIT binary patch literal 1059 zcmV+;1l;?HP)0X@C#K{td43{l&nq|qN&S=z3&5Y5_ zY+07*)NBQfdr4;^vIXZ0`+#5wgZ;hBJ4TA%`5UZD~O1{6*;M-xK|Q=cCBWk(C8#+PnEY zjZ^f}hUKcb&Ho6v@~&_^PBDtp*I#+6(k47u0Q*$~ZQhe7#wbcric*Y%yI`G}39JtV zTUyn{$_A8rw?*j3q(>;6c(#3dVyXSxlfTf}k&O?)brrw|7k~Hb4-`)MISQRd1pvHU ze@_01&eLe@xo)^%hZ8Qi;e>-=(y#8iCoB#nZGfY=e*eP{y#V>fJIN$NhU8tn+wIsB zYAtu<2{9=T$MHEM04yD3MII~=+dG!MLPmA;H1X%6rjZl?0rtE?RrfYl~YAdfV ztuCyyc^L%cSuh3ze*WmK*B2D;=wWVIbCuY(8KCd!MYsElsx8-5@;Ty zGDWxCM*Q}T|4AP|_`Fh~2V3-usAFIX&t-y5Pwl0s6c_c?MUz$|FXx&*N9PV zq)7v6*Pv)uN_Kos0{>+*+_SBbewp=72!q#?ts?K1p z>RI)7_)5rGfgTr^vR|Ky+8mfXKFV{5P$7<7?qduJnOF`$f>84= zAc#S9p($O383eS8rvesoP)bP@b{rp5pmQ9+fj})=MR%hyr60nonTl#-_muH7R06PJ z1ToMxq-x0p#%8R*3i1K?P`-biGWTezfP0x?E3D|FGixvDcKTA>0zV6N2ei&Q`_EsA d{|Eki`y27+3V`e|09*h7002ovPDHLkV1k6P0AhN2)+1cef!)Jrf1j0vVfH73LWPrk^5#u!6Pl!OS%3mQUe zf<>cZfGCMJF)9#RArOlfD7H`#C_+=9T)N%uo;~Nxd_L@AOSij7(gzd&-_tqgo8Qd* z=bM=vC5)^B{O^GOLjLQi+7ZOXUp8W{U4C?ga3>!(2@w%}?r6mb;5JY2+9jj-7pQ?R z$*R8!@0@4FK9)hcumaN13-^kv4|GnuLtgt*;|>P;-AASa7WA!6+tBmK9pK&=>l~9I zifsoJk^VjDXC3QZ1@L}grS;+M3b1E`WXb4`7vYn6UiUw5;)zYk_1-Rjr@zaqyD=*# zuA|m?GK`#~gqoI14qbkJ2*xeGJUjKO{>E=Nso@%2YpJV!vpU`~JkIUdG*DXoQxnU) z2Gc1y)pzylja5$`S?|YlWt?xoq8R9#>3yoZB(IJ&FIoA{>Z|R!GkoW*rHrEl=zb|b zOw7)D7Sz9;KdEys)47YH0D(2%_aDr^;*-koJKArY0l^@{1e`gJhldZvMBjVP>&xH& z#pY)pE1lEY=!++*VZxOwtxRGRwndQWo}LGsnNQ>!W69*2#rOZY@UyZ@(`JPVd`wnY zWix)--G)Gfaooq;eV-dKqH~6bmOpmfv*@Aar#j-&n-wuRT@P3Re3JCzEUG`gA9T*} z&{V$AQfFd^_JD_HeJ)K)OZ~lcKJ{q3{F=8Zb01Pe( zY=XKsg-z};3c(3Acefs%xZvauYqtJ&o&eX;2nG)qA8ltcH7@;7Im%Lgo+%4~f)&-v zcC2XIc8Vk(ah!~uI*qgkZcAKr&^PG3yT)efTvNAgUvX(XNt}LMG=f6X1!)h;HK?Lu zeH$P|XKY&d@VxG(nnqM+e7AHs7+6?X?ql-e4EDs@ErF1Ch&VxfWatbAqzGswLx2h! z;Z|Q&Nb8ga43cfh;I>Mun^RUO6yUgRP0_N7c^2uj=H}ugf|-OoKv3z8uCP!ze&5B` z0}Th7y262HCa-#WN>$OgAO?*>OVS?Fc37Z@1r~-Y7rWY;4{iLJ1RyDP_wGJcGInkC z?D^$0i=zr{>j(iPKTzSf9}dpCbpH2_?@qLw#Y2%Ig+>Sw?(<&zlE$Uet12F>EGay3 zjv#I}aIgyziWoh1VviyP7*Zs0aM6HGmA%8t5_tK5K?;acNCZU+hZHU@ z={mBo2@xhj1PhHrfb%7 literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/publish_input_bg.9.png b/res/drawable-hdpi/publish_input_bg.9.png new file mode 100644 index 0000000000000000000000000000000000000000..0526caf9014388bb7e8cede5b0d4864be9a8a325 GIT binary patch literal 482 zcmV<80UiE{P)wk`I$JWRb0vRjyzejKN_11uXdpoqotoCc(;Q;|$Uul`IVn zsz;3%6r<7g4;lT(5y$b3>S;coPf(I1lQc~SDZIlFMbWeV-gS_=@SqE#1EPbnTrMTg z^HxPscrWvc?<~t?u~-N^8r(|i3x7utr-pV}UcePrz{vFV_Pmms3l68>`MI$_8~dxrpOJB$D{W$P)n2D7$5^= zfDDiU@*0p5k_?amGC&5%02v^Eh8*hqB>L6+B+Y<9GRRXIS~CEo+YIy|-Hyll66<)l ziLd(F^RQJfc06ud$5UW%Xl_E)M!3-oVE|j@c;k+t3N%@0R@>$ zg8YIR{xf6-S*`(cr9536LpZJ{ConL%xv8kK*It@6(L>*rXU7MrF|9tKvfK$ Lu6{1-oD!M + + + + \ No newline at end of file diff --git a/res/drawable/slash_bg.xml b/res/drawable/slash_bg.xml new file mode 100644 index 0000000..4a0abc2 --- /dev/null +++ b/res/drawable/slash_bg.xml @@ -0,0 +1,3 @@ + + \ No newline at end of file diff --git a/res/layout/activity_head_diary_form.xml b/res/layout/activity_head_diary_form.xml index e5ec4e1..c21c450 100644 --- a/res/layout/activity_head_diary_form.xml +++ b/res/layout/activity_head_diary_form.xml @@ -314,31 +314,31 @@ android:src="@drawable/diary_arrow" /> - + + android:onClick="onClickCompanion" + android:paddingBottom="6dp"> + android:src="@drawable/diary_arrow" /> + android:onClick="onClickProdrome" + android:paddingBottom="6dp" > + android:src="@drawable/diary_arrow" /> @@ -454,7 +454,7 @@ android:textSize="17sp" android:textColor="@color/green"/> - - + --> - @@ -113,15 +113,93 @@ android:layout_alignParentRight="true" android:src="@drawable/diary_arrow" /> - + --> - - + + + + + + + + + + + + + + + + + @@ -495,7 +573,7 @@ android:src="@drawable/icon_drug" /> - - + + + diff --git a/res/layout/activity_start_time_dialog.xml b/res/layout/activity_start_time_dialog.xml index 65ebf96..9ded9af 100644 --- a/res/layout/activity_start_time_dialog.xml +++ b/res/layout/activity_start_time_dialog.xml @@ -88,7 +88,19 @@ android:textColor="#333" android:background="@drawable/btn_style_white" android:gravity="center" - android:onClick="onClickCancel" + android:onClick="onClickCancel" + /> +