Merge branch 'master' of https://git.trustie.net/kaka727/shangwen666

2016-08-29 11:05:33 +08:00 · 2016-08-29 11:05:33 +08:00 · 45d19e4178
parent 5714e0383b dd0e5ca252
commit 45d19e4178
280 changed files with 8902 additions and 481 deletions
--- a/logo/1471916225_687675.png
+++ b/logo/1471916225_687675.png
--- a/logo/logo.png
+++ b/logo/logo.png
--- a/代码/在这里3.0/bin/Shop.apk
+++ b/代码/在这里3.0/bin/Shop.apk
--- a/代码/在这里3.0/bin/classes/com/stone/date/MessageDef.class
+++ b/代码/在这里3.0/bin/classes/com/stone/date/MessageDef.class
--- a/代码/在这里3.0/bin/classes/com/stone/date/TypeDef.class
+++ b/代码/在这里3.0/bin/classes/com/stone/date/TypeDef.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/BuildConfig.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/BuildConfig.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/R$anim.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/R$anim.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/R$attr.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/R$attr.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/R$color.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/R$color.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/R$dimen.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/R$dimen.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/R$drawable.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/R$drawable.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/R$id.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/R$id.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/R$layout.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/R$layout.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/R$menu.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/R$menu.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/R$string.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/R$string.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/R$style.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/R$style.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/R.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/R.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$1$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$1$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$2$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$2$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$2.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$2.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$3.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$3.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$ViewHolder.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$ViewHolder.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/BXTListAdapter.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/BXTListAdapter.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/BXTNewsHolder.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/BXTNewsHolder.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/BaseContentAdapter.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/BaseContentAdapter.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ClassroomAdapter$ViewHolder.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ClassroomAdapter$ViewHolder.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ClassroomAdapter.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ClassroomAdapter.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/CommentAdapter$ViewHolder.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/CommentAdapter$ViewHolder.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/CommentAdapter.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/CommentAdapter.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/GoodsHolder.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/GoodsHolder.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/GoodsListAdapter.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/GoodsListAdapter.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/GridAdapter.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/GridAdapter.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ImagePagerAdapter.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ImagePagerAdapter.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/InfoNewsListAdapter.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/InfoNewsListAdapter.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/InformationListAdapter.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/InformationListAdapter.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineListAdapter.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineListAdapter.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineListHolder.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineListHolder.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineSoftAdapter.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineSoftAdapter.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineSoftHolder.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineSoftHolder.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/NewsHolder.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/NewsHolder.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/NewsListAdapter.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/NewsListAdapter.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/OrderInfoHolder.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/OrderInfoHolder.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/OrderInfoListAdapter.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/OrderInfoListAdapter.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/SComHolder.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/SComHolder.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/SCommentAdapter.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/SCommentAdapter.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ShopHolder.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ShopHolder.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ShopListAdapter.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ShopListAdapter.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/SmartFragmentStatePagerAdapter.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/SmartFragmentStatePagerAdapter.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ViewPagerAdapter.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ViewPagerAdapter.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/BXTNews.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/model/BXTNews.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/Classroom.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/model/Classroom.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/Comment.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/model/Comment.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/Constant.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/model/Constant.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/Discuss.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/model/Discuss.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/FeedBack.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/model/FeedBack.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/Good.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/model/Good.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/Information.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/model/Information.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/Library.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/model/Library.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/LuckyUser.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/model/LuckyUser.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/News.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/model/News.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/Order.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/model/Order.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/Reservation.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/model/Reservation.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/SComment.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/model/SComment.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/Shop.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/model/Shop.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/User.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/model/User.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/AboutActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/AboutActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity$2.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity$2.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity$3.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity$3.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/BXTActivity$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/BXTActivity$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/BXTActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/BXTActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/BXTNewsActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/BXTNewsActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/BaseActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/BaseActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/ClassroomActivity$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/ClassroomActivity$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/ClassroomActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/ClassroomActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$2.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$2.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$3$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$3$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$3.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$3.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$4.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$4.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$5.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$5.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/EditActivity$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/EditActivity$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/EditActivity$2.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/EditActivity$2.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/EditActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/EditActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/FeedBackActivity$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/FeedBackActivity$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/FeedBackActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/FeedBackActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/HomeActivity$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/HomeActivity$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/HomeActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/HomeActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/InfoContentActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/InfoContentActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/InfoNewsContentActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/InfoNewsContentActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/InformationActivity$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/InformationActivity$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/InformationActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/InformationActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryActivity$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryActivity$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$2$1$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$2$1$1.class
--- a/Show More
+++ b/Show More