p62453891
/
shangwen666
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'qinjiaming_branch'

This commit is contained in:
qinjiaming_branch 2016-08-28 20:48:27 +08:00
parent 83db9fd57c a748034f71
commit 8fb1246607
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
代码/在这里3.0/bin/classes/com/stone/shop/view/MultiViewGroup.class
View File

Binary file not shown.

BIN
代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil.class
View File

Binary file not shown.

9
代码/在这里3.0/src/com/stone/shop/view/MultiViewGroup.java
View File

@ -164,11 +164,10 @@ public class MultiViewGroup extends ViewGroup {
//手指位置地点 //手指位置地点
float x = event.getX(); float x = event.getX();
switch(event.getAction()){ switch(event.getAction()){
case MotionEvent.ACTION_DOWN: case MotionEvent.ACTION_DOWN: //如果屏幕的动画还没结束，你就按下了，我们就结束该动画
//如果屏幕的动画还没结束，你就按下了，我们就结束该动画 if(mScroller != null&&!mScroller.isFinished()){
if(mScroller != null){ mScroller.abortAnimation();
if(!mScroller.isFinished()) }
{mScroller.abortAnimation();}}
mLastionMotionX = x ; mLastionMotionX = x ;
break ; break ;
case MotionEvent.ACTION_MOVE: case MotionEvent.ACTION_MOVE:

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

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

9
代码/在这里3.0/src/com/stone/ui/DateTimePickDialogUtil.java
View File

@ -136,13 +136,18 @@ public class DateTimePickDialogUtil implements OnDateChangedListener, OnTimeChan
String hourStr = spliteString(time, ":", "index", "front"); // 时 String hourStr = spliteString(time, ":", "index", "front"); // 时
String minuteStr = spliteString(time, ":", "index", "back"); // 分 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 currentYear = Integer.valueOf(yearStr.trim()).intValue();
int currentMonth = Integer.valueOf(monthStr.trim()).intValue() - 1; int currentMonth = Integer.valueOf(monthStr.trim()).intValue() - 1;
int currentDay = Integer.valueOf(dayStr.trim()).intValue(); int currentDay = Integer.valueOf(dayStr.trim()).intValue();
int currentHour = Integer.valueOf(hourStr.trim()).intValue(); int currentHour = Integer.valueOf(hourStr.trim()).intValue();
int currentMinute = Integer.valueOf(minuteStr.trim()).intValue(); int currentMinute = Integer.valueOf(minuteStr.trim()).intValue();
*/
calendar.set(currentYear, currentMonth, currentDay, currentHour, currentMinute); calendar.set(currentYear, currentMonth, currentDay, currentHour, currentMinute);
return calendar; return calendar;
} }