modified:   AndroidManifest.xml
	new file:   gen/com/holding/smile/BuildConfig.java
	modified:   gen/com/holding/smile/R.java
	new file:   res/layout/cate_item.xml
	new file:   res/layout/cate_view.xml
	modified:   res/layout/footer.xml
	modified:   res/layout/header.xml
	modified:   res/layout/smile_main.xml
	modified:   res/values/url.xml
	modified:   src/com/holding/smile/activity/BaseActivity.java
	new file:   src/com/holding/smile/activity/CategoryActivity.java
	modified:   src/com/holding/smile/activity/GoodsDetailActivity.java
	modified:   src/com/holding/smile/activity/MainActivity.java
	modified:   src/com/holding/smile/activity/MainTwoActivity.java
	modified:   src/com/holding/smile/activity/MyApplication.java
	new file:   src/com/holding/smile/adapter/CategoryAdapter.java
	modified:   src/com/holding/smile/adapter/HorizontalGridViewAdapter.java
	modified:   src/com/holding/smile/adapter/ImageAdapter.java
	modified:   src/com/holding/smile/adapter/MyJGoodsAdapter.java
	modified:   src/com/holding/smile/adapter/VerticalListAdapter.java
	modified:   src/com/holding/smile/dto/BrandJGoods.java
	modified:   src/com/holding/smile/dto/RtnValueDto.java
	new file:   src/com/holding/smile/entity/Category.java
	modified:   src/com/holding/smile/entity/JGoods.java
	new file:   src/com/holding/smile/entity/SortType.java
	modified:   src/com/holding/smile/service/DataService.java
	modified:   src/testdata/brandJGoodsInitJson.json
	modified:   src/testdata/jGoodsInitJson.json
	modified:   src/testdata/jGoodsMoreJson.json
	modified:   src/testdata/jGoodsRefreshJson.json
	modified:   src/testdata/jGoodsSearchInitJson.json
	modified:   src/testdata/jGoodsSearchMoreJson.json
	modified:   src/testdata/jGoodsSearchRefreshJson.json
	modified:   src/testdata/jGoodsTwoInitJson.json
	modified:   src/testdata/jGoodsTwoMoreJson.json
	modified:   src/testdata/jGoodsTwoRefreshJson.json