From a748034f7154341b1cd3d6133615acf95e13b7d8 Mon Sep 17 00:00:00 2001
From: qinjiaming_branch <450015824@qq.com>
Date: Sun, 28 Aug 2016 20:41:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90=E2=80=9C?=
 =?UTF-8?q?=E4=B8=BB=E8=A6=81=E2=80=9D=E7=BA=A7=E5=88=AB=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84=E6=94=B9=E5=8A=A8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/stone/shop/view/MultiViewGroup.class  | Bin 8180 -> 8176 bytes
 .../com/stone/ui/DateTimePickDialogUtil.class | Bin 6576 -> 6530 bytes
 .../src/com/stone/shop/view/MultiViewGroup.java |   9 ++++-----
 .../src/com/stone/ui/DateTimePickDialogUtil.java |   9 +++++++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MultiViewGroup.class b/代码/在这里3.0/bin/classes/com/stone/shop/view/MultiViewGroup.class
index ba8871660205279ca4fc7100140aeff4ca1176a2..09c6d3150c4ee2b52e7d62c94715fba6b56904bc 100644
GIT binary patch
delta 386
zcmWNMPe{{o0L4Ggxn+|zHkl*m)*9s;!)+BC<jhe~D@B4JB!oPP7caZ%Vd!zEU4BQQ
zTU684a-~H73!)W;9=znGf2X1tHITr8-`jh<$NSUDHFLE+zl!y?e@3>OM6H>_(ZxFy
zxXU~%6j^17dz83OnHslvK!r7`JfzMep0LgvHrU}YKMniGQ`$TeypWHV3h_#VyjGmI
zO43k<_d3G|o#UhOe9{=3y26&OvP}dS#Q~PP?~Cs<c9R<9D+#`Fk?)N2!|Dv&4*oLA
zZ@m1WpC)nsa-J5G>@vmw`ny1nF0^r*2?2EwlZ}Mz49meK9biHSxh^NO>Sj(Z7IcV`
z+?3^ESzapYp{8D*%Ws8)jaU$;!Y1t~K1Jx)F(NunRs)<>l*@{7&ERRp>)ue8hLXmf
i!le^<bP~T#ky4tB`8}%BW<Zu38ZqT*3d&jeBh`I#d{*KB

delta 385
zcmWNMJ4hQ~6otQoZ4JI34N>zDBR--w#s><iRjc@>6a*0|w3B3UannJnTc!+VbQ46h
z2BV=WYD-%M(TdUzF6pG{Qi`ppP(-Ewa=Dyyxc7X2TdrE7w>C}1?rg(Knx#BEoL}~K
zfdGq)@{Tc<m>|L=%LIuMVud+YjT<xSdo$PAVx1i}h_lHrwz=d3cYG9ll9kVL@kQnA
zsFFQZbD##k>KTV><49c`tCw$j$#?a0f*WWKCl@5FaUSvmC#QHhqmu-E{G7JWJAWJF
zoE-k(;DSo?uAOTJ`Nu16V!QTSb=;FFVOJ6!J;19+_?1kzEWA((LrNu}G)9!cxH1VU
zi;!}dQ7(&mOjI`0J}>NW?t5IMsK{J%V^uK@mEcw>PgTZq!_=b+2F(6ORj~}0MNfPt
kUPHQS$yOaU)#Ed`4QixWep8@{*9JXcv{AK&+Y2NA0cUwwGXMYp

diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil.class b/代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil.class
index 8076767b689e803c07ef911052a16894ffa3bfd6..a729aad3beb45b9eda6e162c7b17d9c20ae86f12 100644
GIT binary patch
delta 415
zcmXZX%Sr-a6bJDCNgZ_@XDm$}%Ujyb&=$f32GJrHE-I)ONYKa@78O_!1VM}Fw)mhD
zTIE8zkeVbdUAO8HdW0UKBepsGzT5f!r<p!YH-A-)RMH5x-TdBuF;_kiU6YS;BBVV?
zA%(&e5nXLIFs4wfcg<QV7mA0gn=+C#uFwQ&?Wk*6vNs^X1)wb|-b%u7=++L|KS?nc
z3`Mu~Z8&xNzf@iBOHBH*Cl@%vCC+e#8(gExwT3&iaE~yzeC#(y1W{h`7Z~Inf*B2z
zu#Ev;)yT!wgdlFIcWOog=QPB!U=GLRW=Y7ROdggM>)4=SmJNBVEs&RK#}1ar$C5ct
zhWz+~gF~fAXDJ*iP63va0|sb>rE*Lcjf!c1Y&2MfGcnVls9~u??kR3q+(gL^1;v(s
nK3V5XPyF~99=yPZSA_6}DV`yPCTDCRgLf?QbSwA}-~OLJhM7zp

delta 440
zcmYL@OG^S#7>3`^%h>45INcnlG&Q?ns0(2tg=kaYqFT6VD`-)KLIkxag0@}hYz$gS
z7F`hosZB)7enP8$LfdH5SAlH~&vQ73_t{C+Q}qwcg$dFK!y;ktQCIS%#bma$R$MHu
zW`yBAm4XWOQAj*`lX^s<eu@%YOQk|_V{Sn_+YL|FjW`V|G(^#Rn?57SPmrJkcoFly
z_3<X&ERX4GlKemli=$vEW?M@w)s+85Gu<r_pT4Q>J#1nhyEs4vhp6EQ4IJYc0wG?g
z{_P-)2pcb=oo@&ZJYfmTu(37B%cmVd)JSJ?AchM4ymMj<yVSuXVG3K+$>c%~W$I#T
zLmv4F>SmNtMvi<;ZqAt|1F!IK)EN1h6i$ng$)s{%kb0Oj&eW+_d>PR|-~?)Hv`Jyh
zc>(ti4Oq@jqIi=6BJIz_tK4+<`?(9}FmQoBTw(-QNZ^_qZ;-|<CUJ*Z)J4_*{tf*|
BSk(Xk

diff --git a/代码/在这里3.0/src/com/stone/shop/view/MultiViewGroup.java b/代码/在这里3.0/src/com/stone/shop/view/MultiViewGroup.java
index 09a52ea..2c0646e 100644
--- a/代码/在这里3.0/src/com/stone/shop/view/MultiViewGroup.java
+++ b/代码/在这里3.0/src/com/stone/shop/view/MultiViewGroup.java
@@ -164,11 +164,10 @@ public class MultiViewGroup extends ViewGroup {
 		//手指位置地点
 		float x = event.getX();		
 		switch(event.getAction()){
-		case MotionEvent.ACTION_DOWN:
-			//如果屏幕的动画还没结束，你就按下了，我们就结束该动画
-			if(mScroller != null){
-				if(!mScroller.isFinished())
-					{mScroller.abortAnimation();}}		
+		case MotionEvent.ACTION_DOWN:				//如果屏幕的动画还没结束，你就按下了，我们就结束该动画
+			if(mScroller != null&&!mScroller.isFinished()){
+					mScroller.abortAnimation();
+					}		
 			mLastionMotionX = x ;
 			break ;
 		case MotionEvent.ACTION_MOVE:
diff --git a/代码/在这里3.0/src/com/stone/ui/DateTimePickDialogUtil.java b/代码/在这里3.0/src/com/stone/ui/DateTimePickDialogUtil.java
index 0804ab6..f2ac64b 100644
--- a/代码/在这里3.0/src/com/stone/ui/DateTimePickDialogUtil.java
+++ b/代码/在这里3.0/src/com/stone/ui/DateTimePickDialogUtil.java
@@ -136,13 +136,18 @@ public class DateTimePickDialogUtil implements OnDateChangedListener, OnTimeChan
 
 		String hourStr = spliteString(time, ":", "index", "front"); // 时
 		String minuteStr = spliteString(time, ":", "index", "back"); // 分
-
+		int currentYear =Integer.parseInt(yearStr.trim());
+		int currentMonth = Integer.parseInt(monthStr.trim())-1;
+		int currentDay = Integer.parseInt(dayStr.trim());
+		int currentHour = Integer.parseInt(hourStr.trim());
+		int currentMinute = Integer.parseInt(minuteStr.trim());
+/*				
 		int currentYear = Integer.valueOf(yearStr.trim()).intValue();
 		int currentMonth = Integer.valueOf(monthStr.trim()).intValue() - 1;
 		int currentDay = Integer.valueOf(dayStr.trim()).intValue();
 		int currentHour = Integer.valueOf(hourStr.trim()).intValue();
 		int currentMinute = Integer.valueOf(minuteStr.trim()).intValue();
-
+*/
 		calendar.set(currentYear, currentMonth, currentDay, currentHour, currentMinute);
 		return calendar;
 	}