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

2016-08-26 21:49:48 +08:00 · 2016-08-26 21:49:48 +08:00 · 2f23a18077
parent 2f41ba4c20 8da8ac1d0f
commit 2f23a18077
172 changed files with 669 additions and 723 deletions
--- a/个人任务分工表_之前那个传错了.png
+++ b/个人任务分工表_之前那个传错了.png
--- a/代码/在这里3.0/bin/Shop.apk
+++ b/代码/在这里3.0/bin/Shop.apk
--- a/代码/在这里3.0/bin/classes.dex
+++ b/代码/在这里3.0/bin/classes.dex
--- 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/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/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/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/MineSoftAdapter.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineSoftAdapter.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/OrderInfoListAdapter.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/OrderInfoListAdapter.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/ShopListAdapter.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ShopListAdapter.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/Good.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/model/Good.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/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/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/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.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/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$2$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$2$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$2.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$2.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$2.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$2.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$3.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$3.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$4$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$4$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$4.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$4.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$BaseUiListener.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$BaseUiListener.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineActivity$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/MineActivity$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineActivity$2.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/MineActivity$2.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/MineActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity$2.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity$2.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity$3.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity$3.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/MultiScreenActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/MultiScreenActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/MultiViewGroup.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/MultiViewGroup.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/NewsActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/NewsActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderActivity$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderActivity$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderActivity$2.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderActivity$2.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderInfoActivity$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderInfoActivity$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderInfoActivity$2.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderInfoActivity$2.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderInfoActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderInfoActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/RegisterActivity$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/RegisterActivity$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/RegisterActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/RegisterActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$2$1$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$2$1$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$2$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$2$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$2.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$2.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopAllActivity$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopAllActivity$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopAllActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopAllActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopItemActivity$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopItemActivity$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopItemActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopItemActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/WsqActivity$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/WsqActivity$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/WsqActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/WsqActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/old/OldMineActivity$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/old/OldMineActivity$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/shop/view/old/OldMineActivity.class
+++ b/代码/在这里3.0/bin/classes/com/stone/shop/view/old/OldMineActivity.class
--- a/代码/在这里3.0/bin/classes/com/stone/ui/AutoScrollViewPager$MyHandler.class
+++ b/代码/在这里3.0/bin/classes/com/stone/ui/AutoScrollViewPager$MyHandler.class
--- a/代码/在这里3.0/bin/classes/com/stone/ui/AutoScrollViewPager.class
+++ b/代码/在这里3.0/bin/classes/com/stone/ui/AutoScrollViewPager.class
--- a/代码/在这里3.0/bin/classes/com/stone/ui/CustomDurationScroller.class
+++ b/代码/在这里3.0/bin/classes/com/stone/ui/CustomDurationScroller.class
--- a/代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil$1.class
+++ b/代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil$1.class
--- a/代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil$2.class
+++ b/代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil$2.class
--- a/代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil.class
+++ b/代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil.class
--- a/代码/在这里3.0/bin/classes/com/stone/ui/ViewPagerCompat.class
+++ b/代码/在这里3.0/bin/classes/com/stone/ui/ViewPagerCompat.class
--- a/Show More
+++ b/Show More