Merge branch 'qinjiaming_branch'

代码/在这里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:

代码/在这里3.0/src/com/stone/shop/view/SplashActivity.java

@@ -54,12 +54,12 @@ public class SplashActivity extends Activity {
 
 			@Override
 			public void onAnimationStart(Animation arg0) {
-
+				/*do nothing*/
 			}
 
 			@Override
 			public void onAnimationRepeat(Animation arg0) {
-
+				/*do nothing*/
 			}
 
 			@Override

代码/在这里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;
 	}