new file:   layout/activity_imageview.xml
	new file:   values/attrs.xml
	modified:   ../src/com/holding/smile/activity/BaseActivity.java
	modified:   ../src/com/holding/smile/activity/GoodsDetailActivity.java
	modified:   ../src/com/holding/smile/activity/IdcardEditActivity.java
	new file:   ../src/com/holding/smile/activity/ImageViewActivity.java
	modified:   ../src/com/holding/smile/activity/MyApplication.java
	modified:   ../src/com/holding/smile/activity/MySmileActivity.java
	modified:   ../src/com/holding/smile/activity/OrderDetailActivity.java
	modified:   ../src/com/holding/smile/activity/SearchGoodsActivity.java
	modified:   ../src/com/holding/smile/activity/SortActivity.java
	modified:   ../src/com/holding/smile/adapter/BigImgPagerAdapter.java
	modified:   ../src/com/holding/smile/adapter/BrandAdapter.java
	modified:   ../src/com/holding/smile/adapter/ColorAdapter.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/MyOrderInformAdapter.java
	modified:   ../src/com/holding/smile/adapter/MyPagerAdapter.java
	modified:   ../src/com/holding/smile/adapter/MyShoppingCartAdapter.java
	modified:   ../src/com/holding/smile/adapter/OrderDetailAdapter.java
	modified:   ../src/com/holding/smile/adapter/RecommendGoodsAdapter.java
	modified:   ../src/com/holding/smile/adapter/VerticalListAdapter.java
deleted:    ../src/com/holding/smile/cache/ImageLoader.java
	modified:   ../src/com/holding/smile/myview/MyLinearLayout.java
new file:   ../src/com/holding/smile/myview/ProgressWheel.java
modified:   ../src/com/holding/smile/myview/TouchImageView.java
Merge branch 'master' of https://github.com/rememberlostcode/flyhz

Conflicts:
	smile_android/src/com/holding/smile/myview/MyLinearLayout.java

modified:   src/main/java/com/flyhz/framework/util/StringUtil.java
	modified:   src/main/java/com/flyhz/shop/build/solr/SolrDataImpl.java
	modified:   src/main/java/com/flyhz/shop/dto/CartItemDto.java
	new file:   src/main/java/com/flyhz/shop/dto/DiscountDto.java
	modified:   src/main/java/com/flyhz/shop/dto/OrderItem.java
	modified:   src/main/java/com/flyhz/shop/dto/ProductBuildDto.java
	new file:   src/main/java/com/flyhz/shop/persistence/dao/DiscountDao.java
	modified:   src/main/java/com/flyhz/shop/persistence/entity/CartitemModel.java
	new file:   src/main/java/com/flyhz/shop/persistence/entity/DiscountModel.java
	new file:   src/main/java/com/flyhz/shop/service/DiscountService.java
	modified:   src/main/java/com/flyhz/shop/service/ShoppingCartService.java
	new file:   src/main/java/com/flyhz/shop/service/impl/DiscountServiceImpl.java
	modified:   src/main/java/com/flyhz/shop/service/impl/OrderServiceImpl.java
	modified:   src/main/java/com/flyhz/shop/service/impl/OrderStatusServiceImpl.java
	modified:   src/main/java/com/flyhz/shop/service/impl/ShoopingCartServiceImpl.java
	modified:   src/main/java/com/flyhz/shop/web/controller/ShoppingCartController.java
	modified:   src/main/resources/mybatis/sqlMapConfig.xml
	modified:   src/main/resources/mybatis/sqlmap/CartItemMapper.xml
	new file:   src/main/resources/mybatis/sqlmap/DiscountMapper.xml
	modified:   src/main/resources/spring/applicationContext-dao.xml
	modified:   ../smile_android/AndroidManifest.xml
	modified:   ../smile_android/libs/armeabi/libjni_curl.so
new file:   ../smile_android/libs/photoviewlibrary.jar
	new file:   ../smile_android/libs/universal-image-loader-1.9.1.jar
	new file:   ../smile_android/res/drawable-hdpi/new_product_detail_item_narmal.png
	new file:   ../smile_android/res/drawable-hdpi/new_product_detail_selectitem_normal.png
	new file:   ../smile_android/res/drawable-ldpi/my_discount_bg.xml
	modified:   ../smile_android/res/layout/color_item.xml
	modified:   ../smile_android/res/layout/footer.xml
	modified:   ../smile_android/res/layout/goods_detail_view.xml
	new file:   ../smile_android/res/layout/my_discount_layout.xml
	modified:   ../smile_android/res/layout/order_item.xml
	modified:   ../smile_android/res/values/strings.xml
	modified:   ../smile_android/res/values/url.xml
	modified:   ../smile_android/src/com/holding/smile/activity/GoodsDetailActivity.java
	modified:   ../smile_android/src/com/holding/smile/activity/ImageViewActivity.java
	modified:   ../smile_android/src/com/holding/smile/activity/OrderInformActivity.java
	modified:   ../smile_android/src/com/holding/smile/activity/OrderPayActivity.java
	modified:   ../smile_android/src/com/holding/smile/adapter/MyJGoodsAdapter.java
	new file:   ../smile_android/src/com/holding/smile/dto/DiscountDto.java
	modified:   ../smile_android/src/com/holding/smile/dto/OrderItem.java
	modified:   ../smile_android/src/com/holding/smile/entity/CartItem.java
	new file:   ../smile_android/src/com/holding/smile/entity/JDiscount.java
	modified:   ../smile_android/src/com/holding/smile/entity/JGoods.java
	modified:   ../smile_android/src/com/holding/smile/myview/MyLinearLayout.java
	modified:   ../smile_android/src/com/holding/smile/myview/MyTableLayout.java
	modified:   ../smile_android/src/com/holding/smile/service/DataService.java
	modified:   ../smile_android/src/com/holding/smile/service/LoginService.java
	modified:   ../smile_android/src/com/holding/smile/service/SubmitService.java
	modified:   ../smile_android/src/com/holding/smile/tools/StrUtils.java
	modified:   ../smile_android/src/com/holding/smile/tools/URLUtil.java
	modified:   ../smile_nodejs/requestHandlers.js