Merge branch 'qinjiaming_branch'

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

@@ -1,11 +1,9 @@
 package com.stone.shop.adapter;
 
-import java.util.Iterator;
 import java.util.List;
 
 import com.stone.shop.R;
 import com.stone.shop.model.BXTNews;
-import com.stone.shop.model.Good;
 
 import android.content.Context;
 import android.util.Log;
@@ -13,7 +11,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-import android.widget.Button;
 import android.widget.TextView;
 
 /**
@@ -24,12 +21,10 @@ import android.widget.TextView;
  */
 public class BXTListAdapter extends BaseAdapter {
 
-	private Context mContext;
 	private List<BXTNews> mNewsList; // 商品列表信息
 	private LayoutInflater mInflater = null;
 
 	public BXTListAdapter(Context context, List<BXTNews> newsList) {
-		mContext = context;
 		mNewsList = newsList;
 		mInflater = LayoutInflater.from(context);
 	}

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

@@ -14,12 +14,10 @@ import android.widget.TextView;
 
 public class ClassroomAdapter extends BaseAdapter {
 
-	private Context mContext;
 	private List<Classroom> mNewsList; // 商品列表信息
 	private LayoutInflater mInflater = null;
 
 	public ClassroomAdapter(Context context, List<Classroom> newsList) {
-		mContext = context;
 		mNewsList = newsList;
 		mInflater = LayoutInflater.from(context);
 	}

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

@@ -7,7 +7,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-import android.widget.Button;
 import android.widget.TextView;
 
 import com.stone.shop.R;
@@ -15,12 +14,11 @@ import com.stone.shop.model.Good;
 
 public class GoodsListAdapter extends BaseAdapter {
 
-	private Context mContext;
+
 	private List<Good> mGoodsList; // 商品列表信息
 	private LayoutInflater mInflater = null;
 
 	public GoodsListAdapter(Context context, List<Good> goodsList) {
-		mContext = context;
 		mGoodsList = goodsList;
 		mInflater = LayoutInflater.from(context);
 	}

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

@@ -1,6 +1,5 @@
 package com.stone.shop.adapter;
 
-import android.R.integer;
 import android.content.Context;
 import android.view.View;
 import android.view.ViewGroup;
@@ -23,21 +22,21 @@ public class GridAdapter extends BaseAdapter {
 	private int mIndex = 0; // 代表当前需要适配页面中第几个GridView
 
 	//学习小菜
-	public static String[] mSchoolTexts = TypeDef.typeSonList1;
+	public static final String[] mSchoolTexts = TypeDef.typeSonList1;
 	private int[] mSchoolImages = { R.drawable.ic_8, R.drawable.ic_8, R.drawable.ic_8 };
 	
 	//吃饭小菜
-	public static String[] mFoodTexts = TypeDef.typeSonList2;
+	public static final String[] mFoodTexts = TypeDef.typeSonList2;
 	private int[] mFoodImages = { R.drawable.ic_41, R.drawable.ic_42};
 
 	//购物小菜
-	public static String[] mGiftTexts = TypeDef.typeSonList3;
+	public static final String[] mGiftTexts = TypeDef.typeSonList3;
 	private int[] mGiftImages = { R.drawable.ic_7, R.drawable.ic_7,
 			R.drawable.ic_7, R.drawable.ic_7, R.drawable.ic_7, 
 			R.drawable.ic_7, R.drawable.ic_7};
 
 	//疯狂小菜
-	public static String[] mOutTexts = TypeDef.typeSonList4;
+	public static final String[] mOutTexts = TypeDef.typeSonList4;
 	private int[] mOutImages = { R.drawable.ic_3, R.drawable.ic_3,
 			R.drawable.ic_3, R.drawable.ic_3, R.drawable.ic_3, 
 			R.drawable.ic_3, R.drawable.ic_3  };
@@ -82,8 +81,6 @@ public class GridAdapter extends BaseAdapter {
 	@Override
 	public View getView(int position, View convertView, ViewGroup parent) {
 		View view = View.inflate(mContext, R.layout.shop_grid_item, null);
-		// RelativeLayout rl = (RelativeLayout)
-		// view.findViewById(R.id.relaGrid);
 
 		ImageView image = (ImageView) view.findViewById(R.id.img_chooseImage);
 		TextView text = (TextView) view.findViewById(R.id.tv_chooseText);

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

@@ -1,15 +1,11 @@
 package com.stone.shop.adapter;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import com.stone.shop.R;
 import com.stone.shop.model.Information;
-import com.stone.shop.model.News;
 
-import android.R.integer;
 import android.content.Context;
-//import android.graphics.pdf.PdfDocument.Page;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -24,12 +20,10 @@ import android.widget.TextView;
  */
 public class InfoNewsListAdapter extends BaseAdapter {
 
-	private Context mContext;
 	private LayoutInflater mInflater = null;
 	private List<Information> mInfoNewsList = null;  
 
 	public InfoNewsListAdapter(Context context, List<Information> infonewsList) {
-		mContext = context;
 		mInfoNewsList = infonewsList;
 		mInflater = LayoutInflater.from(context);
 	}
@@ -72,7 +66,7 @@ public class InfoNewsListAdapter extends BaseAdapter {
 			newsHolder = (NewsHolder) convertView.getTag();
 		}
 		//拆分字符串，只取年月日
-		String[] ss = new String[2];
+		String[] ss;
 		ss = mInfoNewsList.get(position).getCreatedAt().split(" ");
 		newsHolder.tvNewsType.setText(mInfoNewsList.get(position).getHolder());	//新闻单位
 		newsHolder.tvNewsTitle.setText(mInfoNewsList.get(position).getTitle());	//新闻标题

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

@@ -3,7 +3,6 @@ package com.stone.shop.adapter;
 import java.util.List;
 
 import com.stone.shop.R;
-import com.stone.shop.model.BXTNews;
 import com.stone.shop.model.Information;
 
 import android.content.Context;
@@ -22,31 +21,26 @@ import android.widget.TextView;
  */
 public class InformationListAdapter extends BaseAdapter {
 
-	private Context mContext;
 	private List<Information> mInfoList; // 商品列表信息
 	private LayoutInflater mInflater = null;
 	
 	public InformationListAdapter(Context context, List<Information> infoList) {
-		mContext = context;
 		mInfoList = infoList;
 		mInflater = LayoutInflater.from(context);
 	}
 	
 	@Override
 	public int getCount() {
-		// TODO Auto-generated method stub
 		return mInfoList.size();
 	}
 
 	@Override
 	public Object getItem(int position) {
-		// TODO Auto-generated method stub
 		return mInfoList.get(position);
 	}
 
 	@Override
 	public long getItemId(int position) {
-		// TODO Auto-generated method stub
 		return position;
 	}
 
@@ -59,7 +53,6 @@ public class InformationListAdapter extends BaseAdapter {
 	
 	@Override
 	public View getView(int position, View convertView, ViewGroup parent) {
-		// TODO Auto-generated method stub
 		BXTNewsHolder newsHolder;
 		if (convertView == null) {
 			convertView = mInflater.inflate(R.layout.info_list_item, null);

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

@@ -17,14 +17,12 @@ import com.stone.shop.R;
  */
 public class MineListAdapter extends BaseAdapter {
 	
-	private Context mContext;
 	private String[] mItemNames; 		// 项目列表名称
 	private String[] mItemContents;		//项目列表的备注值
 	private int[] mItemImgIds;			// 项目列表Icon	
 	private LayoutInflater mInflater = null;
 	
 	public MineListAdapter(Context context, String[] names, String[] contents, int[] imgIds) {
-		mContext = context;
 		mItemNames = names;
 		mItemContents = contents;
 		mItemImgIds = imgIds;