Merge branch 'qinjiaming_branch'

代码/在这里3.0/src/com/stone/shop/adapter/ImagePagerAdapter.java

@@ -46,7 +46,7 @@ public class ImagePagerAdapter extends PagerAdapter {
 
      @Override  
      public void restoreState(Parcelable arg0, ClassLoader arg1) {  
-
+    	 /*do nothing*/
      }  
 
      @Override  
@@ -56,12 +56,12 @@ public class ImagePagerAdapter extends PagerAdapter {
 
      @Override  
      public void startUpdate(View arg0) {  
-
+    	 /*do nothing*/
      }  
 
      @Override  
      public void finishUpdate(View arg0) {  
-
+    	 /*do nothing*/
      }  
      
 }

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

@@ -116,6 +116,7 @@ public class CommentActivity extends Activity implements OnClickListener {
 
 			@Override
 			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+				/*do nothing*/
 			}
 		});
 		commentList.setCacheColorHint(0);
@@ -174,7 +175,6 @@ public class CommentActivity extends Activity implements OnClickListener {
 		query.setLimit(Constant.NUMBERS_PER_PAGE);
 		query.setSkip(Constant.NUMBERS_PER_PAGE * (pageNum++));
 		query.findObjects(this, new FindListener<Comment>() {
-			@Override
 			public void onSuccess(List<Comment> data) {
 				if (!data.isEmpty()&& data.get(data.size() - 1) != null) {
 					if (data.size() < Constant.NUMBERS_PER_PAGE) {
@@ -186,13 +186,15 @@ public class CommentActivity extends Activity implements OnClickListener {
 				} else {
 					toast("暂无更多评论~");
 					footer.setText("暂无更多评论~");
-					pageNum--;				}			}
-			@Override
+					pageNum--;				
+					}			
+				}
 			public void onError(int arg0, String arg1) {
 				toast("获取评论失败。请检查网络~");
 				pageNum--;
 			}
-		});}
+		});
+		}
 	@Override
 	public void onClick(View v) {
 		switch (v.getId()) {
@@ -264,7 +266,6 @@ public class CommentActivity extends Activity implements OnClickListener {
 				qiangYu.update(CommentActivity.this, new UpdateListener() {
 					@Override
 					public void onSuccess() {/* fetchData*/}
-
 					@Override
 					public void onFailure(int arg0, String arg1) {/*do nothing*/}
 				});

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

@@ -3,7 +3,6 @@ package com.stone.shop.view;
 import com.stone.shop.R;
 
 import android.app.Activity;
-import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -37,7 +36,6 @@ public class MainActivity extends Activity implements OnClickListener {
 		switch (v.getId()) {
 		case R.id.bt_scrollLeft:
 			tv.scrollBy(20, 0);
-			
 			int tvscrllX = tv.getScrollX();
 			int tvscrllY = tv.getScrollY();
 			System.out.println( " tvscrllX ---> " + tvscrllX + " --- tvscrllY ---> "+tvscrllY);
@@ -45,11 +43,12 @@ public class MainActivity extends Activity implements OnClickListener {
 			break;
 		case R.id.bt_scrollRight:
 			tv.scrollTo(-100, 0);
-
 			int tvscrllXx = tv.getScrollX();
 			int tvscrllYx = tv.getScrollY();
 			System.out.println( " tvscrllX ---> " + tvscrllXx + " --- tvscrllY ---> "+tvscrllYx);
 			break;
+		default:
+			break;
 		}
 
 	}

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

@@ -40,6 +40,7 @@ public class MineInfoEditActivity extends Activity {
 		  @Override  
 		  public void handleMessage(Message msg) {  
 		      if(msg.what==MessageDef.MINE_INFO_FINISH_FIND_USER) {
+		    	  initView();
 				}
 		  }  
 	};

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

@@ -68,8 +68,9 @@ public class ReservationActivity extends Activity {
 						}
 					} catch (ParseException e) {
 						Logger logger = Logger.getLogger("lavasoft"); 
-						logger.log(Level.SEVERE, "sthwrong", e);
-					}				}		}
+						logger.log(Level.SEVERE, "sthwrong", e);}				
+					}		
+				}
 			@Override
 			public void onError(int arg0, String arg1) {toast("查询失败");}
 		});

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

@@ -10,8 +10,6 @@ import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.support.v4.view.PagerTabStrip;
-import android.support.v4.view.PagerTitleStrip;
-import android.support.v4.view.ViewPager;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -206,7 +204,7 @@ public class ShopItemActivity extends Activity implements OnClickListener, OnIte
 	public void onClick(View v) {
 		switch (v.getId()) {
 		case R.id.btn_commit:
-			if (etCommit.getText().toString().equals("")) {toast("亲，先写一句吧");}
+			if ("".equals(etCommit.getText().toString())) {toast("亲，先写一句吧");}
 			else {
 				SimpleDateFormat formatter = new SimpleDateFormat("yyyy年MM月dd日  HH:mm:ss ");
 				Date curDate = new Date(System.currentTimeMillis());// 获取当前时间