modified:   ../../smile/src/main/java/com/flyhz/shop/build/solr/SolrDataImpl.java
	modified:   ../../smile/src/main/java/com/flyhz/shop/web/controller/OrderController.java
	modified:   ../../smile/src/main/resources/mybatis/sqlmap/OrderMapper.xml
	modified:   ../AndroidManifest.xml
	deleted:    ../assets/index.html
	deleted:    ../assets/index2.html
	new file:   drawable-hdpi/new_cb_normal.png
	modified:   layout/login.xml
	modified:   layout/order_manager.xml
	modified:   values/strings.xml
	modified:   ../src/com/holding/smile/activity/BaseActivity.java
	modified:   ../src/com/holding/smile/activity/IdcardManagerActivity.java
	modified:   ../src/com/holding/smile/activity/LoginActivity.java
	modified:   ../src/com/holding/smile/activity/MyOrdersActivity.java
	modified:   ../src/com/holding/smile/activity/MySmileActivity.java
	modified:   ../src/com/holding/smile/activity/PersonalSettingsActivity.java
	modified:   ../src/com/holding/smile/service/LoginService.java