diff --git a/代码/在这里3.0/.classpath b/代码/在这里3.0/.classpath
deleted file mode 100644
index 0461652..0000000
--- a/代码/在这里3.0/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/代码/在这里3.0/.project b/代码/在这里3.0/.project
deleted file mode 100644
index b261c40..0000000
--- a/代码/在这里3.0/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
- Shop
-
-
-
-
-
- com.android.ide.eclipse.adt.ResourceManagerBuilder
-
-
-
-
- com.android.ide.eclipse.adt.PreCompilerBuilder
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- com.android.ide.eclipse.adt.ApkBuilder
-
-
-
-
-
- com.android.ide.eclipse.adt.AndroidNature
- org.eclipse.jdt.core.javanature
-
-
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/BaseContentAdapter.class b/代码/在这里3.0/bin/classes/com/stone/shop/adapter/BaseContentAdapter.class
deleted file mode 100644
index 29a5087..0000000
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/BaseContentAdapter.class and /dev/null differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun b/代码/在这里3.0/bin/classes/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun
deleted file mode 100644
index fb8f926..0000000
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 博学堂讲座实体类
- * @date 2014-5-10
- * @author Stone
- */
-public class BXTNews extends BmobObject{
-
- //private String id;
-
- private String title; //标题
- private String topic; //讲座主题
- private String speaker; //主 讲 人
- private String time; //讲座时间
- private String location; //讲座地点
- private String holder1; //主办单位
- private String holder2; //承办单位
- private String points; //主讲内容提要
- private String speakerinfo; //主讲人简介
-
- public String getTitle() {
- return title;
- }
- public String getTopic() {
- return topic;
- }
- public String getSpeaker() {
- return speaker;
- }
- public String getTime() {
- return time;
- }
- public String getLocation() {
- return location;
- }
- public String getHolder1() {
- return holder1;
- }
- public String getHolder2() {
- return holder2;
- }
- public String getPoints() {
- return points;
- }
- public String getSpeakerinfo() {
- return speakerinfo;
- }
- public void setTitle(String title) {
- this.title = title;
- }
- public void setTopic(String topic) {
- this.topic = topic;
- }
- public void setSpeaker(String speaker) {
- this.speaker = speaker;
- }
- public void setTime(String time) {
- this.time = time;
- }
- public void setLocation(String location) {
- this.location = location;
- }
- public void setHolder1(String holder1) {
- this.holder1 = holder1;
- }
- public void setHolder2(String holder2) {
- this.holder2 = holder2;
- }
- public void setPoints(String points) {
- this.points = points;
- }
- public void setSpeakerinfo(String speakerinfo) {
- this.speakerinfo = speakerinfo;
- }
-}
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f b/代码/在这里3.0/bin/classes/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
deleted file mode 100644
index fb8f926..0000000
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 博学堂讲座实体类
- * @date 2014-5-10
- * @author Stone
- */
-public class BXTNews extends BmobObject{
-
- //private String id;
-
- private String title; //标题
- private String topic; //讲座主题
- private String speaker; //主 讲 人
- private String time; //讲座时间
- private String location; //讲座地点
- private String holder1; //主办单位
- private String holder2; //承办单位
- private String points; //主讲内容提要
- private String speakerinfo; //主讲人简介
-
- public String getTitle() {
- return title;
- }
- public String getTopic() {
- return topic;
- }
- public String getSpeaker() {
- return speaker;
- }
- public String getTime() {
- return time;
- }
- public String getLocation() {
- return location;
- }
- public String getHolder1() {
- return holder1;
- }
- public String getHolder2() {
- return holder2;
- }
- public String getPoints() {
- return points;
- }
- public String getSpeakerinfo() {
- return speakerinfo;
- }
- public void setTitle(String title) {
- this.title = title;
- }
- public void setTopic(String topic) {
- this.topic = topic;
- }
- public void setSpeaker(String speaker) {
- this.speaker = speaker;
- }
- public void setTime(String time) {
- this.time = time;
- }
- public void setLocation(String location) {
- this.location = location;
- }
- public void setHolder1(String holder1) {
- this.holder1 = holder1;
- }
- public void setHolder2(String holder2) {
- this.holder2 = holder2;
- }
- public void setPoints(String points) {
- this.points = points;
- }
- public void setSpeakerinfo(String speakerinfo) {
- this.speakerinfo = speakerinfo;
- }
-}
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun~HEAD b/代码/在这里3.0/bin/classes/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun~HEAD
deleted file mode 100644
index fb8f926..0000000
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun~HEAD
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 博学堂讲座实体类
- * @date 2014-5-10
- * @author Stone
- */
-public class BXTNews extends BmobObject{
-
- //private String id;
-
- private String title; //标题
- private String topic; //讲座主题
- private String speaker; //主 讲 人
- private String time; //讲座时间
- private String location; //讲座地点
- private String holder1; //主办单位
- private String holder2; //承办单位
- private String points; //主讲内容提要
- private String speakerinfo; //主讲人简介
-
- public String getTitle() {
- return title;
- }
- public String getTopic() {
- return topic;
- }
- public String getSpeaker() {
- return speaker;
- }
- public String getTime() {
- return time;
- }
- public String getLocation() {
- return location;
- }
- public String getHolder1() {
- return holder1;
- }
- public String getHolder2() {
- return holder2;
- }
- public String getPoints() {
- return points;
- }
- public String getSpeakerinfo() {
- return speakerinfo;
- }
- public void setTitle(String title) {
- this.title = title;
- }
- public void setTopic(String topic) {
- this.topic = topic;
- }
- public void setSpeaker(String speaker) {
- this.speaker = speaker;
- }
- public void setTime(String time) {
- this.time = time;
- }
- public void setLocation(String location) {
- this.location = location;
- }
- public void setHolder1(String holder1) {
- this.holder1 = holder1;
- }
- public void setHolder2(String holder2) {
- this.holder2 = holder2;
- }
- public void setPoints(String points) {
- this.points = points;
- }
- public void setSpeakerinfo(String speakerinfo) {
- this.speakerinfo = speakerinfo;
- }
-}
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun b/代码/在这里3.0/bin/classes/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun
deleted file mode 100644
index b0a9ac8..0000000
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.stone.shop.model;
-
-import java.io.Serializable;
-
-import cn.bmob.v3.BmobObject;
-import cn.bmob.v3.datatype.BmobFile;
-
-/**
- * 商品实体类
- * @date 2014-4-24
- * @author Stone
- */
-public class Good extends BmobObject implements Serializable{
-
- private static final long serialVersionUID = -3248168273019127389L;
-
- //private String id; 商品ID, 默认
-
- private String shopID = ""; // 商店ID
- private String shopName = ""; //商店名称
- private String type = ""; // 类型
- private String name = ""; // 名称
- private String price = ""; // 价格
- private BmobFile picGood = null; // 商品主图
-
- public Good(String name, String price) {
- this.name = name;
- this.price = price;
- }
-
- public String getShopID() {
- return shopID;
- }
-
- public void setShopID(String shopID) {
- this.shopID = shopID;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getPrice() {
- return price;
- }
-
- public void setPrice(String price) {
- this.price = price;
- }
-
-}
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f b/代码/在这里3.0/bin/classes/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
deleted file mode 100644
index b0a9ac8..0000000
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.stone.shop.model;
-
-import java.io.Serializable;
-
-import cn.bmob.v3.BmobObject;
-import cn.bmob.v3.datatype.BmobFile;
-
-/**
- * 商品实体类
- * @date 2014-4-24
- * @author Stone
- */
-public class Good extends BmobObject implements Serializable{
-
- private static final long serialVersionUID = -3248168273019127389L;
-
- //private String id; 商品ID, 默认
-
- private String shopID = ""; // 商店ID
- private String shopName = ""; //商店名称
- private String type = ""; // 类型
- private String name = ""; // 名称
- private String price = ""; // 价格
- private BmobFile picGood = null; // 商品主图
-
- public Good(String name, String price) {
- this.name = name;
- this.price = price;
- }
-
- public String getShopID() {
- return shopID;
- }
-
- public void setShopID(String shopID) {
- this.shopID = shopID;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getPrice() {
- return price;
- }
-
- public void setPrice(String price) {
- this.price = price;
- }
-
-}
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun~HEAD b/代码/在这里3.0/bin/classes/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun~HEAD
deleted file mode 100644
index b0a9ac8..0000000
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun~HEAD
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.stone.shop.model;
-
-import java.io.Serializable;
-
-import cn.bmob.v3.BmobObject;
-import cn.bmob.v3.datatype.BmobFile;
-
-/**
- * 商品实体类
- * @date 2014-4-24
- * @author Stone
- */
-public class Good extends BmobObject implements Serializable{
-
- private static final long serialVersionUID = -3248168273019127389L;
-
- //private String id; 商品ID, 默认
-
- private String shopID = ""; // 商店ID
- private String shopName = ""; //商店名称
- private String type = ""; // 类型
- private String name = ""; // 名称
- private String price = ""; // 价格
- private BmobFile picGood = null; // 商品主图
-
- public Good(String name, String price) {
- this.name = name;
- this.price = price;
- }
-
- public String getShopID() {
- return shopID;
- }
-
- public void setShopID(String shopID) {
- this.shopID = shopID;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getPrice() {
- return price;
- }
-
- public void setPrice(String price) {
- this.price = price;
- }
-
-}
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/News.java~remotes_origin_zhaozaichun b/代码/在这里3.0/bin/classes/com/stone/shop/model/News.java~remotes_origin_zhaozaichun
deleted file mode 100644
index b169779..0000000
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/News.java~remotes_origin_zhaozaichun
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 首页校内新闻实体类
- *
- * @date 2014-5-3
- * @author Stone
- */
-public class News extends BmobObject {
-
- // private String id;
- // private String time;
-
- private String type; // 新闻类型
- private String title; // 新闻标题
- private String author; // 新闻作者
- private String content; // 新闻内容
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getAuthor() {
- return author;
- }
-
- public void setAuthor(String author) {
- this.author = author;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
-}
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/News.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f b/代码/在这里3.0/bin/classes/com/stone/shop/model/News.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
deleted file mode 100644
index b169779..0000000
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/News.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 首页校内新闻实体类
- *
- * @date 2014-5-3
- * @author Stone
- */
-public class News extends BmobObject {
-
- // private String id;
- // private String time;
-
- private String type; // 新闻类型
- private String title; // 新闻标题
- private String author; // 新闻作者
- private String content; // 新闻内容
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getAuthor() {
- return author;
- }
-
- public void setAuthor(String author) {
- this.author = author;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
-}
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/News.java~remotes_origin_zhaozaichun~HEAD b/代码/在这里3.0/bin/classes/com/stone/shop/model/News.java~remotes_origin_zhaozaichun~HEAD
deleted file mode 100644
index b169779..0000000
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/News.java~remotes_origin_zhaozaichun~HEAD
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 首页校内新闻实体类
- *
- * @date 2014-5-3
- * @author Stone
- */
-public class News extends BmobObject {
-
- // private String id;
- // private String time;
-
- private String type; // 新闻类型
- private String title; // 新闻标题
- private String author; // 新闻作者
- private String content; // 新闻内容
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getAuthor() {
- return author;
- }
-
- public void setAuthor(String author) {
- this.author = author;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
-}
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun b/代码/在这里3.0/bin/classes/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun
deleted file mode 100644
index 7abf4ae..0000000
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 店铺评论实体类
- * @date 2014-5-3
- * @author Stone
- */
-public class SComment extends BmobObject {
-
- // private String id;
- // private String time;
-
- private String shopID;
- private String shopName;
- private String userID;
- private String userName;
- private String content;
-
- public String getShopID() {
- return shopID;
- }
-
- public void setShopID(String shopID) {
- this.shopID = shopID;
- }
-
- public String getShopName() {
- return shopName;
- }
-
- public void setShopName(String shopName) {
- this.shopName = shopName;
- }
-
- public String getUserID() {
- return userID;
- }
-
- public void setUserID(String userID) {
- this.userID = userID;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
-}
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f b/代码/在这里3.0/bin/classes/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
deleted file mode 100644
index 7abf4ae..0000000
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 店铺评论实体类
- * @date 2014-5-3
- * @author Stone
- */
-public class SComment extends BmobObject {
-
- // private String id;
- // private String time;
-
- private String shopID;
- private String shopName;
- private String userID;
- private String userName;
- private String content;
-
- public String getShopID() {
- return shopID;
- }
-
- public void setShopID(String shopID) {
- this.shopID = shopID;
- }
-
- public String getShopName() {
- return shopName;
- }
-
- public void setShopName(String shopName) {
- this.shopName = shopName;
- }
-
- public String getUserID() {
- return userID;
- }
-
- public void setUserID(String userID) {
- this.userID = userID;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
-}
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun~HEAD b/代码/在这里3.0/bin/classes/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun~HEAD
deleted file mode 100644
index 7abf4ae..0000000
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun~HEAD
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 店铺评论实体类
- * @date 2014-5-3
- * @author Stone
- */
-public class SComment extends BmobObject {
-
- // private String id;
- // private String time;
-
- private String shopID;
- private String shopName;
- private String userID;
- private String userName;
- private String content;
-
- public String getShopID() {
- return shopID;
- }
-
- public void setShopID(String shopID) {
- this.shopID = shopID;
- }
-
- public String getShopName() {
- return shopName;
- }
-
- public void setShopName(String shopName) {
- this.shopName = shopName;
- }
-
- public String getUserID() {
- return userID;
- }
-
- public void setUserID(String userID) {
- this.userID = userID;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
-}
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun b/代码/在这里3.0/bin/classes/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun
deleted file mode 100644
index 5e22bde..0000000
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.stone.shop.model;
-
-import java.io.Serializable;
-
-import cn.bmob.v3.BmobObject;
-import cn.bmob.v3.datatype.BmobFile;
-
-/**
- * 店铺实体类, 实现序列化, Activity之间实现传递
- * @date 2014-4-24
- * @author Stone
- */
-public class Shop extends BmobObject implements Serializable{
-
- private static final long serialVersionUID = -8796635595320697255L;
-
- private String userID; // 主人
- private String type; // 类型(11代表第一个GridView中的第一个)
- private String name; // 店名
- private String location; // 地理位置
- private String phone; // 联系电话
- private String info; // 简介
- private String sale; // 促销信息
- private BmobFile picShop; // 商店主图
-
- public String getUserID() {
- return userID;
- }
-
- public void setUserID(String userID) {
- this.userID = userID;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getLocation() {
- return location;
- }
-
- public void setLocation(String location) {
- this.location = location;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getInfo() {
- return info;
- }
-
- public void setInfo(String info) {
- this.info = info;
- }
-
- public String getSale() {
- return sale;
- }
-
- public void setSale(String sale) {
- this.sale = sale;
- }
-
-}
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f b/代码/在这里3.0/bin/classes/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
deleted file mode 100644
index 5e22bde..0000000
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.stone.shop.model;
-
-import java.io.Serializable;
-
-import cn.bmob.v3.BmobObject;
-import cn.bmob.v3.datatype.BmobFile;
-
-/**
- * 店铺实体类, 实现序列化, Activity之间实现传递
- * @date 2014-4-24
- * @author Stone
- */
-public class Shop extends BmobObject implements Serializable{
-
- private static final long serialVersionUID = -8796635595320697255L;
-
- private String userID; // 主人
- private String type; // 类型(11代表第一个GridView中的第一个)
- private String name; // 店名
- private String location; // 地理位置
- private String phone; // 联系电话
- private String info; // 简介
- private String sale; // 促销信息
- private BmobFile picShop; // 商店主图
-
- public String getUserID() {
- return userID;
- }
-
- public void setUserID(String userID) {
- this.userID = userID;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getLocation() {
- return location;
- }
-
- public void setLocation(String location) {
- this.location = location;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getInfo() {
- return info;
- }
-
- public void setInfo(String info) {
- this.info = info;
- }
-
- public String getSale() {
- return sale;
- }
-
- public void setSale(String sale) {
- this.sale = sale;
- }
-
-}
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun~HEAD b/代码/在这里3.0/bin/classes/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun~HEAD
deleted file mode 100644
index 5e22bde..0000000
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun~HEAD
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.stone.shop.model;
-
-import java.io.Serializable;
-
-import cn.bmob.v3.BmobObject;
-import cn.bmob.v3.datatype.BmobFile;
-
-/**
- * 店铺实体类, 实现序列化, Activity之间实现传递
- * @date 2014-4-24
- * @author Stone
- */
-public class Shop extends BmobObject implements Serializable{
-
- private static final long serialVersionUID = -8796635595320697255L;
-
- private String userID; // 主人
- private String type; // 类型(11代表第一个GridView中的第一个)
- private String name; // 店名
- private String location; // 地理位置
- private String phone; // 联系电话
- private String info; // 简介
- private String sale; // 促销信息
- private BmobFile picShop; // 商店主图
-
- public String getUserID() {
- return userID;
- }
-
- public void setUserID(String userID) {
- this.userID = userID;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getLocation() {
- return location;
- }
-
- public void setLocation(String location) {
- this.location = location;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getInfo() {
- return info;
- }
-
- public void setInfo(String info) {
- this.info = info;
- }
-
- public String getSale() {
- return sale;
- }
-
- public void setSale(String sale) {
- this.sale = sale;
- }
-
-}
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/User.java~remotes_origin_zhaozaichun b/代码/在这里3.0/bin/classes/com/stone/shop/model/User.java~remotes_origin_zhaozaichun
deleted file mode 100644
index 511703e..0000000
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/User.java~remotes_origin_zhaozaichun
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.datatype.BmobFile;
-import cn.bmob.v3.datatype.BmobRelation;
-
-/**
- * 用户实体类
- * @date 2014-4-24
- * @author Stone
- */
-public class User extends BmobUser {
-
- public static String userId;
-
- // 父类中已经存在的属性
- // private String id;
- // private String username;
- // private String password;
- // private String email;
- // private String regTime;
-
- private String sex; // 性别
- private String phone; // 电话
- private String qq; // QQ
- private String school = "湖北工业大学"; // 学校
- private String cademy; // 学院
- private String dorPart; // 校区
- private String dorNum; // 寝室号
- private String state = "未登陆"; // 登录状态
- private String type = "普通用户"; // 用户类型(普通用户、黑名单、中奖者)
- //private BmobFile picUser; // 头像
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getSex() {
- return sex;
- }
-
- public void setSex(String sex) {
- this.sex = sex;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getQQ() {
- return qq;
- }
-
- public void setQQ(String qq) {
- this.qq = qq;
- }
-
- public String getSchool() {
- return school;
- }
-
- public void setSchool(String school) {
- this.school = school;
- }
-
- public String getCademy() {
- return cademy;
- }
-
- public void setCademy(String cademy) {
- this.cademy = cademy;
- }
-
- public String getDorPart() {
- return dorPart;
- }
-
- public void setDorPart(String dorPart) {
- this.dorPart = dorPart;
- }
-
- public String getDorNum() {
- return dorNum;
- }
-
- public void setDorNum(String dorNum) {
- this.dorNum = dorNum;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
-}
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/User.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f b/代码/在这里3.0/bin/classes/com/stone/shop/model/User.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
deleted file mode 100644
index 511703e..0000000
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/User.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.datatype.BmobFile;
-import cn.bmob.v3.datatype.BmobRelation;
-
-/**
- * 用户实体类
- * @date 2014-4-24
- * @author Stone
- */
-public class User extends BmobUser {
-
- public static String userId;
-
- // 父类中已经存在的属性
- // private String id;
- // private String username;
- // private String password;
- // private String email;
- // private String regTime;
-
- private String sex; // 性别
- private String phone; // 电话
- private String qq; // QQ
- private String school = "湖北工业大学"; // 学校
- private String cademy; // 学院
- private String dorPart; // 校区
- private String dorNum; // 寝室号
- private String state = "未登陆"; // 登录状态
- private String type = "普通用户"; // 用户类型(普通用户、黑名单、中奖者)
- //private BmobFile picUser; // 头像
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getSex() {
- return sex;
- }
-
- public void setSex(String sex) {
- this.sex = sex;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getQQ() {
- return qq;
- }
-
- public void setQQ(String qq) {
- this.qq = qq;
- }
-
- public String getSchool() {
- return school;
- }
-
- public void setSchool(String school) {
- this.school = school;
- }
-
- public String getCademy() {
- return cademy;
- }
-
- public void setCademy(String cademy) {
- this.cademy = cademy;
- }
-
- public String getDorPart() {
- return dorPart;
- }
-
- public void setDorPart(String dorPart) {
- this.dorPart = dorPart;
- }
-
- public String getDorNum() {
- return dorNum;
- }
-
- public void setDorNum(String dorNum) {
- this.dorNum = dorNum;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
-}
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/User.java~remotes_origin_zhaozaichun~HEAD b/代码/在这里3.0/bin/classes/com/stone/shop/model/User.java~remotes_origin_zhaozaichun~HEAD
deleted file mode 100644
index 511703e..0000000
--- a/代码/在这里3.0/bin/classes/com/stone/shop/model/User.java~remotes_origin_zhaozaichun~HEAD
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.datatype.BmobFile;
-import cn.bmob.v3.datatype.BmobRelation;
-
-/**
- * 用户实体类
- * @date 2014-4-24
- * @author Stone
- */
-public class User extends BmobUser {
-
- public static String userId;
-
- // 父类中已经存在的属性
- // private String id;
- // private String username;
- // private String password;
- // private String email;
- // private String regTime;
-
- private String sex; // 性别
- private String phone; // 电话
- private String qq; // QQ
- private String school = "湖北工业大学"; // 学校
- private String cademy; // 学院
- private String dorPart; // 校区
- private String dorNum; // 寝室号
- private String state = "未登陆"; // 登录状态
- private String type = "普通用户"; // 用户类型(普通用户、黑名单、中奖者)
- //private BmobFile picUser; // 头像
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getSex() {
- return sex;
- }
-
- public void setSex(String sex) {
- this.sex = sex;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getQQ() {
- return qq;
- }
-
- public void setQQ(String qq) {
- this.qq = qq;
- }
-
- public String getSchool() {
- return school;
- }
-
- public void setSchool(String school) {
- this.school = school;
- }
-
- public String getCademy() {
- return cademy;
- }
-
- public void setCademy(String cademy) {
- this.cademy = cademy;
- }
-
- public String getDorPart() {
- return dorPart;
- }
-
- public void setDorPart(String dorPart) {
- this.dorPart = dorPart;
- }
-
- public String getDorNum() {
- return dorNum;
- }
-
- public void setDorNum(String dorNum) {
- this.dorNum = dorNum;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
-}
diff --git a/代码/在这里3.0/res/layout/main.xml b/代码/在这里3.0/res/layout/main.xml
deleted file mode 100644
index 8b56a8e..0000000
--- a/代码/在这里3.0/res/layout/main.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/代码/在这里3.0/res/layout/multiview.xml b/代码/在这里3.0/res/layout/multiview.xml
deleted file mode 100644
index cca1359..0000000
--- a/代码/在这里3.0/res/layout/multiview.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/代码/在这里3.0/src/com/stone/date/MessageDef.java b/代码/在这里3.0/src/com/stone/date/MessageDef.java
deleted file mode 100644
index 1128511..0000000
--- a/代码/在这里3.0/src/com/stone/date/MessageDef.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.stone.date;
-
-
-public class MessageDef {
-
- //查询用户订单成功完成
- public static final int MINE_FINISH_LOAD_DATA = 401;
-
- //查询用户成功完成
- public static final int MINE_INFO_FINISH_FIND_USER = 402;
-}
diff --git a/代码/在这里3.0/src/com/stone/date/TypeDef.java b/代码/在这里3.0/src/com/stone/date/TypeDef.java
deleted file mode 100644
index 294f4cc..0000000
--- a/代码/在这里3.0/src/com/stone/date/TypeDef.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.stone.date;
-
-/**
- * 类型分类汇总
- *
- * @date 2014-4-29
- * @author Stone
- */
-public class TypeDef {
-
- //父分类
- public static final String[] typeDadList = { "学习", "点餐", "校园服务", "娱乐" };
-
- //子分类--学习小菜
- public static final String[] typeSonList1 = { "教室", "图书馆" , "学校通知"};
-
- //子分类--吃饭小菜
- public static final String[] typeSonList2 = { "一食堂", "二食堂" };
-
- //子分类--购物小菜
- public static final String[] typeSonList3 = {"博学堂", "打印", "理发", "宾馆", "自行车", "生日蛋糕", "宿舍超市"};
-
- //子分类--疯狂小菜
- public static final String[] typeSonList4 = { "兼职", "景点门票", "租车", "旅游",
- "聚餐", "宾馆", "KTV" };
-
- public static final String[] chDayOfWeek = {"天","一","二","三","四","五","六"};
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/adapter/AIContentAdapter.java b/代码/在这里3.0/src/com/stone/shop/adapter/AIContentAdapter.java
deleted file mode 100644
index 856ae0f..0000000
--- a/代码/在这里3.0/src/com/stone/shop/adapter/AIContentAdapter.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.List;
-
-import com.stone.shop.R;
-import com.stone.shop.model.Constant;
-import com.stone.shop.model.Discuss;
-import com.stone.shop.model.User;
-import com.stone.shop.view.CommentActivity;
-import com.stone.util.ActivityUtil;
-
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.Color;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.datatype.BmobPointer;
-import cn.bmob.v3.datatype.BmobRelation;
-import cn.bmob.v3.listener.FindListener;
-import cn.bmob.v3.listener.UpdateListener;
-
-public class AIContentAdapter extends BaseContentAdapter {
-
- public static final String TAG = "AIContentAdapter";
- public static final int SAVE_FAVOURITE = 2;
-
- public AIContentAdapter(Context context, List list) {
- super(context, list);
- // TODO Auto-generated constructor stub
- }
-
- @Override
- public View getConvertView(int position, View convertView, ViewGroup parent) {
- // TODO Auto-generated method stub
- final ViewHolder viewHolder;
- if (convertView == null) {
- viewHolder = new ViewHolder();
- convertView = mInflater.inflate(R.layout.ai_item, null);
- viewHolder.userName = (TextView) convertView.findViewById(R.id.user_name);
- viewHolder.userLogo = (ImageView) convertView.findViewById(R.id.user_logo);
- viewHolder.contentText = (TextView) convertView.findViewById(R.id.content_text);
- viewHolder.contentImage = (ImageView) convertView.findViewById(R.id.content_image);
- viewHolder.love = (TextView) convertView.findViewById(R.id.item_action_love);
- viewHolder.hate = (TextView) convertView.findViewById(R.id.item_action_hate);
- viewHolder.share = (TextView) convertView.findViewById(R.id.item_action_share);
- viewHolder.comment = (TextView) convertView.findViewById(R.id.item_action_comment);
- viewHolder.title_text = (TextView) convertView.findViewById(R.id.title_text);
- viewHolder.time_text = (TextView) convertView.findViewById(R.id.time_text);
- convertView.setTag(viewHolder);
- } else {
- viewHolder = (ViewHolder) convertView.getTag();
- }
- final Discuss entity = dataList.get(position);
- viewHolder.userName.setText(entity.getAuthor().getUsername());
- viewHolder.contentText.setText(entity.getContent());
- if (null == entity.getContentfigureurl()) {
- viewHolder.contentImage.setVisibility(View.GONE);
- } else {
- viewHolder.contentImage.setVisibility(View.VISIBLE);
- }
- viewHolder.love.setText(entity.getLove() + "");
- if (entity.getMyLove()) {
- viewHolder.love.setTextColor(Color.parseColor("#D95555"));
- } else {
- viewHolder.love.setTextColor(Color.parseColor("#000000"));
- }
- viewHolder.title_text.setText(entity.getTitle());
- viewHolder.time_text.setText(entity.getCreatedAt());
- viewHolder.hate.setText(entity.getHate() + "");
- viewHolder.love.setOnClickListener(new OnClickListener() {
- boolean oldFav = entity.getMyFav();
-
- @Override
- public void onClick(View v) {
- // TODO Auto-generated method stub
- if (entity.getMyLove()) {
- ActivityUtil.show(mContext, "您已赞过啦");
-
- return;
- }
-
- entity.setLove(entity.getLove() + 1);
- viewHolder.love.setTextColor(Color.parseColor("#D95555"));
- viewHolder.love.setText(entity.getLove() + "");
-
- entity.increment("love", 1);
- if (entity.getMyFav()) {
- entity.setMyFav(false);
- }
- entity.setMyLove(true);
- entity.update(mContext, new UpdateListener() {
-
- @Override
- public void onSuccess() {
- // TODO Auto-generated method stub
- entity.setMyLove(true);
- entity.setMyFav(oldFav);
- }
-
- @Override
- public void onFailure(int arg0, String arg1) {
- // TODO Auto-generated method stub
- entity.setMyLove(false);
- entity.setMyFav(oldFav);
- }
- });
- }
- });
- viewHolder.hate.setOnClickListener(new OnClickListener() {
-
- @Override
- public void onClick(View v) {
- // TODO Auto-generated method stub
- entity.setHate(entity.getHate() + 1);
- viewHolder.hate.setText(entity.getHate() + "");
- entity.increment("hate", 1);
- entity.update(mContext, new UpdateListener() {
-
- @Override
- public void onSuccess() {
- // TODO Auto-generated method stub
- ActivityUtil.show(mContext, "点踩成功~");
- }
-
- @Override
- public void onFailure(int arg0, String arg1) {
- // TODO Auto-generated method stub
-
- }
- });
- }
- });
- viewHolder.comment.setOnClickListener(new OnClickListener() {
-
- @Override
- public void onClick(View v) {
- // TODO Auto-generated method stub
- // 评论
- Intent intent = new Intent();
- intent.setClass(mContext, CommentActivity.class);
- intent.putExtra("data", entity);
- mContext.startActivity(intent);
- }
- });
-
- return convertView;
- }
-
- public static class ViewHolder {
- public ImageView userLogo;
- public TextView userName;
- public TextView contentText;
- public ImageView contentImage;
- private TextView title_text;
- private TextView time_text;
- public TextView love;
- public TextView hate;
- public TextView share;
- public TextView comment;
- }
-
-}
\ No newline at end of file
diff --git a/代码/在这里3.0/src/com/stone/shop/adapter/BXTListAdapter.java b/代码/在这里3.0/src/com/stone/shop/adapter/BXTListAdapter.java
deleted file mode 100644
index 656c523..0000000
--- a/代码/在这里3.0/src/com/stone/shop/adapter/BXTListAdapter.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.List;
-
-import com.stone.shop.R;
-import com.stone.shop.model.BXTNews;
-
-import android.content.Context;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-/**
- * 教学类-博学堂-讲座列表适配器
- *
- * @date 2014-5-10
- * @author Stone
- */
-public class BXTListAdapter extends BaseAdapter {
-
- private List mNewsList; // 商品列表信息
- private LayoutInflater mInflater = null;
-
- public BXTListAdapter(Context context, List newsList) {
- mNewsList = newsList;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mNewsList.size();
- }
-
- @Override
- public Object getItem(int position) {
- return mNewsList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- // 刷新列表中的数据
- public void refresh(List list) {
- Log.i("BXTNewsAdapter", "Adapter刷新数据");
- mNewsList = list;
- notifyDataSetChanged();
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- BXTNewsHolder newsHolder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.bxt_list_item, null);
- newsHolder = new BXTNewsHolder();
- newsHolder.tvBXTNewsTitle = (TextView) convertView
- .findViewById(R.id.tv_bxt_news_item_title);
- convertView.setTag(newsHolder);
- } else {
- newsHolder = (BXTNewsHolder) convertView.getTag();
- }
- newsHolder.tvBXTNewsTitle.setText(mNewsList.get(position).getTitle());
- return convertView;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/adapter/BaseContentAdapter.java b/代码/在这里3.0/src/com/stone/shop/adapter/BaseContentAdapter.java
deleted file mode 100644
index 129f03f..0000000
--- a/代码/在这里3.0/src/com/stone/shop/adapter/BaseContentAdapter.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.List;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-
-
-public abstract class BaseContentAdapter extends BaseAdapter{
-
- protected Context mContext;
- protected List dataList ;
- protected LayoutInflater mInflater;
-
-
-
- public List getDataList() {
- return dataList;
- }
-
- public void setDataList(List dataList) {
- this.dataList = dataList;
- }
-
- public BaseContentAdapter(Context context,List list){
- mContext = context;
- dataList = list;
- mInflater = LayoutInflater.from(mContext);
- }
-
- @Override
- public int getCount() {
- // TODO Auto-generated method stub
- return dataList.size();
- }
-
- @Override
- public T getItem(int position) {
- // TODO Auto-generated method stub
- return dataList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- // TODO Auto-generated method stub
- return position;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- // TODO Auto-generated method stub
-
- return getConvertView(position,convertView,parent);
- }
-
- public abstract View getConvertView(int position, View convertView, ViewGroup parent);
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/adapter/ClassroomAdapter.java b/代码/在这里3.0/src/com/stone/shop/adapter/ClassroomAdapter.java
deleted file mode 100644
index 4862b6d..0000000
--- a/代码/在这里3.0/src/com/stone/shop/adapter/ClassroomAdapter.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.List;
-
-import com.stone.shop.R;
-import com.stone.shop.model.Classroom;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-public class ClassroomAdapter extends BaseAdapter {
-
- private List mNewsList; // 商品列表信息
- private LayoutInflater mInflater = null;
-
- public ClassroomAdapter(Context context, List newsList) {
- mNewsList = newsList;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mNewsList.size();
- }
-
- @Override
- public Object getItem(int position) {
- return mNewsList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- // 刷新列表中的数据
- public void refresh(List list) {
- mNewsList = list;
- notifyDataSetChanged();
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- ViewHolder viewHolder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.gv_item_classroom, null);
- viewHolder = new ViewHolder();
- viewHolder.tv_chooseText = (TextView) convertView.findViewById(R.id.tv_chooseText);
- convertView.setTag(viewHolder);
- } else {
- viewHolder = (ViewHolder) convertView.getTag();
- }
- viewHolder.tv_chooseText.setText(mNewsList.get(position).getName());
- return convertView;
- }
-
- class ViewHolder {
-
- public TextView tv_chooseText; // 博学堂讲座标题
-
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/adapter/CommentAdapter.java b/代码/在这里3.0/src/com/stone/shop/adapter/CommentAdapter.java
deleted file mode 100644
index 99f8633..0000000
--- a/代码/在这里3.0/src/com/stone/shop/adapter/CommentAdapter.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.List;
-
-import com.stone.shop.R;
-import com.stone.shop.model.Comment;
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-
-public class CommentAdapter extends BaseContentAdapter{
-
- public CommentAdapter(Context context, List list) {
- super(context, list);
- // TODO Auto-generated constructor stub
- }
-
- @Override
- public View getConvertView(int position, View convertView, ViewGroup parent) {
- // TODO Auto-generated method stub
- ViewHolder viewHolder;
- if(convertView == null){
- viewHolder = new ViewHolder();
- convertView = mInflater.inflate(R.layout.comment_item, null);
- viewHolder.userName = (TextView)convertView.findViewById(R.id.userName_comment);
- viewHolder.commentContent = (TextView)convertView.findViewById(R.id.content_comment);
- viewHolder.index = (TextView)convertView.findViewById(R.id.index_comment);
- viewHolder.time_comment = (TextView) convertView.findViewById(R.id.time_comment);
- convertView.setTag(viewHolder);
- }else{
- viewHolder = (ViewHolder)convertView.getTag();
- }
-
- final Comment comment = dataList.get(position);
- if(comment.getUser()!=null){
- viewHolder.userName.setText(comment.getUser().getUsername());
- }else{
- viewHolder.userName.setText("墙友");
- }
- viewHolder.index.setText((position+1)+"楼");
- viewHolder.commentContent.setText(comment.getCommentContent());
- viewHolder.time_comment.setText(comment.getCreatedAt());
- return convertView;
- }
-
- public static class ViewHolder{
- public TextView userName;
- public TextView commentContent;
- public TextView index;
- private TextView time_comment;
- }
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/adapter/GoodsHolder.java b/代码/在这里3.0/src/com/stone/shop/adapter/GoodsHolder.java
deleted file mode 100644
index 0a4e852..0000000
--- a/代码/在这里3.0/src/com/stone/shop/adapter/GoodsHolder.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.widget.Button;
-import android.widget.TextView;
-
-/**
- * 商品视图
- * @date 2014-4-26
- * @author Stone
- */
-public class GoodsHolder {
-
- public TextView tvName; //商品名称
- public TextView tvPrice; //商品单价
- public TextView btnBuyGood; //购买按钮
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/adapter/GoodsListAdapter.java b/代码/在这里3.0/src/com/stone/shop/adapter/GoodsListAdapter.java
deleted file mode 100644
index 0c3b611..0000000
--- a/代码/在这里3.0/src/com/stone/shop/adapter/GoodsListAdapter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.List;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-import com.stone.shop.R;
-import com.stone.shop.model.Good;
-
-public class GoodsListAdapter extends BaseAdapter {
-
-
- private List mGoodsList; // 商品列表信息
- private LayoutInflater mInflater = null;
-
- public GoodsListAdapter(Context context, List goodsList) {
- mGoodsList = goodsList;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mGoodsList.size();
- }
-
- @Override
- public Object getItem(int position) {
- return mGoodsList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- // 刷新列表中的数据
- public void refresh(List list) {
- mGoodsList = list;
- notifyDataSetChanged();
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- GoodsHolder goodHolder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.goods_list_item, null);
- goodHolder = new GoodsHolder();
- goodHolder.tvName = (TextView) convertView
- .findViewById(R.id.tv_good_name);
- goodHolder.tvPrice = (TextView) convertView
- .findViewById(R.id.tv_good_price);
- goodHolder.btnBuyGood = (TextView) convertView
- .findViewById(R.id.btn_buy_good);
- convertView.setTag(goodHolder);
- } else {
- goodHolder = (GoodsHolder) convertView.getTag();
- }
- goodHolder.tvName.setText(mGoodsList.get(position).getName());
- goodHolder.tvPrice.setText("¥"+mGoodsList.get(position).getPrice());
- return convertView;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/adapter/GridAdapter.java b/代码/在这里3.0/src/com/stone/shop/adapter/GridAdapter.java
deleted file mode 100644
index cad116f..0000000
--- a/代码/在这里3.0/src/com/stone/shop/adapter/GridAdapter.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.stone.date.TypeDef;
-import com.stone.shop.R;
-
-/**
- * 生活-- 网格布局(ImageView+TextView)适配器
- *
- * @date 2014-4-24
- * @author Stone
- */
-public class GridAdapter extends BaseAdapter {
-
- private Context mContext;
- private int mIndex = 0; // 代表当前需要适配页面中第几个GridView
-
- //学习小菜
- public static final String[] mSchoolTexts = TypeDef.typeSonList1;
- private int[] mSchoolImages = { R.drawable.ic_81, R.drawable.ic_82, R.drawable.ic_8 };
-
- //吃饭小菜
- public static final String[] mFoodTexts = TypeDef.typeSonList2;
- private int[] mFoodImages = { R.drawable.ic_41, R.drawable.ic_42};
-
- //购物小菜
- public static final String[] mGiftTexts = TypeDef.typeSonList3;
- private int[] mGiftImages = { R.drawable.ic_71, R.drawable.ic_72,
- R.drawable.ic_73, R.drawable.ic_74, R.drawable.ic_75,
- R.drawable.ic_76, R.drawable.ic_77};
-
- //疯狂小菜
- public static final String[] mOutTexts = TypeDef.typeSonList4;
- private int[] mOutImages = { R.drawable.ic_3, R.drawable.ic_3,
- R.drawable.ic_3, R.drawable.ic_3, R.drawable.ic_3,
- R.drawable.ic_3, R.drawable.ic_3 };
-
- public GridAdapter(Context context, int index) {
- mContext = context;
- mIndex = index;
- }
-
- @Override
- public int getCount() {
- int count = 0;
- switch (mIndex) {
- case 0:
- count = mFoodImages.length;
- break;
- case 1:
- count = mGiftImages.length;
- break;
- case 2:
- count = mOutImages.length;
- break;
- case 3:
- count = mSchoolImages.length;
- break;
- default:
- break;
- }
- return count;
- }
-
- @Override
- public Object getItem(int position) {
- return null;
- }
-
- @Override
- public long getItemId(int position) {
- return 0;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- View view = View.inflate(mContext, R.layout.shop_grid_item, null);
-
- ImageView image = (ImageView) view.findViewById(R.id.img_chooseImage);
- TextView text = (TextView) view.findViewById(R.id.tv_chooseText);
- switch (mIndex) {
- case 0:
- image.setImageResource(mFoodImages[position]);
- text.setText(mFoodTexts[position]);
- break;
- case 1:
- image.setImageResource(mGiftImages[position]);
- text.setText(mGiftTexts[position]);
- break;
- case 2:
- image.setImageResource(mOutImages[position]);
- text.setText(mOutTexts[position]);
- break;
- case 3:
- image.setImageResource(mSchoolImages[position]);
- text.setText(mSchoolTexts[position]);
- break;
- default:
- break;
- }
-
- return view;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/adapter/InfoNewsListAdapter.java b/代码/在这里3.0/src/com/stone/shop/adapter/InfoNewsListAdapter.java
deleted file mode 100644
index f1965cc..0000000
--- a/代码/在这里3.0/src/com/stone/shop/adapter/InfoNewsListAdapter.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.List;
-
-import com.stone.shop.R;
-import com.stone.shop.model.Information;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-/**
- * 校园通知消息列表适配器——第二版
- * @author XCP
- * @date 2016-8-25
- *
- */
-public class InfoNewsListAdapter extends BaseAdapter {
-
- private LayoutInflater mInflater = null;
- private List mInfoNewsList = null;
-
- public InfoNewsListAdapter(Context context, List infonewsList) {
- mInfoNewsList = infonewsList;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mInfoNewsList.size();
- }
-
- @Override
- public Object getItem(int position) {
- return mInfoNewsList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- // 刷新列表中的数据
- public void refresh(List list) {
- mInfoNewsList = list;
- notifyDataSetChanged();
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- NewsHolder newsHolder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.news_list_item, null);
- newsHolder = new NewsHolder();
- newsHolder.tvNewsType = (TextView) convertView
- .findViewById(R.id.tv_news_type);
- newsHolder.tvNewsTitle = (TextView) convertView
- .findViewById(R.id.tv_news_title);
- newsHolder.tvNewsDate = (TextView) convertView
- .findViewById(R.id.tv_news_date);
- convertView.setTag(newsHolder);
- } else {
- newsHolder = (NewsHolder) convertView.getTag();
- }
- //拆分字符串,只取年月日
- String[] ss;
- ss = mInfoNewsList.get(position).getCreatedAt().split(" ");
- newsHolder.tvNewsType.setText(mInfoNewsList.get(position).getHolder()); //新闻单位
- newsHolder.tvNewsTitle.setText(mInfoNewsList.get(position).getTitle()); //新闻标题
- newsHolder.tvNewsDate.setText(ss[0]); //新闻发布日期
- return convertView;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/adapter/InformationListAdapter.java b/代码/在这里3.0/src/com/stone/shop/adapter/InformationListAdapter.java
deleted file mode 100644
index 7fac847..0000000
--- a/代码/在这里3.0/src/com/stone/shop/adapter/InformationListAdapter.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.List;
-
-import com.stone.shop.R;
-import com.stone.shop.model.Information;
-
-import android.content.Context;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-
-/**
- * 学校通知列表适配器
- * @author XCP
- * @date 2016-8-22
- */
-public class InformationListAdapter extends BaseAdapter {
-
- private List mInfoList; // 商品列表信息
- private LayoutInflater mInflater = null;
-
- public InformationListAdapter(Context context, List infoList) {
- mInfoList = infoList;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mInfoList.size();
- }
-
- @Override
- public Object getItem(int position) {
- return mInfoList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- // 刷新列表中的数据
- public void refresh(List list) {
- Log.i("InformationListAdapter", "Adapter刷新数据");
- mInfoList = list;
- notifyDataSetChanged();
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- BXTNewsHolder newsHolder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.info_list_item, null);
- newsHolder = new BXTNewsHolder();
- newsHolder.tvBXTNewsTitle = (TextView) convertView
- .findViewById(R.id.tv_info_item_title);
- convertView.setTag(newsHolder);
- } else {
- newsHolder = (BXTNewsHolder) convertView.getTag();
- }
- newsHolder.tvBXTNewsTitle.setText(mInfoList.get(position).getTitle());
- return convertView;
-
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/adapter/MineListAdapter.java b/代码/在这里3.0/src/com/stone/shop/adapter/MineListAdapter.java
deleted file mode 100644
index fbb4a70..0000000
--- a/代码/在这里3.0/src/com/stone/shop/adapter/MineListAdapter.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.stone.shop.R;
-
-/**
- * MineActivity 项目列表适配器
- * @date 2014-5-10
- * @author Stone
- */
-public class MineListAdapter extends BaseAdapter {
-
- private String[] mItemNames; // 项目列表名称
- private String[] mItemContents; //项目列表的备注值
- private int[] mItemImgIds; // 项目列表Icon
- private LayoutInflater mInflater = null;
-
- public MineListAdapter(Context context, String[] names, String[] contents, int[] imgIds) {
- mItemNames = names;
- mItemContents = contents;
- mItemImgIds = imgIds;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mItemNames.length;
- }
-
- @Override
- public Object getItem(int position) {
- return mItemNames[position];
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- MineListHolder holder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.mine_list_item, null);
- holder = new MineListHolder();
- holder.imgItem = (ImageView) convertView.findViewById(R.id.img_item);
- holder.tvItemName = (TextView) convertView
- .findViewById(R.id.tv_item_name);
- holder.tvItemContent = (TextView) convertView.findViewById(R.id.tv_item_content);
- convertView.setTag(holder);
- } else {
- holder = (MineListHolder) convertView.getTag();
- }
- holder.imgItem.setBackgroundResource(mItemImgIds[position]);
- holder.tvItemName.setText(mItemNames[position]);
- holder.tvItemContent.setText(mItemContents[position]);
- return convertView;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/adapter/MineListHolder.java b/代码/在这里3.0/src/com/stone/shop/adapter/MineListHolder.java
deleted file mode 100644
index eb315fe..0000000
--- a/代码/在这里3.0/src/com/stone/shop/adapter/MineListHolder.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.widget.ImageView;
-import android.widget.TextView;
-
-public class MineListHolder {
-
- public ImageView imgItem; //项目Icon
- public TextView tvItemName; //项目名称
- public TextView tvItemContent; //项目值
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/adapter/MineSoftAdapter.java b/代码/在这里3.0/src/com/stone/shop/adapter/MineSoftAdapter.java
deleted file mode 100644
index aedeecf..0000000
--- a/代码/在这里3.0/src/com/stone/shop/adapter/MineSoftAdapter.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-import com.stone.shop.R;
-
-/**
- * MineActivity 项目列表适配器
- * @date 2014-5-10
- * @author Stone
- */
-public class MineSoftAdapter extends BaseAdapter {
-
- private String[] mItemNames; // 项目列表名称
- private String[] mItemContents; //项目列表的备注值
- private LayoutInflater mInflater = null;
-
- public MineSoftAdapter(Context context, String[] names, String[] contents) {
- mItemNames = names;
- mItemContents = contents;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mItemNames.length;
- }
-
- @Override
- public Object getItem(int position) {
- return mItemNames[position];
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- MineListHolder holder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.mine_soft_list_item, null);
- holder = new MineListHolder();
- holder.tvItemName = (TextView) convertView
- .findViewById(R.id.tv_item_name);
- holder.tvItemContent = (TextView) convertView.findViewById(R.id.tv_item_content);
- convertView.setTag(holder);
- } else {
- holder = (MineListHolder) convertView.getTag();
- }
- holder.tvItemName.setText(mItemNames[position]);
- holder.tvItemContent.setText(mItemContents[position]);
- return convertView;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/adapter/MineSoftHolder.java b/代码/在这里3.0/src/com/stone/shop/adapter/MineSoftHolder.java
deleted file mode 100644
index d3ed1ac..0000000
--- a/代码/在这里3.0/src/com/stone/shop/adapter/MineSoftHolder.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.widget.TextView;
-
-public class MineSoftHolder {
-
- public TextView tvItemName; //项目名称
- public TextView tvItemContent; //项目值
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/adapter/NewsHolder.java b/代码/在这里3.0/src/com/stone/shop/adapter/NewsHolder.java
deleted file mode 100644
index b49850d..0000000
--- a/代码/在这里3.0/src/com/stone/shop/adapter/NewsHolder.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.widget.TextView;
-
-public class NewsHolder {
-
- public TextView tvNewsType; //新闻分类
- public TextView tvNewsTitle; //新闻标题
- public TextView tvNewsDate; //新闻时间
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/adapter/NewsListAdapter.java b/代码/在这里3.0/src/com/stone/shop/adapter/NewsListAdapter.java
deleted file mode 100644
index 272608d..0000000
--- a/代码/在这里3.0/src/com/stone/shop/adapter/NewsListAdapter.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.stone.shop.R;
-import com.stone.shop.model.News;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-/**
- * 新闻列表适配器
- *
- * @date 2014-5-3
- * @author Stone
- */
-public class NewsListAdapter extends BaseAdapter {
-
- private LayoutInflater mInflater = null;
- private List mNewsList = null; // 所选分类下的所有店铺列表
-
- public NewsListAdapter(Context context, List newsList) {
- mNewsList = newsList;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mNewsList.size();
- }
-
- @Override
- public Object getItem(int position) {
- return mNewsList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- // 刷新列表中的数据
- public void refresh(List list) {
- mNewsList = list;
- notifyDataSetChanged();
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- NewsHolder newsHolder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.news_list_item, null);
- newsHolder = new NewsHolder();
- newsHolder.tvNewsType = (TextView) convertView
- .findViewById(R.id.tv_news_type);
- newsHolder.tvNewsTitle = (TextView) convertView
- .findViewById(R.id.tv_news_title);
- newsHolder.tvNewsDate = (TextView) convertView
- .findViewById(R.id.tv_news_date);
- convertView.setTag(newsHolder);
- } else {
- newsHolder = (NewsHolder) convertView.getTag();
- }
- //拆分字符串,只取年月日
- String[] ss;
- ss = mNewsList.get(position).getCreatedAt().split(" ");
- newsHolder.tvNewsType.setText(mNewsList.get(position).getType()); //新闻类型
- newsHolder.tvNewsTitle.setText(mNewsList.get(position).getTitle()); //新闻标题
- newsHolder.tvNewsDate.setText(ss[0]); //新闻发布日期
- return convertView;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/adapter/OrderInfoHolder.java b/代码/在这里3.0/src/com/stone/shop/adapter/OrderInfoHolder.java
deleted file mode 100644
index 7b94ec6..0000000
--- a/代码/在这里3.0/src/com/stone/shop/adapter/OrderInfoHolder.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.widget.TextView;
-
-public class OrderInfoHolder {
-
- public TextView tvOrderInfoGoodName;
- public TextView tvOrderInfoShopName;
- public TextView tvOrderInfoPrice;
- public TextView tvOrderInfoState;
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/adapter/OrderInfoListAdapter.java b/代码/在这里3.0/src/com/stone/shop/adapter/OrderInfoListAdapter.java
deleted file mode 100644
index 12fe42e..0000000
--- a/代码/在这里3.0/src/com/stone/shop/adapter/OrderInfoListAdapter.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.List;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-
-import com.stone.shop.R;
-import com.stone.shop.model.Order;
-
-
-/**
- * 适配器--适配订单列表中的数据
- *
- * @date 2014-5-27
- * @author Stone
- */
-public class OrderInfoListAdapter extends BaseAdapter {
-
- private LayoutInflater mInflater = null;
- private List mOrderList = null; // 所选分类下的所有店铺列表
-
- public OrderInfoListAdapter(Context context, List orderList) {
- mOrderList = orderList;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mOrderList.size();
- }
-
- @Override
- public Object getItem(int position) {
- return mOrderList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- public void refresh(List list) {
- mOrderList = list;
- notifyDataSetChanged();
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- OrderInfoHolder orderInfoHolder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.order_info_list_item, null);
- orderInfoHolder = new OrderInfoHolder();
- orderInfoHolder.tvOrderInfoGoodName = (TextView) convertView
- .findViewById(R.id.tv_order_info_good_name);
- orderInfoHolder.tvOrderInfoShopName = (TextView) convertView
- .findViewById(R.id.tv_order_info_shop_name);
- orderInfoHolder.tvOrderInfoPrice = (TextView) convertView
- .findViewById(R.id.tv_order_info_price);
- orderInfoHolder.tvOrderInfoState = (TextView) convertView
- .findViewById(R.id.tv_order_info_state);
- convertView.setTag(orderInfoHolder);
- } else {
- orderInfoHolder = (OrderInfoHolder) convertView.getTag();
- }
- orderInfoHolder.tvOrderInfoGoodName.setText(mOrderList.get(position).getGoodName());
- orderInfoHolder.tvOrderInfoShopName.setText(mOrderList.get(position).getShopName());
- orderInfoHolder.tvOrderInfoPrice.setText("¥" + mOrderList.get(position).getPrice());
- orderInfoHolder.tvOrderInfoState.setText(mOrderList.get(position).getState());
- return convertView;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/adapter/SCommentAdapter.java b/代码/在这里3.0/src/com/stone/shop/adapter/SCommentAdapter.java
deleted file mode 100644
index c3d48c9..0000000
--- a/代码/在这里3.0/src/com/stone/shop/adapter/SCommentAdapter.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.List;
-
-import com.stone.shop.R;
-import com.stone.shop.model.SComment;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-/**
- * 店铺评论列表适配器
- * @date 2014-5-3
- * @author Stone
- */
-public class SCommentAdapter extends BaseAdapter {
-
- private LayoutInflater mInflater = null;
- private List mSComList = null; // 所选分类下的所有店铺列表
-
- public SCommentAdapter(Context context, List list) {
- mSComList = list;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mSComList.size();
- }
-
- @Override
- public Object getItem(int position) {
- return mSComList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- SComHolder scomHolder;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.scom_list_item, null);
- scomHolder = new SComHolder();
- scomHolder.tvComUser = (TextView) convertView
- .findViewById(R.id.tv_commit_user);
- scomHolder.tvComContent = (TextView) convertView
- .findViewById(R.id.tv_commit_content);
- convertView.setTag(scomHolder);
- } else {
- scomHolder = (SComHolder) convertView.getTag();
- }
- scomHolder.tvComUser.setText(mSComList.get(position).getUserName());
- scomHolder.tvComContent.setText(mSComList.get(position).getContent());
- return convertView;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/adapter/ShopListAdapter.java b/代码/在这里3.0/src/com/stone/shop/adapter/ShopListAdapter.java
deleted file mode 100644
index cd23303..0000000
--- a/代码/在这里3.0/src/com/stone/shop/adapter/ShopListAdapter.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.stone.shop.adapter;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-
-import com.stone.date.TypeDef;
-import com.stone.shop.R;
-import com.stone.shop.model.Shop;
-
-/**
- * 适配器--适配某一分类下的店铺列表数据
- *
- * @date 2014-4-29
- * @author Stone
- */
-public class ShopListAdapter extends BaseAdapter {
-
- private LayoutInflater mInflater = null;
- private ArrayList mShopList = null; // 所选分类下的所有店铺列表
- private String mType; // 商店的分类
-
- public ShopListAdapter(Context context, ArrayList shopList,
- String type) {
- mShopList = shopList;
- mType = type;
- mInflater = LayoutInflater.from(context);
- }
-
- @Override
- public int getCount() {
- return mShopList.size();
- }
-
- @Override
- public Object getItem(int position) {
- return mShopList.get(position);
- }
-
- @Override
- public long getItemId(int position) {
- return position;
- }
-
- // 刷新列表中的数据
- public void refresh(ArrayList list) {
- mShopList = list;
- //将数字的类型编号转换为文字
- exchangeType(mType);
- notifyDataSetChanged();
- }
-
- /**
- * 根据当前的type类型, 转换成相应的文字
- * @date 2014-4-29
- * @param typeString
- */
- private void exchangeType(String typeString) {
-
- int type = Integer.parseInt(typeString);
- int fatherType = type / 10; //父类型编号
- int sonType = type % 10; //子类型编号
-
- Iterator iterator = mShopList.iterator();
- while (iterator.hasNext()) {
- switch (fatherType) {
- case 1:
- iterator.next().setType(
- TypeDef.typeDadList[fatherType-1] + "/"
- + TypeDef.typeSonList1[sonType-1]);
- break;
- case 2:
- iterator.next().setType(
- TypeDef.typeDadList[fatherType-1] + "/"
- + TypeDef.typeSonList2[sonType-1]);
- break;
- case 3:
- iterator.next().setType(
- TypeDef.typeDadList[fatherType-1] + "/"
- + TypeDef.typeSonList3[sonType-1]);
- break;
- case 4:
- iterator.next().setType(
- TypeDef.typeDadList[fatherType-1] + "/"
- + TypeDef.typeSonList4[sonType-1]);
- break;
- default:
- break;
- }
-
- }
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- ShopHolder shopHodler;
- if (convertView == null) {
- convertView = mInflater.inflate(R.layout.shop_all_list_item, null);
- shopHodler = new ShopHolder();
- shopHodler.tvShopName = (TextView) convertView
- .findViewById(R.id.tv_shop_name);
- shopHodler.tvShopType = (TextView) convertView
- .findViewById(R.id.tv_shop_type);
- shopHodler.tvShopLoc = (TextView) convertView
- .findViewById(R.id.tv_shop_loc);
- convertView.setTag(shopHodler);
- } else {
- shopHodler = (ShopHolder) convertView.getTag();
- }
- shopHodler.tvShopName.setText(mShopList.get(position).getName());
- // 商店的类型需要单独处理
- shopHodler.tvShopType.setText(mShopList.get(position).getType());
- shopHodler.tvShopLoc.setText("二食堂");
- return convertView;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/adapter/SmartFragmentStatePagerAdapter.java b/代码/在这里3.0/src/com/stone/shop/adapter/SmartFragmentStatePagerAdapter.java
deleted file mode 100644
index b89a8f7..0000000
--- a/代码/在这里3.0/src/com/stone/shop/adapter/SmartFragmentStatePagerAdapter.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.stone.shop.adapter;
-
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.util.SparseArray;
-import android.view.ViewGroup;
-
-/*
-Extension of FragmentStatePagerAdapter which intelligently caches
-all active fragments and manages the fragment lifecycles.
-Usage involves extending from SmartFragmentStatePagerAdapter as you would any other PagerAdapter.
-*/
-public abstract class SmartFragmentStatePagerAdapter extends FragmentStatePagerAdapter {
- // Sparse array to keep track of registered fragments in memory
- private SparseArray registeredFragments = new SparseArray();
-
- public SmartFragmentStatePagerAdapter(FragmentManager fragmentManager) {
- super(fragmentManager);
- }
-
- // Register the fragment when the item is instantiated
- @Override
- public Object instantiateItem(ViewGroup container, int position) {
- Fragment fragment = (Fragment) super.instantiateItem(container, position);
- registeredFragments.put(position, fragment);
- return fragment;
- }
-
- // Unregister when the item is inactive
- @Override
- public void destroyItem(ViewGroup container, int position, Object object) {
- registeredFragments.remove(position);
- super.destroyItem(container, position, object);
- }
-
- // Returns the fragment for the position (if instantiated)
- public Fragment getRegisteredFragment(int position) {
- return registeredFragments.get(position);
- }
-}
\ No newline at end of file
diff --git a/代码/在这里3.0/src/com/stone/shop/model/BXTNews.java b/代码/在这里3.0/src/com/stone/shop/model/BXTNews.java
deleted file mode 100644
index 2137fb2..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/BXTNews.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 博学堂讲座实体类
- * @date 2014-5-10
- * @author Stone
- */
-public class BXTNews extends BmobObject{
-
- private String title; //标题
- private String topic; //讲座主题
- private String speaker; //主 讲 人
- private String time; //讲座时间
- private String location; //讲座地点
- private String holder1; //主办单位
- private String holder2; //承办单位
- private String points; //主讲内容提要
- private String speakerinfo; //主讲人简介
-
- public String getTitle() {
- return title;
- }
- public String getTopic() {
- return topic;
- }
- public String getSpeaker() {
- return speaker;
- }
- public String getTime() {
- return time;
- }
- public String getLocation() {
- return location;
- }
- public String getHolder1() {
- return holder1;
- }
- public String getHolder2() {
- return holder2;
- }
- public String getPoints() {
- return points;
- }
- public String getSpeakerinfo() {
- return speakerinfo;
- }
- public void setTitle(String title) {
- this.title = title;
- }
- public void setTopic(String topic) {
- this.topic = topic;
- }
- public void setSpeaker(String speaker) {
- this.speaker = speaker;
- }
- public void setTime(String time) {
- this.time = time;
- }
- public void setLocation(String location) {
- this.location = location;
- }
- public void setHolder1(String holder1) {
- this.holder1 = holder1;
- }
- public void setHolder2(String holder2) {
- this.holder2 = holder2;
- }
- public void setPoints(String points) {
- this.points = points;
- }
- public void setSpeakerinfo(String speakerinfo) {
- this.speakerinfo = speakerinfo;
- }
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun b/代码/在这里3.0/src/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun
deleted file mode 100644
index fb8f926..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 博学堂讲座实体类
- * @date 2014-5-10
- * @author Stone
- */
-public class BXTNews extends BmobObject{
-
- //private String id;
-
- private String title; //标题
- private String topic; //讲座主题
- private String speaker; //主 讲 人
- private String time; //讲座时间
- private String location; //讲座地点
- private String holder1; //主办单位
- private String holder2; //承办单位
- private String points; //主讲内容提要
- private String speakerinfo; //主讲人简介
-
- public String getTitle() {
- return title;
- }
- public String getTopic() {
- return topic;
- }
- public String getSpeaker() {
- return speaker;
- }
- public String getTime() {
- return time;
- }
- public String getLocation() {
- return location;
- }
- public String getHolder1() {
- return holder1;
- }
- public String getHolder2() {
- return holder2;
- }
- public String getPoints() {
- return points;
- }
- public String getSpeakerinfo() {
- return speakerinfo;
- }
- public void setTitle(String title) {
- this.title = title;
- }
- public void setTopic(String topic) {
- this.topic = topic;
- }
- public void setSpeaker(String speaker) {
- this.speaker = speaker;
- }
- public void setTime(String time) {
- this.time = time;
- }
- public void setLocation(String location) {
- this.location = location;
- }
- public void setHolder1(String holder1) {
- this.holder1 = holder1;
- }
- public void setHolder2(String holder2) {
- this.holder2 = holder2;
- }
- public void setPoints(String points) {
- this.points = points;
- }
- public void setSpeakerinfo(String speakerinfo) {
- this.speakerinfo = speakerinfo;
- }
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f b/代码/在这里3.0/src/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
deleted file mode 100644
index fb8f926..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 博学堂讲座实体类
- * @date 2014-5-10
- * @author Stone
- */
-public class BXTNews extends BmobObject{
-
- //private String id;
-
- private String title; //标题
- private String topic; //讲座主题
- private String speaker; //主 讲 人
- private String time; //讲座时间
- private String location; //讲座地点
- private String holder1; //主办单位
- private String holder2; //承办单位
- private String points; //主讲内容提要
- private String speakerinfo; //主讲人简介
-
- public String getTitle() {
- return title;
- }
- public String getTopic() {
- return topic;
- }
- public String getSpeaker() {
- return speaker;
- }
- public String getTime() {
- return time;
- }
- public String getLocation() {
- return location;
- }
- public String getHolder1() {
- return holder1;
- }
- public String getHolder2() {
- return holder2;
- }
- public String getPoints() {
- return points;
- }
- public String getSpeakerinfo() {
- return speakerinfo;
- }
- public void setTitle(String title) {
- this.title = title;
- }
- public void setTopic(String topic) {
- this.topic = topic;
- }
- public void setSpeaker(String speaker) {
- this.speaker = speaker;
- }
- public void setTime(String time) {
- this.time = time;
- }
- public void setLocation(String location) {
- this.location = location;
- }
- public void setHolder1(String holder1) {
- this.holder1 = holder1;
- }
- public void setHolder2(String holder2) {
- this.holder2 = holder2;
- }
- public void setPoints(String points) {
- this.points = points;
- }
- public void setSpeakerinfo(String speakerinfo) {
- this.speakerinfo = speakerinfo;
- }
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun~HEAD b/代码/在这里3.0/src/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun~HEAD
deleted file mode 100644
index fb8f926..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun~HEAD
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 博学堂讲座实体类
- * @date 2014-5-10
- * @author Stone
- */
-public class BXTNews extends BmobObject{
-
- //private String id;
-
- private String title; //标题
- private String topic; //讲座主题
- private String speaker; //主 讲 人
- private String time; //讲座时间
- private String location; //讲座地点
- private String holder1; //主办单位
- private String holder2; //承办单位
- private String points; //主讲内容提要
- private String speakerinfo; //主讲人简介
-
- public String getTitle() {
- return title;
- }
- public String getTopic() {
- return topic;
- }
- public String getSpeaker() {
- return speaker;
- }
- public String getTime() {
- return time;
- }
- public String getLocation() {
- return location;
- }
- public String getHolder1() {
- return holder1;
- }
- public String getHolder2() {
- return holder2;
- }
- public String getPoints() {
- return points;
- }
- public String getSpeakerinfo() {
- return speakerinfo;
- }
- public void setTitle(String title) {
- this.title = title;
- }
- public void setTopic(String topic) {
- this.topic = topic;
- }
- public void setSpeaker(String speaker) {
- this.speaker = speaker;
- }
- public void setTime(String time) {
- this.time = time;
- }
- public void setLocation(String location) {
- this.location = location;
- }
- public void setHolder1(String holder1) {
- this.holder1 = holder1;
- }
- public void setHolder2(String holder2) {
- this.holder2 = holder2;
- }
- public void setPoints(String points) {
- this.points = points;
- }
- public void setSpeakerinfo(String speakerinfo) {
- this.speakerinfo = speakerinfo;
- }
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/Classroom.java b/代码/在这里3.0/src/com/stone/shop/model/Classroom.java
deleted file mode 100644
index 82a32bf..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/Classroom.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-public class Classroom extends BmobObject {
-
- private String name;
- private String type;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- @Override
- public String toString() {
- return "ClassRoom [name= " + name + "tpye= " + type + "]";
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/Comment.java b/代码/在这里3.0/src/com/stone/shop/model/Comment.java
deleted file mode 100644
index 5dfaeed..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/Comment.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-
-public class Comment extends BmobObject{
-
- public static final String TAG = "Comment";
-
- private User user;
- private String commentContent;
- public User getUser() {
- return user;
- }
- public void setUser(User user) {
- this.user = user;
- }
- public String getCommentContent() {
- return commentContent;
- }
- public void setCommentContent(String commentContent) {
- this.commentContent = commentContent;
- }
-
-
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/Discuss.java b/代码/在这里3.0/src/com/stone/shop/model/Discuss.java
deleted file mode 100644
index 7c3bdbb..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/Discuss.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.stone.shop.model;
-
-import java.io.Serializable;
-
-import cn.bmob.v3.BmobObject;
-import cn.bmob.v3.datatype.BmobFile;
-import cn.bmob.v3.datatype.BmobRelation;
-
-public class Discuss extends BmobObject implements Serializable {
-
- private User author;
- private String title;
- private String content;
- private BmobFile Contentfigureurl;
- private int love;
- private int hate;
- private int share;
- private int comment;
- private boolean isPass;
- private boolean myFav;// 收藏
- private boolean myLove;// 赞
- private BmobRelation relation;
-
- public BmobRelation getRelation() {
- return relation;
- }
-
- public void setRelation(BmobRelation relation) {
- this.relation = relation;
- }
-
- public User getAuthor() {
- return author;
- }
-
- public void setAuthor(User author) {
- this.author = author;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- public BmobFile getContentfigureurl() {
- return Contentfigureurl;
- }
-
- public void setContentfigureurl(BmobFile contentfigureurl) {
- Contentfigureurl = contentfigureurl;
- }
-
- public int getLove() {
- return love;
- }
-
- public void setLove(int love) {
- this.love = love;
- }
-
- public int getHate() {
- return hate;
- }
-
- public void setHate(int hate) {
- this.hate = hate;
- }
-
- public int getShare() {
- return share;
- }
-
- public void setShare(int share) {
- this.share = share;
- }
-
- public int getComment() {
- return comment;
- }
-
- public void setComment(int comment) {
- this.comment = comment;
- }
-
- public boolean isPass() {
- return isPass;
- }
-
- public void setPass(boolean isPass) {
- this.isPass = isPass;
- }
-
- public boolean getMyFav() {
- return myFav;
- }
-
- public void setMyFav(boolean myFav) {
- this.myFav = myFav;
- }
-
- public boolean getMyLove() {
- return myLove;
- }
-
- public void setMyLove(boolean myLove) {
- this.myLove = myLove;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- @Override
- public String toString() {
- return "QiangYu [author=" + author + ", content=" + content + ", Contentfigureurl=" + Contentfigureurl
- + ", love=" + love + ", hate=" + hate + ", share=" + share + ", comment=" + comment + ", isPass="
- + isPass + ", myFav=" + myFav + ", myLove=" + myLove + ", relation=" + relation + "]";
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/FeedBack.java b/代码/在这里3.0/src/com/stone/shop/model/FeedBack.java
deleted file mode 100644
index 9461f41..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/FeedBack.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 用户反馈信息
- * @date 2014-5-27
- * @author Stone
- */
-public class FeedBack extends BmobObject {
-
- private String username;
- private String phone;
- private String email;
- private String content;
-
- public String getUsername() {
- return username;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public String getEmail() {
- return email;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/Good.java b/代码/在这里3.0/src/com/stone/shop/model/Good.java
deleted file mode 100644
index dde7f69..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/Good.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.stone.shop.model;
-
-import java.io.Serializable;
-
-import cn.bmob.v3.BmobObject;
-import cn.bmob.v3.datatype.BmobFile;
-
-/**
- * 商品实体类
- * @date 2014-4-24
- * @author Stone
- */
-public class Good extends BmobObject implements Serializable{
-
- private static final long serialVersionUID = -3248168273019127389L;
-
- //private String id; 商品ID, 默认
-
- private String shopID = ""; // 商店ID
- private String type = ""; // 类型
- private String name = ""; // 名称
- private String price = ""; // 价格
-
- public Good(String name, String price) {
- this.name = name;
- this.price = price;
- }
-
- public String getShopID() {
- return shopID;
- }
-
- public void setShopID(String shopID) {
- this.shopID = shopID;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getPrice() {
- return price;
- }
-
- public void setPrice(String price) {
- this.price = price;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun b/代码/在这里3.0/src/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun
deleted file mode 100644
index b0a9ac8..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.stone.shop.model;
-
-import java.io.Serializable;
-
-import cn.bmob.v3.BmobObject;
-import cn.bmob.v3.datatype.BmobFile;
-
-/**
- * 商品实体类
- * @date 2014-4-24
- * @author Stone
- */
-public class Good extends BmobObject implements Serializable{
-
- private static final long serialVersionUID = -3248168273019127389L;
-
- //private String id; 商品ID, 默认
-
- private String shopID = ""; // 商店ID
- private String shopName = ""; //商店名称
- private String type = ""; // 类型
- private String name = ""; // 名称
- private String price = ""; // 价格
- private BmobFile picGood = null; // 商品主图
-
- public Good(String name, String price) {
- this.name = name;
- this.price = price;
- }
-
- public String getShopID() {
- return shopID;
- }
-
- public void setShopID(String shopID) {
- this.shopID = shopID;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getPrice() {
- return price;
- }
-
- public void setPrice(String price) {
- this.price = price;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f b/代码/在这里3.0/src/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
deleted file mode 100644
index b0a9ac8..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.stone.shop.model;
-
-import java.io.Serializable;
-
-import cn.bmob.v3.BmobObject;
-import cn.bmob.v3.datatype.BmobFile;
-
-/**
- * 商品实体类
- * @date 2014-4-24
- * @author Stone
- */
-public class Good extends BmobObject implements Serializable{
-
- private static final long serialVersionUID = -3248168273019127389L;
-
- //private String id; 商品ID, 默认
-
- private String shopID = ""; // 商店ID
- private String shopName = ""; //商店名称
- private String type = ""; // 类型
- private String name = ""; // 名称
- private String price = ""; // 价格
- private BmobFile picGood = null; // 商品主图
-
- public Good(String name, String price) {
- this.name = name;
- this.price = price;
- }
-
- public String getShopID() {
- return shopID;
- }
-
- public void setShopID(String shopID) {
- this.shopID = shopID;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getPrice() {
- return price;
- }
-
- public void setPrice(String price) {
- this.price = price;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun~HEAD b/代码/在这里3.0/src/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun~HEAD
deleted file mode 100644
index b0a9ac8..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun~HEAD
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.stone.shop.model;
-
-import java.io.Serializable;
-
-import cn.bmob.v3.BmobObject;
-import cn.bmob.v3.datatype.BmobFile;
-
-/**
- * 商品实体类
- * @date 2014-4-24
- * @author Stone
- */
-public class Good extends BmobObject implements Serializable{
-
- private static final long serialVersionUID = -3248168273019127389L;
-
- //private String id; 商品ID, 默认
-
- private String shopID = ""; // 商店ID
- private String shopName = ""; //商店名称
- private String type = ""; // 类型
- private String name = ""; // 名称
- private String price = ""; // 价格
- private BmobFile picGood = null; // 商品主图
-
- public Good(String name, String price) {
- this.name = name;
- this.price = price;
- }
-
- public String getShopID() {
- return shopID;
- }
-
- public void setShopID(String shopID) {
- this.shopID = shopID;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getPrice() {
- return price;
- }
-
- public void setPrice(String price) {
- this.price = price;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/Information.java b/代码/在这里3.0/src/com/stone/shop/model/Information.java
deleted file mode 100644
index 7161add..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/Information.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 学校通知实体类
- * @author XCP
- * @date 2016-8-22
- */
-
-public class Information extends BmobObject{
-
- private String title; //标题
- private String topic; //主题
- private String time; //时间
- private String holder; //单位
- private String content; //内容
-
- public String getTitle() {
- return title;
- }
- public String getTopic() {
- return topic;
- }
- public String getTime() {
- return time;
- }
- public String getHolder() {
- return holder;
- }
- public String getcontent() {
- return content;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
- public void setTopic(String topic) {
- this.topic = topic;
- }
- public void setTime(String time) {
- this.time = time;
- }
- public void setHolder(String holder) {
- this.holder = holder;
- }
- public void setContent(String content){
- this.content = content;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/Library.java b/代码/在这里3.0/src/com/stone/shop/model/Library.java
deleted file mode 100644
index f627301..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/Library.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-public class Library {
- private String name;
- private String type;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- @Override
- public String toString() {
- return "Library [name= " + name + "tpye= " + type + "]";
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/LuckyUser.java b/代码/在这里3.0/src/com/stone/shop/model/LuckyUser.java
deleted file mode 100644
index 4600723..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/LuckyUser.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 中奖用户
- * @date 2014-5-28
- * @author Stone
- */
-public class LuckyUser extends BmobObject {
-
- private String username;
- private String award;
-
- public String getUsername() {
- return username;
- }
- public String getAward() {
- return award;
- }
- public void setUsername(String username) {
- this.username = username;
- }
- public void setAward(String award) {
- this.award = award;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/News.java b/代码/在这里3.0/src/com/stone/shop/model/News.java
deleted file mode 100644
index d9dfbce..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/News.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 首页校内新闻实体类
- *
- * @date 2014-5-3
- * @author Stone
- */
-public class News extends BmobObject {
-
- private String type; // 新闻类型
- private String title; // 新闻标题
- private String author; // 新闻作者
- private String content; // 新闻内容
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getAuthor() {
- return author;
- }
-
- public void setAuthor(String author) {
- this.author = author;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/News.java~remotes_origin_zhaozaichun b/代码/在这里3.0/src/com/stone/shop/model/News.java~remotes_origin_zhaozaichun
deleted file mode 100644
index b169779..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/News.java~remotes_origin_zhaozaichun
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 首页校内新闻实体类
- *
- * @date 2014-5-3
- * @author Stone
- */
-public class News extends BmobObject {
-
- // private String id;
- // private String time;
-
- private String type; // 新闻类型
- private String title; // 新闻标题
- private String author; // 新闻作者
- private String content; // 新闻内容
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getAuthor() {
- return author;
- }
-
- public void setAuthor(String author) {
- this.author = author;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/News.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f b/代码/在这里3.0/src/com/stone/shop/model/News.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
deleted file mode 100644
index b169779..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/News.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 首页校内新闻实体类
- *
- * @date 2014-5-3
- * @author Stone
- */
-public class News extends BmobObject {
-
- // private String id;
- // private String time;
-
- private String type; // 新闻类型
- private String title; // 新闻标题
- private String author; // 新闻作者
- private String content; // 新闻内容
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getAuthor() {
- return author;
- }
-
- public void setAuthor(String author) {
- this.author = author;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/News.java~remotes_origin_zhaozaichun~HEAD b/代码/在这里3.0/src/com/stone/shop/model/News.java~remotes_origin_zhaozaichun~HEAD
deleted file mode 100644
index b169779..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/News.java~remotes_origin_zhaozaichun~HEAD
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 首页校内新闻实体类
- *
- * @date 2014-5-3
- * @author Stone
- */
-public class News extends BmobObject {
-
- // private String id;
- // private String time;
-
- private String type; // 新闻类型
- private String title; // 新闻标题
- private String author; // 新闻作者
- private String content; // 新闻内容
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- public String getAuthor() {
- return author;
- }
-
- public void setAuthor(String author) {
- this.author = author;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/Order.java b/代码/在这里3.0/src/com/stone/shop/model/Order.java
deleted file mode 100644
index 4879ef3..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/Order.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 订单实体类
- * @date 2014-4-24
- * @author Stone
- */
-public class Order extends BmobObject {
-
- private String userName;
- private String goodID; // 商品ID
- private String goodName;
- private String shopID; // 商店ID
- private String shopName;
- private String count; // 数量
- private String price; // 价格
- private String time; // 取餐时间
- private String phone; // 联系电话
- private String state = "未取餐"; // 订单状态(已取, 未取)
- private String tips; // 附加信息
-
- public String getGoodID() {
- return goodID;
- }
- public String getGoodName() {
- return goodName;
- }
- public String getUserName() {
- return userName;
- }
- public String getShopID() {
- return shopID;
- }
- public String getShopName() {
- return shopName;
- }
- public String getCount() {
- return count;
- }
- public String getPrice() {
- return price;
- }
- public String getTime() {
- return time;
- }
- public String getPhone() {
- return phone;
- }
- public String getState() {
- return state;
- }
- public String getTips() {
- return tips;
- }
- public void setGoodID(String goodID) {
- this.goodID = goodID;
- }
- public void setGoodName(String goodName) {
- this.goodName = goodName;
- }
- public void setUserName(String userName) {
- this.userName = userName;
- }
- public void setShopID(String shopID) {
- this.shopID = shopID;
- }
- public void setShopName(String shopName) {
- this.shopName = shopName;
- }
- public void setCount(String count) {
- this.count = count;
- }
- public void setTime(String time) {
- this.time = time;
- }
- public void setPrice(String price) {
- this.price = price;
- }
- public void setPhone(String phone) {
- this.phone = phone;
- }
- public void setState(String state) {
- this.state = state;
- }
- public void setTips(String tips) {
- this.tips = tips;
- }
-
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/Reservation.java b/代码/在这里3.0/src/com/stone/shop/model/Reservation.java
deleted file mode 100644
index d1fafaa..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/Reservation.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-public class Reservation extends BmobObject {
-
- private String roomId;
- private String roomName;
- private String userId;
- private String dateTime;
-
- public String getRoomId() {
- return roomId;
- }
-
- public void setRoomId(String roomId) {
- this.roomId = roomId;
- }
-
- public String getRoomName() {
- return roomName;
- }
-
- public void setRoomName(String roomName) {
- this.roomName = roomName;
- }
-
- public String getUserId() {
- return userId;
- }
-
- public void setUserId(String userId) {
- this.userId = userId;
- }
-
- public String getDateTime() {
- return dateTime;
- }
-
- public void setDateTime(String dateTime) {
- this.dateTime = dateTime;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/SComment.java b/代码/在这里3.0/src/com/stone/shop/model/SComment.java
deleted file mode 100644
index 002c9e3..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/SComment.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 店铺评论实体类
- * @date 2014-5-3
- * @author Stone
- */
-public class SComment extends BmobObject {
-
- private String shopID;
- private String shopName;
- private String userID;
- private String userName;
- private String content;
-
- public String getShopID() {
- return shopID;
- }
-
- public void setShopID(String shopID) {
- this.shopID = shopID;
- }
-
- public String getShopName() {
- return shopName;
- }
-
- public void setShopName(String shopName) {
- this.shopName = shopName;
- }
-
- public String getUserID() {
- return userID;
- }
-
- public void setUserID(String userID) {
- this.userID = userID;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun b/代码/在这里3.0/src/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun
deleted file mode 100644
index 7abf4ae..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 店铺评论实体类
- * @date 2014-5-3
- * @author Stone
- */
-public class SComment extends BmobObject {
-
- // private String id;
- // private String time;
-
- private String shopID;
- private String shopName;
- private String userID;
- private String userName;
- private String content;
-
- public String getShopID() {
- return shopID;
- }
-
- public void setShopID(String shopID) {
- this.shopID = shopID;
- }
-
- public String getShopName() {
- return shopName;
- }
-
- public void setShopName(String shopName) {
- this.shopName = shopName;
- }
-
- public String getUserID() {
- return userID;
- }
-
- public void setUserID(String userID) {
- this.userID = userID;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f b/代码/在这里3.0/src/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
deleted file mode 100644
index 7abf4ae..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 店铺评论实体类
- * @date 2014-5-3
- * @author Stone
- */
-public class SComment extends BmobObject {
-
- // private String id;
- // private String time;
-
- private String shopID;
- private String shopName;
- private String userID;
- private String userName;
- private String content;
-
- public String getShopID() {
- return shopID;
- }
-
- public void setShopID(String shopID) {
- this.shopID = shopID;
- }
-
- public String getShopName() {
- return shopName;
- }
-
- public void setShopName(String shopName) {
- this.shopName = shopName;
- }
-
- public String getUserID() {
- return userID;
- }
-
- public void setUserID(String userID) {
- this.userID = userID;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun~HEAD b/代码/在这里3.0/src/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun~HEAD
deleted file mode 100644
index 7abf4ae..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun~HEAD
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobObject;
-
-/**
- * 店铺评论实体类
- * @date 2014-5-3
- * @author Stone
- */
-public class SComment extends BmobObject {
-
- // private String id;
- // private String time;
-
- private String shopID;
- private String shopName;
- private String userID;
- private String userName;
- private String content;
-
- public String getShopID() {
- return shopID;
- }
-
- public void setShopID(String shopID) {
- this.shopID = shopID;
- }
-
- public String getShopName() {
- return shopName;
- }
-
- public void setShopName(String shopName) {
- this.shopName = shopName;
- }
-
- public String getUserID() {
- return userID;
- }
-
- public void setUserID(String userID) {
- this.userID = userID;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/Shop.java b/代码/在这里3.0/src/com/stone/shop/model/Shop.java
deleted file mode 100644
index 9cac20a..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/Shop.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.stone.shop.model;
-
-import java.io.Serializable;
-
-import cn.bmob.v3.BmobObject;
-import cn.bmob.v3.datatype.BmobFile;
-
-/**
- * 店铺实体类, 实现序列化, Activity之间实现传递
- * @date 2014-4-24
- * @author Stone
- */
-public class Shop extends BmobObject implements Serializable{
-
- private static final long serialVersionUID = -8796635595320697255L;
-
- private String userID; // 主人
- private String type; // 类型(11代表第一个GridView中的第一个)
- private String name; // 店名
- private String location; // 地理位置
- private String phone; // 联系电话
- private String info; // 简介
- private String sale; // 促销信息
- public String getUserID() {
- return userID;
- }
-
- public void setUserID(String userID) {
- this.userID = userID;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getLocation() {
- return location;
- }
-
- public void setLocation(String location) {
- this.location = location;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getInfo() {
- return info;
- }
-
- public void setInfo(String info) {
- this.info = info;
- }
-
- public String getSale() {
- return sale;
- }
-
- public void setSale(String sale) {
- this.sale = sale;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun b/代码/在这里3.0/src/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun
deleted file mode 100644
index 5e22bde..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.stone.shop.model;
-
-import java.io.Serializable;
-
-import cn.bmob.v3.BmobObject;
-import cn.bmob.v3.datatype.BmobFile;
-
-/**
- * 店铺实体类, 实现序列化, Activity之间实现传递
- * @date 2014-4-24
- * @author Stone
- */
-public class Shop extends BmobObject implements Serializable{
-
- private static final long serialVersionUID = -8796635595320697255L;
-
- private String userID; // 主人
- private String type; // 类型(11代表第一个GridView中的第一个)
- private String name; // 店名
- private String location; // 地理位置
- private String phone; // 联系电话
- private String info; // 简介
- private String sale; // 促销信息
- private BmobFile picShop; // 商店主图
-
- public String getUserID() {
- return userID;
- }
-
- public void setUserID(String userID) {
- this.userID = userID;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getLocation() {
- return location;
- }
-
- public void setLocation(String location) {
- this.location = location;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getInfo() {
- return info;
- }
-
- public void setInfo(String info) {
- this.info = info;
- }
-
- public String getSale() {
- return sale;
- }
-
- public void setSale(String sale) {
- this.sale = sale;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f b/代码/在这里3.0/src/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
deleted file mode 100644
index 5e22bde..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.stone.shop.model;
-
-import java.io.Serializable;
-
-import cn.bmob.v3.BmobObject;
-import cn.bmob.v3.datatype.BmobFile;
-
-/**
- * 店铺实体类, 实现序列化, Activity之间实现传递
- * @date 2014-4-24
- * @author Stone
- */
-public class Shop extends BmobObject implements Serializable{
-
- private static final long serialVersionUID = -8796635595320697255L;
-
- private String userID; // 主人
- private String type; // 类型(11代表第一个GridView中的第一个)
- private String name; // 店名
- private String location; // 地理位置
- private String phone; // 联系电话
- private String info; // 简介
- private String sale; // 促销信息
- private BmobFile picShop; // 商店主图
-
- public String getUserID() {
- return userID;
- }
-
- public void setUserID(String userID) {
- this.userID = userID;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getLocation() {
- return location;
- }
-
- public void setLocation(String location) {
- this.location = location;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getInfo() {
- return info;
- }
-
- public void setInfo(String info) {
- this.info = info;
- }
-
- public String getSale() {
- return sale;
- }
-
- public void setSale(String sale) {
- this.sale = sale;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun~HEAD b/代码/在这里3.0/src/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun~HEAD
deleted file mode 100644
index 5e22bde..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun~HEAD
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.stone.shop.model;
-
-import java.io.Serializable;
-
-import cn.bmob.v3.BmobObject;
-import cn.bmob.v3.datatype.BmobFile;
-
-/**
- * 店铺实体类, 实现序列化, Activity之间实现传递
- * @date 2014-4-24
- * @author Stone
- */
-public class Shop extends BmobObject implements Serializable{
-
- private static final long serialVersionUID = -8796635595320697255L;
-
- private String userID; // 主人
- private String type; // 类型(11代表第一个GridView中的第一个)
- private String name; // 店名
- private String location; // 地理位置
- private String phone; // 联系电话
- private String info; // 简介
- private String sale; // 促销信息
- private BmobFile picShop; // 商店主图
-
- public String getUserID() {
- return userID;
- }
-
- public void setUserID(String userID) {
- this.userID = userID;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getLocation() {
- return location;
- }
-
- public void setLocation(String location) {
- this.location = location;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getInfo() {
- return info;
- }
-
- public void setInfo(String info) {
- this.info = info;
- }
-
- public String getSale() {
- return sale;
- }
-
- public void setSale(String sale) {
- this.sale = sale;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/User.java b/代码/在这里3.0/src/com/stone/shop/model/User.java
deleted file mode 100644
index 61988d7..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/User.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.datatype.BmobFile;
-import cn.bmob.v3.datatype.BmobRelation;
-
-/**
- * 用户实体类
- * @date 2014-4-24
- * @author Stone
- */
-public class User extends BmobUser {
-
- public static String userId;
-
- // 父类中已经存在的属性
-
-
- private String sex; // 性别
- private String phone; // 电话
- private String qq; // QQ
- private String school = "湖北工业大学"; // 学校
- private String cademy; // 学院
- private String dorPart; // 校区
- private String dorNum; // 寝室号
- private String state = "未登陆"; // 登录状态
- private String type = "普通用户"; // 用户类型(普通用户、黑名单、中奖者)
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getSex() {
- return sex;
- }
-
- public void setSex(String sex) {
- this.sex = sex;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getQQ() {
- return qq;
- }
-
- public void setQQ(String qq) {
- this.qq = qq;
- }
-
- public String getSchool() {
- return school;
- }
-
- public void setSchool(String school) {
- this.school = school;
- }
-
- public String getCademy() {
- return cademy;
- }
-
- public void setCademy(String cademy) {
- this.cademy = cademy;
- }
-
- public String getDorPart() {
- return dorPart;
- }
-
- public void setDorPart(String dorPart) {
- this.dorPart = dorPart;
- }
-
- public String getDorNum() {
- return dorNum;
- }
-
- public void setDorNum(String dorNum) {
- this.dorNum = dorNum;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/User.java~remotes_origin_zhaozaichun b/代码/在这里3.0/src/com/stone/shop/model/User.java~remotes_origin_zhaozaichun
deleted file mode 100644
index 511703e..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/User.java~remotes_origin_zhaozaichun
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.datatype.BmobFile;
-import cn.bmob.v3.datatype.BmobRelation;
-
-/**
- * 用户实体类
- * @date 2014-4-24
- * @author Stone
- */
-public class User extends BmobUser {
-
- public static String userId;
-
- // 父类中已经存在的属性
- // private String id;
- // private String username;
- // private String password;
- // private String email;
- // private String regTime;
-
- private String sex; // 性别
- private String phone; // 电话
- private String qq; // QQ
- private String school = "湖北工业大学"; // 学校
- private String cademy; // 学院
- private String dorPart; // 校区
- private String dorNum; // 寝室号
- private String state = "未登陆"; // 登录状态
- private String type = "普通用户"; // 用户类型(普通用户、黑名单、中奖者)
- //private BmobFile picUser; // 头像
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getSex() {
- return sex;
- }
-
- public void setSex(String sex) {
- this.sex = sex;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getQQ() {
- return qq;
- }
-
- public void setQQ(String qq) {
- this.qq = qq;
- }
-
- public String getSchool() {
- return school;
- }
-
- public void setSchool(String school) {
- this.school = school;
- }
-
- public String getCademy() {
- return cademy;
- }
-
- public void setCademy(String cademy) {
- this.cademy = cademy;
- }
-
- public String getDorPart() {
- return dorPart;
- }
-
- public void setDorPart(String dorPart) {
- this.dorPart = dorPart;
- }
-
- public String getDorNum() {
- return dorNum;
- }
-
- public void setDorNum(String dorNum) {
- this.dorNum = dorNum;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/User.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f b/代码/在这里3.0/src/com/stone/shop/model/User.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
deleted file mode 100644
index 511703e..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/User.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.datatype.BmobFile;
-import cn.bmob.v3.datatype.BmobRelation;
-
-/**
- * 用户实体类
- * @date 2014-4-24
- * @author Stone
- */
-public class User extends BmobUser {
-
- public static String userId;
-
- // 父类中已经存在的属性
- // private String id;
- // private String username;
- // private String password;
- // private String email;
- // private String regTime;
-
- private String sex; // 性别
- private String phone; // 电话
- private String qq; // QQ
- private String school = "湖北工业大学"; // 学校
- private String cademy; // 学院
- private String dorPart; // 校区
- private String dorNum; // 寝室号
- private String state = "未登陆"; // 登录状态
- private String type = "普通用户"; // 用户类型(普通用户、黑名单、中奖者)
- //private BmobFile picUser; // 头像
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getSex() {
- return sex;
- }
-
- public void setSex(String sex) {
- this.sex = sex;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getQQ() {
- return qq;
- }
-
- public void setQQ(String qq) {
- this.qq = qq;
- }
-
- public String getSchool() {
- return school;
- }
-
- public void setSchool(String school) {
- this.school = school;
- }
-
- public String getCademy() {
- return cademy;
- }
-
- public void setCademy(String cademy) {
- this.cademy = cademy;
- }
-
- public String getDorPart() {
- return dorPart;
- }
-
- public void setDorPart(String dorPart) {
- this.dorPart = dorPart;
- }
-
- public String getDorNum() {
- return dorNum;
- }
-
- public void setDorNum(String dorNum) {
- this.dorNum = dorNum;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/model/User.java~remotes_origin_zhaozaichun~HEAD b/代码/在这里3.0/src/com/stone/shop/model/User.java~remotes_origin_zhaozaichun~HEAD
deleted file mode 100644
index 511703e..0000000
--- a/代码/在这里3.0/src/com/stone/shop/model/User.java~remotes_origin_zhaozaichun~HEAD
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.stone.shop.model;
-
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.datatype.BmobFile;
-import cn.bmob.v3.datatype.BmobRelation;
-
-/**
- * 用户实体类
- * @date 2014-4-24
- * @author Stone
- */
-public class User extends BmobUser {
-
- public static String userId;
-
- // 父类中已经存在的属性
- // private String id;
- // private String username;
- // private String password;
- // private String email;
- // private String regTime;
-
- private String sex; // 性别
- private String phone; // 电话
- private String qq; // QQ
- private String school = "湖北工业大学"; // 学校
- private String cademy; // 学院
- private String dorPart; // 校区
- private String dorNum; // 寝室号
- private String state = "未登陆"; // 登录状态
- private String type = "普通用户"; // 用户类型(普通用户、黑名单、中奖者)
- //private BmobFile picUser; // 头像
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getSex() {
- return sex;
- }
-
- public void setSex(String sex) {
- this.sex = sex;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
- public String getQQ() {
- return qq;
- }
-
- public void setQQ(String qq) {
- this.qq = qq;
- }
-
- public String getSchool() {
- return school;
- }
-
- public void setSchool(String school) {
- this.school = school;
- }
-
- public String getCademy() {
- return cademy;
- }
-
- public void setCademy(String cademy) {
- this.cademy = cademy;
- }
-
- public String getDorPart() {
- return dorPart;
- }
-
- public void setDorPart(String dorPart) {
- this.dorPart = dorPart;
- }
-
- public String getDorNum() {
- return dorNum;
- }
-
- public void setDorNum(String dorNum) {
- this.dorNum = dorNum;
- }
-
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/AwardActivity.java b/代码/在这里3.0/src/com/stone/shop/view/AwardActivity.java
deleted file mode 100644
index 599a17b..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/AwardActivity.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.AIContentAdapter;
-import com.stone.shop.model.Discuss;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.AdapterView;
-import android.widget.ListView;
-import android.widget.Toast;
-import android.widget.AdapterView.OnItemClickListener;
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.datatype.BmobDate;
-import cn.bmob.v3.listener.FindListener;
-
-public class AwardActivity extends Activity {
-
- private ArrayList mListItems;
- private AIContentAdapter mAdapter;
- private ListView actualListView;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_award);
-
- initView();
-
- initData();
-
- findViewById(R.id.btn_add).setOnClickListener(new OnClickListener() {
-
- @Override
- public void onClick(View v) {
- startActivityForResult(new Intent(AwardActivity.this, EditActivity.class), 1024);
- }
- });
- }
-
- private void initView() {
-
- actualListView = (ListView) findViewById(R.id.pull_refresh_list);
- actualListView.setOnItemClickListener(new OnItemClickListener() {
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position, long id) {
- Intent intent = new Intent();
- intent.setClass(AwardActivity.this, CommentActivity.class);
- intent.putExtra("data", mListItems.get(position));
- startActivity(intent);
- }
- });
-
- }
-
- private void initData() {
-
- mListItems = new ArrayList();
- mAdapter = new AIContentAdapter(this, mListItems);
- actualListView.setAdapter(mAdapter);
-
- fetchData();
-
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
- private void fetchData() {
- BmobQuery query = new BmobQuery();
- query.order("-createdAt");
- query.setLimit(1000);
- BmobDate date = new BmobDate(new Date(System.currentTimeMillis()));
- query.addWhereLessThan("createdAt", date);
- query.include("author");
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List list) {
- if (list != null) {
- mListItems.clear();
- mListItems.addAll(list);
- mAdapter.notifyDataSetChanged();
- }
-
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast(arg1);
- }
- });
- }
-
- @Override
- protected void onActivityResult(int requestCode, int resultCode, Intent data) {
- super.onActivityResult(requestCode, resultCode, data);
- if (requestCode == 1024 && resultCode == RESULT_OK) {
- fetchData();
- }
- }
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/BXTActivity.java b/代码/在这里3.0/src/com/stone/shop/view/BXTActivity.java
deleted file mode 100644
index c4b7ef5..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/BXTActivity.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.BXTListAdapter;
-import com.stone.shop.model.BXTNews;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ListView;
-import android.widget.Toast;
-/**
- * 教学类-博学堂界面
- * @date 2014-5-10
- * @author Stone
- */
-public class BXTActivity extends Activity implements OnItemClickListener{
-
-
- private ListView lvBXTNews;
- private BXTListAdapter mBxtListAdapter;
- private List mBXTNewsList;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_bxt);
-
- initView();
- initData();
-
- }
-
- private void initView() {
- lvBXTNews = (ListView) findViewById(R.id.lv_bxt_news);
- mBXTNewsList = new ArrayList();
- mBxtListAdapter = new BXTListAdapter(this, mBXTNewsList);
- lvBXTNews.setAdapter(mBxtListAdapter);
- lvBXTNews.setOnItemClickListener(this);
- }
-
- private void initData() {
- BmobQuery query = new BmobQuery();
- query.findObjects(this, new FindListener() {
- @Override
- public void onSuccess(List newsList) {
- if(newsList.isEmpty())
- toast("亲, 暂时还木有讲座哦");
- else {
- mBXTNewsList = newsList;
- mBxtListAdapter.refresh(newsList);
- mBxtListAdapter.notifyDataSetChanged();
-
- }
-
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("查询失败");
- }
- });
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position,
- long id) {
- Intent toBXTNewsActivity = new Intent(BXTActivity.this, BXTNewsActivity.class);
- toBXTNewsActivity.putExtra("title", mBXTNewsList.get(position).getTitle());
- toBXTNewsActivity.putExtra("topic", mBXTNewsList.get(position).getTopic());
- toBXTNewsActivity.putExtra("speaker", mBXTNewsList.get(position).getSpeaker());
- toBXTNewsActivity.putExtra("time", mBXTNewsList.get(position).getTime());
- toBXTNewsActivity.putExtra("location", mBXTNewsList.get(position).getLocation());
- toBXTNewsActivity.putExtra("holder1", mBXTNewsList.get(position).getHolder1());
- toBXTNewsActivity.putExtra("holder2", mBXTNewsList.get(position).getHolder2());
- toBXTNewsActivity.putExtra("points", mBXTNewsList.get(position).getPoints());
- toBXTNewsActivity.putExtra("speakerinfo", mBXTNewsList.get(position).getSpeakerinfo());
- startActivity(toBXTNewsActivity);
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/BXTNewsActivity.java b/代码/在这里3.0/src/com/stone/shop/view/BXTNewsActivity.java
deleted file mode 100644
index b40d7f5..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/BXTNewsActivity.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.stone.shop.view;
-
-import com.stone.shop.R;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.TextView;
-
-/**
- * 教学类-博学堂-讲座详情界面
- * @date 2014-5-10
- * @author Stone
- */
-public class BXTNewsActivity extends Activity {
-
- private TextView tvBXTNewsTitle;
- private TextView tvBXTNewsTopic;
- private TextView tvBXTNewsSpeaker;
- private TextView tvBXTNewsTime;
- private TextView tvBXTNewsLoc;
- private TextView tvBXTNewsHolder1;
- private TextView tvBXTNewsHolder2;
- private TextView tvBXTNewsPoints;
- private TextView tvBXTNewsSpeakerInfo;
-
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_bxt_news);
-
- initView();
- }
-
- private void initView() {
-
- tvBXTNewsTitle = (TextView) findViewById(R.id.tv_bxt_news_title);
- tvBXTNewsTopic = (TextView) findViewById(R.id.tv_bxt_news_topic);
- tvBXTNewsSpeaker = (TextView) findViewById(R.id.tv_bxt_news_speaker);
- tvBXTNewsTime = (TextView) findViewById(R.id.tv_bxt_news_time);
- tvBXTNewsLoc = (TextView) findViewById(R.id.tv_bxt_news_loc);
- tvBXTNewsHolder1 = (TextView) findViewById(R.id.tv_bxt_news_holder1);
- tvBXTNewsHolder2 = (TextView) findViewById(R.id.tv_bxt_news_holder2);
- tvBXTNewsPoints = (TextView) findViewById(R.id.tv_bxt_news_point);
- tvBXTNewsSpeakerInfo = (TextView) findViewById(R.id.tv_bxt_news_speaker_info);
-
- tvBXTNewsTitle.setText(getIntent().getStringExtra("title"));
- tvBXTNewsTopic.setText(getIntent().getStringExtra("topic"));
- tvBXTNewsSpeaker.setText(getIntent().getStringExtra("speaker"));
- tvBXTNewsTime.setText(getIntent().getStringExtra("time"));
- tvBXTNewsLoc.setText(getIntent().getStringExtra("location"));
- tvBXTNewsHolder1.setText(getIntent().getStringExtra("holder1"));
- tvBXTNewsHolder2.setText(getIntent().getStringExtra("holder2"));
- tvBXTNewsPoints.setText(getIntent().getStringExtra("points"));
- tvBXTNewsSpeakerInfo.setText(getIntent().getStringExtra("speakerinfo"));
-
- }
-
-
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/ClassroomActivity.java b/代码/在这里3.0/src/com/stone/shop/view/ClassroomActivity.java
deleted file mode 100644
index e042691..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/ClassroomActivity.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.ClassroomAdapter;
-import com.stone.shop.model.Classroom;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.GridView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-public class ClassroomActivity extends Activity implements OnItemClickListener {
-
- private GridView lvBXTNews;
- private ClassroomAdapter mBxtListAdapter;
- private List mBXTNewsList;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_classroom);
-
- initView();
- initData();
-
- }
-
- private void initView() {
- lvBXTNews = (GridView) findViewById(R.id.gv_classroom);
- mBXTNewsList = new ArrayList();
- mBxtListAdapter = new ClassroomAdapter(this, mBXTNewsList);
- lvBXTNews.setAdapter(mBxtListAdapter);
- lvBXTNews.setOnItemClickListener(this);
-
- TextView tv_title = (TextView) findViewById(R.id.tv_title);
- tv_title.setText("教室");
- }
-
- private void initData() {
- BmobQuery query = new BmobQuery();
- query.addWhereEqualTo("type", "教室");
- query.findObjects(this, new FindListener() {
- @Override
- public void onSuccess(List newsList) {
- if (newsList.isEmpty())
- toast("亲, 暂时还木有教室哦");
- else {
- mBXTNewsList = newsList;
- mBxtListAdapter.refresh(newsList);
- mBxtListAdapter.notifyDataSetChanged();
-
- }
-
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("查询失败");
- }
- });
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position, long id) {
- Intent intent = new Intent(ClassroomActivity.this, ReservationActivity.class);
- Classroom classroom = mBXTNewsList.get(position);
- intent.putExtra("roomId", classroom.getObjectId());
- intent.putExtra("roomName", classroom.getName());
- startActivity(intent);
-
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/CommentActivity.java b/代码/在这里3.0/src/com/stone/shop/view/CommentActivity.java
deleted file mode 100644
index b9182e3..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/CommentActivity.java
+++ /dev/null
@@ -1,374 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.CommentAdapter;
-import com.stone.shop.model.Comment;
-import com.stone.shop.model.Constant;
-import com.stone.shop.model.Discuss;
-import com.stone.shop.model.User;
-import com.stone.util.ActivityUtil;
-import com.stone.util.ToastFactory;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.Gravity;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.ListAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.datatype.BmobPointer;
-import cn.bmob.v3.datatype.BmobRelation;
-import cn.bmob.v3.listener.FindListener;
-import cn.bmob.v3.listener.SaveListener;
-import cn.bmob.v3.listener.UpdateListener;
-
-public class CommentActivity extends Activity implements OnClickListener {
-
- private ListView commentList;
- private TextView footer;
-
- private EditText commentContent;
- private Button commentCommit;
-
- private TextView userName;
- private TextView commentItemContent;
- private ImageView commentItemImage;
-
- private ImageView userLogo;
- private TextView comment;
- private TextView share;
- private TextView love;
- private TextView hate;
- private TextView title_text;
- private TextView time_text;
-
- private Discuss qiangYu;
- private String commentEdit = "";
-
- private CommentAdapter mAdapter;
-
- private List comments = new ArrayList();
-
- private int pageNum;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_comment);
-
- findViews();
- setupViews();
- setListener();
- fetchData();
-
- }
-
- private void findViews() {
- commentList = (ListView) findViewById(R.id.comment_list);
- footer = (TextView) findViewById(R.id.loadmore);
-
- commentContent = (EditText) findViewById(R.id.comment_content);
- commentCommit = (Button) findViewById(R.id.comment_commit);
-
- userName = (TextView) findViewById(R.id.user_name);
- commentItemContent = (TextView) findViewById(R.id.content_text);
- commentItemImage = (ImageView) findViewById(R.id.content_image);
-
- userLogo = (ImageView) findViewById(R.id.user_logo);
- comment = (TextView) findViewById(R.id.item_action_comment);
- share = (TextView) findViewById(R.id.item_action_share);
- love = (TextView) findViewById(R.id.item_action_love);
- hate = (TextView) findViewById(R.id.item_action_hate);
-
- title_text = (TextView) findViewById(R.id.title_text);
- time_text = (TextView) findViewById(R.id.time_text);
-
- }
-
- private void setupViews() {
- getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
- | WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
- qiangYu = (Discuss) getIntent().getSerializableExtra("data");
- pageNum = 0;
-
- mAdapter = new CommentAdapter(this, comments);
- commentList.setAdapter(mAdapter);
- setListViewHeightBasedOnChildren(commentList);
- commentList.setOnItemClickListener(new OnItemClickListener() {
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position, long id) {
- /*do nothing*/
- }
- });
- commentList.setCacheColorHint(0);
- commentList.setScrollingCacheEnabled(false);
- commentList.setScrollContainer(false);
- commentList.setFastScrollEnabled(true);
- commentList.setSmoothScrollbarEnabled(true);
-
- initMoodView(qiangYu);
- }
-
- private void initMoodView(Discuss mood2) {
- if (mood2 == null) {
- return;
- }
- userName.setText(qiangYu.getAuthor().getUsername());
- commentItemContent.setText(qiangYu.getContent());
- if (null == qiangYu.getContentfigureurl()) {
- commentItemImage.setVisibility(View.GONE);
- } else {
- commentItemImage.setVisibility(View.VISIBLE);
-
- }
-
- love.setText(qiangYu.getLove() + "");
- if (qiangYu.getMyLove()) {
- love.setTextColor(Color.parseColor("#D95555"));
- } else {
- love.setTextColor(Color.parseColor("#000000"));
- }
- hate.setText(qiangYu.getHate() + "");
- time_text.setText(mood2.getCreatedAt());
- title_text.setText(mood2.getTitle());
- }
-
- private void setListener() {
- footer.setOnClickListener(this);
- commentCommit.setOnClickListener(this);
-
- userLogo.setOnClickListener(this);
- love.setOnClickListener(this);
- hate.setOnClickListener(this);
- share.setOnClickListener(this);
- comment.setOnClickListener(this);
- }
-
- private void fetchData() {
- fetchComment();
- }
-
- private void fetchComment() {
- BmobQuery query = new BmobQuery();
- query.addWhereRelatedTo("relation", new BmobPointer(qiangYu));
- query.include("user");
- query.order("createdAt");
- query.setLimit(Constant.NUMBERS_PER_PAGE);
- query.setSkip(Constant.NUMBERS_PER_PAGE * (pageNum++));
- query.findObjects(this, new FindListener() {
- public void onSuccess(List data) {
- if (!data.isEmpty()&& data.get(data.size() - 1) != null) {
- if (data.size() < Constant.NUMBERS_PER_PAGE) {
- toast("已加载完所有评论~");
- footer.setText("暂无更多评论~");}
- mAdapter.getDataList().addAll(data);
- mAdapter.notifyDataSetChanged();
- setListViewHeightBasedOnChildren(commentList);
- } else {
- toast("暂无更多评论~");
- footer.setText("暂无更多评论~");
- pageNum--;
- }
- }
- public void onError(int arg0, String arg1) {
- toast("获取评论失败。请检查网络~");
- pageNum--;
- }
- });
- }
- @Override
- public void onClick(View v) {
- switch (v.getId()) {
- case R.id.user_logo:
- break;
- case R.id.loadmore:
- onClickLoadMore();
- break;
- case R.id.comment_commit:
- onClickCommit();
- break;
- case R.id.item_action_love:
- onClickLove();
- break;
- case R.id.item_action_hate:
- onClickHate();
- break;
- case R.id.item_action_share:
- break;
- case R.id.item_action_comment:
- onClickComment();
- break;
- default:
- break;
- }
- }
-
- private void onClickLoadMore() {
- fetchData();
- }
-
- private void onClickCommit() {
- User currentUser = BmobUser.getCurrentUser(this, User.class);
- if (currentUser != null) {// 已登录
- commentEdit = commentContent.getText().toString().trim();
- if (TextUtils.isEmpty(commentEdit)) {
- toast("评论内容不能为空。");
- return;
- }
- // comment now
- publishComment(currentUser, commentEdit);
- } else {// 未登录
- toast("发表评论前请先登录。");
-
- }
-
- }
-
- private void publishComment(User user, String content) {
-
- final Comment comment = new Comment();
- comment.setUser(user);
- comment.setCommentContent(content);
- comment.save(this, new SaveListener() {
- @Override
- public void onSuccess() {
- toast("评论成功。");
- if (mAdapter.getDataList().size() < Constant.NUMBERS_PER_PAGE) {
- mAdapter.getDataList().add(comment);
- mAdapter.notifyDataSetChanged();
- setListViewHeightBasedOnChildren(commentList);
- }
- commentContent.setText("");
- hideSoftInput();
- // 将该评论与强语绑定到一起
- BmobRelation relation = new BmobRelation();
- relation.add(comment);
- qiangYu.setRelation(relation);
- qiangYu.update(CommentActivity.this, new UpdateListener() {
- @Override
- public void onSuccess() {/* fetchData*/}
- @Override
- public void onFailure(int arg0, String arg1) {/*do nothing*/}
- });
- }
- @Override
- public void onFailure(int arg0, String arg1) {
- toast("评论失败。请检查网络~");
- }
- });
- }
- boolean isFav = false;
-
- private void onClickLove() {
- User user = BmobUser.getCurrentUser(this, User.class);
- if (user == null) {
- // 前往登录注册界面
- ActivityUtil.show(this, "请先登录。");
- return;
- }
- if (qiangYu.getMyLove()) {
- ActivityUtil.show(CommentActivity.this, "您已经赞过啦");
- return;
- }
- isFav = qiangYu.getMyFav();
- if (isFav) {
- qiangYu.setMyFav(false);
- }
- qiangYu.setLove(qiangYu.getLove() + 1);
- love.setTextColor(Color.parseColor("#D95555"));
- love.setText(qiangYu.getLove() + "");
- qiangYu.increment("love", 1);
- qiangYu.update(this, new UpdateListener() {
-
- @Override
- public void onSuccess() {
- qiangYu.setMyLove(true);
- qiangYu.setMyFav(isFav);
- ActivityUtil.show(CommentActivity.this, "点赞成功~");
- }
- @Override
- public void onFailure(int arg0, String arg1) {/*do nothing*/}
- });
- }
-
- private void onClickHate() {
- qiangYu.setHate(qiangYu.getHate() + 1);
- hate.setText(qiangYu.getHate() + "");
- qiangYu.increment("hate", 1);
- qiangYu.update(this, new UpdateListener() {
-
- @Override
- public void onSuccess() {
- ActivityUtil.show(CommentActivity.this, "点踩成功~");
- }
-
- @Override
- public void onFailure(int arg0, String arg1) {
- /*do nothing*/
- }
- });
- }
-
-
- private void onClickComment() {
- commentContent.requestFocus();
-
- InputMethodManager imm = (InputMethodManager) this.getSystemService(Context.INPUT_METHOD_SERVICE);
-
- imm.showSoftInput(commentContent, 0);
- }
-
- private void hideSoftInput() {
- InputMethodManager imm = (InputMethodManager) this.getSystemService(Context.INPUT_METHOD_SERVICE);
-
- imm.hideSoftInputFromWindow(commentContent.getWindowToken(), 0);
- }
-
-
- /***
- * 动态设置listview的高度 item 总布局必须是linearLayout
- *
- * @param listView
- */
- public void setListViewHeightBasedOnChildren(ListView listView) {
- ListAdapter listAdapter = listView.getAdapter();
- if (listAdapter == null) {
- return;
- }
- int totalHeight = 0;
- for (int i = 0; i < listAdapter.getCount(); i++) {
- View listItem = listAdapter.getView(i, null, listView);
- listItem.measure(0, 0);
- totalHeight += listItem.getMeasuredHeight();
- }
- ViewGroup.LayoutParams params = listView.getLayoutParams();
- params.height = totalHeight + (listView.getDividerHeight() * (listAdapter.getCount() - 1)) + 15;
- listView.setLayoutParams(params);
- }
-
- private void toast(String message) {
- Toast toast = ToastFactory.getToast(this, message);
- toast.setGravity(Gravity.BOTTOM, 0, 0);
- toast.show();
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/EditActivity.java b/代码/在这里3.0/src/com/stone/shop/view/EditActivity.java
deleted file mode 100644
index f761bac..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/EditActivity.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.stone.shop.view;
-
-import com.stone.shop.R;
-import com.stone.shop.model.Discuss;
-import com.stone.shop.model.User;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.EditText;
-import android.widget.Toast;
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.datatype.BmobFile;
-import cn.bmob.v3.listener.SaveListener;
-
-public class EditActivity extends Activity {
-
- private EditText edit_title;
- private EditText edit_content;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- // TODO Auto-generated method stub
- super.onCreate(savedInstanceState);
-
- setContentView(R.layout.activity_edit);
-
- initView();
-
- findViewById(R.id.btn_publish).setOnClickListener(new OnClickListener() {
-
- @Override
- public void onClick(View v) {
- // TODO Auto-generated method stub
- String title = edit_title.getText().toString().trim();
- String content = edit_content.getText().toString().trim();
-
- if (TextUtils.isEmpty(title)) {
- toast("标题不能为空");
- return;
- }
-
- if (TextUtils.isEmpty(content)) {
- toast("内容不能为空");
- return;
- }
- publishWithoutFigure(title ,content, null);
- }
- });
- }
-
- private void initView() {
- edit_title = (EditText) findViewById(R.id.edit_title);
- edit_content = (EditText) findViewById(R.id.edit_content);
-
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
- private void publishWithoutFigure(final String title, final String commitContent,
- final BmobFile figureFile) {
-
- User user = BmobUser.getCurrentUser(this, User.class);
-
- final Discuss qiangYu = new Discuss();
- qiangYu.setAuthor(user);
- qiangYu.setTitle(title);
- qiangYu.setContent(commitContent);
- if (figureFile != null) {
- qiangYu.setContentfigureurl(figureFile);
- }
- qiangYu.setLove(0);
- qiangYu.setHate(0);
- qiangYu.setShare(0);
- qiangYu.setComment(0);
- qiangYu.setPass(true);
- qiangYu.save(this, new SaveListener() {
-
- @Override
- public void onSuccess() {
- // TODO Auto-generated method stub
- toast("发表成功!");
- setResult(RESULT_OK);
- finish();
- }
-
- @Override
- public void onFailure(int arg0, String arg1) {
- // TODO Auto-generated method stub
- toast("发表失败!");
- }
- });
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/FeedBackActivity.java b/代码/在这里3.0/src/com/stone/shop/view/FeedBackActivity.java
deleted file mode 100644
index 0da1d90..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/FeedBackActivity.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.stone.shop.view;
-
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.listener.SaveListener;
-
-import com.stone.shop.R;
-import com.stone.shop.model.FeedBack;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.Toast;
-
-/**
- * 意见反馈界面
- *
- * @date 2014-5-27
- * @author Stone
- */
-public class FeedBackActivity extends Activity implements OnClickListener {
-
- private EditText etContent;
- private Button btnSubmit;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_feedback);
-
- initView();
- }
-
- private void initView() {
- etContent = (EditText) findViewById(R.id.et_feedback_content);
- btnSubmit = (Button) findViewById(R.id.btn_feedback_submit);
- btnSubmit.setOnClickListener(this);
- }
-
- /**
- * 提交用户的反馈信息
- */
- private void submit() {
- String content = etContent.getText().toString();
- if ("".equals(content)) {
- toast("亲,请先写点东西吧");
- } else {
- BmobUser user = BmobUser.getCurrentUser(this);
- FeedBack fb = new FeedBack();
- fb.setUsername(user.getUsername());
- fb.setEmail(user.getEmail());
- fb.setContent(content);
- fb.save(this, new SaveListener() {
-
- @Override
- public void onSuccess() {
- toast("提交成功, 在这里会尽快回复");
- back();
- }
-
- @Override
- public void onFailure(int arg0, String arg1) {
- toast("提交失败");
- }
- });
-
- }
-
- }
-
- @Override
- public void onClick(View v) {
- if(v.getId()==R.id.btn_feedback_submit) {
- submit();
- }
- }
-
- private void back() {
- finish();
- }
-
- public void clickFeedBack(View v) {
- finish();
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/HomeActivity.java b/代码/在这里3.0/src/com/stone/shop/view/HomeActivity.java
deleted file mode 100644
index d6a828d..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/HomeActivity.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.FrameLayout;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.ImageView.ScaleType;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.date.TypeDef;
-import com.stone.shop.R;
-import com.stone.shop.adapter.ImagePagerAdapter;
-import com.stone.shop.adapter.NewsListAdapter;
-import com.stone.shop.model.News;
-import com.stone.ui.AutoScrollViewPager;
-import com.stone.ui.ListScrollView;
-
-/**
- * 主界面
- *
- * @date 2014-4-24
- * @author Stone
- */
-public class HomeActivity extends Activity implements OnClickListener,
- OnItemClickListener {
-
- private ListScrollView listScrollView;
-
- // 校历
- private TextView tvWeek; // 周次和星期
- private TextView tvDay; // 年月日
-
- // 图片轮播
- private FrameLayout flImageAds;
- private AutoScrollViewPager viewPager;
- private List mImgViews;
- private ImageButton btnHideAds;
- private int[] mImgResId = { R.drawable.ic_banner1, R.drawable.ic_banner1,
- R.drawable.ic_banner1, R.drawable.ic_banner1 };
-
- // 校园新闻
- private ListView lvNewsList;
- private List newsList = new ArrayList();
- private NewsListAdapter newsListAdapter;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_home);
-
- // 解决ScrollView和ListView之间的冲突
- listScrollView = (ListScrollView) findViewById(R.id.listScrollView);
- lvNewsList = (ListView) findViewById(R.id.lv_news);
- listScrollView.setListView(lvNewsList);
-
- flImageAds = (FrameLayout) findViewById(R.id.fl_image_ads);
- viewPager = (AutoScrollViewPager) findViewById(R.id.view_pager);
- btnHideAds = (ImageButton) findViewById(R.id.btn_hide_ads);
-
- mImgViews = new ArrayList();
- for (int i = 0; i < mImgResId.length; i++) {
- ImageView imageView = new ImageView(this);
- imageView.setImageResource(mImgResId[i]);
- imageView.setScaleType(ScaleType.CENTER_CROP);
- mImgViews.add(imageView);
- }
-
- btnHideAds.setOnClickListener(this);
-
- viewPager.setAdapter(new ImagePagerAdapter(this, mImgViews));
- viewPager.setInterval(3000); // 设置自动滚动的间隔时间,单位为毫秒
- viewPager.setDirection(AutoScrollViewPager.RIGHT); // 设置自动滚动的方向,默认向右
- viewPager.setCycle(true); // 是否自动循环轮播,默认为true
- viewPager.setScrollDurationFactor(3); // 设置ViewPager滑动动画间隔时间的倍率,达到减慢动画或改变动画速度的效果
- viewPager.setStopScrollWhenTouch(true); // 当手指碰到ViewPager时是否停止自动滚动,默认为true
- viewPager.setBorderAnimation(true); // 设置循环滚动时滑动到从边缘滚动到下一个是否需要动画,默认为true
- viewPager
- .setSlideBorderMode(AutoScrollViewPager.SLIDE_BORDER_MODE_NONE);// 滑动到第一个或最后一个Item的处理方式,支持没有任何操作、轮播以及传递到父View三种模式
-
- viewPager.startAutoScroll();
-
- // 校历
- tvWeek = (TextView) findViewById(R.id.tv_week);
- tvDay = (TextView) findViewById(R.id.tv_day);
- setTime();
-
- // 新闻
- newsListAdapter = new NewsListAdapter(this, newsList);
- lvNewsList.setAdapter(newsListAdapter);
- lvNewsList.setOnItemClickListener(this);
-
- getNewsData();
- }
-
- /**
- * 设置校历中日期的时间
- */
- public void setTime() {
- Calendar calendar = Calendar.getInstance();
- String year = Integer.toString(calendar.get(Calendar.YEAR));
- String month = Integer.toString(calendar.get(Calendar.MONTH)+1);
- String day = Integer.toString(calendar.get(Calendar.DAY_OF_MONTH));
- String week = Integer.toString(calendar.get(Calendar.WEEK_OF_YEAR)-9);
- String dayOfWeek = Integer.toString(calendar.get(Calendar.DAY_OF_WEEK));
- String chDayOfWeek = TypeDef.chDayOfWeek[Integer.parseInt(dayOfWeek)-1];
- toast(year+"-"+month+"-"+day+" "+" 第 "+week+" 周 "+" "+" 星期 "+chDayOfWeek);
- tvWeek.setText(" 第 "+week+" 周 "+" "+" 星期 "+chDayOfWeek);
- tvDay.setText(year+" 年 "+month+" 月 "+day+" 日");
- }
-
- /**
- * 初始化新闻列表数据
- * @date 2014-5-3
- * @author Stone
- */
- public void getNewsData() {
- BmobQuery query = new BmobQuery();
- query.order("-updatedAt");
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List object) {
- newsList = object;
- // 通知Adapter数据更新
- newsListAdapter.refresh((ArrayList) newsList);
- newsListAdapter.notifyDataSetChanged();
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("对不起, 获取数据失败了");
- }
- });
- }
-
- @Override
- protected void onResume() {
- super.onResume();
- // start auto scroll when onResume
- viewPager.startAutoScroll();
- }
-
- @Override
- public void onClick(View v) {
- if(v.getId()==R.id.btn_hide_ads) {
- flImageAds.setVisibility(View.GONE);
- }
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position,
- long id) {
- Intent toNewsDetail = new Intent(HomeActivity.this, NewsActivity.class);
- toNewsDetail.putExtra("NewsTitle", newsList.get(position).getTitle());
- toNewsDetail.putExtra("NewsAuthor", newsList.get(position).getAuthor());
- toNewsDetail.putExtra("NewsTime", newsList.get(position).getCreatedAt());
- toNewsDetail.putExtra("NewsContent", newsList.get(position).getContent());
- startActivity(toNewsDetail);
- }
-
- public void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT);
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/InfoContentActivity.java b/代码/在这里3.0/src/com/stone/shop/view/InfoContentActivity.java
deleted file mode 100644
index 8f1b261..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/InfoContentActivity.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.stone.shop.view;
-
-import com.stone.shop.R;
-import com.stone.shop.model.Information;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.TextView;
-
-/**
- * 教学 - 学校通知详情界面
- * @author XCP
- * @date 2016-8-22
- */
-public class InfoContentActivity extends Activity {
-
- private TextView tvInfoTitle;
- private TextView tvInfoTopic;
- private TextView tvInfoTime;
- private TextView tvInfoHolder;
- private TextView tvInfoContent;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_infoitem);
-
- initView();
- }
-
- private void initView() {
-
- tvInfoTitle = (TextView) findViewById(R.id.tv_info_item_title);
- tvInfoTopic = (TextView) findViewById(R.id.tv_info_item_topic);
- tvInfoTime = (TextView) findViewById(R.id.tv_info_item_time);
- tvInfoHolder = (TextView) findViewById(R.id.tv_info_item_holder);
- tvInfoContent = (TextView) findViewById(R.id.tv_info_item_content);
-
- tvInfoTitle.setText(getIntent().getStringExtra("title"));
- tvInfoTopic.setText(getIntent().getStringExtra("topic"));
- tvInfoTime.setText(getIntent().getStringExtra("time"));
- tvInfoHolder.setText(getIntent().getStringExtra("holder"));
- tvInfoContent.setText(getIntent().getStringExtra("content"));
-
- }
-
-
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/InfoNewsContentActivity.java b/代码/在这里3.0/src/com/stone/shop/view/InfoNewsContentActivity.java
deleted file mode 100644
index 3281ed6..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/InfoNewsContentActivity.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.stone.shop.view;
-
-import com.stone.shop.R;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.TextView;
-
-/**
- * 校园新闻内容显示——第二版
- * @author XCP
- * @date 2016-8-30
- *
- */
-public class InfoNewsContentActivity extends Activity {
-
- private TextView tvInfoTitle;
- private TextView tvInfoTopic;
- private TextView tvInfoTime;
- private TextView tvInfoHolder;
- private TextView tvInfoContent;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_infonews_item);
-
- initView();
- }
-
- private void initView() {
- tvInfoTitle = (TextView) findViewById(R.id.tv_infonews_title);
- tvInfoTopic = (TextView) findViewById(R.id.tv_infonews_topic);
- tvInfoTime = (TextView) findViewById(R.id.tv_infonews_time);
- tvInfoHolder = (TextView) findViewById(R.id.tv_infonews_holder);
- tvInfoContent = (TextView) findViewById(R.id.tv_infonews_content);
-
- tvInfoTitle.setText(getIntent().getStringExtra("title"));
- tvInfoTopic.setText("关键词:" + getIntent().getStringExtra("topic"));
- tvInfoTime.setText("日期:" + getIntent().getStringExtra("time"));
- tvInfoHolder.setText("单位: " + getIntent().getStringExtra("holder"));
- tvInfoContent.setText(getIntent().getStringExtra("content"));
-
- }
-
-
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/InformationActivity.java b/代码/在这里3.0/src/com/stone/shop/view/InformationActivity.java
deleted file mode 100644
index 717d629..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/InformationActivity.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.InfoNewsListAdapter;
-import com.stone.shop.model.Information;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ListView;
-import android.widget.Toast;
-
-/**
- * 教学-学校通知界面
- * @author XCP
- * @date 2016-8-22
- */
-public class InformationActivity extends Activity implements OnItemClickListener{
-
- private ListView mlvInfoContent;
- private InfoNewsListAdapter mInfoNewsListAdapter;
- private List mInformationList;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_information);
-
- initView();
- initData();
-
- }
-
- private void initView() {
- mlvInfoContent = (ListView) findViewById(R.id.lv_information);
- mInformationList = new ArrayList();
- mInfoNewsListAdapter = new InfoNewsListAdapter(this, mInformationList);
- mlvInfoContent.setAdapter(mInfoNewsListAdapter);
- mlvInfoContent.setOnItemClickListener(this);
- }
-
- private void initData() {
- BmobQuery query = new BmobQuery();
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List infoList) {
- if(infoList.isEmpty())
- toast("亲, 暂时还木有通知哦");
- else {
- mInformationList = infoList;
- mInfoNewsListAdapter.refresh(infoList);
- mInfoNewsListAdapter.notifyDataSetChanged();
-
- }
-
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("查询失败");
- }
- });
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position,
- long id) {
- Intent toInfoContentActivity = new Intent(InformationActivity.this, InfoNewsContentActivity.class);
- toInfoContentActivity.putExtra("title", mInformationList.get(position).getTitle());
- toInfoContentActivity.putExtra("topic", mInformationList.get(position).getTopic());
- toInfoContentActivity.putExtra("time", mInformationList.get(position).getTime());
- toInfoContentActivity.putExtra("holder", mInformationList.get(position).getHolder());
- toInfoContentActivity.putExtra("content", mInformationList.get(position).getcontent());
- startActivity(toInfoContentActivity);
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/LibraryActivity.java b/代码/在这里3.0/src/com/stone/shop/view/LibraryActivity.java
deleted file mode 100644
index 497450c..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/LibraryActivity.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.ClassroomAdapter;
-import com.stone.shop.model.Classroom;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.GridView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-public class LibraryActivity extends Activity implements OnItemClickListener {
-
- private GridView lvBXTNews;
- private ClassroomAdapter mBxtListAdapter;
- private List mBXTNewsList;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_library);
- initView();
- initData();
-
- }
-
- private void initView() {
- lvBXTNews = (GridView) findViewById(R.id.gv_library);
- mBXTNewsList = new ArrayList();
- mBxtListAdapter = new ClassroomAdapter(this, mBXTNewsList);
- lvBXTNews.setAdapter(mBxtListAdapter);
- lvBXTNews.setOnItemClickListener(this);
-
- TextView tv_title = (TextView) findViewById(R.id.tv_title);
- tv_title.setText("研修室");
- }
-
- private void initData() {
- BmobQuery query = new BmobQuery();
- query.addWhereEqualTo("type", "研修室");
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List newsList) {
- if (newsList.isEmpty())
- toast("亲, 暂时还木有研修室哦");
- else {
- mBXTNewsList = newsList;
- mBxtListAdapter.refresh(newsList);
- mBxtListAdapter.notifyDataSetChanged();
-
- }
-
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("查询失败");
- }
- });
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position, long id) {
- Intent intent = new Intent(LibraryActivity.this, LibraryReservationActivity.class);
- Classroom classroom = mBXTNewsList.get(position);
- intent.putExtra("roomId", classroom.getObjectId());
- intent.putExtra("roomName", classroom.getName());
- startActivity(intent);
-
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/LibraryReservationActivity.java b/代码/在这里3.0/src/com/stone/shop/view/LibraryReservationActivity.java
deleted file mode 100644
index 200e599..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/LibraryReservationActivity.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.stone.shop.view;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import com.stone.shop.R;
-import com.stone.shop.model.Reservation;
-import com.stone.shop.model.User;
-import com.stone.ui.DateTimePickDialogUtil;
-import com.stone.ui.DateTimePickDialogUtil.DateTimeListener;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.TextView;
-import android.widget.Toast;
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.listener.FindListener;
-import cn.bmob.v3.listener.SaveListener;
-
-public class LibraryReservationActivity extends Activity {
-
- private Button btnLogin;
- private SimpleDateFormat dateFormat;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.layout_libraryreservation);
-
- TextView tvTitle = (TextView) findViewById(R.id.tv_title);
- tvTitle.setText("预定研修室");
-
- final String roomId = getIntent().getStringExtra("roomId");
- final String roomName = getIntent().getStringExtra("roomName");
-
- TextView tvRoom = (TextView) findViewById(R.id.textView1);
- tvRoom.setText("研修室:" + roomName);
-
- btnLogin = (Button) findViewById(R.id.btn_login);
-
- dateFormat = new SimpleDateFormat("yyyy年MM月dd日 HH:mm");
-
- // 查找Person表里面id为6b6c11c537的数据
- BmobQuery bmobQuery = new BmobQuery();
- bmobQuery.addWhereEqualTo("userId", User.userId);
- bmobQuery.addWhereEqualTo("roomId", roomId);
- bmobQuery.findObjects(LibraryReservationActivity.this, new FindListener() {
- @Override
- public void onSuccess(List newsList) {
- if (!newsList.isEmpty()) {
-
- String dateTime = newsList.get(0).getDateTime();
-
- try {
- if (dateFormat.parse(dateTime).before(new Date())) {
-
- Reservation gameScore = new Reservation();
- gameScore.setObjectId(newsList.get(0).getObjectId());
- gameScore.delete(LibraryReservationActivity.this);
- } else {
- btnLogin.setEnabled(false);
- btnLogin.setText("已经预定" + (TextUtils.isEmpty(dateTime) ? "" : (" " + dateTime)));
- }
- } catch (ParseException e) {
- // TODO
- Logger logger = Logger.getLogger("lavasoft");
- logger.log(Level.SEVERE, "something may be wrong", e);
- }
- }
- }
- @Override
- public void onError(int arg0, String arg1) {
- toast("查询失败");
- }
- });
- btnLogin.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- // TODO
- DateTimePickDialogUtil dateTimePicKDialog = new DateTimePickDialogUtil(LibraryReservationActivity.this,
- dateFormat.format(new Date()));
- dateTimePicKDialog.dateTimePicKDialog(new DateTimeListener() {
- @Override
- public void onDateTimeChane(final String dateTime) {
- //TODO
- Reservation libreservation = new Reservation();
- libreservation.setRoomId(roomId);
- libreservation.setRoomName(roomName);
- libreservation.setUserId(User.userId);
- libreservation.setDateTime(dateTime);
- libreservation.save(LibraryReservationActivity.this, new SaveListener() {
- @Override
- public void onSuccess() {
- // TODO
- toast("预定成功");
- btnLogin.setEnabled(false);
- btnLogin.setText("已经预定 " + dateTime);
- }
- @Override
- public void onFailure(int arg0, String arg1) {
- // TODO
- toast("预定失败");
- }
- });
- }
- });
-
- }
- });
- }
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-}
-
-
diff --git a/代码/在这里3.0/src/com/stone/shop/view/LoginActivity.java b/代码/在这里3.0/src/com/stone/shop/view/LoginActivity.java
deleted file mode 100644
index ea7133f..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/LoginActivity.java
+++ /dev/null
@@ -1,299 +0,0 @@
-package com.stone.shop.view;
-
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.graphics.Bitmap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.os.SystemClock;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toast;
-import cn.bmob.v3.Bmob;
-import cn.bmob.v3.listener.SaveListener;
-
-import com.stone.shop.R;
-import com.stone.shop.model.User;
-import com.stone.util.Util;
-import com.tencent.connect.UserInfo;
-import com.tencent.connect.common.Constants;
-import com.tencent.tauth.IUiListener;
-import com.tencent.tauth.Tencent;
-import com.tencent.tauth.UiError;
-
-/**
- * 登陆界面
- *
- * @date 2014-4-24
- * @author Stone
- */
-public class LoginActivity extends Activity implements OnClickListener {
-
- private static final String TAG = "LoginActicity";
-
- private Button btnLogin;
- private Button btnReg;
- private EditText etUsername;
- private EditText etPassword;
-
- private String username;
- private String password;
-
- private static final String APP_ID = "222222";
- private UserInfo mInfo;
- private TextView mUserInfo;
- private ImageView mUserLogo;
- private ImageView mNewLoginButton;
-
- // QQ登陆
- private static Tencent mTencent;
- public String sthwrong="something may be wrong";
- public String lavasoft="lavasoft";
-
- Handler mHandler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- if (msg.what == 0) {
- JSONObject response = (JSONObject) msg.obj;
- if (response.has("nickname")) {
- try {
- mUserInfo.setVisibility(android.view.View.VISIBLE);
- mUserInfo.setText(response.getString("nickname"));
- } catch (JSONException e) {
- Logger logger = Logger.getLogger(lavasoft);
- logger.log(Level.SEVERE, sthwrong, e);}
- }
- } else if (msg.what == 1) {
- Bitmap bitmap = (Bitmap) msg.obj;
- mUserLogo.setImageBitmap(bitmap);
- mUserLogo.setVisibility(android.view.View.VISIBLE);
- }
- }
- };
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- // 初始化 Bmob SDK
- // 使用时请将第二个参数Application ID替换成你在Bmob服务器端创建的Application ID
- Bmob.initialize(this, "252a2c58d0dc9a78a5411501c62ce0de");
- setContentView(R.layout.activity_login);
- // QQ登陆, 获取实例
- mTencent = Tencent.createInstance(APP_ID, this.getApplicationContext());
- btnLogin = (Button) findViewById(R.id.btn_login);
- btnReg = (Button) findViewById(R.id.btn_register);
- etUsername = (EditText) findViewById(R.id.et_username);
- etPassword = (EditText) findViewById(R.id.et_password);
- btnLogin.setOnClickListener(this);
- btnReg.setOnClickListener(this);
- findViewById(R.id.btn_qq).setOnClickListener(this);
- mUserInfo = (TextView) findViewById(R.id.user_nickname);
- mUserLogo = (ImageView) findViewById(R.id.user_logo);
- mNewLoginButton = (ImageView) findViewById(R.id.new_login_btn);
- mNewLoginButton.setOnClickListener(this);
- getUserInfo();}
- public String getusername()
- {
- return username;
- }
- public String getpassword()
- {
- return password;
- }
- private void getUserInfo() {
- SharedPreferences sp = getSharedPreferences("UserInfo", 0);
- etUsername.setText(sp.getString(getusername(), null));
- etPassword.setText(sp.getString(getpassword(), null));
- }
- // 保存用户的登陆记录
- private void saveUserInfo(String username, String password) {
- SharedPreferences sp = getSharedPreferences("UserInfo", 0);
- Editor editor = sp.edit();
- editor.putString("username", username);
- editor.putString("password", password);
- editor.commit();
- }
-
- public void onClickLogin() {
- if (!mTencent.isSessionValid()) {
- mTencent.login(this, "all", loginListener);
- Log.d("SDKQQAgentPref", "FirstLaunch_SDK:" + SystemClock.elapsedRealtime());
- } else {
-
- mTencent.logout(this);
- updateUserInfo();
- }
- }
- @Override
- public void onClick(View v) {
- switch (v.getId()) {
- // 登陆
- case R.id.btn_login:
- username = etUsername.getText().toString();
- password = etPassword.getText().toString();
- if (!Util.isNetworkConnected(this)) {
- toast("木有网络 ( ⊙ o ⊙ ) ");
- } else if ("".equals(username) || "".equals(password)) {
- toast("请输入账号和密码");
- break;
- } else {
- final User bu2 = new User();
- bu2.setUsername(username);
- bu2.setPassword(password);
- bu2.login(this, new SaveListener() {
- @Override
- public void onSuccess() {
- toast("欢迎进入 在这里 服务系统");
- saveUserInfo(username, password); // 保存用户信息
- User.userId = bu2.getObjectId(); // 跳转到主页
- Intent toHome = new Intent(LoginActivity.this, BaseActivity.class);
- startActivity(toHome);
- finish();}
- @Override
- public void onFailure(int arg0, String arg1) {
- toast("用户名或密码错误");
- }
- });
- }
- break;
- case R.id.btn_register:
- Intent toReg = new Intent(LoginActivity.this, RegisterActivity.class);
- startActivity(toReg);
- break;
- case R.id.btn_qq:
- onClickLogin();
- break;
- default:
- break;
- }
- }
- public void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
- IUiListener loginListener = new BaseUiListener() {
- @Override
- protected void doComplete(JSONObject values) {
- Log.d("SDKQQAgentPref", "AuthorSwitch_SDK:" + SystemClock.elapsedRealtime());
- initOpenidAndToken(values);
- updateUserInfo();
- }
- };
-
- private class BaseUiListener implements IUiListener {
-
- @Override
- public void onComplete(Object response) {
- if (null == response) {
- Util.showResultDialog(LoginActivity.this, "返回为空", "登录失败");
- return;
- }
- JSONObject jsonResponse = (JSONObject) response;
- if (jsonResponse.length() == 0) {
- Util.showResultDialog(LoginActivity.this, "返回为空", "登录失败");
- return;
- }
-
- doComplete((JSONObject) response);
- try {
- User.userId = jsonResponse.getString("openid");
- } catch (JSONException e) {
- // TODO
- Logger logger = Logger.getLogger(lavasoft);
- logger.log(Level.SEVERE, sthwrong, e);
- }
-
- Intent toHome = new Intent(LoginActivity.this, BaseActivity.class);
- startActivity(toHome);
- finish();
- }
- protected void doComplete(JSONObject values) {
- //do nothing
- }
- @Override
- public void onError(UiError e) {
- Util.toastMessage(LoginActivity.this, "onError: " + e.errorDetail);
- Util.dismissDialog();
- }
- @Override
- public void onCancel() {
- Util.toastMessage(LoginActivity.this, "onCancel: ");
- Util.dismissDialog();
- }
- }
- private void updateUserInfo() {
- if (mTencent != null && mTencent.isSessionValid()) {
- IUiListener listener = new IUiListener() {
- @Override
- public void onError(UiError e) { /*do nothing*/ }
- @Override
- public void onComplete(final Object response) {
- Message msg = new Message();
- msg.obj = response;
- msg.what = 0;
- mHandler.sendMessage(msg);
- new Thread() {
- @Override
- public void run() {
- JSONObject json = (JSONObject) response;
- if (json.has("figureurl")) {
- Bitmap bitmap = null;
- try {bitmap = Util.getbitmap(json.getString("figureurl_qq_2"));
- } catch (JSONException e) {
- Logger logger = Logger.getLogger(lavasoft);
- logger.log(Level.SEVERE, sthwrong, e);}
- Message msg = new Message();
- msg.obj = bitmap;
- msg.what = 1;
- mHandler.sendMessage(msg);}}
- }.start();}
- @Override
- public void onCancel() {/*do nothing*/}
- };
- mInfo = new UserInfo(this, mTencent.getQQToken());
- mInfo.getUserInfo(listener);
- } else {
- mUserInfo.setText("");
- mUserInfo.setVisibility(android.view.View.GONE);
- mUserLogo.setVisibility(android.view.View.GONE);
- }
- }
- public static void initOpenidAndToken(JSONObject jsonObject) {
- try {
- String token = jsonObject.getString(Constants.PARAM_ACCESS_TOKEN);
- String expires = jsonObject.getString(Constants.PARAM_EXPIRES_IN);
- String openId = jsonObject.getString(Constants.PARAM_OPEN_ID);
- if (!TextUtils.isEmpty(token) && !TextUtils.isEmpty(expires) && !TextUtils.isEmpty(openId)) {
- mTencent.setAccessToken(token, expires);
- mTencent.setOpenId(openId);
- }
- } catch (Exception e) {
- Logger logger = Logger.getLogger("lavasoft");
- logger.log(Level.SEVERE, "sthwrong", e);
- }
- }
-
- @Override
- protected void onActivityResult(int requestCode, int resultCode, Intent data) {
- Log.d(TAG, "-->onActivityResult " + requestCode + " resultCode=" + resultCode);
- if (requestCode == Constants.REQUEST_LOGIN || requestCode == Constants.REQUEST_APPBAR) {
- Tencent.onActivityResultData(requestCode, resultCode, data, loginListener);
- }
- super.onActivityResult(requestCode, resultCode, data);
- }
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/MainActivity.java b/代码/在这里3.0/src/com/stone/shop/view/MainActivity.java
deleted file mode 100644
index bc125ca..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/MainActivity.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.stone.shop.view;
-
-import com.stone.shop.R;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.TextView;
-
-public class MainActivity extends Activity implements OnClickListener {
-
- private TextView tv;
- private Button bt_scrollLeft;
- private Button bt_scrollRight;
-
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- setContentView(R.layout.main);
-
- tv = (TextView) findViewById(R.id.tv_scroll);
-
- bt_scrollLeft = (Button) findViewById(R.id.bt_scrollLeft);
- bt_scrollRight = (Button) findViewById(R.id.bt_scrollRight);
-
- bt_scrollLeft.setOnClickListener(this);
- bt_scrollRight.setOnClickListener(this);
- }
-
- @Override
- public void onClick(View v) {
- // TODO Auto-generated method stub
-
- switch (v.getId()) {
- case R.id.bt_scrollLeft:
- tv.scrollBy(20, 0);
- int tvscrllX = tv.getScrollX();
- int tvscrllY = tv.getScrollY();
- System.out.println( " tvscrllX ---> " + tvscrllX + " --- tvscrllY ---> "+tvscrllY);
- bt_scrollLeft.scrollBy(20, 0);
- break;
- case R.id.bt_scrollRight:
- tv.scrollTo(-100, 0);
- int tvscrllXx = tv.getScrollX();
- int tvscrllYx = tv.getScrollY();
- System.out.println( " tvscrllX ---> " + tvscrllXx + " --- tvscrllY ---> "+tvscrllYx);
- break;
- default:
- break;
- }
-
- }
-
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/MineActivity.java b/代码/在这里3.0/src/com/stone/shop/view/MineActivity.java
deleted file mode 100644
index 0bd2437..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/MineActivity.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package com.stone.shop.view;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ListView;
-import android.widget.Toast;
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.listener.CountListener;
-
-import com.stone.date.MessageDef;
-import com.stone.shop.R;
-import com.stone.shop.adapter.MineListAdapter;
-import com.stone.shop.model.Order;
-
-/**
- * 个人中心主界面
- * @date 2014-4-24
- * @author Stone
- */
-public class MineActivity extends Activity implements OnItemClickListener{
-
- private String[] userItemNames = {"stonekity"} ;
- private String[] userItemContents = {""} ;
- private String[] orderItemNames = {"当前订单", "历史订单"};
- private String[] orderItemContents = {"*", ""};
- private String[] aboutItemNames = {"通知中心", "软件相关", "推荐给朋友", "退出账号"};
- private String[] aboutItemContents = {"", "", "", ""};
-
- private int[] userImgIds = {R.drawable.ic_menu_myplaces};
- private int[] orderImgIds = {R.drawable.ic_menu_find_holo_light, R.drawable.ic_menu_copy_holo_light};
- private int[] aboutImgIds = {R.drawable.ic_menu_notifications, R.drawable.ic_menu_info_details, R.drawable.ic_menu_share, R.drawable.ic_star_yes};
-
- private ListView lvMineUser;
- private ListView lvMineOrder;
- private ListView lvMineAbout;
- private MineListAdapter userListAdapter;
- private MineListAdapter orderListAdapter;
- private MineListAdapter aboutListAdapter;
-
- private Handler mHandler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- if(msg.what==MessageDef.MINE_FINISH_LOAD_DATA) {
- orderListAdapter.notifyDataSetChanged();
- }
- }
-};
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_mine);
-
- initData("已取餐");
- initData("未取餐");
- initView();
- }
-
- private void initView() {
-
- lvMineUser = (ListView) findViewById(R.id.lv_mine_user);
- lvMineOrder = (ListView) findViewById(R.id.lv_mine_order);
- lvMineAbout = (ListView) findViewById(R.id.lv_mine_about);
-
- userListAdapter = new MineListAdapter(this, userItemNames, userItemContents, userImgIds);
- orderListAdapter = new MineListAdapter(this, orderItemNames, orderItemContents, orderImgIds);
- aboutListAdapter = new MineListAdapter(this, aboutItemNames, aboutItemContents, aboutImgIds);
-
- lvMineUser.setAdapter(userListAdapter);
- lvMineOrder.setAdapter(orderListAdapter);
- lvMineAbout.setAdapter(aboutListAdapter);
-
- lvMineUser.setOnItemClickListener(this);
- lvMineOrder.setOnItemClickListener(this);
- lvMineAbout.setOnItemClickListener(this);
-
- }
-
- //初始化列表菜单中数据
- public void initData(final String type) {
- //获取用户
- BmobUser user = BmobUser.getCurrentUser(this);
- userItemNames[0] = user.getUsername();
-
- //获取小菜订单(数量)
- BmobQuery query = new BmobQuery();
- query.order("-updatedAt");
- query.addWhereEqualTo("userName", user.getUsername());
- query.addWhereEqualTo("state", type);
- query.count(this, Order.class, new CountListener() {
-
- @Override
- public void onSuccess(int count) {
- if("未取餐".equals(type)) {
- orderItemContents[0] ="( " +count+ " )";
- }
- if("已取餐".equals(type)) {
- orderItemContents[1] ="( " +count+ " )";
- }
- Message msg = new Message();
- msg.what = MessageDef.MINE_FINISH_LOAD_DATA;
- mHandler.sendMessage(msg);
- }
-
- @Override
- public void onFailure(int arg0, String arg1) {
- toast("查询失败");
- }
- });
-
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position,
- long id) {
-
- //个人资料
- if(parent.getId() == R.id.lv_mine_user) {
- switch (position) {
- case 0: //资料卡
- Intent toMineInfo = new Intent(MineActivity.this, MineInfoActivity.class);
- startActivity(toMineInfo);
- break;
-
- default:
- break;
- }
- }
- //小菜订单
- if(parent.getId() == R.id.lv_mine_order) {
- Intent toOrderInfo;
- switch (position) {
- case 0:
- toOrderInfo = new Intent(MineActivity.this, OrderInfoActivity.class);
- toOrderInfo.putExtra("type", "now");
- startActivity(toOrderInfo);
- break;
- case 1:
- toOrderInfo = new Intent(MineActivity.this, OrderInfoActivity.class);
- toOrderInfo.putExtra("type", "old");
- startActivity(toOrderInfo);
- break;
- default:
- break;
- }
- }
-
- //其他
- if(parent.getId() == R.id.lv_mine_about) {
-
- switch (position) {
- case 1: //软件相关
- Intent toMineSoft = new Intent(MineActivity.this, MineSoftActivity.class);
- startActivity(toMineSoft);
- break;
- case 2: //推荐给朋友
- Intent toShare = new Intent(Intent.ACTION_SEND);
- toShare.setType("text/plain");
- toShare.putExtra(Intent.EXTRA_SUBJECT, "分享");
- toShare.putExtra(Intent.EXTRA_TEXT, "校园小菜-HBUT版" +"\n" + "针对湖工大的校园小菜测试版上线了,赶紧下载体验吧"+ "http://xiaocai.bmob.cn");
- startActivity(Intent.createChooser(toShare, "分享到"));
- break;
- case 3: //退出当期账号
- BmobUser.logOut(this);
- Intent toLogin = new Intent(MineActivity.this, LoginActivity.class);
- startActivity(toLogin);
- finish();
- break;
- default:
- break;
- }
-
- }
-
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/MineInfoActivity.java b/代码/在这里3.0/src/com/stone/shop/view/MineInfoActivity.java
deleted file mode 100644
index fd57ca9..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/MineInfoActivity.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.List;
-
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.date.MessageDef;
-import com.stone.shop.R;
-import com.stone.shop.model.User;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.view.View;
-import android.widget.TextView;
-import android.widget.Toast;
-
-/**
- * 个人资料卡
- * @date 2014-5-21
- * @author Stone
- */
-public class MineInfoActivity extends Activity {
-
- private TextView tvUsername;
- private TextView tvSchool;
- private TextView tvCademy;
- private TextView tvDorPart;
- private TextView tvDorNum;
- private TextView tvPhone;
- private TextView tvQQ;
-
- private User curUser = new User();
-
- private Handler mHandler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- switch (msg.what) {
- case MessageDef.MINE_INFO_FINISH_FIND_USER:
- initView();
- break;
- default:
- break;
- }
- }
- };
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_mine_info);
-
- getCurUser();
- }
-
- private void initView() {
- tvUsername = (TextView) findViewById(R.id.tv_mineinfo_username);
- tvSchool = (TextView) findViewById(R.id.tv_mineinfo_school);
- tvCademy = (TextView) findViewById(R.id.tv_mineinfo_cademy);
- tvDorPart = (TextView) findViewById(R.id.tv_mineinfo_dorpart);
- tvDorNum = (TextView) findViewById(R.id.tv_mineinfo_dornum);
- tvPhone = (TextView) findViewById(R.id.tv_mineinfo_phone);
- tvQQ = (TextView) findViewById(R.id.tv_mineinfo_qq);
-
- tvUsername.setText(curUser.getUsername());
- tvSchool.setText(curUser.getSchool());
- tvCademy.setText(curUser.getCademy());
- tvDorPart.setText(curUser.getDorPart());
- tvDorNum.setText(curUser.getDorNum());
- tvPhone.setText(curUser.getPhone());
- tvQQ.setText(curUser.getQQ());
-
- }
-
- private void getCurUser() {
- BmobUser bmobUser = BmobUser.getCurrentUser(this);
- BmobQuery query = new BmobQuery();
- query.addWhereEqualTo("objectId", bmobUser.getObjectId());
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List object) {
- curUser = object.get(0);
- Message msg = new Message();
- msg.what = MessageDef.MINE_INFO_FINISH_FIND_USER;
- mHandler.sendMessage(msg);
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("亲, 获取当前用户失败");
- }
- });
-
- }
-
- public void clickEdit(View v) {
- Intent toEditMineInfo = new Intent(MineInfoActivity.this, MineInfoEditActivity.class);
-
- startActivity(toEditMineInfo);
- }
-
- public void clickBack(View v) {
- finish();
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/MineInfoEditActivity.java b/代码/在这里3.0/src/com/stone/shop/view/MineInfoEditActivity.java
deleted file mode 100644
index 1831de1..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/MineInfoEditActivity.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.List;
-
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.listener.FindListener;
-import cn.bmob.v3.listener.UpdateListener;
-
-import com.stone.date.MessageDef;
-import com.stone.shop.R;
-import com.stone.shop.model.User;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.Toast;
-
-/**
- * 修改个人资料卡
- * @date 2014-5-28
- * @author Stone
- */
-public class MineInfoEditActivity extends Activity {
-
- private EditText etUsername;
- private EditText etSchool;
- private EditText etCademy;
- private EditText etDorPart;
- private EditText etDorNum;
- private EditText etPhone;
- private EditText etQQ;
-
- private User curUser;
- private Handler mHandler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- if(msg.what==MessageDef.MINE_INFO_FINISH_FIND_USER) {
- initView();
- }
- }
- };
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_mine_info_edit);
-
- setCurUser();
- }
-
- private void initView() {
- etUsername = (EditText) findViewById(R.id.et_mineinfo_username);
- etSchool = (EditText) findViewById(R.id.et_mineinfo_school);
- etCademy = (EditText) findViewById(R.id.et_mineinfo_cademy);
- etDorPart = (EditText) findViewById(R.id.et_mineinfo_dorpart);
- etDorNum = (EditText) findViewById(R.id.et_mineinfo_dornum);
- etPhone = (EditText) findViewById(R.id.et_mineinfo_phone);
- etQQ = (EditText) findViewById(R.id.et_mineinfo_qq);
-
- etUsername.setText(curUser.getUsername());
- etSchool.setText(curUser.getSchool());
- etCademy.setText(curUser.getCademy());
- etDorPart.setText(curUser.getDorPart());
- etDorNum.setText(curUser.getDorNum());
- etPhone.setText(curUser.getPhone());
- etQQ.setText(curUser.getQQ());
- }
-
- private void setCurUser() {
- BmobUser bmobUser = BmobUser.getCurrentUser(this);
- BmobQuery query = new BmobQuery();
- query.addWhereEqualTo("objectId", bmobUser.getObjectId());
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List object) {
- curUser = object.get(0);
- Message msg = new Message();
- msg.what = MessageDef.MINE_INFO_FINISH_FIND_USER;
- mHandler.sendMessage(msg);
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("获取当前用户失败");
- }
- });
-
- }
-
- private void saveUserInfo() {
- if(curUser == null) {
- toast("curUser为空");
- } else {
- toast("当前用户为 " + curUser.getUsername());
- }
- Log.i("当前用户的ID: ", curUser.getObjectId());
- curUser.setUsername(etUsername.getText().toString());
- curUser.setSchool(etSchool.getText().toString());
- curUser.setCademy(etCademy.getText().toString());
- curUser.setDorPart(etDorPart.getText().toString());
- curUser.setDorNum(etDorNum.getText().toString());
- curUser.setPhone(etPhone.getText().toString());
- curUser.setQQ(etQQ.getText().toString());
- curUser.update(this, curUser.getObjectId(), new UpdateListener() {
-
- @Override
- public void onSuccess() {
- toast("更新成功");
- }
-
- @Override
- public void onFailure(int arg0, String arg1) {
- toast("更新失败");
- }
- });
- }
-
- public void clickSave(View v) {
- saveUserInfo();
- finish();
- }
-
- public void clickCancel(View v) {
- finish();
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/MineSoftActivity.java b/代码/在这里3.0/src/com/stone/shop/view/MineSoftActivity.java
deleted file mode 100644
index c1960fd..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/MineSoftActivity.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.stone.shop.view;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.MineListAdapter;
-import com.stone.shop.adapter.MineSoftAdapter;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
-import android.widget.Toast;
-import android.widget.AdapterView.OnItemClickListener;
-
-/**
- * 软件相关
- * @date 2014-5-21
- * @author Stone
- */
-public class MineSoftActivity extends Activity implements OnItemClickListener{
-
-
- private String[] softItemNames = {"意见反馈", "检查更新", "使用协议", "关于我们"};
- private String[] softItemContents = {"", "", "", ""};
- private ListView lvMineSoft;
-
- private MineSoftAdapter softListAdapter;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_soft);
-
- initView();
- }
-
- private void initView() {
- lvMineSoft = (ListView) findViewById(R.id.lv_mine_soft);
- softListAdapter = new MineSoftAdapter(this, softItemNames, softItemContents);
- lvMineSoft.setAdapter(softListAdapter);
- lvMineSoft.setOnItemClickListener(this);
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position,
- long id) {
- switch (position) {
- case 0:
- Intent toFeedBack = new Intent(MineSoftActivity.this, FeedBackActivity.class);
- startActivity(toFeedBack);
- break;
- case 1:
- toast("已经是最新版本");
- break;
- case 2:
- break;
- case 3:
- Intent toAboutSoft = new Intent(MineSoftActivity.this, AboutActivity.class);
- startActivity(toAboutSoft);
- break;
-
- default:
- break;
- }
-
- }
-
- public void clickSoftBack(View v) {
- finish();
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/MultiScreenActivity.java b/代码/在这里3.0/src/com/stone/shop/view/MultiScreenActivity.java
deleted file mode 100644
index cad6aa0..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/MultiScreenActivity.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.logging.Logger;
-
-import com.stone.shop.R;
-import android.content.Intent;
-import android.app.Activity;
-import android.os.Bundle;
-import android.util.DisplayMetrics;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-
-/**
- *
- * @author http://http://blog.csdn.net/qinjuning
- */
-public class MultiScreenActivity extends Activity implements OnClickListener {
-
- private Button bt_scrollLeft;
- private Button bt_scrollRight;
- private MultiViewGroup mulTiViewGroup ;
-
- public static int screenWidth ;
- public static int scrrenHeight ;
-
-
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- DisplayMetrics metric = new DisplayMetrics();
- getWindowManager().getDefaultDisplay().getMetrics(metric);
- screenWidth = metric.widthPixels ;
- scrrenHeight = metric.heightPixels;
- //System.out.println("screenWidth * scrrenHeight --->" + screenWidth + " * " +scrrenHeight);
- Logger logger = Logger.getLogger("lavasoft");
- logger.info("screenWidth * scrrenHeight --->" + screenWidth + " * " +scrrenHeight);
- setContentView(R.layout.multiview);
- mulTiViewGroup = (MultiViewGroup)findViewById(R.id.mymultiViewGroup);
- bt_scrollLeft = (Button) findViewById(R.id.bt_scrollLeft);
- bt_scrollRight = (Button) findViewById(R.id.bt_scrollRight);
- bt_scrollLeft.setOnClickListener(this);
- bt_scrollRight.setOnClickListener(this);
- }
-
- @Override
- public void onClick(View v) {
- Intent intent = new Intent(MultiScreenActivity.this,LoginActivity.class);
-
- switch (v.getId()) {
- case R.id.bt_scrollLeft:
- startActivity(intent);
- break;
- case R.id.bt_scrollRight:
- mulTiViewGroup.stopMove() ;
- break;
- default:
- break;
- }
- }
-
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/MultiViewGroup.java b/代码/在这里3.0/src/com/stone/shop/view/MultiViewGroup.java
deleted file mode 100644
index 2c0646e..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/MultiViewGroup.java
+++ /dev/null
@@ -1,320 +0,0 @@
-package com.stone.shop.view;
-
-import com.stone.shop.R;
-import android.content.Context;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.MotionEvent;
-import android.view.VelocityTracker;
-import android.view.View;
-import android.view.ViewConfiguration;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.Scroller;
-
-//自定义ViewGroup , 包含了三个LinearLayout控件,存放在不同的布局位置,通过scrollBy或者scrollTo方法切换
-public class MultiViewGroup extends ViewGroup {
-
- private Context mContext;
-
- private static String TAG = "MultiViewGroup";
- private int curScreen = 0 ; //当前屏
-
- private Scroller mScroller = null ;
-
-
- public MultiViewGroup(Context context) {
- super(context);
- mContext = context;
- init();
- }
-
- public MultiViewGroup(Context context, AttributeSet attrs) {
- super(context, attrs);
- mContext = context;
- init();
- }
- //startScroll 滑屏
- public void startMove(){
- curScreen ++ ;
- Log.i(TAG, "----startMove---- curScreen " + curScreen);
-
- Log.i(TAG, "----width " + getWidth());
- //采用Scroller类控制滑动过程
- mScroller.startScroll((curScreen-1) *getWidth(), 0,
- getWidth(), 0,3000);
- //暴力点直接到目标出
- //其实在点击按钮的时候,就回触发View绘制流程,这儿我们在强制绘制下View
- invalidate();
- }
- //停止滑屏
- public void stopMove(){
-
- Log.v(TAG, "----stopMove ----");
-
- if(mScroller != null){
- //如果动画还没结束,我们就按下了结束的按钮,那我们就结束该动画,即马上滑动指定位置
- if(!mScroller.isFinished()){
-
- int scrollCurX= mScroller.getCurrX() ;
- //判断是否达到下一屏的中间位置,如果达到就抵达下一屏,否则保持在原屏幕
- int descScreen = ( scrollCurX + getWidth() / 2) / getWidth() ;
-
- Log.i(TAG, "----mScroller.is not finished ---- shouldNext" + descScreen);
-
- Log.i(TAG, "----mScroller.is not finished ---- scrollCurX " + scrollCurX);
- mScroller.abortAnimation();
-
- //停止了动画,我们马上滑倒目标位置
- scrollTo(descScreen * getWidth() , 0);
- mScroller.forceFinished(true);
-
- curScreen = descScreen ;
- }
- }
- else
- Log.i(TAG, "----OK mScroller.is finished ---- ");
- }
- // 只有当前LAYOUT中的某个CHILD导致SCROLL发生滚动,才会致使自己的COMPUTESCROLL被调用
- @Override
- public void computeScroll() {
- Log.e(TAG, "computeScroll");
- // 如果返回true,表示动画还没有结束
- // 因为前面startScroll,所以只有在startScroll完成时 才会为false
- if (mScroller.computeScrollOffset()) {
- Log.e(TAG, mScroller.getCurrX() + "======" + mScroller.getCurrY());
- // 产生了动画效果 每次滚动一点
- scrollTo(mScroller.getCurrX(), mScroller.getCurrY());
-
- Log.e(TAG, "### getleft is " + getLeft() + " ### getRight is " + getRight());
-
- //刷新View 否则效果可能有误差
- postInvalidate();
- }
- else
- Log.i(TAG, "have done the scoller -----");
- }
- /////以上可以演示Scroller类的使用
- //// --------------------------------
- /////--------------------------------
-
- private static final int TOUCH_STATE_REST = 0;
- private static final int TOUCH_STATE_SCROLLING = 1;
- private int mTouchState = TOUCH_STATE_REST;
- //--------------------------
- //处理触摸事件 ~
- public static final int SNAP_VELOCITY = 600 ;
- private int mTouchSlop = 0 ;
- private float mLastionMotionX = 0 ;
- //处理触摸的速率
- private VelocityTracker mVelocityTracker = null ;
-
- // 这个感觉没什么作用 不管true还是false 都是会执行onTouchEvent的 因为子view里面onTouchEvent返回false了
- @Override
- public boolean onInterceptTouchEvent(MotionEvent ev) {
- Log.e(TAG, "onInterceptTouchEvent-slop:" + mTouchSlop);
-
- final int action = ev.getAction();
- //表示已经开始滑动了,不需要走该Action_MOVE方法了(第一次时可能调用)。
- if ((action == MotionEvent.ACTION_MOVE) && (mTouchState != TOUCH_STATE_REST)) {
- return true;
- }
-
- final float x = ev.getX();
-
- switch (action) {
- case MotionEvent.ACTION_MOVE:
- Log.e(TAG, "onInterceptTouchEvent move");
- final int xDiff = (int) Math.abs(mLastionMotionX - x);
- if (xDiff > mTouchSlop)
- {mTouchState = TOUCH_STATE_SCROLLING;} //超过了最小滑动距离
- break;
- case MotionEvent.ACTION_DOWN:
- Log.e(TAG, "onInterceptTouchEvent down");
- mLastionMotionX = x;
- Log.e(TAG, mScroller.isFinished() + "");
- mTouchState = mScroller.isFinished() ? TOUCH_STATE_REST : TOUCH_STATE_SCROLLING;
- break;
- case MotionEvent.ACTION_CANCEL:
- case MotionEvent.ACTION_UP:
- Log.e(TAG, "onInterceptTouchEvent up or cancel");
- mTouchState = TOUCH_STATE_REST;
- break;
- default:
- break;
- }
- Log.e(TAG, mTouchState + "====" + TOUCH_STATE_REST);
- return mTouchState != TOUCH_STATE_REST;
- }
- public boolean onTouchEvent(MotionEvent event){
-
- Log.i(TAG, "--- onTouchEvent--> " );
- Log.e(TAG, "onTouchEvent start");
- if (mVelocityTracker == null) {
-
- Log.e(TAG, "onTouchEvent start-------** VelocityTracker.obtain");
-
- mVelocityTracker = VelocityTracker.obtain();
- }
-
- mVelocityTracker.addMovement(event);
-
- super.onTouchEvent(event);
-
- //手指位置地点
- float x = event.getX();
- switch(event.getAction()){
- case MotionEvent.ACTION_DOWN: //如果屏幕的动画还没结束,你就按下了,我们就结束该动画
- if(mScroller != null&&!mScroller.isFinished()){
- mScroller.abortAnimation();
- }
- mLastionMotionX = x ;
- break ;
- case MotionEvent.ACTION_MOVE:
- int detaX = (int)(mLastionMotionX - x );
- scrollBy(detaX, 0);
- Log.e(TAG, "--- MotionEvent.ACTION_MOVE--> detaX is " + detaX );
- mLastionMotionX = x ;
- break ;
- case MotionEvent.ACTION_UP:
- final VelocityTracker velocityTracker = mVelocityTracker ;
- velocityTracker.computeCurrentVelocity(1000);
- int velocityX = (int) velocityTracker.getXVelocity() ;
- Log.e(TAG , "---velocityX---" + velocityX);
- //滑动速率达到了一个标准(快速向右滑屏,返回上一个屏幕) 马上进行切屏处理
- if (velocityX > SNAP_VELOCITY && curScreen > 0) {
- // Fling enough to move left
- Log.e(TAG, "snap left");
- snapToScreen(curScreen - 1);
- }
- //快速向左滑屏,返回下一个屏幕)
- else if(velocityX < -SNAP_VELOCITY && curScreen < (getChildCount()-1)){
- Log.e(TAG, "snap right");
- snapToScreen(curScreen + 1);
- }
- //以上为快速移动的 ,强制切换屏幕
- else{
- //我们是缓慢移动的,因此先判断是保留在本屏幕还是到下一屏幕
- snapToDestination();
- }
-
- if (mVelocityTracker != null) {
- mVelocityTracker.recycle();
- mVelocityTracker = null;
- }
- mTouchState = TOUCH_STATE_REST ;
- break;
- case MotionEvent.ACTION_CANCEL:
- mTouchState = TOUCH_STATE_REST ;
- break;
- default:
- break;
- }
- return true ;
- }
- ////我们是缓慢移动的
- private void snapToDestination(){
- //当前的偏移位置
- int scrollX = getScrollX() ;
- Log.e(TAG, "### onTouchEvent snapToDestination ### scrollX is " + scrollX);
- //判断是否超过下一屏的中间位置,如果达到就抵达下一屏,否则保持在原屏幕
- //直接使用这个公式判断是哪一个屏幕 前后或者自己
- //判断是否超过下一屏的中间位置,如果达到就抵达下一屏,否则保持在原屏幕
- // 这样的一个简单公式意思是:假设当前滑屏偏移值即 scrollCurX 加上每个屏幕一半的宽度,除以每个屏幕的宽度就是
- // 我们目标屏所在位置了。 假如每个屏幕宽度为320dip, 我们滑到了500dip处,很显然我们应该到达第二屏
- int destScreen = (getScrollX() + getWidth() / 2 ) / getWidth() ;
- Log.e(TAG, "### onTouchEvent ACTION_UP### dx destScreen " + destScreen);
- snapToScreen(destScreen);
- }
- private void snapToScreen(int whichScreen){
- //简单的移到目标屏幕,可能是当前屏或者下一屏幕
- //直接跳转过去,不太友好
- //为了友好性,我们在增加一个动画效果
- //需要再次滑动的距离 屏或者下一屏幕的继续滑动距离
-
- curScreen = whichScreen ;
-
- if(curScreen > getChildCount() - 1)
- curScreen = getChildCount() - 1 ;
-
- int dx = curScreen*getWidth() - getScrollX() ;
-
- Log.e(TAG, "### onTouchEvent ACTION_UP### dx is " + dx);
-
- mScroller.startScroll(getScrollX(), 0, dx, 0,Math.abs(dx) * 2);
-
- //此时需要手动刷新View 否则没效果
- invalidate();
-
- }
-
- private void init() {
-
- mScroller = new Scroller(mContext);
-
- // 初始化3个 LinearLayout控件
- LinearLayout oneLL = new LinearLayout(mContext);
-
- oneLL.setBackground(getResources().getDrawable(R.drawable.w01));
- addView(oneLL);
-
- LinearLayout twoLL = new LinearLayout(mContext);
- twoLL.setBackground(getResources().getDrawable(R.drawable.w02));
- addView(twoLL);
-
- LinearLayout threeLL = new LinearLayout(mContext);
- threeLL.setBackground(getResources().getDrawable(R.drawable.w03));
- addView(threeLL);
-
- LinearLayout fourLL = new LinearLayout(mContext);
- fourLL.setBackground(getResources().getDrawable(R.drawable.w04));
- addView(fourLL);
-
- LinearLayout fiveLL = new LinearLayout(mContext);
- fiveLL.setBackground(getResources().getDrawable(R.drawable.w05));
- addView(fiveLL);
-
- //初始化一个最小滑动距离
- mTouchSlop = ViewConfiguration.get(getContext()).getScaledTouchSlop();
- }
-
- // measure过程
- @Override
- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-
- Log.i(TAG, "--- start onMeasure --");
-
- // 设置该ViewGroup的大小
- int width = MeasureSpec.getSize(widthMeasureSpec);
- int height = MeasureSpec.getSize(heightMeasureSpec);
- setMeasuredDimension(width, height);
-
- int childCount = getChildCount();
- Log.i(TAG, "--- onMeasure childCount is -->" + childCount);
- for (int i = 0; i < childCount; i++) {
- View child = getChildAt(i);
- // 设置每个子视图的大小 , 即全屏
- child.measure(getWidth(), MultiScreenActivity.scrrenHeight);
- }
- }
- // layout过程
- @Override
- protected void onLayout(boolean changed, int l, int t, int r, int b) {
- Log.i(TAG, "--- start onLayout --");
- int startLeft = 0; // 每个子视图的起始布局坐标
- int startTop = 10; // 间距设置为10px 相当于 android:marginTop= "10px"
- int childCount = getChildCount();
- Log.i(TAG, "--- onLayout childCount is -->" + childCount );
-
- for (int i = 0; i < childCount; i++) {
- View child = getChildAt(i);
-
- //即使可见的,才划到屏幕上
- if(child.getVisibility() != View.GONE)
- {
- child.layout(startLeft, startTop, startLeft + getWidth(), startTop + MultiScreenActivity.scrrenHeight );
- startLeft = startLeft + getWidth() ;}//校准每个子View的起始布局位置
- //三个子视图的在屏幕中的分布如下 [0 , 320] / [320,640] / [640,960]
- }
- }
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/NewsActivity.java b/代码/在这里3.0/src/com/stone/shop/view/NewsActivity.java
deleted file mode 100644
index 5d9c755..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/NewsActivity.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.stone.shop.view;
-
-import com.stone.shop.R;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.TextView;
-
-/**
- * 新闻内容显示界面
- * @date 2014-5-8
- * @author Stone
- */
-public class NewsActivity extends Activity {
-
- private TextView tvNewsTitle;
- private TextView tvNewsAuthor;
- private TextView tvNewsTime;
- private TextView tvNewsContent;
-
- private String newsTitle;
- private String newsAuthor;
- private String newsTime;
- private String newsContent;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_news);
-
- getIntentData();
- initView();
- }
-
- //获取Intent中传入的新闻数据
- private void getIntentData() {
- newsTitle = getIntent().getStringExtra("NewsTitle");
- newsAuthor = getIntent().getStringExtra("NewsAuthor");
- newsTime = getIntent().getStringExtra("NewsTime");
- newsContent = getIntent().getStringExtra("NewsContent");
-
- newsTitle = splitString(newsTitle); //拆分字符串, 将新闻标题设置为 "】" 后面的内容
- }
-
- private String splitString(String str) {
- String[] strs;
- if("".equals(str)){
- return "";
- } else if ( !(str.contains("【") || str.contains("】")) ) {
- return str;
- }
- strs = str.split("】");
- return strs[1];
- }
-
- private void initView() {
- tvNewsTitle = (TextView) findViewById(R.id.tv_news_title);
- tvNewsAuthor = (TextView) findViewById(R.id.tv_news_author);
- tvNewsTime = (TextView) findViewById(R.id.tv_news_time);
- tvNewsContent = (TextView) findViewById(R.id.tv_news_content);
-
- tvNewsTitle.setText(newsTitle);
- tvNewsAuthor.setText("作者: "+newsAuthor);
- tvNewsTime.setText("发布日期 : "+newsTime);
- tvNewsContent.setText(newsContent);
- }
-
-
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/OrderActivity.java b/代码/在这里3.0/src/com/stone/shop/view/OrderActivity.java
deleted file mode 100644
index 9952abd..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/OrderActivity.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.Calendar;
-
-import android.app.Activity;
-import android.app.TimePickerDialog;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.TimePicker;
-import android.widget.Toast;
-
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.listener.SaveListener;
-
-import com.stone.shop.R;
-import com.stone.shop.model.Good;
-import com.stone.shop.model.Order;
-import com.stone.shop.model.Shop;
-import com.stone.util.Util;
-
-/**
- * 应用主界面
- *
- * @date 2014-5-13
- * @author Stone
- */
-public class OrderActivity extends Activity implements OnClickListener {
-
- private TextView tvOrderShop; // 店名
- private TextView tvOrderGood; // 菜名
- private TextView tvOrderCount; // 数量
- private TextView tvOrderTime; // 取餐时间
- private TimePicker tpOrderTime; // 时间选择控件
- private EditText etOrderPhone; // 联系电话
- private EditText etOrderWords; // 附加留言
- private Button btnOrderCountMore; // 增加数量
- private Button btnOrderCountLess; // 减少数量
-
- private Button btnOrderSetTime; // 设置时间
- private Button btnOrderSubmit; // 提交订单
-
- private int mHour;
- private int mMinute;
- private String time = "12 : 30";
- private TimePickerDialog dlgSetOrderTime;
- private TimePickerDialog.OnTimeSetListener mTimeSetListener = new TimePickerDialog.OnTimeSetListener() {
-
- public void onTimeSet(TimePicker view, int hourOfDay, int minute) {
- mHour = hourOfDay;
- mMinute = minute;
- updateDisplay();
- }
- };
-
- // 从上级页面中传入的数据
- private Shop shop; // 当期选择的Shop
- private Good good; // 当前选择的商品
- private String shopID; // 当前选择的Shop的ID
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_order);
-
- shop = (Shop) getIntent().getSerializableExtra("shop");
- good = (Good) getIntent().getSerializableExtra("good");
- shopID = getIntent().getStringExtra("shopID");
-
- initView();
- }
-
- private void initView() {
-
- tvOrderShop = (TextView) findViewById(R.id.tv_order_shop);
- tvOrderGood = (TextView) findViewById(R.id.tv_order_good);
- tvOrderCount = (TextView) findViewById(R.id.tv_order_count);
- tvOrderTime = (TextView) findViewById(R.id.tv_order_time);
- tvOrderShop.setText(shop.getName());
- tvOrderGood.setText(good.getName());
-
- etOrderPhone = (EditText) findViewById(R.id.et_order_phone);
- etOrderWords = (EditText) findViewById(R.id.et_order_words);
-
- btnOrderCountMore = (Button) findViewById(R.id.btn_order_count_more);
- btnOrderCountLess = (Button) findViewById(R.id.btn_order_count_less);
- btnOrderSetTime = (Button) findViewById(R.id.btn_set_time);
- btnOrderSubmit = (Button) findViewById(R.id.btn_order_submit);
- btnOrderCountMore.setOnClickListener(this);
- btnOrderCountLess.setOnClickListener(this);
- btnOrderSetTime.setOnClickListener(this);
- btnOrderSubmit.setOnClickListener(this);
-
- }
-
-
- @Override
- public void onClick(View v) {
- int count;
- switch (v.getId()) {
- case R.id.btn_order_count_more:
- count = Integer.parseInt(tvOrderCount.getText().toString());
- if (count == 4) {toast("每份订单数量不能超过 4");
- } else {
- tvOrderCount.setText(Integer.toString(count+1)); }
- break;
- case R.id.btn_order_count_less:
- count = Integer.parseInt(tvOrderCount.getText().toString());
- if (count == 1) {
- toast("每份订单数量至少为 1 ");
- } else {tvOrderCount.setText(Integer.toString(count-1));}
- break;
- case R.id.btn_set_time:
- final Calendar c = Calendar.getInstance();
- mHour = c.get(Calendar.HOUR_OF_DAY);
- mMinute = c.get(Calendar.MINUTE);
- dlgSetOrderTime = new TimePickerDialog(this, mTimeSetListener, mHour, mMinute, true);
- dlgSetOrderTime.show();
- break;
- case R.id.btn_dlg_ok:
- time = tpOrderTime.getCurrentHour() + " : " + tpOrderTime.getCurrentMinute();
- dlgSetOrderTime.dismiss();
- break;
- case R.id.btn_order_submit:
- postOrder();
- finish();
- break;
- default:
- break;
- }
-
- }
-
- /**
- * 提交订单数据
- */
- private void postOrder() {
- String count = tvOrderCount.getText().toString();
- String phone = etOrderPhone.getText().toString();
- String words = etOrderWords.getText().toString();
- float price = Integer.parseInt(count) * Float.parseFloat(good.getPrice());
- if (!Util.isPhoneNumberValid(phone)) {
- toast("请输入正确的联系电话, 方便取餐");
- } else {
- Order order = new Order();
- BmobUser user = BmobUser.getCurrentUser(this);
- order.setUserName(user.getUsername());
- order.setGoodID(good.getObjectId());
- order.setGoodName(good.getName());
- order.setShopID(shop.getObjectId());
- order.setShopName(shop.getName());
- order.setCount(count);
- order.setTime(time);
- order.setPrice(Float.toString(price));
- order.setPhone(phone);
- order.setTips(words);
- order.save(this, new SaveListener() {
-
- @Override
- public void onSuccess() {
- // TODO
- toast("订单提交成功");
- }
-
- @Override
- public void onFailure(int arg0, String arg1) {
- // TODO
- toast("订单提交失败");
- }
- });
-
- }
- }
-
- private void updateDisplay() {
- time = mHour + " : " + mMinute;
- tvOrderTime.setText(time);
- }
-
- private void back() {
- Intent back = new Intent(OrderActivity.this, ShopItemActivity.class);
- Bundle bundle = new Bundle();
- bundle.putSerializable("shop", shop);
- bundle.putString("shopID", shopID); // 商铺的ID需要单独传递,否则获取到的是null
- back.putExtras(bundle);
- startActivity(back);
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/OrderInfoActivity.java b/代码/在这里3.0/src/com/stone/shop/view/OrderInfoActivity.java
deleted file mode 100644
index 8de8190..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/OrderInfoActivity.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemLongClickListener;
-import android.widget.ListView;
-import android.widget.PopupMenu;
-import android.widget.Toast;
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.OrderInfoListAdapter;
-import com.stone.shop.model.Order;
-
-/**
- * 订单详情页面
- *
- * @date 2014-5-27
- * @author Stone
- */
-public class OrderInfoActivity extends Activity implements OnItemLongClickListener{
-
- private ListView lvOrderInfo;
- private OrderInfoListAdapter orderInfoListAdapter;
- private List orderList = new ArrayList();
-
- private String type = ""; // now-当前订单 old-历史订单
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_order_info);
-
- type = getIntent().getStringExtra("type");
-
- initData();
- initView();
- }
-
- private void initView() {
- lvOrderInfo = (ListView) findViewById(R.id.lv_order_info);
- orderInfoListAdapter = new OrderInfoListAdapter(this, orderList);
- lvOrderInfo.setAdapter(orderInfoListAdapter);
- lvOrderInfo.setOnItemLongClickListener(this);
- }
-
- // 初始化列表菜单中数据
- public void initData() {
- // 获取用户
- BmobUser user = BmobUser.getCurrentUser(this);
-
- // 获取小菜订单(数量)
- BmobQuery query = new BmobQuery();
- query.order("-updatedAt");
- query.addWhereEqualTo("userName", user.getUsername());
- if("now".equals(type)) {
- query.addWhereEqualTo("state", "未取餐");
- } else if("old".equals(type)) {
- query.addWhereEqualTo("state", "已取餐");
- } else {/*do nothing*/}
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List object) {
- if (object.isEmpty())
- toast("您还没有订单");
- orderList = object;
- // 通知Adapter数据更新
- orderInfoListAdapter.refresh(orderList);
- orderInfoListAdapter.notifyDataSetChanged();
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("查询失败");
- }
- });
-
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
- //订单长按响应事件
- @Override
- public boolean onItemLongClick(AdapterView> parent, View view,
- int position, long id) {
- PopupMenu popup = new PopupMenu(this, lvOrderInfo);
- popup.getMenuInflater().inflate(R.menu.popup, popup.getMenu());
-
- popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
- public boolean onMenuItemClick(MenuItem item) {
- Toast.makeText(OrderInfoActivity.this, "Clicked popup menu item " + item.getTitle(),
- Toast.LENGTH_SHORT).show();
- return true;
- }
- });
-
- popup.show();
- return false;
- }
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/RegisterActivity.java b/代码/在这里3.0/src/com/stone/shop/view/RegisterActivity.java
deleted file mode 100644
index cb35761..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/RegisterActivity.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.stone.shop.view;
-
-import com.stone.shop.R;
-import com.stone.shop.model.User;
-import com.stone.util.Util;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.Toast;
-import cn.bmob.v3.listener.SaveListener;
-
-/**
- * 注册界面
- *
- * @date 2014-4-24
- * @author Stone
- */
-public class RegisterActivity extends Activity implements OnClickListener {
-
- private Button btnReg;
- private EditText etUsername;
- private EditText etPassword;
- private EditText etComfirmPsd;
- private EditText etPhone;
-
- private String username = null;
- private String password = null;
- private String comfirmPsd = null;
- private String phone = null;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_reg);
-
- etUsername = (EditText) findViewById(R.id.et_username);
- etPassword = (EditText) findViewById(R.id.et_password);
- etComfirmPsd = (EditText) findViewById(R.id.et_comfirm_psd);
- etPhone = (EditText) findViewById(R.id.et_phone);
-
- btnReg = (Button) findViewById(R.id.btn_reg_now);
- btnReg.setOnClickListener(this);
- }
-
- @Override
- public void onClick(View v) {
- if(v.getId()==R.id.btn_reg_now) {
- username = etUsername.getText().toString();
- password = etPassword.getText().toString();
- comfirmPsd = etComfirmPsd.getText().toString();
- phone = etPhone.getText().toString();
- if (!Util.isNetworkConnected(this)) {
- toast("木有网络 ( ⊙ o ⊙ ) ");
- } else if ("".equals(username) || "".equals(password) || "".equals(comfirmPsd) || "".equals(phone)) {
- toast("不填完整不能拿到身份证, ~~~~(>_<)~~~~ ");
- } else if (!comfirmPsd.equals(password)) {
- toast("两次密码输入不一致");
- } else if (!Util.isPhoneNumberValid(phone)) {
- toast("请输入正确的手机号码");
- } else {
- // 开始提交注册信息
- User bu = new User();
- bu.setUsername(username);
- bu.setPassword(password);
- bu.setPhone(phone);
- bu.signUp(this, new SaveListener() {
- @Override
- public void onSuccess() {
- toast("拿到身份证了,快登陆吧");
- Intent backLogin = new Intent(RegisterActivity.this, LoginActivity.class);
- startActivity(backLogin);
- RegisterActivity.this.finish();
- }
- @Override
- public void onFailure(int arg0, String arg1) {
- toast("该名字已被人使用,换个名字吧.");
- }
- }
-
- );
- }
- }
- }
-
- public void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/ReservationActivity.java b/代码/在这里3.0/src/com/stone/shop/view/ReservationActivity.java
deleted file mode 100644
index e516e79..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/ReservationActivity.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.stone.shop.view;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import com.stone.shop.R;
-import com.stone.shop.model.Reservation;
-import com.stone.shop.model.User;
-import com.stone.ui.DateTimePickDialogUtil;
-import com.stone.ui.DateTimePickDialogUtil.DateTimeListener;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.TextView;
-import android.widget.Toast;
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.listener.FindListener;
-import cn.bmob.v3.listener.SaveListener;
-
-public class ReservationActivity extends Activity {
-
- private Button btn_login;
- private SimpleDateFormat dateFormat;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.layout_reservation);
-
- TextView tv_title = (TextView) findViewById(R.id.tv_title);
- tv_title.setText("教室预定");
-
- final String roomId = getIntent().getStringExtra("roomId");
- final String roomName = getIntent().getStringExtra("roomName");
-
- TextView tv_room = (TextView) findViewById(R.id.tv_room);
- tv_room.setText("教室:" + roomName);
-
- btn_login = (Button) findViewById(R.id.btn_login);
-
- dateFormat = new SimpleDateFormat("yyyy年MM月dd日 HH:mm");
-
- // 查找Person表里面id为6b6c11c537的数据
- BmobQuery bmobQuery = new BmobQuery();
- bmobQuery.addWhereEqualTo("userId", User.userId);
- bmobQuery.addWhereEqualTo("roomId", roomId);
- bmobQuery.findObjects(ReservationActivity.this, new FindListener() {
- @Override
- public void onSuccess(List newsList) {
- if (!newsList.isEmpty()) {
- String dateTime = newsList.get(0).getDateTime();
- try {
- if (dateFormat.parse(dateTime).before(new Date())) {
- Reservation gameScore = new Reservation();
- gameScore.setObjectId(newsList.get(0).getObjectId());
- gameScore.delete(ReservationActivity.this);
- } else {
- btn_login.setEnabled(false);
- btn_login.setText("已经预定" + (TextUtils.isEmpty(dateTime) ? "" : (" " + dateTime)));
- }
- } catch (ParseException e) {
- Logger logger = Logger.getLogger("lavasoft");
- logger.log(Level.SEVERE, "sthwrong", e);}
- }
- }
- @Override
- public void onError(int arg0, String arg1) {toast("查询失败");}
- });
-
- btn_login.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- DateTimePickDialogUtil dateTimePicKDialog = new DateTimePickDialogUtil(ReservationActivity.this,
- dateFormat.format(new Date()));
- dateTimePicKDialog.dateTimePicKDialog(new DateTimeListener() {
- @Override
- public void onDateTimeChane(final String dateTime) {
- Reservation reservation = new Reservation();
- reservation.setRoomId(roomId);
- reservation.setRoomName(roomName);
- reservation.setUserId(User.userId);
- reservation.setDateTime(dateTime);
- reservation.save(ReservationActivity.this, new SaveListener() {
- @Override
- public void onSuccess() {
- toast("预定成功");
- btn_login.setEnabled(false);
- btn_login.setText("已经预定 " + dateTime);}
- @Override
- public void onFailure(int arg0, String arg1) {toast("预定失败");}
- });
- }
- });
-
- }
- });
-
- }
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/ShopActivity.java b/代码/在这里3.0/src/com/stone/shop/view/ShopActivity.java
deleted file mode 100644
index 4f7ab85..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/ShopActivity.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.stone.shop.view;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.GridAdapter;
-import com.stone.ui.MyGridView;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.Toast;
-
-/**
- * 商品主界面
- * @date 2014-4-24
- * @author Stone
- */
-public class ShopActivity extends Activity implements OnItemClickListener{
-
- private MyGridView gvSchoolClass; //学习小菜
- private MyGridView gvFoodClass; //吃饭小菜
- private MyGridView gvGiftClass; //购物小菜
- private MyGridView gvOutClass; //疯狂小菜
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_shop);
-
- initView();
- }
-
- /**
- * 初始化组件并适配数据
- */
- public void initView() {
- gvFoodClass = (MyGridView) findViewById(R.id.gv_food_class);
- gvGiftClass = (MyGridView) findViewById(R.id.gv_gift_class);
- gvOutClass = (MyGridView) findViewById(R.id.gv_out_class);
- gvSchoolClass = (MyGridView) findViewById(R.id.gv_school_class);
-
- gvFoodClass.setAdapter(new GridAdapter(this, 0));
- gvFoodClass.setOnItemClickListener(this);
-
- gvGiftClass.setAdapter(new GridAdapter(this, 1));
- gvGiftClass.setOnItemClickListener(this);
-
- gvOutClass.setAdapter(new GridAdapter(this, 2));
- gvOutClass.setOnItemClickListener(this);
-
- gvSchoolClass.setAdapter(new GridAdapter(this, 3));
- gvSchoolClass.setOnItemClickListener(this);
-
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position,
- long id) {
- Log.i("GridView点击了: ", "position"+position);
- switch (parent.getId()) {
-
- //点击 学习小菜 中的子项(1代表第一个GridView, (position+1)代表GridView中第几个元素)
- case R.id.gv_school_class:
- //教学类的做特别处理
- if(position==2) {
- Intent toInformationActivity = new Intent(ShopActivity.this,InformationActivity.class);
- startActivity(toInformationActivity);
- }
- if(position==1) {
- Intent toBXTActivity = new Intent(ShopActivity.this,LibraryActivity.class);
- startActivity(toBXTActivity);
- }
- if(position==0) {
- Intent toBXTActivity = new Intent(ShopActivity.this, ClassroomActivity.class);
- startActivity(toBXTActivity);
- }
-
- break;
- //点击 吃饭小菜 中的子项
- case R.id.gv_food_class:
- toShopAllActivity( GridAdapter.mFoodTexts[position], "2"+(position+1) );
- break;
- //点击 购物小菜 中的子项
- case R.id.gv_gift_class:
- if(position==0) {
- Intent toBXTActivity = new Intent(ShopActivity.this, BXTActivity.class);
- startActivity(toBXTActivity);
- } else {
- toShopAllActivity( GridAdapter.mGiftTexts[position], "3"+(position+1) );}
- break;
- case R.id.gv_out_class: //点击 疯狂小菜 中的子项
- toShopAllActivity( GridAdapter.mOutTexts[position], "4"+(position+1) );
- break;
- default:
- break;
- }
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
- /**
- *
- * @param title 父分类标题
- * @param type
- */
- private void toShopAllActivity(String title, String type) {
- Intent toShopAll = new Intent(ShopActivity.this, ShopAllActivity.class);
- toShopAll.putExtra("title", title);
- //当前点击的项的父分类
- toShopAll.putExtra("type", type);
- startActivity(toShopAll);
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/ShopAllActivity.java b/代码/在这里3.0/src/com/stone/shop/view/ShopAllActivity.java
deleted file mode 100644
index c0a7287..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/ShopAllActivity.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.stone.shop.view;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.ShopListAdapter;
-import com.stone.shop.model.Shop;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-import android.widget.AdapterView.OnItemClickListener;
-
-/**
- * 某一分类下的所有店铺页面
- * @author Stone
- * @date 2014-4-26
- */
-public class ShopAllActivity extends Activity implements OnItemClickListener{
-
- private static final String TAG = "ShopAllActivity" ;
-
- private TextView tvTitle;
- private ListView lvShopAllList;
- private ShopListAdapter shopListAdapter;
-
- //记录从ShopActivity中传过来的当前点击项的类型
- private String type;
- private List shopList = new ArrayList();
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_shop_all);
-
- //得到从上级Activity中传入的Type数据
- type = getIntent().getStringExtra("type");
-
- //获取商店数据
- getShopsDate();
-
- initView();
-
- }
-
- public void initView() {
- //设置标题
- tvTitle = (TextView) findViewById(R.id.tv_title);
- tvTitle.setText(getIntent().getStringExtra("title"));
-
- lvShopAllList = (ListView) findViewById(R.id.lv_shop_all);
- shopListAdapter = new ShopListAdapter(this, (ArrayList) shopList, type);
- lvShopAllList.setAdapter(shopListAdapter);
- lvShopAllList.setOnItemClickListener(this);
-
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position,
- long id) {
- //将当前点击的Shop对象传递给下一个Activity
- Intent toShopItem = new Intent(ShopAllActivity.this, ShopItemActivity.class);
- Bundle bundle = new Bundle();
- bundle.putSerializable("shop", shopList.get(position) );
- bundle.putString("shopID", shopList.get(position).getObjectId()); //商铺的ID需要单独传递,否则获取到的是null
- Log.i(TAG, ">>发出>>" + "shopID: "+shopList.get(position).getObjectId()+" shopName: "+shopList.get(position).getName());
- toShopItem.putExtras(bundle);
- startActivity(toShopItem);
- }
-
- /**
- * 加载当前分类的所有店铺到ListView中
- */
- private void getShopsDate() {
- BmobQuery query = new BmobQuery();
- query.order("-updatedAt");
- Shop shop = new Shop();
- shop.setType(type);
- query.addWhereEqualTo("type", shop.getType()); // 查询当前类型的所有店铺
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List object) {
- if(object.isEmpty())
- toast("还没开张, 耐心等待吧");
- shopList = object;
- // 通知Adapter数据更新
- shopListAdapter.refresh((ArrayList) shopList);
- shopListAdapter.notifyDataSetChanged();
-
- }
-
- @Override
- public void onError(int arg0, String msg) {
- toast("查询失败:"+msg);
- }
-
- });
- }
-
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/ShopItemActivity.java b/代码/在这里3.0/src/com/stone/shop/view/ShopItemActivity.java
deleted file mode 100644
index 32c51bd..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/ShopItemActivity.java
+++ /dev/null
@@ -1,252 +0,0 @@
-package com.stone.shop.view;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.support.v4.view.PagerTabStrip;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.BmobQuery.CachePolicy;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.shop.R;
-import com.stone.shop.adapter.GoodsListAdapter;
-import com.stone.shop.adapter.ViewPagerAdapter;
-import com.stone.shop.model.Good;
-import com.stone.shop.model.Shop;
-import com.stone.ui.ViewPagerCompat;
-
-public class ShopItemActivity extends Activity implements OnClickListener, OnItemClickListener{
-
- private static final String TAG = "ShopItemActivity";
-
- // ViewPager页
- private View view1, view2; // 需要滑动的页卡
- private ViewPagerCompat viewPager; // viewpager
- private ViewPagerAdapter shopViewPagerAdapter;
- private PagerTabStrip pagerTabStrip; // 一个viewpager的指示器,效果就是一个横的粗的下划线
- private List viewList; // 把需要滑动的页卡添加到这个list中
- private List titleList; // viewpager的标题
-
- // 店铺商品列表
- private ListView lvGoodsList;
- private GoodsListAdapter goodsListAdapter;
-
- // 店铺简介页中的控件
- private TextView tvShopName; // 店铺名
- private TextView tvShopInfo; // 店铺简介
- private TextView tvShopSale; // 店铺促销信息
- private TextView tvShopLoc; // 店铺地理位置
- private TextView tvShopPhone; // 店铺电话
- private Button btnCommit;
- private EditText etCommit;
- private LinearLayout llCommitParent; // 评论父线性布局
- private ImageView imgCall; // 拨打电话
-
- // UI测试数据
- private static List goodsList;
-
- // 从上级页面中传入的数据
- private Shop shop; // 当期选择的Shop
- private Good selectGood;
- private String shopID; // 当前选择的Shop的ID
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_shop_item);
-
- // 获取到从ShopAllActivity中传递过来的Shop对象
- shop = (Shop) getIntent().getSerializableExtra("shop");
- shopID = getIntent().getStringExtra("shopID");
- Log.i(TAG, "<<收到<<" + "shopID: " + shop.getObjectId() + " shopName: "
- + shop.getName());
- Log.i(TAG,
- "<<收到<<" + "shopID: " + shopID + " shopName: " + shop.getName());
-
- // 初始化商品页面以及适配数据
- initGoodsDate();
- initView();
-
-
- }
-
- public void initView() {
-
- viewPager = (ViewPagerCompat) findViewById(R.id.viewpager);
- pagerTabStrip = (PagerTabStrip) findViewById(R.id.pagertab);
- pagerTabStrip.setTabIndicatorColor(Color.rgb(255, 0, 0));
- pagerTabStrip.setDrawFullUnderline(false);
- pagerTabStrip.setTextSpacing(50);
- pagerTabStrip.setTextColor(Color.rgb(255, 0, 0));
-
- view1 = LayoutInflater.from(this)
- .inflate(R.layout.viewpager_menu, null);
- view2 = LayoutInflater.from(this).inflate(R.layout.viewpager_shopinfo,
- null);
-
- initContentView();
-
- viewList = new ArrayList();// 将要分页显示的View装入数组中
- viewList.add(view1);
- viewList.add(view2);
-
- titleList = new ArrayList();// 每个页面的Title数据
- titleList.add("商品");
- titleList.add("店铺简介");
- shopViewPagerAdapter = new ViewPagerAdapter(viewList, titleList);
-
- viewPager.setAdapter(shopViewPagerAdapter);
- viewPager.setCurrentItem(0);
-
- }
-
- /**
- * 获取某一商店的所有商品
- *
- * @date 2014-5-1
- * @autor Stone
- */
- public void initGoodsDate() {
- goodsList = new ArrayList();
- goodsListAdapter = new GoodsListAdapter(this, goodsList);
- BmobQuery query = new BmobQuery();
- query.addWhereEqualTo("shopID", shopID);
- query.setCachePolicy(CachePolicy.CACHE_ELSE_NETWORK); //
- // 先从缓存取数据,如果没有,再从网络取。
- query.setLimit(15); // 限制最多15个结果
- query.findObjects(this, new FindListener() {
-
- @Override
- public void onSuccess(List goods) {
- if (goods.isEmpty()) {
- toast("该店还没有添加商品");
- }
- goodsList = goods;
- goodsListAdapter.refresh(goodsList);
- goodsListAdapter.notifyDataSetChanged();
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("查询失败");
- }
- });
-
- }
-
- public void initContentView() {
- // 商品列表页
- lvGoodsList = (ListView) view1.findViewById(R.id.lv_goods_list);
- lvGoodsList.setAdapter(goodsListAdapter);
- lvGoodsList.setOnItemClickListener(this);
-
- // 店铺简介页
- tvShopName = (TextView) view2.findViewById(R.id.tv_shop_title);
- tvShopInfo = (TextView) view2.findViewById(R.id.tv_shop_introduce);
- tvShopSale = (TextView) view2.findViewById(R.id.tv_shop_promotion);
- tvShopLoc = (TextView) view2.findViewById(R.id.tv_shop_location);
- tvShopPhone = (TextView) view2.findViewById(R.id.tv_shop_phone);
- tvShopName.setText(shop.getName()); // 设置店铺名
- tvShopInfo.setText(shop.getInfo()); // 设置店铺简介
- tvShopSale.setText(shop.getSale()); // 设置店铺公告
- tvShopLoc.setText("位置:" + "二食堂二楼"); // 设置店铺位置
- tvShopPhone.setText("电话:" + shop.getPhone()); // 设置店铺联系电话
-
- btnCommit = (Button) view2.findViewById(R.id.btn_commit);
- btnCommit.setOnClickListener(this);
-
- // 获取到评论的布局
- etCommit = (EditText) view2.findViewById(R.id.et_commit);
- llCommitParent = (LinearLayout) view2
- .findViewById(R.id.ll_commit_parent_view);
- imgCall = (ImageView) view2.findViewById(R.id.img_call);
- imgCall.setOnClickListener(this);
-
- }
-
- /**
- * 添加一条评论
- *
- * @param user
- * @param content
- */
- public void insertCommit(String user, String content) {
- View view = LayoutInflater.from(this).inflate(R.layout.commit, null);
- TextView tvUser = (TextView) view.findViewById(R.id.tv_commit_user);
- TextView tvContent = (TextView) view
- .findViewById(R.id.tv_commit_content);
- tvUser.setText(user);
- tvContent.setText(content);
- llCommitParent.addView(view);
- }
-
-
- @Override
- public void onClick(View v) {
- switch (v.getId()) {
- case R.id.btn_commit:
- if ("".equals(etCommit.getText().toString())) {toast("亲,先写一句吧");}
- else {
- SimpleDateFormat formatter = new SimpleDateFormat("yyyy年MM月dd日 HH:mm:ss ");
- Date curDate = new Date(System.currentTimeMillis());// 获取当前时间
- String time = formatter.format(curDate);
- String content = etCommit.getText().toString() + " [ " + time+ " ] ";
- insertCommit("admin" + ":", content);
- etCommit.setText("");
- }
- break;
- case R.id.img_call:
- toast("店主没有留下电话");
- break;
- default:
- break;
- }
- }
-
- @Override
- public void onItemClick(AdapterView> parent, View view, int position,
- long id) {
- switch (viewPager.getCurrentItem()) {
- case 0:
- toast("选择的商品名称: " + goodsList.get(position).getName());
- selectGood = goodsList.get(position);
- toast("点击了购买按钮");
- Intent toOrderActivity = new Intent(ShopItemActivity.this, OrderActivity.class);
- Bundle bundle = new Bundle();
- bundle.putSerializable("shop", shop );
- bundle.putSerializable("good", selectGood);
- bundle.putString("shopID", shopID); //商铺的ID需要单独传递,否则获取到的是null
- toOrderActivity.putExtras(bundle);
- startActivity(toOrderActivity);
- break;
- case 1:
- break;
- default:
- break;
- }
- }
-
- public void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/SplashActivity.java b/代码/在这里3.0/src/com/stone/shop/view/SplashActivity.java
deleted file mode 100644
index a8fb5be..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/SplashActivity.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.stone.shop.view;
-
-import com.stone.shop.R;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Animation;
-import android.view.animation.Animation.AnimationListener;
-import android.view.animation.AnimationSet;
-import android.view.animation.RotateAnimation;
-import android.view.animation.ScaleAnimation;
-import android.widget.RelativeLayout;
-
-public class SplashActivity extends Activity {
- private RelativeLayout rlSplash;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- initView();
- initAnimation();
- }
-
- private void initView() {
- setContentView(R.layout.activity_splash);
- rlSplash = (RelativeLayout) findViewById(R.id.rl_splash);
- }
-
- private void initAnimation() {
- AnimationSet set = new AnimationSet(false);
- RotateAnimation rtAnimation = new RotateAnimation(0, 360,
- Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF,
- 0.5f);
- rtAnimation.setDuration(2000);
- rtAnimation.setFillAfter(true);
-
- ScaleAnimation scAnimation = new ScaleAnimation(0, 1, 0, 1,
- Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF,
- 0.5f);
- scAnimation.setDuration(2000);
- scAnimation.setFillAfter(true);
-
- AlphaAnimation alAnimation = new AlphaAnimation(0, 1);
- alAnimation.setDuration(2000);
- alAnimation.setFillAfter(true);
-
- set.addAnimation(rtAnimation);
- set.addAnimation(scAnimation);
- set.addAnimation(alAnimation);
-
- set.setAnimationListener(new AnimationListener() {
-
- @Override
- public void onAnimationStart(Animation arg0) {
- /*do nothing*/
- }
-
- @Override
- public void onAnimationRepeat(Animation arg0) {
- /*do nothing*/
- }
-
- @Override
- public void onAnimationEnd(Animation arg0) {
- startActivity(new Intent(SplashActivity.this,
- MultiScreenActivity.class));
- finish();
- }
- });
-
- rlSplash.startAnimation(set);
- }
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/WsqActivity.java b/代码/在这里3.0/src/com/stone/shop/view/WsqActivity.java
deleted file mode 100644
index c3b3a65..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/WsqActivity.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.stone.shop.view;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.webkit.WebChromeClient;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.Toast;
-
-import com.stone.shop.R;
-
-/**
- * 购物车主界面
- * @date 2014-4-24
- * @author Stone
- */
-public class WsqActivity extends Activity {
-
- private static final String URL_WSQ = "http://wx.wsq.qq.com/231782938";
- private WebView wsqWebView;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_car);
-
- wsqWebView = (WebView) findViewById(R.id.wv_wsq);
-
- // -----------------------------------------------------------------
-
- wsqWebView.getSettings().setJavaScriptEnabled(true); // 设置使用够执行JS脚本
- wsqWebView.getSettings().setDefaultFontSize(12);
- wsqWebView.setWebChromeClient(new WebChromeClient());
- wsqWebView.setWebViewClient(new WebViewClient() {
- @Override
- public boolean shouldOverrideUrlLoading(WebView view,
- String url) {
- view.loadUrl(url);// 使用当前WebView处理跳转
- return true;// true表示此事件在此处被处理,不需要再广播
- }
-
- @Override
- // 转向错误时的处理
- public void onReceivedError(WebView view, int errorCode,
- String description, String failingUrl) {
- Toast.makeText(WsqActivity.this,
- "Oh no! " + description, Toast.LENGTH_SHORT)
- .show();
- }
- });
- wsqWebView.loadUrl(URL_WSQ);
- // ------------------------------------------------
-
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/shop/view/old/OldMineActivity.java b/代码/在这里3.0/src/com/stone/shop/view/old/OldMineActivity.java
deleted file mode 100644
index 2c48b09..0000000
--- a/代码/在这里3.0/src/com/stone/shop/view/old/OldMineActivity.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package com.stone.shop.view.old;
-
-import java.util.List;
-
-import cn.bmob.v3.BmobQuery;
-import cn.bmob.v3.BmobUser;
-import cn.bmob.v3.listener.FindListener;
-
-import com.stone.shop.R;
-import com.stone.shop.model.User;
-import com.stone.shop.view.AboutActivity;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
-import android.widget.Button;
-import android.widget.TextView;
-import android.widget.Toast;
-
-/**
- * 个人中心主界面
- * @date 2014-4-24
- * @author Stone
- */
-public class OldMineActivity extends Activity implements OnClickListener{
-
- private static final String TAG = "OldMineActivity" ;
-
- private Button btnAbout;
- private Button btnContact;
- private Button btnJoin;
-
- private TextView tvUserName; //当前用户的用户名
- private TextView tvSchool; //学校
- private TextView tvCademy; //学院
- private TextView tvDorPart; //所在区 西区
- private TextView tvDorNum; //宿舍楼号 19栋
-
- private TextView tvMe; //我
- private TextView tvXiaoCai; //小菜
- private TextView tvBowl; //饭碗
- private User user = new User();
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_mine_old);
-
- BmobUser user = BmobUser.getCurrentUser(this);
- Log.i(TAG, "BmobUser.userName = " + user.getUsername());
- getCurUser(user.getUsername());
-
- initView();
- }
-
- public void initView() {
-
- tvUserName = (TextView) findViewById(R.id.tv_username);
- tvSchool = (TextView) findViewById(R.id.tv_school);
- tvCademy = (TextView) findViewById(R.id.tv_cademy);
- tvDorPart = (TextView) findViewById(R.id.tv_dorPart);
- tvDorNum = (TextView) findViewById(R.id.tv_dorNum);
-
- btnAbout = (Button) findViewById(R.id.btn_about);
- btnContact = (Button) findViewById(R.id.btn_contact);
- btnJoin = (Button) findViewById(R.id.btn_share);
-
- tvUserName = (TextView) findViewById(R.id.tv_username);
- tvMe = (TextView) findViewById(R.id.tv_me);
- tvXiaoCai = (TextView) findViewById(R.id.tv_xiaocai);
- tvBowl = (TextView) findViewById(R.id.tv_bowl);
-
- btnAbout.setOnClickListener(this);
- btnContact.setOnClickListener(this);
- btnJoin.setOnClickListener(this);
-
- tvMe.setOnClickListener(this);
- tvXiaoCai.setOnClickListener(this);
- tvBowl.setOnClickListener(this);
- }
-
- //获得当前用户User类型
- public void getCurUser(String username) {
- BmobQuery query = new BmobQuery();
- query.addWhereEqualTo("username", username);
- query.findObjects(this, new FindListener() {
- @Override
- public void onSuccess(List object) {
- if(object.size()==1)
- user = object.get(0);
- else
- user = null;
- loadData();
- }
-
- @Override
- public void onError(int arg0, String arg1) {
- toast("获取信息失败");
- }
- });
- }
-
- //加载查询到的用户数据
- public void loadData() {
- tvUserName.setText(user.getUsername());
- tvSchool.setText(user.getSchool());
- tvCademy.setText(user.getCademy());
- tvDorPart.setText(user.getDorPart());
- tvDorNum.setText(user.getDorNum());
- }
-
- @Override
- public void onClick(View v) {
- switch (v.getId()) {
- case R.id.btn_share:
- Intent toShare = new Intent(Intent.ACTION_SEND);
- toShare.setType("text/plain");
- toShare.putExtra(Intent.EXTRA_SUBJECT, "分享");
- toShare.putExtra(Intent.EXTRA_TEXT, "在这里" +"\n" + "针对NUDT三号狱的在这里测试版上线了,赶紧下载体验吧"+ "http://xiaocai.bmob.cn");
- startActivity(Intent.createChooser(toShare, "分享到"));
- break;
- case R.id.tv_me:
- startAnim(R.id.tv_me);
- break;
- case R.id.tv_xiaocai:
- startAnim(R.id.tv_xiaocai);
- break;
- case R.id.tv_bowl:
- startAnim(R.id.tv_bowl);
- break;
- default:
- Intent toAbout = new Intent(OldMineActivity.this, AboutActivity.class);
- startActivity(toAbout);
- break;
- }
- }
-
- //点击文字动画
- private void startAnim(int id){
- Animation scale = AnimationUtils.loadAnimation(this, R.anim.shake);
- if(id == R.id.tv_me)
- tvMe.startAnimation(scale);
- else if(id == R.id.tv_xiaocai)
- tvXiaoCai.startAnimation(scale);
- else if(id == R.id.tv_bowl)
- tvBowl.startAnimation(scale);
- else {/*do nothing*/ }
- }
-
- private void toast(String toast) {
- Toast.makeText(this, toast, Toast.LENGTH_SHORT).show();
- }
-
-
-
-}
diff --git a/代码/在这里3.0/src/com/stone/ui/DateTimePickDialogUtil.java b/代码/在这里3.0/src/com/stone/ui/DateTimePickDialogUtil.java
deleted file mode 100644
index f2ac64b..0000000
--- a/代码/在这里3.0/src/com/stone/ui/DateTimePickDialogUtil.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package com.stone.ui;
-
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-
-import com.stone.shop.R;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.widget.DatePicker;
-import android.widget.DatePicker.OnDateChangedListener;
-import android.widget.LinearLayout;
-import android.widget.TimePicker;
-import android.widget.TimePicker.OnTimeChangedListener;
-
-/**
- * 日期时间选择控件 使用方法: private EditText inputDate;//需要设置的日期时间文本编辑框 private String
- * initDateTime="2012年9月3日 14:44",//初始日期时间值 在点击事件中使用:
- * inputDate.setOnClickListener(new OnClickListener() {
- *
- * @Override public void onClick(View v) { DateTimePickDialogUtil
- * dateTimePicKDialog=new
- * DateTimePickDialogUtil(SinvestigateActivity.this,initDateTime);
- * dateTimePicKDialog.dateTimePicKDialog(inputDate);
- *
- * } });
- *
- * @author
- */
-public class DateTimePickDialogUtil implements OnDateChangedListener, OnTimeChangedListener {
- private DatePicker datePicker;
- private TimePicker timePicker;
- private AlertDialog ad;
- private String dateTime;
- private String initDateTime;
- private Activity activity;
-
- /**
- * 日期时间弹出选择框构造函数
- *
- * @param activity
- * :调用的父activity
- * @param initDateTime
- * 初始日期时间值,作为弹出窗口的标题和日期时间初始值
- */
- public DateTimePickDialogUtil(Activity activity, String initDateTime) {
- this.activity = activity;
- this.initDateTime = initDateTime;
-
- }
-
- public void init(DatePicker datePicker, TimePicker timePicker) {
- Calendar calendar = Calendar.getInstance();
- if (!(null == initDateTime || "".equals(initDateTime))) {
- calendar = this.getCalendarByInintData(initDateTime);
- } else {
- initDateTime = calendar.get(Calendar.YEAR) + "年" + calendar.get(Calendar.MONTH) + "月"
- + calendar.get(Calendar.DAY_OF_MONTH) + "日 " + calendar.get(Calendar.HOUR_OF_DAY) + ":"
- + calendar.get(Calendar.MINUTE);
- }
-
- datePicker.init(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH),
- this);
- timePicker.setCurrentHour(calendar.get(Calendar.HOUR_OF_DAY));
- timePicker.setCurrentMinute(calendar.get(Calendar.MINUTE));
- }
-
- /**
- * 弹出日期时间选择框方法
- *
- * @param inputDate
- * :为需要设置的日期时间文本编辑框
- * @return
- */
- public AlertDialog dateTimePicKDialog(final DateTimeListener dateTimeListener) {
- LinearLayout dateTimeLayout = (LinearLayout) activity.getLayoutInflater().inflate(R.layout.common_datetime,
- null);
- datePicker = (DatePicker) dateTimeLayout.findViewById(R.id.datepicker);
- timePicker = (TimePicker) dateTimeLayout.findViewById(R.id.timepicker);
- init(datePicker, timePicker);
- timePicker.setIs24HourView(true);
- timePicker.setOnTimeChangedListener(this);
-
- ad = new AlertDialog.Builder(activity).setTitle(initDateTime).setView(dateTimeLayout)
- .setPositiveButton("设置", new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int whichButton) {
-
- if (dateTimeListener != null) {
- dateTimeListener.onDateTimeChane(dateTime);
- }
- }
- }).setNegativeButton("取消", new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int whichButton) {/*do nothing*/}
- }).show();
-
- onDateChanged(null, 0, 0, 0);
- return ad;
- }
-
- public void onTimeChanged(TimePicker view, int hourOfDay, int minute) {
- onDateChanged(null, 0, 0, 0);
- }
-
- public void onDateChanged(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
- // 获得日历实例
- Calendar calendar = Calendar.getInstance();
-
- calendar.set(datePicker.getYear(), datePicker.getMonth(), datePicker.getDayOfMonth(),
- timePicker.getCurrentHour(), timePicker.getCurrentMinute());
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日 HH:mm");
-
- dateTime = sdf.format(calendar.getTime());
- ad.setTitle(dateTime);
- }
-
- /**
- * 实现将初始日期时间2012年07月02日 16:45 拆分成年 月 日 时 分 秒,并赋值给calendar
- *
- * @param initDateTime
- * 初始日期时间值 字符串型
- * @return Calendar
- */
- private Calendar getCalendarByInintData(String initDateTime) {
- Calendar calendar = Calendar.getInstance();
-
- // 将初始日期时间2012年07月02日 16:45 拆分成年 月 日 时 分 秒
- String date = spliteString(initDateTime, "日", "index", "front"); // 日期
- String time = spliteString(initDateTime, "日", "index", "back"); // 时间
-
- String yearStr = spliteString(date, "年", "index", "front"); // 年份
- String monthAndDay = spliteString(date, "年", "index", "back"); // 月日
-
- String monthStr = spliteString(monthAndDay, "月", "index", "front"); // 月
- String dayStr = spliteString(monthAndDay, "月", "index", "back"); // 日
-
- String hourStr = spliteString(time, ":", "index", "front"); // 时
- String minuteStr = spliteString(time, ":", "index", "back"); // 分
- int currentYear =Integer.parseInt(yearStr.trim());
- int currentMonth = Integer.parseInt(monthStr.trim())-1;
- int currentDay = Integer.parseInt(dayStr.trim());
- int currentHour = Integer.parseInt(hourStr.trim());
- int currentMinute = Integer.parseInt(minuteStr.trim());
-/*
- int currentYear = Integer.valueOf(yearStr.trim()).intValue();
- int currentMonth = Integer.valueOf(monthStr.trim()).intValue() - 1;
- int currentDay = Integer.valueOf(dayStr.trim()).intValue();
- int currentHour = Integer.valueOf(hourStr.trim()).intValue();
- int currentMinute = Integer.valueOf(minuteStr.trim()).intValue();
-*/
- calendar.set(currentYear, currentMonth, currentDay, currentHour, currentMinute);
- return calendar;
- }
-
- /**
- * 截取子串
- *
- * @param srcStr
- * 源串
- * @param pattern
- * 匹配模式
- * @param indexOrLast
- * @param frontOrBack
- * @return
- */
- public static String spliteString(String srcStr, String pattern, String indexOrLast, String frontOrBack) {
- String result = "";
- int loc;
- if ("index".equalsIgnoreCase(indexOrLast)) {
- loc = srcStr.indexOf(pattern); // 取得字符串第一次出现的位置
- } else {
- loc = srcStr.lastIndexOf(pattern); // 最后一个匹配串的位置
- }
- if ("front".equalsIgnoreCase(frontOrBack)) {
- if (loc != -1)
- result = srcStr.substring(0, loc); // 截取子串
- } else {
- if (loc != -1)
- result = srcStr.substring(loc + 1, srcStr.length()); // 截取子串
- }
- return result;
- }
-
- public interface DateTimeListener {
-
- void onDateTimeChane(String dateTime);
-
- }
-}
diff --git a/代码/在这里3.0/src/com/stone/ui/ListScrollView.java b/代码/在这里3.0/src/com/stone/ui/ListScrollView.java
deleted file mode 100644
index a04aaf7..0000000
--- a/代码/在这里3.0/src/com/stone/ui/ListScrollView.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.stone.ui;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.ListView;
-import android.widget.ScrollView;
-
-public class ListScrollView extends ScrollView {
-
- private ListView listView;
-
- public ListScrollView(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public ListScrollView(Context context) {
- super(context);
- }
-
- /**
- * 覆写onInterceptTouchEvent方法,点击操作发生在ListView的区域的时候,
- * 返回false让ScrollView的onTouchEvent接收不到MotionEvent,而是把Event传到下一级的控件中
- */
- @Override
- public boolean onInterceptTouchEvent(MotionEvent ev) {
- // TODO Auto-generated method stub
- if (listView != null && checkArea(listView, ev)) {
- return false;
- }
- return super.onInterceptTouchEvent(ev);
- }
-
- /**
- * 测试view是否在点击范围内
- * @param locate
- * @param v
- * @return
- */
- private boolean checkArea(View v, MotionEvent event){
- float x = event.getRawX();
- float y = event.getRawY();
- int[] locate = new int[2];
- v.getLocationOnScreen(locate);
- int l = locate[0];
- int r = l + v.getWidth();
- int t = locate[1];
- int b = t + v.getHeight();
- if (l < x && x < r && t < y && y < b) {
- return true;
- }
- return false;
- }
-
- public ListView getListView() {
- return listView;
- }
-
- public void setListView(ListView listView) {
- this.listView = listView;
- }
-}
diff --git a/代码/在这里3.0/src/com/stone/ui/MyGridView.java b/代码/在这里3.0/src/com/stone/ui/MyGridView.java
deleted file mode 100644
index dbbbf38..0000000
--- a/代码/在这里3.0/src/com/stone/ui/MyGridView.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.stone.ui;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.GridView;
-
-/**
- * 商品详情页--商品分类网格视图
- * @author Stone
- */
-public class MyGridView extends GridView {
-
- public MyGridView(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public MyGridView(Context context) {
- super(context);
- }
-
- public MyGridView(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- }
-
- @Override
- public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- int expandSpec = MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2,
- MeasureSpec.AT_MOST);
- super.onMeasure(widthMeasureSpec, expandSpec);
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/ui/ViewPagerCompat.java b/代码/在这里3.0/src/com/stone/ui/ViewPagerCompat.java
deleted file mode 100644
index 2263f31..0000000
--- a/代码/在这里3.0/src/com/stone/ui/ViewPagerCompat.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.stone.ui;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import android.content.Context;
-import android.support.v4.view.ViewPager;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-
-/**
- * 商铺详情页--ViewPager的加强类,主要是为了解决滑动冲突的问题。不然的话,
- * 在ViewPager内部加入ListView等可滑动控件,两者之间会产生干扰。
- * @author Stone
- * {@link} http://blog.csdn.net/singwhatiwanna/article/details/17201587
- */
-//测试自动分析
-public class ViewPagerCompat extends ViewPager {
- // mViewTouchMode表示ViewPager是否全权控制滑动事件,默认为false,即不控制
- private boolean mViewTouchMode = false;
-
- public ViewPagerCompat(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- public void setViewTouchMode(boolean b) {
- if (b && !isFakeDragging()) {
- // 全权控制滑动事件
- beginFakeDrag();
- } else if (!b && isFakeDragging()) {
- // 终止控制滑动事件
- endFakeDrag();
- }
- mViewTouchMode = b;
- }
-
- /**
- * 在mViewTouchMode为true的时候,ViewPager不拦截点击事件,点击事件将由子View处理
- */
- @Override
- public boolean onInterceptTouchEvent(MotionEvent event) {
- if (mViewTouchMode) {
- return false;
- }
- return super.onInterceptTouchEvent(event);
- }
-
- @Override
- public boolean onTouchEvent(MotionEvent ev) {
- try {
- return super.onTouchEvent(ev);
- } catch (Exception e) {
- Logger logger = Logger.getLogger("lavasoft");
- logger.log(Level.SEVERE, "sthwrong", e);
- return false;
- }
- }
-
- /**
- * 在mViewTouchMode为true或者滑动方向不是左右的时候,ViewPager将放弃控制点击事件,
- * 这样做有利于在ViewPager中加入ListView等可以滑动的控件,否则两者之间的滑动将会有冲突
- */
- @Override
- public boolean arrowScroll(int direction) {
- if (mViewTouchMode)
- return false;
- if (direction != FOCUS_LEFT && direction != FOCUS_RIGHT)
- return false;
- return super.arrowScroll(direction);
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/util/ActivityUtil.java b/代码/在这里3.0/src/com/stone/util/ActivityUtil.java
deleted file mode 100644
index 40870f2..0000000
--- a/代码/在这里3.0/src/com/stone/util/ActivityUtil.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.stone.util;
-
-import android.content.Context;
-import android.view.Gravity;
-import android.widget.Toast;
-
-public final class ActivityUtil {
-
- /**
- * 短时间显示Toast消息,并保证运行在UI线程中
- *
- * @param activity
- * Activity
- * @param message
- * 消息内容
- */
- public static void show(final Context context, final String message) {
- Toast toast = ToastFactory.getToast(context, message);
- toast.setGravity(Gravity.CENTER, 0, 0);
- toast.show();
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/util/ToastFactory.java b/代码/在这里3.0/src/com/stone/util/ToastFactory.java
deleted file mode 100644
index 31f160b..0000000
--- a/代码/在这里3.0/src/com/stone/util/ToastFactory.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.stone.util;
-
-import android.content.Context;
-import android.widget.Toast;
-
-
-public class ToastFactory {
- private static Context context = null;
- private static Toast toast = null;
-
- public static Toast getToast(Context context, String text) {
- if (ToastFactory.context == context) {
- toast.setText(text);
- toast.setDuration(Toast.LENGTH_SHORT);
-
- } else {
-
- ToastFactory.context = context;
- toast = Toast.makeText(context, text, Toast.LENGTH_SHORT);
- }
- return toast;
- }
-
- public static void cancelToast() {
- if (toast != null) {
- toast.cancel();
- }
- }
-
-}
diff --git a/代码/在这里3.0/src/com/stone/util/Util.java b/代码/在这里3.0/src/com/stone/util/Util.java
deleted file mode 100644
index ed81ca3..0000000
--- a/代码/在这里3.0/src/com/stone/util/Util.java
+++ /dev/null
@@ -1,755 +0,0 @@
-package com.stone.util;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.RandomAccessFile;
-import java.io.UnsupportedEncodingException;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.ProgressDialog;
-import android.content.ContentUris;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Bitmap.CompressFormat;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Environment;
-import android.provider.MediaStore;
-import android.text.TextUtils;
-import android.util.Log;
-import android.widget.Toast;
-import junit.framework.Assert;
-
-/**
- * 工具类
- *
- * @date 2014-5-9
- * @author Stone
- */
-
-public class Util {
-
- /**
- * 判断电话号码是否有效
- *
- * @param phoneNumber @return true 有效 / false 无效
- */
-
- public static boolean isPhoneNumberValid(String phoneNumber) {
-
- boolean isValid = false;
-
- String expression = "((^(13|15|18)[0-9]{9}$)|(^0[1,2]{1}\\d{1}-?\\d{8}$)|(^0[3-9] {1}\\d{2}-?\\d{7,8}$)|(^0[1,2]{1}\\d{1}-?\\d{8}-(\\d{1,4})$)|(^0[3-9]{1}\\d{2}-? \\d{7,8}-(\\d{1,4})$))";
- CharSequence inputStr = phoneNumber;
-
- Pattern pattern = Pattern.compile(expression);
- Matcher matcher = pattern.matcher(inputStr);
-
- if (matcher.matches()) {
- isValid = true;
- }
- return isValid;
- }
-
- // 判断网络是否连接
- public static boolean isNetworkConnected(Context context) {
- if (context != null) {
- ConnectivityManager mConnectivityManager = (ConnectivityManager) context
- .getSystemService(Context.CONNECTIVITY_SERVICE);
- NetworkInfo mNetworkInfo = mConnectivityManager
- .getActiveNetworkInfo();
- if (mNetworkInfo != null) {
- return mNetworkInfo.isAvailable();
- }
- }
- return false;
- }
-
-private static final String TAG = "SDK_Sample.Util";
-
- private static Dialog mProgressDialog;
- private static Toast mToast;
-
- /* Convert byte[] to hex string.这里我们可以将byte转换成int,然后利用Integer.toHexString(int)来转换成16进制字符串。
- * @param src byte[] data
- * @return hex string
- */
- public static String bytesToHexString(byte[] src){
- StringBuilder stringBuilder = new StringBuilder("");
- String nullreplace="";
- if (src == null || src.length <= 0) {
- return nullreplace;
- }
- for (int i = 0; i < src.length; i++) {
- int v = src[i] & 0xFF;
- String hv = Integer.toHexString(v);
- if (hv.length() < 2) {
- stringBuilder.append(0);
- }
- stringBuilder.append(hv);
- }
- return stringBuilder.toString();
- }
- /**
- * Convert hex string to byte[]
- * @param hexString the hex string
- * @return byte[]
- */
- public static byte[] hexStringToBytes(String hexString) {
- byte[] nullreplace=null;
- if (hexString == null || "".equals(hexString)) {
- return nullreplace;
- }
- hexString = hexString.toUpperCase();
- int length = hexString.length() / 2;
- char[] hexChars = hexString.toCharArray();
- byte[] d = new byte[length];
- for (int i = 0; i < length; i++) {
- int pos = i * 2;
- d[i] = (byte) (charToByte(hexChars[pos]) << 4 | charToByte(hexChars[pos + 1]));
- }
- return d;
- }
- /**
- * Convert char to byte
- * @param c char
- * @return byte
- */
- private static byte charToByte(char c) {
- return (byte) "0123456789ABCDEF".indexOf(c);
- }
-
- /*
- * 16进制数字字符集
- */
- private static String hexString="0123456789ABCDEF";
- /*
- * 将字符串编码成16进制数字,适用于所有字符(包括中文)
- */
- public static String toHexString(String str)
- {
-//根据默认编码获取字节数组
- byte[] bytes = null;
- try {
- bytes = str.getBytes("UTF-8");
- } catch (UnsupportedEncodingException e) {
- Logger logger = Logger.getLogger("lavasoft");
- logger.log(Level.SEVERE, "sthwrong", e);
- }
- if (bytes == null)
- return null;
- StringBuilder sb=new StringBuilder(bytes.length*2);
-//将字节数组中每个字节拆解成2位16进制整数
- for(int i=0;i>4));
- sb.append(hexString.charAt(bytes[i]&0x0f));
- }
- return sb.toString();
- }
-
- //转换十六进制编码为字符串
- public static String hexToString(String s)
- {
- if("0x".equals(s.substring(0, 2)))
- {
- s =s.substring(2);
- }
- byte[] baKeyword = new byte[s.length()/2];
- for(int i = 0; i < baKeyword.length; i++)
- {
- try
- {
- baKeyword[i] = (byte)(0xff & Integer.parseInt(s.substring(i*2, i*2+2),16));
- }
- catch(Exception e)
- {
- Logger logger = Logger.getLogger("lavasoft");
- logger.log(Level.SEVERE, "sthwrong", e);
- }
- }
-
- try
- {
- s = new String(baKeyword, "utf-8");//UTF-16le:Not
- }
- catch (Exception e1)
- {
- Logger logger = Logger.getLogger("lavasoft");
- logger.log(Level.SEVERE, "sthwrong", e1);
- }
- return s;
- }
-
- public static byte[] bmpToByteArray(final Bitmap bmp, final boolean needRecycle) {
- ByteArrayOutputStream output = new ByteArrayOutputStream();
- bmp.compress(CompressFormat.PNG, 100, output);
- if (needRecycle) {
- bmp.recycle();
- }
-
- byte[] result = output.toByteArray();
- try {
- output.close();
- } catch (Exception e) {
- Logger logger = Logger.getLogger("lavasoft");
- logger.log(Level.SEVERE, "sthwrong", e);
- }
-
- return result;
- }
-
- public static byte[] getHtmlByteArray(final String url) {
- URL htmlUrl = null;
- InputStream inStream = null;
- try {
- htmlUrl = new URL(url);
- URLConnection connection = htmlUrl.openConnection();
- HttpURLConnection httpConnection = (HttpURLConnection)connection;
- int responseCode = httpConnection.getResponseCode();
- if(responseCode == HttpURLConnection.HTTP_OK){
- inStream = httpConnection.getInputStream();
- }
- } catch (MalformedURLException e) {
- Logger logger = Logger.getLogger("lavasoft");
- logger.log(Level.SEVERE, "sthwrong", e);
- } catch (IOException e) {
- Logger logger = Logger.getLogger("lavasoft");
- logger.log(Level.SEVERE, "sthwrong", e);
- }
- byte[] data = inputStreamToByte(inStream);
- return data;
- }
-
- public static byte[] inputStreamToByte(InputStream is) {
- try{
- ByteArrayOutputStream bytestream = new ByteArrayOutputStream();
- int ch;
- while ((ch = is.read()) != -1) {
- bytestream.write(ch);
- }
- byte imgdata[] = bytestream.toByteArray();
- bytestream.close();
- return imgdata;
- }catch(Exception e){
- Logger logger = Logger.getLogger("lavasoft");
- logger.log(Level.SEVERE, "sthwrong", e);
- }
- byte[] nullreplace=new byte[0];
- return nullreplace;
- }
-
- public static byte[] readFromFile(String fileName, int offset, int len) {
- byte[] nullreplace=new byte[0];
- if (fileName == null) {
- return nullreplace;
- }
-
- File file = new File(fileName);
- if (!file.exists()) {
- Log.i(TAG, "readFromFile: file not found");
- return nullreplace;
- }
-
- if (len == -1) {
- len = (int) file.length();
- }
-
- Log.d(TAG, "readFromFile : offset = " + offset + " len = " + len + " offset + len = " + (offset + len));
-
- if(offset <0){
- Log.e(TAG, "readFromFile invalid offset:" + offset);
- return nullreplace;
- }
- if(len <=0 ){
- Log.e(TAG, "readFromFile invalid len:" + len);
- return nullreplace;
- }
- if(offset + len > (int) file.length()){
- Log.e(TAG, "readFromFile invalid file len:" + file.length());
- return nullreplace;
- }
-
- byte[] b = null;
- try {
- RandomAccessFile in = new RandomAccessFile(fileName, "r");
- b = new byte[len];
- in.seek(offset);
- in.readFully(b);
- in.close();
-
- } catch (Exception e) {
- Log.e(TAG, "readFromFile : errMsg = " + e.getMessage());
- Logger logger = Logger.getLogger("lavasoft");
- logger.log(Level.SEVERE, "sthwrong", e);
- }
- return b;
- }
-
- public static int computeSampleSize(BitmapFactory.Options options,
-
- int minSideLength, int maxNumOfPixels) {
-
- int initialSize = computeInitialSampleSize(options, minSideLength,
-
- maxNumOfPixels);
-
- int roundedSize;
-
- if (initialSize <= 8) {
-
- roundedSize = 1;
-
- while (roundedSize < initialSize) {
-
- roundedSize <<= 1;
-
- }
-
- } else {
-
- roundedSize = (initialSize + 7) / 8 * 8;
-
- }
-
- return roundedSize;
- }
-
- private static int computeInitialSampleSize(BitmapFactory.Options options,int minSideLength, int maxNumOfPixels)
- {
- double w = options.outWidth;
- double h = options.outHeight;
- int lowerBound = (maxNumOfPixels == -1) ? 1 :(int) Math.ceil(Math.sqrt(w * h / maxNumOfPixels));
- int upperBound = (minSideLength == -1) ? 128 :(int) Math.min(Math.floor(w / minSideLength),Math.floor(h / minSideLength));
- if (upperBound < lowerBound) {
- // return the larger one when there is no overlapping zone.
- return lowerBound;
- }
- if ((maxNumOfPixels == -1) &&(minSideLength == -1)) {
-
- return 1;
-
- } else if (minSideLength == -1) {
-
- return lowerBound;
-
- } else {
-
- return upperBound;
-
- }
- }
-
- /**
- * 以最省内存的方式读取图片
- */
- public static Bitmap readBitmap(final String path){
- try{
- FileInputStream stream = new FileInputStream(new File(path+"test.jpg"));
- BitmapFactory.Options opts = new BitmapFactory.Options();
- opts.inSampleSize = 8;
- opts.inPurgeable=true;
- opts.inInputShareable=true;
- Bitmap bitmap = BitmapFactory.decodeStream(stream , null, opts);
- return bitmap;
- } catch (OutOfMemoryError e) {
- Logger logger = Logger.getLogger("lavasoft");
- logger.log(Level.SEVERE, "sthwrong", e);
- return null;
- } catch (Exception e) {
- Logger logger = Logger.getLogger("lavasoft");
- logger.log(Level.SEVERE, "sthwrong", e);
- return null;
- }
- }
-
- private static final int MAX_DECODE_PICTURE_SIZE = 1920 * 1440;
- public static Bitmap extractThumbNail(final String path, final int height, final int width, final boolean crop) {
- Assert.assertTrue(path != null && !"".equals(path) && height > 0 && width > 0);
-
- BitmapFactory.Options options = new BitmapFactory.Options();
-
- try {
- options.inJustDecodeBounds = true;
- Bitmap tmp = BitmapFactory.decodeFile(path, options);
- if (tmp != null) {
- tmp.recycle();
- tmp = null;
- }
- Log.d(TAG, "extractThumbNail: round=" + width + "x" + height + ", crop=" + crop);
- final double beY = options.outHeight * 1.0 / height;
- final double beX = options.outWidth * 1.0 / width;
- Log.d(TAG, "extractThumbNail: extract beX = " + beX + ", beY = " + beY);
- options.inSampleSize = (int) (crop ? (beY > beX ? beX : beY) : (beY < beX ? beX : beY));
- if (options.inSampleSize <= 1) {
- options.inSampleSize = 1;
- }
-
- // NOTE: out of memory error
- while (options.outHeight * options.outWidth / options.inSampleSize > MAX_DECODE_PICTURE_SIZE) {
- options.inSampleSize++;
- }
-
- int newHeight = height;
- int newWidth = width;
- if (crop) {
- if (beY > beX) {
- newHeight = (int) (newWidth * 1.0 * options.outHeight / options.outWidth);
- } else {
- newWidth = (int) (newHeight * 1.0 * options.outWidth / options.outHeight);
- }
- } else {
- if (beY < beX) {
- newHeight = (int) (newWidth * 1.0 * options.outHeight / options.outWidth);
- } else {
- newWidth = (int) (newHeight * 1.0 * options.outWidth / options.outHeight);
- }
- }
-
- options.inJustDecodeBounds = false;
-
- Log.i(TAG, "bitmap required size=" + newWidth + "x" + newHeight + ", orig=" + options.outWidth + "x" + options.outHeight + ", sample=" + options.inSampleSize);
- Bitmap bm = BitmapFactory.decodeFile(path, options);
- if (bm == null) {
- Log.e(TAG, "bitmap decode failed");
- return null;
- }
-
- Log.i(TAG, "bitmap decoded size=" + bm.getWidth() + "x" + bm.getHeight());
- final Bitmap scale = Bitmap.createScaledBitmap(bm, newWidth, newHeight, true);
- if (scale != null) {
- bm.recycle();
- bm = scale;
- }
-
- if (crop) {
- final Bitmap cropped = Bitmap.createBitmap(bm, (bm.getWidth() - width) >> 1, (bm.getHeight() - height) >> 1, width, height);
- if (cropped == null) {
- return bm;
- }
-
- bm.recycle();
- bm = cropped;
- Log.i(TAG, "bitmap croped size=" + bm.getWidth() + "x" + bm.getHeight());
- }
- return bm;
-
- } catch (final OutOfMemoryError e) {
- Log.e(TAG, "decode bitmap failed: " + e.getMessage());
- Logger logger = Logger.getLogger("lavasoft");
- logger.log(Level.SEVERE, "sthwrong", e);
- options = null;
- }
-
- return null;
- }
-
- public static final void showResultDialog(Context context, String msg,
- String title) {
- if(msg == null)
- return;
- String rmsg = msg.replace(",", "\n");
- Log.d("Util", rmsg);
- new AlertDialog.Builder(context).setTitle(title).setMessage(rmsg)
- .setNegativeButton("知道了", null).create().show();
- }
-
- public static final void showProgressDialog(Context context, String title,
- String message) {
- dismissDialog();
- if (TextUtils.isEmpty(title)) {
- title = "请稍候";
- }
- if (TextUtils.isEmpty(message)) {
- message = "正在加载...";
- }
- mProgressDialog = ProgressDialog.show(context, title, message);
- }
-
- public static AlertDialog showConfirmCancelDialog(Context context,String message,DialogInterface.OnClickListener posListener)
- {
- AlertDialog dlg = new AlertDialog.Builder(context).setMessage(message).setPositiveButton("确认", posListener).setNegativeButton("取消", null).create();
- dlg.setCanceledOnTouchOutside(false);
- dlg.show();
- return dlg;
- }
- public static final void dismissDialog() {
- if (mProgressDialog != null) {
- mProgressDialog.dismiss();
- mProgressDialog = null;
- }
- }
-
- /**
- * 打印消息并且用Toast显示消息
- *
- * @param activity
- * @param message
- * @param logLevel
- * 填d, w, e分别代表debug, warn, error; 默认是debug
- */
- public static final void toastMessage(final Activity activity,
- final String message, String logLevel) {
- if ("w".equals(logLevel)) {
- Log.w("sdkDemo", message);
- } else if ("e".equals(logLevel)) {
- Log.e("sdkDemo", message);
- } else {
- Log.d("sdkDemo", message);
- }
- activity.runOnUiThread(new Runnable() {
- @Override
- public void run() {
- if (mToast != null) {
- mToast.cancel();
- mToast = null;
- }
- mToast = Toast.makeText(activity, message, Toast.LENGTH_SHORT);
- mToast.show();
- }
- });
- }
-
- /**
- * 打印消息并且用Toast显示消息
- *
- * @param activity
- * @param message
- * @param logLevel
- * 填d, w, e分别代表debug, warn, error; 默认是debug
- */
- public static final void toastMessage(final Activity activity,
- final String message) {
- toastMessage(activity, message, null);
- }
-
- /**
- * 根据一个网络连接(String)获取bitmap图像
- *
- * @param imageUri
- * @return
- * @throws MalformedURLException
- */
- public static Bitmap getbitmap(String imageUri) {
- Log.v(TAG, "getbitmap:" + imageUri);
- // 显示网络上的图片
- Bitmap bitmap = null;
- try {
- URL myFileUrl = new URL(imageUri);
- HttpURLConnection conn = (HttpURLConnection) myFileUrl
- .openConnection();
- conn.setDoInput(true);
- conn.connect();
- InputStream is = conn.getInputStream();
- bitmap = BitmapFactory.decodeStream(is);
- is.close();
-
- Log.v(TAG, "image download finished." + imageUri);
- } catch (OutOfMemoryError e) {
- Logger logger = Logger.getLogger("lavasoft");
- logger.log(Level.SEVERE, "sthwrong", e);
- bitmap = null;
- } catch (IOException e) {
- Logger logger = Logger.getLogger("lavasoft");
- logger.log(Level.SEVERE, "sthwrong", e);
- Log.v(TAG, "getbitmap bmp fail---");
- bitmap = null;
- }
- return bitmap;
- }
-
- public static void release() {
- mProgressDialog = null;
- mToast = null;
- }
-
- // =========
- // =通过URI获取本地图片的path
- // =兼容android 5.0
- // ==========
-
- public static final String ACTION_OPEN_DOCUMENT = "android.intent.action.OPEN_DOCUMENT";
- public static final int Build_VERSION_KITKAT = 19;
- public static String getPath(final Context context, final Uri uri) {
-
- final boolean isKitKat = Build.VERSION.SDK_INT >= 19;
-
- // DocumentProvider
- if (isKitKat && isDocumentUri(context, uri)) {
- // ExternalStorageProvider
- if (isExternalStorageDocument(uri)) {
- final String docId = getDocumentId(uri);
- final String[] split = docId.split(":");
- final String type = split[0];
-
- if ("primary".equalsIgnoreCase(type)) {
- return Environment.getExternalStorageDirectory() + "/" + split[1];
- }
-
- }
- // DownloadsProvider
- else if (isDownloadsDocument(uri)) {
-
- final String id = getDocumentId(uri);
- final Uri contentUri = ContentUris.withAppendedId(Uri.parse("content://downloads/public_downloads"),
- Long.valueOf(id));
-
- return getDataColumn(context, contentUri, null, null);
- }
- // MediaProvider
- else if (isMediaDocument(uri)) {
- final String docId = getDocumentId(uri);
- final String[] split = docId.split(":");
- final String type = split[0];
-
- Uri contentUri = null;
- if ("image".equals(type)) {
- contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
- } else if ("video".equals(type)) {
- contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
- } else if ("audio".equals(type)) {
- contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
- }
-
- final String selection = "_id=?";
- final String[] selectionArgs = new String[] { split[1] };
-
- return getDataColumn(context, contentUri, selection, selectionArgs);
- }
- }
- // MediaStore (and general)
- else if ("content".equalsIgnoreCase(uri.getScheme())) {
-
- // Return the remote address
- if (isGooglePhotosUri(uri))
- return uri.getLastPathSegment();
-
- return getDataColumn(context, uri, null, null);
- }
- // File
- else if ("file".equalsIgnoreCase(uri.getScheme())) {
- return uri.getPath();
- }
-
- return null;
- }
-
- private static final String PATH_DOCUMENT = "document";
-
- /**
- * Test if the given URI represents a {@link Document} backed by a
- * {@link DocumentsProvider}.
- */
- private static boolean isDocumentUri(Context context, Uri uri) {
- final List paths = uri.getPathSegments();
- if (paths.size() < 2) {
- return false;
- }
- if (!PATH_DOCUMENT.equals(paths.get(0))) {
- return false;
- }
-
- return true;
- }
-
- private static String getDocumentId(Uri documentUri) {
- final List paths = documentUri.getPathSegments();
- if (paths.size() < 2) {
- throw new IllegalArgumentException("Not a document: " + documentUri);
- }
- if (!PATH_DOCUMENT.equals(paths.get(0))) {
- throw new IllegalArgumentException("Not a document: " + documentUri);
- }
- return paths.get(1);
- }
-
- /**
- * Get the value of the data column for this Uri. This is useful for
- * MediaStore Uris, and other file-based ContentProviders.
- *
- * @param context
- * The context.
- * @param uri
- * The Uri to query.
- * @param selection
- * (Optional) Filter used in the query.
- * @param selectionArgs
- * (Optional) Selection arguments used in the query.
- * [url=home.php?mod=space&uid=7300]@return[/url] The value of
- * the _data column, which is typically a file path.
- */
- public static String getDataColumn(Context context, Uri uri, String selection, String[] selectionArgs) {
-
- Cursor cursor = null;
- final String column = "_data";
- final String[] projection = { column };
-
- try {
- cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null);
- if (cursor != null && cursor.moveToFirst()) {
- final int index = cursor.getColumnIndexOrThrow(column);
- return cursor.getString(index);
- }
- } finally {
- if (cursor != null)
- cursor.close();
- }
- return null;
- }
-
- /**
- * @param uri
- * The Uri to check.
- * @return Whether the Uri authority is ExternalStorageProvider.
- */
- public static boolean isExternalStorageDocument(Uri uri) {
- return "com.android.externalstorage.documents".equals(uri.getAuthority());
- }
-
- /**
- * @param uri
- * The Uri to check.
- * @return Whether the Uri authority is DownloadsProvider.
- */
- public static boolean isDownloadsDocument(Uri uri) {
- return "com.android.providers.downloads.documents".equals(uri.getAuthority());
- }
-
- /**
- * @param uri
- * The Uri to check.
- * @return Whether the Uri authority is MediaProvider.
- */
- public static boolean isMediaDocument(Uri uri) {
- return "com.android.providers.media.documents".equals(uri.getAuthority());
- }
-
- /**
- * @param uri
- * The Uri to check.
- * @return Whether the Uri authority is Google Photos.
- */
- public static boolean isGooglePhotosUri(Uri uri) {
- return "com.google.android.apps.photos.content".equals(uri.getAuthority());
- }
-}
diff --git a/代码/在这里3.0/.DS_Store b/代码/在这里3.0_最终版/.DS_Store
similarity index 100%
rename from 代码/在这里3.0/.DS_Store
rename to 代码/在这里3.0_最终版/.DS_Store
diff --git a/代码/在这里3.0_最终版/.classpath b/代码/在这里3.0_最终版/.classpath
new file mode 100644
index 0000000..09d475c
--- /dev/null
+++ b/代码/在这里3.0_最终版/.classpath
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/代码/在这里3.0_最终版/.project b/代码/在这里3.0_最终版/.project
new file mode 100644
index 0000000..3e9aa67
--- /dev/null
+++ b/代码/在这里3.0_最终版/.project
@@ -0,0 +1,33 @@
+
+
+ Shop
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/代码/在这里3.0/.settings/org.eclipse.core.resources.prefs b/代码/在这里3.0_最终版/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from 代码/在这里3.0/.settings/org.eclipse.core.resources.prefs
rename to 代码/在这里3.0_最终版/.settings/org.eclipse.core.resources.prefs
diff --git a/代码/在这里3.0/.settings/org.eclipse.jdt.core.prefs b/代码/在这里3.0_最终版/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from 代码/在这里3.0/.settings/org.eclipse.jdt.core.prefs
rename to 代码/在这里3.0_最终版/.settings/org.eclipse.jdt.core.prefs
diff --git a/代码/在这里3.0/AndroidManifest.xml b/代码/在这里3.0_最终版/AndroidManifest.xml
similarity index 100%
rename from 代码/在这里3.0/AndroidManifest.xml
rename to 代码/在这里3.0_最终版/AndroidManifest.xml
diff --git a/代码/在这里3.0/bin/AndroidManifest.xml b/代码/在这里3.0_最终版/bin/AndroidManifest.xml
similarity index 100%
rename from 代码/在这里3.0/bin/AndroidManifest.xml
rename to 代码/在这里3.0_最终版/bin/AndroidManifest.xml
diff --git a/代码/在这里3.0/bin/Shop.apk b/代码/在这里3.0_最终版/bin/Shop.apk
similarity index 100%
rename from 代码/在这里3.0/bin/Shop.apk
rename to 代码/在这里3.0_最终版/bin/Shop.apk
diff --git a/代码/在这里3.0/bin/Shop2.apk b/代码/在这里3.0_最终版/bin/Shop2.apk
similarity index 100%
rename from 代码/在这里3.0/bin/Shop2.apk
rename to 代码/在这里3.0_最终版/bin/Shop2.apk
diff --git a/代码/在这里3.0/bin/classes.dex b/代码/在这里3.0_最终版/bin/classes.dex
similarity index 100%
rename from 代码/在这里3.0/bin/classes.dex
rename to 代码/在这里3.0_最终版/bin/classes.dex
diff --git a/代码/在这里3.0/bin/classes/com/stone/date/MessageDef.class b/代码/在这里3.0_最终版/bin/classes/com/stone/date/MessageDef.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/date/MessageDef.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/date/MessageDef.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/date/TypeDef.class b/代码/在这里3.0_最终版/bin/classes/com/stone/date/TypeDef.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/date/TypeDef.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/date/TypeDef.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/BuildConfig.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/BuildConfig.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/BuildConfig.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/BuildConfig.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/R$anim.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/R$anim.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/R$anim.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/R$anim.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/R$attr.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/R$attr.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/R$attr.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/R$attr.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/R$color.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/R$color.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/R$color.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/R$color.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/R$dimen.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/R$dimen.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/R$dimen.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/R$dimen.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/R$drawable.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/R$drawable.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/R$drawable.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/R$drawable.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/R$id.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/R$id.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/R$id.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/R$id.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/R$layout.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/R$layout.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/R$layout.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/R$layout.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/R$menu.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/R$menu.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/R$menu.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/R$menu.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/R$string.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/R$string.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/R$string.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/R$string.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/R$style.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/R$style.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/R$style.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/R$style.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/R.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/R.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/R.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/R.class
diff --git 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
similarity index 82%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$1$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/AIContentAdapter$1$1.class
index 1cafd98..1a39dc8 100644
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$1$1.class and b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/AIContentAdapter$1$1.class differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/AIContentAdapter$1.class
similarity index 92%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/AIContentAdapter$1.class
index a66066c..24c98bd 100644
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$1.class and b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/AIContentAdapter$1.class differ
diff --git 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
similarity index 85%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$2$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/AIContentAdapter$2$1.class
index cf5f465..c448f67 100644
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$2$1.class and b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/AIContentAdapter$2$1.class differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$2.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/AIContentAdapter$2.class
similarity index 89%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$2.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/AIContentAdapter$2.class
index cd39a4c..4649d59 100644
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$2.class and b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/AIContentAdapter$2.class differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$3.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/AIContentAdapter$3.class
similarity index 90%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$3.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/AIContentAdapter$3.class
index e84bdcb..ffeddd6 100644
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$3.class and b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/AIContentAdapter$3.class differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$ViewHolder.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/AIContentAdapter$ViewHolder.class
similarity index 76%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$ViewHolder.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/AIContentAdapter$ViewHolder.class
index 78f9658..b43b580 100644
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter$ViewHolder.class and b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/AIContentAdapter$ViewHolder.class differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/AIContentAdapter.class
similarity index 93%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/AIContentAdapter.class
index a0dd50a..43a0354 100644
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/AIContentAdapter.class and b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/AIContentAdapter.class differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/BXTListAdapter.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/BXTListAdapter.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/BXTListAdapter.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/BXTListAdapter.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/BXTNewsHolder.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/BXTNewsHolder.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/BXTNewsHolder.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/BXTNewsHolder.class
diff --git a/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/BaseContentAdapter.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/BaseContentAdapter.class
new file mode 100644
index 0000000..da248c6
Binary files /dev/null and b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/BaseContentAdapter.class differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ClassroomAdapter$ViewHolder.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/ClassroomAdapter$ViewHolder.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/ClassroomAdapter$ViewHolder.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/ClassroomAdapter$ViewHolder.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ClassroomAdapter.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/ClassroomAdapter.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/ClassroomAdapter.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/ClassroomAdapter.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/CommentAdapter$ViewHolder.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/CommentAdapter$ViewHolder.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/CommentAdapter$ViewHolder.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/CommentAdapter$ViewHolder.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/CommentAdapter.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/CommentAdapter.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/CommentAdapter.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/CommentAdapter.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/GoodsHolder.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/GoodsHolder.class
similarity index 83%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/GoodsHolder.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/GoodsHolder.class
index e3bc779..2156871 100644
Binary files a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/GoodsHolder.class and b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/GoodsHolder.class differ
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/GoodsListAdapter.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/GoodsListAdapter.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/GoodsListAdapter.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/GoodsListAdapter.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/GridAdapter.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/GridAdapter.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/GridAdapter.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/GridAdapter.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ImagePagerAdapter.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/ImagePagerAdapter.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/ImagePagerAdapter.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/ImagePagerAdapter.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/InfoNewsListAdapter.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/InfoNewsListAdapter.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/InfoNewsListAdapter.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/InfoNewsListAdapter.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/InformationListAdapter.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/InformationListAdapter.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/InformationListAdapter.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/InformationListAdapter.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineListAdapter.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/MineListAdapter.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineListAdapter.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/MineListAdapter.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineListHolder.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/MineListHolder.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineListHolder.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/MineListHolder.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineSoftAdapter.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/MineSoftAdapter.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineSoftAdapter.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/MineSoftAdapter.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineSoftHolder.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/MineSoftHolder.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/MineSoftHolder.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/MineSoftHolder.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/NewsHolder.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/NewsHolder.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/NewsHolder.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/NewsHolder.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/NewsListAdapter.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/NewsListAdapter.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/NewsListAdapter.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/NewsListAdapter.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/OrderInfoHolder.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/OrderInfoHolder.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/OrderInfoHolder.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/OrderInfoHolder.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/OrderInfoListAdapter.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/OrderInfoListAdapter.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/OrderInfoListAdapter.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/OrderInfoListAdapter.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/SComHolder.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/SComHolder.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/SComHolder.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/SComHolder.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/SCommentAdapter.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/SCommentAdapter.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/SCommentAdapter.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/SCommentAdapter.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ShopHolder.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/ShopHolder.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/ShopHolder.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/ShopHolder.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ShopListAdapter.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/ShopListAdapter.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/ShopListAdapter.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/ShopListAdapter.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/SmartFragmentStatePagerAdapter.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/SmartFragmentStatePagerAdapter.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/SmartFragmentStatePagerAdapter.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/SmartFragmentStatePagerAdapter.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/adapter/ViewPagerAdapter.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/ViewPagerAdapter.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/adapter/ViewPagerAdapter.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/adapter/ViewPagerAdapter.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/BXTNews.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/BXTNews.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/model/BXTNews.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/BXTNews.class
diff --git a/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun
new file mode 100644
index 0000000..5c71fec
--- /dev/null
+++ b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun
@@ -0,0 +1,78 @@
+package com.stone.shop.model;
+
+import cn.bmob.v3.BmobObject;
+
+/**
+ * 博学堂讲座实体类
+ * @date 2014-5-10
+ * @author Stone
+ */
+public class BXTNews extends BmobObject{
+
+ //private String id;
+
+ private String title; //标题
+ private String topic; //讲座主题
+ private String speaker; //主 讲 人
+ private String time; //讲座时间
+ private String location; //讲座地点
+ private String holder1; //主办单位
+ private String holder2; //承办单位
+ private String points; //主讲内容提要
+ private String speakerinfo; //主讲人简介
+
+ public String getTitle() {
+ return title;
+ }
+ public String getTopic() {
+ return topic;
+ }
+ public String getSpeaker() {
+ return speaker;
+ }
+ public String getTime() {
+ return time;
+ }
+ public String getLocation() {
+ return location;
+ }
+ public String getHolder1() {
+ return holder1;
+ }
+ public String getHolder2() {
+ return holder2;
+ }
+ public String getPoints() {
+ return points;
+ }
+ public String getSpeakerinfo() {
+ return speakerinfo;
+ }
+ public void setTitle(String title) {
+ this.title = title;
+ }
+ public void setTopic(String topic) {
+ this.topic = topic;
+ }
+ public void setSpeaker(String speaker) {
+ this.speaker = speaker;
+ }
+ public void setTime(String time) {
+ this.time = time;
+ }
+ public void setLocation(String location) {
+ this.location = location;
+ }
+ public void setHolder1(String holder1) {
+ this.holder1 = holder1;
+ }
+ public void setHolder2(String holder2) {
+ this.holder2 = holder2;
+ }
+ public void setPoints(String points) {
+ this.points = points;
+ }
+ public void setSpeakerinfo(String speakerinfo) {
+ this.speakerinfo = speakerinfo;
+ }
+}
diff --git a/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
new file mode 100644
index 0000000..5c71fec
--- /dev/null
+++ b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
@@ -0,0 +1,78 @@
+package com.stone.shop.model;
+
+import cn.bmob.v3.BmobObject;
+
+/**
+ * 博学堂讲座实体类
+ * @date 2014-5-10
+ * @author Stone
+ */
+public class BXTNews extends BmobObject{
+
+ //private String id;
+
+ private String title; //标题
+ private String topic; //讲座主题
+ private String speaker; //主 讲 人
+ private String time; //讲座时间
+ private String location; //讲座地点
+ private String holder1; //主办单位
+ private String holder2; //承办单位
+ private String points; //主讲内容提要
+ private String speakerinfo; //主讲人简介
+
+ public String getTitle() {
+ return title;
+ }
+ public String getTopic() {
+ return topic;
+ }
+ public String getSpeaker() {
+ return speaker;
+ }
+ public String getTime() {
+ return time;
+ }
+ public String getLocation() {
+ return location;
+ }
+ public String getHolder1() {
+ return holder1;
+ }
+ public String getHolder2() {
+ return holder2;
+ }
+ public String getPoints() {
+ return points;
+ }
+ public String getSpeakerinfo() {
+ return speakerinfo;
+ }
+ public void setTitle(String title) {
+ this.title = title;
+ }
+ public void setTopic(String topic) {
+ this.topic = topic;
+ }
+ public void setSpeaker(String speaker) {
+ this.speaker = speaker;
+ }
+ public void setTime(String time) {
+ this.time = time;
+ }
+ public void setLocation(String location) {
+ this.location = location;
+ }
+ public void setHolder1(String holder1) {
+ this.holder1 = holder1;
+ }
+ public void setHolder2(String holder2) {
+ this.holder2 = holder2;
+ }
+ public void setPoints(String points) {
+ this.points = points;
+ }
+ public void setSpeakerinfo(String speakerinfo) {
+ this.speakerinfo = speakerinfo;
+ }
+}
diff --git a/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun~HEAD b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun~HEAD
new file mode 100644
index 0000000..5c71fec
--- /dev/null
+++ b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/BXTNews.java~remotes_origin_zhaozaichun~HEAD
@@ -0,0 +1,78 @@
+package com.stone.shop.model;
+
+import cn.bmob.v3.BmobObject;
+
+/**
+ * 博学堂讲座实体类
+ * @date 2014-5-10
+ * @author Stone
+ */
+public class BXTNews extends BmobObject{
+
+ //private String id;
+
+ private String title; //标题
+ private String topic; //讲座主题
+ private String speaker; //主 讲 人
+ private String time; //讲座时间
+ private String location; //讲座地点
+ private String holder1; //主办单位
+ private String holder2; //承办单位
+ private String points; //主讲内容提要
+ private String speakerinfo; //主讲人简介
+
+ public String getTitle() {
+ return title;
+ }
+ public String getTopic() {
+ return topic;
+ }
+ public String getSpeaker() {
+ return speaker;
+ }
+ public String getTime() {
+ return time;
+ }
+ public String getLocation() {
+ return location;
+ }
+ public String getHolder1() {
+ return holder1;
+ }
+ public String getHolder2() {
+ return holder2;
+ }
+ public String getPoints() {
+ return points;
+ }
+ public String getSpeakerinfo() {
+ return speakerinfo;
+ }
+ public void setTitle(String title) {
+ this.title = title;
+ }
+ public void setTopic(String topic) {
+ this.topic = topic;
+ }
+ public void setSpeaker(String speaker) {
+ this.speaker = speaker;
+ }
+ public void setTime(String time) {
+ this.time = time;
+ }
+ public void setLocation(String location) {
+ this.location = location;
+ }
+ public void setHolder1(String holder1) {
+ this.holder1 = holder1;
+ }
+ public void setHolder2(String holder2) {
+ this.holder2 = holder2;
+ }
+ public void setPoints(String points) {
+ this.points = points;
+ }
+ public void setSpeakerinfo(String speakerinfo) {
+ this.speakerinfo = speakerinfo;
+ }
+}
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Classroom.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Classroom.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/model/Classroom.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Classroom.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Comment.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Comment.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/model/Comment.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Comment.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Constant.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Constant.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/model/Constant.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Constant.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Discuss.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Discuss.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/model/Discuss.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Discuss.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/FeedBack.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/FeedBack.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/model/FeedBack.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/FeedBack.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Good.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Good.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/model/Good.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Good.class
diff --git a/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun
new file mode 100644
index 0000000..ccf0eaf
--- /dev/null
+++ b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun
@@ -0,0 +1,63 @@
+package com.stone.shop.model;
+
+import java.io.Serializable;
+
+import cn.bmob.v3.BmobObject;
+import cn.bmob.v3.datatype.BmobFile;
+
+/**
+ * 商品实体类
+ * @date 2014-4-24
+ * @author Stone
+ */
+public class Good extends BmobObject implements Serializable{
+
+ private static final long serialVersionUID = -3248168273019127389L;
+
+ //private String id; 商品ID, 默认
+
+ private String shopID = ""; // 商店ID
+ private String shopName = ""; //商店名称
+ private String type = ""; // 类型
+ private String name = ""; // 名称
+ private String price = ""; // 价格
+ private BmobFile picGood = null; // 商品主图
+
+ public Good(String name, String price) {
+ this.name = name;
+ this.price = price;
+ }
+
+ public String getShopID() {
+ return shopID;
+ }
+
+ public void setShopID(String shopID) {
+ this.shopID = shopID;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getPrice() {
+ return price;
+ }
+
+ public void setPrice(String price) {
+ this.price = price;
+ }
+
+}
diff --git a/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
new file mode 100644
index 0000000..ccf0eaf
--- /dev/null
+++ b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
@@ -0,0 +1,63 @@
+package com.stone.shop.model;
+
+import java.io.Serializable;
+
+import cn.bmob.v3.BmobObject;
+import cn.bmob.v3.datatype.BmobFile;
+
+/**
+ * 商品实体类
+ * @date 2014-4-24
+ * @author Stone
+ */
+public class Good extends BmobObject implements Serializable{
+
+ private static final long serialVersionUID = -3248168273019127389L;
+
+ //private String id; 商品ID, 默认
+
+ private String shopID = ""; // 商店ID
+ private String shopName = ""; //商店名称
+ private String type = ""; // 类型
+ private String name = ""; // 名称
+ private String price = ""; // 价格
+ private BmobFile picGood = null; // 商品主图
+
+ public Good(String name, String price) {
+ this.name = name;
+ this.price = price;
+ }
+
+ public String getShopID() {
+ return shopID;
+ }
+
+ public void setShopID(String shopID) {
+ this.shopID = shopID;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getPrice() {
+ return price;
+ }
+
+ public void setPrice(String price) {
+ this.price = price;
+ }
+
+}
diff --git a/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun~HEAD b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun~HEAD
new file mode 100644
index 0000000..ccf0eaf
--- /dev/null
+++ b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Good.java~remotes_origin_zhaozaichun~HEAD
@@ -0,0 +1,63 @@
+package com.stone.shop.model;
+
+import java.io.Serializable;
+
+import cn.bmob.v3.BmobObject;
+import cn.bmob.v3.datatype.BmobFile;
+
+/**
+ * 商品实体类
+ * @date 2014-4-24
+ * @author Stone
+ */
+public class Good extends BmobObject implements Serializable{
+
+ private static final long serialVersionUID = -3248168273019127389L;
+
+ //private String id; 商品ID, 默认
+
+ private String shopID = ""; // 商店ID
+ private String shopName = ""; //商店名称
+ private String type = ""; // 类型
+ private String name = ""; // 名称
+ private String price = ""; // 价格
+ private BmobFile picGood = null; // 商品主图
+
+ public Good(String name, String price) {
+ this.name = name;
+ this.price = price;
+ }
+
+ public String getShopID() {
+ return shopID;
+ }
+
+ public void setShopID(String shopID) {
+ this.shopID = shopID;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getPrice() {
+ return price;
+ }
+
+ public void setPrice(String price) {
+ this.price = price;
+ }
+
+}
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Information.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Information.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/model/Information.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Information.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Library.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Library.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/model/Library.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Library.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/LuckyUser.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/LuckyUser.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/model/LuckyUser.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/LuckyUser.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/News.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/News.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/model/News.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/News.class
diff --git a/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/News.java~remotes_origin_zhaozaichun b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/News.java~remotes_origin_zhaozaichun
new file mode 100644
index 0000000..a04665d
--- /dev/null
+++ b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/News.java~remotes_origin_zhaozaichun
@@ -0,0 +1,53 @@
+package com.stone.shop.model;
+
+import cn.bmob.v3.BmobObject;
+
+/**
+ * 首页校内新闻实体类
+ *
+ * @date 2014-5-3
+ * @author Stone
+ */
+public class News extends BmobObject {
+
+ // private String id;
+ // private String time;
+
+ private String type; // 新闻类型
+ private String title; // 新闻标题
+ private String author; // 新闻作者
+ private String content; // 新闻内容
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getAuthor() {
+ return author;
+ }
+
+ public void setAuthor(String author) {
+ this.author = author;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+}
diff --git a/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/News.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/News.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
new file mode 100644
index 0000000..a04665d
--- /dev/null
+++ b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/News.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
@@ -0,0 +1,53 @@
+package com.stone.shop.model;
+
+import cn.bmob.v3.BmobObject;
+
+/**
+ * 首页校内新闻实体类
+ *
+ * @date 2014-5-3
+ * @author Stone
+ */
+public class News extends BmobObject {
+
+ // private String id;
+ // private String time;
+
+ private String type; // 新闻类型
+ private String title; // 新闻标题
+ private String author; // 新闻作者
+ private String content; // 新闻内容
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getAuthor() {
+ return author;
+ }
+
+ public void setAuthor(String author) {
+ this.author = author;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+}
diff --git a/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/News.java~remotes_origin_zhaozaichun~HEAD b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/News.java~remotes_origin_zhaozaichun~HEAD
new file mode 100644
index 0000000..a04665d
--- /dev/null
+++ b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/News.java~remotes_origin_zhaozaichun~HEAD
@@ -0,0 +1,53 @@
+package com.stone.shop.model;
+
+import cn.bmob.v3.BmobObject;
+
+/**
+ * 首页校内新闻实体类
+ *
+ * @date 2014-5-3
+ * @author Stone
+ */
+public class News extends BmobObject {
+
+ // private String id;
+ // private String time;
+
+ private String type; // 新闻类型
+ private String title; // 新闻标题
+ private String author; // 新闻作者
+ private String content; // 新闻内容
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getAuthor() {
+ return author;
+ }
+
+ public void setAuthor(String author) {
+ this.author = author;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+}
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Order.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Order.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/model/Order.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Order.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Reservation.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Reservation.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/model/Reservation.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Reservation.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/SComment.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/SComment.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/model/SComment.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/SComment.class
diff --git a/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun
new file mode 100644
index 0000000..a9acc45
--- /dev/null
+++ b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun
@@ -0,0 +1,61 @@
+package com.stone.shop.model;
+
+import cn.bmob.v3.BmobObject;
+
+/**
+ * 店铺评论实体类
+ * @date 2014-5-3
+ * @author Stone
+ */
+public class SComment extends BmobObject {
+
+ // private String id;
+ // private String time;
+
+ private String shopID;
+ private String shopName;
+ private String userID;
+ private String userName;
+ private String content;
+
+ public String getShopID() {
+ return shopID;
+ }
+
+ public void setShopID(String shopID) {
+ this.shopID = shopID;
+ }
+
+ public String getShopName() {
+ return shopName;
+ }
+
+ public void setShopName(String shopName) {
+ this.shopName = shopName;
+ }
+
+ public String getUserID() {
+ return userID;
+ }
+
+ public void setUserID(String userID) {
+ this.userID = userID;
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+}
diff --git a/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
new file mode 100644
index 0000000..a9acc45
--- /dev/null
+++ b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
@@ -0,0 +1,61 @@
+package com.stone.shop.model;
+
+import cn.bmob.v3.BmobObject;
+
+/**
+ * 店铺评论实体类
+ * @date 2014-5-3
+ * @author Stone
+ */
+public class SComment extends BmobObject {
+
+ // private String id;
+ // private String time;
+
+ private String shopID;
+ private String shopName;
+ private String userID;
+ private String userName;
+ private String content;
+
+ public String getShopID() {
+ return shopID;
+ }
+
+ public void setShopID(String shopID) {
+ this.shopID = shopID;
+ }
+
+ public String getShopName() {
+ return shopName;
+ }
+
+ public void setShopName(String shopName) {
+ this.shopName = shopName;
+ }
+
+ public String getUserID() {
+ return userID;
+ }
+
+ public void setUserID(String userID) {
+ this.userID = userID;
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+}
diff --git a/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun~HEAD b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun~HEAD
new file mode 100644
index 0000000..a9acc45
--- /dev/null
+++ b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/SComment.java~remotes_origin_zhaozaichun~HEAD
@@ -0,0 +1,61 @@
+package com.stone.shop.model;
+
+import cn.bmob.v3.BmobObject;
+
+/**
+ * 店铺评论实体类
+ * @date 2014-5-3
+ * @author Stone
+ */
+public class SComment extends BmobObject {
+
+ // private String id;
+ // private String time;
+
+ private String shopID;
+ private String shopName;
+ private String userID;
+ private String userName;
+ private String content;
+
+ public String getShopID() {
+ return shopID;
+ }
+
+ public void setShopID(String shopID) {
+ this.shopID = shopID;
+ }
+
+ public String getShopName() {
+ return shopName;
+ }
+
+ public void setShopName(String shopName) {
+ this.shopName = shopName;
+ }
+
+ public String getUserID() {
+ return userID;
+ }
+
+ public void setUserID(String userID) {
+ this.userID = userID;
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
+
+}
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/Shop.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Shop.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/model/Shop.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Shop.class
diff --git a/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun
new file mode 100644
index 0000000..8570a99
--- /dev/null
+++ b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun
@@ -0,0 +1,82 @@
+package com.stone.shop.model;
+
+import java.io.Serializable;
+
+import cn.bmob.v3.BmobObject;
+import cn.bmob.v3.datatype.BmobFile;
+
+/**
+ * 店铺实体类, 实现序列化, Activity之间实现传递
+ * @date 2014-4-24
+ * @author Stone
+ */
+public class Shop extends BmobObject implements Serializable{
+
+ private static final long serialVersionUID = -8796635595320697255L;
+
+ private String userID; // 主人
+ private String type; // 类型(11代表第一个GridView中的第一个)
+ private String name; // 店名
+ private String location; // 地理位置
+ private String phone; // 联系电话
+ private String info; // 简介
+ private String sale; // 促销信息
+ private BmobFile picShop; // 商店主图
+
+ public String getUserID() {
+ return userID;
+ }
+
+ public void setUserID(String userID) {
+ this.userID = userID;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getLocation() {
+ return location;
+ }
+
+ public void setLocation(String location) {
+ this.location = location;
+ }
+
+ public String getPhone() {
+ return phone;
+ }
+
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
+
+ public String getSale() {
+ return sale;
+ }
+
+ public void setSale(String sale) {
+ this.sale = sale;
+ }
+
+}
diff --git a/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
new file mode 100644
index 0000000..8570a99
--- /dev/null
+++ b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
@@ -0,0 +1,82 @@
+package com.stone.shop.model;
+
+import java.io.Serializable;
+
+import cn.bmob.v3.BmobObject;
+import cn.bmob.v3.datatype.BmobFile;
+
+/**
+ * 店铺实体类, 实现序列化, Activity之间实现传递
+ * @date 2014-4-24
+ * @author Stone
+ */
+public class Shop extends BmobObject implements Serializable{
+
+ private static final long serialVersionUID = -8796635595320697255L;
+
+ private String userID; // 主人
+ private String type; // 类型(11代表第一个GridView中的第一个)
+ private String name; // 店名
+ private String location; // 地理位置
+ private String phone; // 联系电话
+ private String info; // 简介
+ private String sale; // 促销信息
+ private BmobFile picShop; // 商店主图
+
+ public String getUserID() {
+ return userID;
+ }
+
+ public void setUserID(String userID) {
+ this.userID = userID;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getLocation() {
+ return location;
+ }
+
+ public void setLocation(String location) {
+ this.location = location;
+ }
+
+ public String getPhone() {
+ return phone;
+ }
+
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
+
+ public String getSale() {
+ return sale;
+ }
+
+ public void setSale(String sale) {
+ this.sale = sale;
+ }
+
+}
diff --git a/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun~HEAD b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun~HEAD
new file mode 100644
index 0000000..8570a99
--- /dev/null
+++ b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/Shop.java~remotes_origin_zhaozaichun~HEAD
@@ -0,0 +1,82 @@
+package com.stone.shop.model;
+
+import java.io.Serializable;
+
+import cn.bmob.v3.BmobObject;
+import cn.bmob.v3.datatype.BmobFile;
+
+/**
+ * 店铺实体类, 实现序列化, Activity之间实现传递
+ * @date 2014-4-24
+ * @author Stone
+ */
+public class Shop extends BmobObject implements Serializable{
+
+ private static final long serialVersionUID = -8796635595320697255L;
+
+ private String userID; // 主人
+ private String type; // 类型(11代表第一个GridView中的第一个)
+ private String name; // 店名
+ private String location; // 地理位置
+ private String phone; // 联系电话
+ private String info; // 简介
+ private String sale; // 促销信息
+ private BmobFile picShop; // 商店主图
+
+ public String getUserID() {
+ return userID;
+ }
+
+ public void setUserID(String userID) {
+ this.userID = userID;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getLocation() {
+ return location;
+ }
+
+ public void setLocation(String location) {
+ this.location = location;
+ }
+
+ public String getPhone() {
+ return phone;
+ }
+
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
+
+ public String getSale() {
+ return sale;
+ }
+
+ public void setSale(String sale) {
+ this.sale = sale;
+ }
+
+}
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/model/User.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/User.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/model/User.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/User.class
diff --git a/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/User.java~remotes_origin_zhaozaichun b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/User.java~remotes_origin_zhaozaichun
new file mode 100644
index 0000000..574a90c
--- /dev/null
+++ b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/User.java~remotes_origin_zhaozaichun
@@ -0,0 +1,106 @@
+package com.stone.shop.model;
+
+import cn.bmob.v3.BmobUser;
+import cn.bmob.v3.datatype.BmobFile;
+import cn.bmob.v3.datatype.BmobRelation;
+
+/**
+ * 用户实体类
+ * @date 2014-4-24
+ * @author Stone
+ */
+public class User extends BmobUser {
+
+ public static String userId;
+
+ // 父类中已经存在的属性
+ // private String id;
+ // private String username;
+ // private String password;
+ // private String email;
+ // private String regTime;
+
+ private String sex; // 性别
+ private String phone; // 电话
+ private String qq; // QQ
+ private String school = "湖北工业大学"; // 学校
+ private String cademy; // 学院
+ private String dorPart; // 校区
+ private String dorNum; // 寝室号
+ private String state = "未登陆"; // 登录状态
+ private String type = "普通用户"; // 用户类型(普通用户、黑名单、中奖者)
+ //private BmobFile picUser; // 头像
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getSex() {
+ return sex;
+ }
+
+ public void setSex(String sex) {
+ this.sex = sex;
+ }
+
+ public String getPhone() {
+ return phone;
+ }
+
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+
+ public String getQQ() {
+ return qq;
+ }
+
+ public void setQQ(String qq) {
+ this.qq = qq;
+ }
+
+ public String getSchool() {
+ return school;
+ }
+
+ public void setSchool(String school) {
+ this.school = school;
+ }
+
+ public String getCademy() {
+ return cademy;
+ }
+
+ public void setCademy(String cademy) {
+ this.cademy = cademy;
+ }
+
+ public String getDorPart() {
+ return dorPart;
+ }
+
+ public void setDorPart(String dorPart) {
+ this.dorPart = dorPart;
+ }
+
+ public String getDorNum() {
+ return dorNum;
+ }
+
+ public void setDorNum(String dorNum) {
+ this.dorNum = dorNum;
+ }
+
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+}
diff --git a/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/User.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/User.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
new file mode 100644
index 0000000..574a90c
--- /dev/null
+++ b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/User.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
@@ -0,0 +1,106 @@
+package com.stone.shop.model;
+
+import cn.bmob.v3.BmobUser;
+import cn.bmob.v3.datatype.BmobFile;
+import cn.bmob.v3.datatype.BmobRelation;
+
+/**
+ * 用户实体类
+ * @date 2014-4-24
+ * @author Stone
+ */
+public class User extends BmobUser {
+
+ public static String userId;
+
+ // 父类中已经存在的属性
+ // private String id;
+ // private String username;
+ // private String password;
+ // private String email;
+ // private String regTime;
+
+ private String sex; // 性别
+ private String phone; // 电话
+ private String qq; // QQ
+ private String school = "湖北工业大学"; // 学校
+ private String cademy; // 学院
+ private String dorPart; // 校区
+ private String dorNum; // 寝室号
+ private String state = "未登陆"; // 登录状态
+ private String type = "普通用户"; // 用户类型(普通用户、黑名单、中奖者)
+ //private BmobFile picUser; // 头像
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getSex() {
+ return sex;
+ }
+
+ public void setSex(String sex) {
+ this.sex = sex;
+ }
+
+ public String getPhone() {
+ return phone;
+ }
+
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+
+ public String getQQ() {
+ return qq;
+ }
+
+ public void setQQ(String qq) {
+ this.qq = qq;
+ }
+
+ public String getSchool() {
+ return school;
+ }
+
+ public void setSchool(String school) {
+ this.school = school;
+ }
+
+ public String getCademy() {
+ return cademy;
+ }
+
+ public void setCademy(String cademy) {
+ this.cademy = cademy;
+ }
+
+ public String getDorPart() {
+ return dorPart;
+ }
+
+ public void setDorPart(String dorPart) {
+ this.dorPart = dorPart;
+ }
+
+ public String getDorNum() {
+ return dorNum;
+ }
+
+ public void setDorNum(String dorNum) {
+ this.dorNum = dorNum;
+ }
+
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+}
diff --git a/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/User.java~remotes_origin_zhaozaichun~HEAD b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/User.java~remotes_origin_zhaozaichun~HEAD
new file mode 100644
index 0000000..574a90c
--- /dev/null
+++ b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/model/User.java~remotes_origin_zhaozaichun~HEAD
@@ -0,0 +1,106 @@
+package com.stone.shop.model;
+
+import cn.bmob.v3.BmobUser;
+import cn.bmob.v3.datatype.BmobFile;
+import cn.bmob.v3.datatype.BmobRelation;
+
+/**
+ * 用户实体类
+ * @date 2014-4-24
+ * @author Stone
+ */
+public class User extends BmobUser {
+
+ public static String userId;
+
+ // 父类中已经存在的属性
+ // private String id;
+ // private String username;
+ // private String password;
+ // private String email;
+ // private String regTime;
+
+ private String sex; // 性别
+ private String phone; // 电话
+ private String qq; // QQ
+ private String school = "湖北工业大学"; // 学校
+ private String cademy; // 学院
+ private String dorPart; // 校区
+ private String dorNum; // 寝室号
+ private String state = "未登陆"; // 登录状态
+ private String type = "普通用户"; // 用户类型(普通用户、黑名单、中奖者)
+ //private BmobFile picUser; // 头像
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getSex() {
+ return sex;
+ }
+
+ public void setSex(String sex) {
+ this.sex = sex;
+ }
+
+ public String getPhone() {
+ return phone;
+ }
+
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
+
+ public String getQQ() {
+ return qq;
+ }
+
+ public void setQQ(String qq) {
+ this.qq = qq;
+ }
+
+ public String getSchool() {
+ return school;
+ }
+
+ public void setSchool(String school) {
+ this.school = school;
+ }
+
+ public String getCademy() {
+ return cademy;
+ }
+
+ public void setCademy(String cademy) {
+ this.cademy = cademy;
+ }
+
+ public String getDorPart() {
+ return dorPart;
+ }
+
+ public void setDorPart(String dorPart) {
+ this.dorPart = dorPart;
+ }
+
+ public String getDorNum() {
+ return dorNum;
+ }
+
+ public void setDorNum(String dorNum) {
+ this.dorNum = dorNum;
+ }
+
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+}
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/AboutActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/AboutActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/AboutActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/AboutActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/AwardActivity$1.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/AwardActivity$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity$2.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/AwardActivity$2.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity$2.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/AwardActivity$2.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity$3.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/AwardActivity$3.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity$3.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/AwardActivity$3.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/AwardActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/AwardActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/AwardActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/BXTActivity$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/BXTActivity$1.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/BXTActivity$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/BXTActivity$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/BXTActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/BXTActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/BXTActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/BXTActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/BXTNewsActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/BXTNewsActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/BXTNewsActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/BXTNewsActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/BaseActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/BaseActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/BaseActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/BaseActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/ClassroomActivity$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/ClassroomActivity$1.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/ClassroomActivity$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/ClassroomActivity$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/ClassroomActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/ClassroomActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/ClassroomActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/ClassroomActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/CommentActivity$1.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/CommentActivity$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$2.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/CommentActivity$2.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$2.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/CommentActivity$2.class
diff --git 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
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$3$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/CommentActivity$3$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$3.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/CommentActivity$3.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$3.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/CommentActivity$3.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$4.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/CommentActivity$4.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$4.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/CommentActivity$4.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$5.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/CommentActivity$5.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity$5.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/CommentActivity$5.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/CommentActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/CommentActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/CommentActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/EditActivity$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/EditActivity$1.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/EditActivity$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/EditActivity$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/EditActivity$2.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/EditActivity$2.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/EditActivity$2.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/EditActivity$2.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/EditActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/EditActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/EditActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/EditActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/FeedBackActivity$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/FeedBackActivity$1.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/FeedBackActivity$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/FeedBackActivity$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/FeedBackActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/FeedBackActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/FeedBackActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/FeedBackActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/HomeActivity$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/HomeActivity$1.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/HomeActivity$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/HomeActivity$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/HomeActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/HomeActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/HomeActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/HomeActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/InfoContentActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/InfoContentActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/InfoContentActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/InfoContentActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/InfoNewsContentActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/InfoNewsContentActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/InfoNewsContentActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/InfoNewsContentActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/InformationActivity$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/InformationActivity$1.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/InformationActivity$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/InformationActivity$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/InformationActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/InformationActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/InformationActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/InformationActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryActivity$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LibraryActivity$1.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryActivity$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LibraryActivity$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LibraryActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LibraryActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LibraryReservationActivity$1.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LibraryReservationActivity$1.class
diff --git 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
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$2$1$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LibraryReservationActivity$2$1$1.class
diff --git 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
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$2$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LibraryReservationActivity$2$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$2.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LibraryReservationActivity$2.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity$2.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LibraryReservationActivity$2.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LibraryReservationActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/LibraryReservationActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LibraryReservationActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LoginActivity$1.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LoginActivity$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$2.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LoginActivity$2.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$2.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LoginActivity$2.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$3.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LoginActivity$3.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$3.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LoginActivity$3.class
diff --git 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
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$4$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LoginActivity$4$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$4.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LoginActivity$4.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$4.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LoginActivity$4.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$BaseUiListener.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LoginActivity$BaseUiListener.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity$BaseUiListener.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LoginActivity$BaseUiListener.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LoginActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/LoginActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/LoginActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MainActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MainActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/MainActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MainActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineActivity$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MineActivity$1.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/MineActivity$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MineActivity$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineActivity$2.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MineActivity$2.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/MineActivity$2.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MineActivity$2.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MineActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/MineActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MineActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoActivity$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MineInfoActivity$1.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoActivity$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MineInfoActivity$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoActivity$2.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MineInfoActivity$2.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoActivity$2.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MineInfoActivity$2.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MineInfoActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MineInfoActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MineInfoEditActivity$1.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MineInfoEditActivity$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity$2.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MineInfoEditActivity$2.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity$2.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MineInfoEditActivity$2.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity$3.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MineInfoEditActivity$3.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity$3.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MineInfoEditActivity$3.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MineInfoEditActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/MineInfoEditActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MineInfoEditActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MineSoftActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MineSoftActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/MineSoftActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MineSoftActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MultiScreenActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MultiScreenActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/MultiScreenActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MultiScreenActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/MultiViewGroup.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MultiViewGroup.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/MultiViewGroup.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/MultiViewGroup.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/NewsActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/NewsActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/NewsActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/NewsActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderActivity$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/OrderActivity$1.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/OrderActivity$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/OrderActivity$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderActivity$2.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/OrderActivity$2.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/OrderActivity$2.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/OrderActivity$2.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/OrderActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/OrderActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/OrderActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderInfoActivity$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/OrderInfoActivity$1.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/OrderInfoActivity$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/OrderInfoActivity$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderInfoActivity$2.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/OrderInfoActivity$2.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/OrderInfoActivity$2.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/OrderInfoActivity$2.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/OrderInfoActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/OrderInfoActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/OrderInfoActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/OrderInfoActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/RegisterActivity$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/RegisterActivity$1.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/RegisterActivity$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/RegisterActivity$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/RegisterActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/RegisterActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/RegisterActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/RegisterActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/ReservationActivity$1.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/ReservationActivity$1.class
diff --git 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
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$2$1$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/ReservationActivity$2$1$1.class
diff --git 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
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$2$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/ReservationActivity$2$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$2.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/ReservationActivity$2.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity$2.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/ReservationActivity$2.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/ReservationActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/ReservationActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/ReservationActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/ShopActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/ShopActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/ShopActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopAllActivity$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/ShopAllActivity$1.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/ShopAllActivity$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/ShopAllActivity$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopAllActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/ShopAllActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/ShopAllActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/ShopAllActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopItemActivity$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/ShopItemActivity$1.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/ShopItemActivity$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/ShopItemActivity$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/ShopItemActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/ShopItemActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/ShopItemActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/ShopItemActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/SplashActivity$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/SplashActivity$1.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/SplashActivity$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/SplashActivity$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/SplashActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/SplashActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/SplashActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/SplashActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/UserInfoActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/UserInfoActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/UserInfoActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/UserInfoActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/WsqActivity$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/WsqActivity$1.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/WsqActivity$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/WsqActivity$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/WsqActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/WsqActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/WsqActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/WsqActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/old/OldAboutActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/old/OldAboutActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/old/OldAboutActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/old/OldAboutActivity.class
diff --git 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
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/old/OldMineActivity$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/old/OldMineActivity$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/shop/view/old/OldMineActivity.class b/代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/old/OldMineActivity.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/shop/view/old/OldMineActivity.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/shop/view/old/OldMineActivity.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/AutoScrollViewPager$MyHandler.class b/代码/在这里3.0_最终版/bin/classes/com/stone/ui/AutoScrollViewPager$MyHandler.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/ui/AutoScrollViewPager$MyHandler.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/ui/AutoScrollViewPager$MyHandler.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/AutoScrollViewPager.class b/代码/在这里3.0_最终版/bin/classes/com/stone/ui/AutoScrollViewPager.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/ui/AutoScrollViewPager.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/ui/AutoScrollViewPager.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/CustomDurationScroller.class b/代码/在这里3.0_最终版/bin/classes/com/stone/ui/CustomDurationScroller.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/ui/CustomDurationScroller.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/ui/CustomDurationScroller.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/ui/DateTimePickDialogUtil$1.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/ui/DateTimePickDialogUtil$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil$2.class b/代码/在这里3.0_最终版/bin/classes/com/stone/ui/DateTimePickDialogUtil$2.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil$2.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/ui/DateTimePickDialogUtil$2.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil$DateTimeListener.class b/代码/在这里3.0_最终版/bin/classes/com/stone/ui/DateTimePickDialogUtil$DateTimeListener.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil$DateTimeListener.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/ui/DateTimePickDialogUtil$DateTimeListener.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil.class b/代码/在这里3.0_最终版/bin/classes/com/stone/ui/DateTimePickDialogUtil.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/ui/DateTimePickDialogUtil.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/ui/DateTimePickDialogUtil.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/DialogOrder$OrderDialogListener.class b/代码/在这里3.0_最终版/bin/classes/com/stone/ui/DialogOrder$OrderDialogListener.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/ui/DialogOrder$OrderDialogListener.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/ui/DialogOrder$OrderDialogListener.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/DialogOrder.class b/代码/在这里3.0_最终版/bin/classes/com/stone/ui/DialogOrder.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/ui/DialogOrder.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/ui/DialogOrder.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/ListScrollView.class b/代码/在这里3.0_最终版/bin/classes/com/stone/ui/ListScrollView.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/ui/ListScrollView.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/ui/ListScrollView.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/MyGridView.class b/代码/在这里3.0_最终版/bin/classes/com/stone/ui/MyGridView.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/ui/MyGridView.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/ui/MyGridView.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/ui/ViewPagerCompat.class b/代码/在这里3.0_最终版/bin/classes/com/stone/ui/ViewPagerCompat.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/ui/ViewPagerCompat.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/ui/ViewPagerCompat.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/util/ActivityUtil.class b/代码/在这里3.0_最终版/bin/classes/com/stone/util/ActivityUtil.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/util/ActivityUtil.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/util/ActivityUtil.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/util/ToastFactory.class b/代码/在这里3.0_最终版/bin/classes/com/stone/util/ToastFactory.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/util/ToastFactory.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/util/ToastFactory.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/util/Util$1.class b/代码/在这里3.0_最终版/bin/classes/com/stone/util/Util$1.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/util/Util$1.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/util/Util$1.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/util/Util.class b/代码/在这里3.0_最终版/bin/classes/com/stone/util/Util.class
similarity index 100%
rename from 代码/在这里3.0/bin/classes/com/stone/util/Util.class
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/util/Util.class
diff --git a/代码/在这里3.0/bin/classes/com/stone/util/Util.java~remotes_origin_zhaozaichun b/代码/在这里3.0_最终版/bin/classes/com/stone/util/Util.java~remotes_origin_zhaozaichun
similarity index 52%
rename from 代码/在这里3.0/bin/classes/com/stone/util/Util.java~remotes_origin_zhaozaichun
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/util/Util.java~remotes_origin_zhaozaichun
index 653e1f9..c0500b1 100644
--- a/代码/在这里3.0/bin/classes/com/stone/util/Util.java~remotes_origin_zhaozaichun
+++ b/代码/在这里3.0_最终版/bin/classes/com/stone/util/Util.java~remotes_origin_zhaozaichun
@@ -46,46 +46,46 @@ import junit.framework.Assert;
*/
public class Util {
- /**
- * 判断电话号码是否有效
- *
- * @param phoneNumber
- * @return true 有效 / false 无效
- */
- public static boolean isPhoneNumberValid(String phoneNumber) {
+ /**
+ * 判断电话号码是否有效
+ *
+ * @param phoneNumber
+ * @return true 有效 / false 无效
+ */
+ public static boolean isPhoneNumberValid(String phoneNumber) {
- boolean isValid = false;
+ boolean isValid = false;
- String expression = "((^(13|15|18)[0-9]{9}$)|(^0[1,2]{1}\\d{1}-?\\d{8}$)|(^0[3-9] {1}\\d{2}-?\\d{7,8}$)|(^0[1,2]{1}\\d{1}-?\\d{8}-(\\d{1,4})$)|(^0[3-9]{1}\\d{2}-? \\d{7,8}-(\\d{1,4})$))";
- CharSequence inputStr = phoneNumber;
+ String expression = "((^(13|15|18)[0-9]{9}$)|(^0[1,2]{1}\\d{1}-?\\d{8}$)|(^0[3-9] {1}\\d{2}-?\\d{7,8}$)|(^0[1,2]{1}\\d{1}-?\\d{8}-(\\d{1,4})$)|(^0[3-9]{1}\\d{2}-? \\d{7,8}-(\\d{1,4})$))";
+ CharSequence inputStr = phoneNumber;
- Pattern pattern = Pattern.compile(expression);
- Matcher matcher = pattern.matcher(inputStr);
+ Pattern pattern = Pattern.compile(expression);
+ Matcher matcher = pattern.matcher(inputStr);
- if (matcher.matches()) {
- isValid = true;
- }
- return isValid;
- }
+ if (matcher.matches()) {
+ isValid = true;
+ }
+ return isValid;
+ }
- // 判断网络是否连接
- public static boolean isNetworkConnected(Context context) {
- if (context != null) {
- ConnectivityManager mConnectivityManager = (ConnectivityManager) context
- .getSystemService(Context.CONNECTIVITY_SERVICE);
- NetworkInfo mNetworkInfo = mConnectivityManager
- .getActiveNetworkInfo();
- if (mNetworkInfo != null) {
- return mNetworkInfo.isAvailable();
- }
- }
- return false;
- }
+ // 判断网络是否连接
+ public static boolean isNetworkConnected(Context context) {
+ if (context != null) {
+ ConnectivityManager mConnectivityManager = (ConnectivityManager) context
+ .getSystemService(Context.CONNECTIVITY_SERVICE);
+ NetworkInfo mNetworkInfo = mConnectivityManager
+ .getActiveNetworkInfo();
+ if (mNetworkInfo != null) {
+ return mNetworkInfo.isAvailable();
+ }
+ }
+ return false;
+ }
private static final String TAG = "SDK_Sample.Util";
-
- private static Dialog mProgressDialog;
- private static Toast mToast;
+
+ private static Dialog mProgressDialog;
+ private static Toast mToast;
/* Convert byte[] to hex string.这里我们可以将byte转换成int,然后利用Integer.toHexString(int)来转换成16进制字符串。
* @param src byte[] data
@@ -145,12 +145,12 @@ private static final String TAG = "SDK_Sample.Util";
{
//根据默认编码获取字节数组
byte[] bytes = null;
- try {
- bytes = str.getBytes("UTF-8");
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
- if (bytes == null) return null;
+ try {
+ bytes = str.getBytes("UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ if (bytes == null) return null;
StringBuilder sb=new StringBuilder(bytes.length*2);
//将字节数组中每个字节拆解成2位16进制整数
for(int i=0;i (int) file.length()){
- Log.e(TAG, "readFromFile invalid file len:" + file.length());
- return null;
- }
+ if(offset <0){
+ Log.e(TAG, "readFromFile invalid offset:" + offset);
+ return null;
+ }
+ if(len <=0 ){
+ Log.e(TAG, "readFromFile invalid len:" + len);
+ return null;
+ }
+ if(offset + len > (int) file.length()){
+ Log.e(TAG, "readFromFile invalid file len:" + file.length());
+ return null;
+ }
- byte[] b = null;
- try {
- RandomAccessFile in = new RandomAccessFile(fileName, "r");
- b = new byte[len];
- in.seek(offset);
- in.readFully(b);
- in.close();
+ byte[] b = null;
+ try {
+ RandomAccessFile in = new RandomAccessFile(fileName, "r");
+ b = new byte[len];
+ in.seek(offset);
+ in.readFully(b);
+ in.close();
- } catch (Exception e) {
- Log.e(TAG, "readFromFile : errMsg = " + e.getMessage());
- e.printStackTrace();
- }
- return b;
- }
+ } catch (Exception e) {
+ Log.e(TAG, "readFromFile : errMsg = " + e.getMessage());
+ e.printStackTrace();
+ }
+ return b;
+ }
public static int computeSampleSize(BitmapFactory.Options options,
@@ -384,205 +384,205 @@ private static final String TAG = "SDK_Sample.Util";
}
private static final int MAX_DECODE_PICTURE_SIZE = 1920 * 1440;
- public static Bitmap extractThumbNail(final String path, final int height, final int width, final boolean crop) {
- Assert.assertTrue(path != null && !path.equals("") && height > 0 && width > 0);
+ public static Bitmap extractThumbNail(final String path, final int height, final int width, final boolean crop) {
+ Assert.assertTrue(path != null && !path.equals("") && height > 0 && width > 0);
- BitmapFactory.Options options = new BitmapFactory.Options();
+ BitmapFactory.Options options = new BitmapFactory.Options();
- try {
- options.inJustDecodeBounds = true;
- Bitmap tmp = BitmapFactory.decodeFile(path, options);
- if (tmp != null) {
- tmp.recycle();
- tmp = null;
- }
+ try {
+ options.inJustDecodeBounds = true;
+ Bitmap tmp = BitmapFactory.decodeFile(path, options);
+ if (tmp != null) {
+ tmp.recycle();
+ tmp = null;
+ }
- Log.d(TAG, "extractThumbNail: round=" + width + "x" + height + ", crop=" + crop);
- final double beY = options.outHeight * 1.0 / height;
- final double beX = options.outWidth * 1.0 / width;
- Log.d(TAG, "extractThumbNail: extract beX = " + beX + ", beY = " + beY);
- options.inSampleSize = (int) (crop ? (beY > beX ? beX : beY) : (beY < beX ? beX : beY));
- if (options.inSampleSize <= 1) {
- options.inSampleSize = 1;
- }
+ Log.d(TAG, "extractThumbNail: round=" + width + "x" + height + ", crop=" + crop);
+ final double beY = options.outHeight * 1.0 / height;
+ final double beX = options.outWidth * 1.0 / width;
+ Log.d(TAG, "extractThumbNail: extract beX = " + beX + ", beY = " + beY);
+ options.inSampleSize = (int) (crop ? (beY > beX ? beX : beY) : (beY < beX ? beX : beY));
+ if (options.inSampleSize <= 1) {
+ options.inSampleSize = 1;
+ }
- // NOTE: out of memory error
- while (options.outHeight * options.outWidth / options.inSampleSize > MAX_DECODE_PICTURE_SIZE) {
- options.inSampleSize++;
- }
+ // NOTE: out of memory error
+ while (options.outHeight * options.outWidth / options.inSampleSize > MAX_DECODE_PICTURE_SIZE) {
+ options.inSampleSize++;
+ }
- int newHeight = height;
- int newWidth = width;
- if (crop) {
- if (beY > beX) {
- newHeight = (int) (newWidth * 1.0 * options.outHeight / options.outWidth);
- } else {
- newWidth = (int) (newHeight * 1.0 * options.outWidth / options.outHeight);
- }
- } else {
- if (beY < beX) {
- newHeight = (int) (newWidth * 1.0 * options.outHeight / options.outWidth);
- } else {
- newWidth = (int) (newHeight * 1.0 * options.outWidth / options.outHeight);
- }
- }
+ int newHeight = height;
+ int newWidth = width;
+ if (crop) {
+ if (beY > beX) {
+ newHeight = (int) (newWidth * 1.0 * options.outHeight / options.outWidth);
+ } else {
+ newWidth = (int) (newHeight * 1.0 * options.outWidth / options.outHeight);
+ }
+ } else {
+ if (beY < beX) {
+ newHeight = (int) (newWidth * 1.0 * options.outHeight / options.outWidth);
+ } else {
+ newWidth = (int) (newHeight * 1.0 * options.outWidth / options.outHeight);
+ }
+ }
- options.inJustDecodeBounds = false;
+ options.inJustDecodeBounds = false;
- Log.i(TAG, "bitmap required size=" + newWidth + "x" + newHeight + ", orig=" + options.outWidth + "x" + options.outHeight + ", sample=" + options.inSampleSize);
- Bitmap bm = BitmapFactory.decodeFile(path, options);
- if (bm == null) {
- Log.e(TAG, "bitmap decode failed");
- return null;
- }
+ Log.i(TAG, "bitmap required size=" + newWidth + "x" + newHeight + ", orig=" + options.outWidth + "x" + options.outHeight + ", sample=" + options.inSampleSize);
+ Bitmap bm = BitmapFactory.decodeFile(path, options);
+ if (bm == null) {
+ Log.e(TAG, "bitmap decode failed");
+ return null;
+ }
- Log.i(TAG, "bitmap decoded size=" + bm.getWidth() + "x" + bm.getHeight());
- final Bitmap scale = Bitmap.createScaledBitmap(bm, newWidth, newHeight, true);
- if (scale != null) {
- bm.recycle();
- bm = scale;
- }
+ Log.i(TAG, "bitmap decoded size=" + bm.getWidth() + "x" + bm.getHeight());
+ final Bitmap scale = Bitmap.createScaledBitmap(bm, newWidth, newHeight, true);
+ if (scale != null) {
+ bm.recycle();
+ bm = scale;
+ }
- if (crop) {
- final Bitmap cropped = Bitmap.createBitmap(bm, (bm.getWidth() - width) >> 1, (bm.getHeight() - height) >> 1, width, height);
- if (cropped == null) {
- return bm;
- }
+ if (crop) {
+ final Bitmap cropped = Bitmap.createBitmap(bm, (bm.getWidth() - width) >> 1, (bm.getHeight() - height) >> 1, width, height);
+ if (cropped == null) {
+ return bm;
+ }
- bm.recycle();
- bm = cropped;
- Log.i(TAG, "bitmap croped size=" + bm.getWidth() + "x" + bm.getHeight());
- }
- return bm;
+ bm.recycle();
+ bm = cropped;
+ Log.i(TAG, "bitmap croped size=" + bm.getWidth() + "x" + bm.getHeight());
+ }
+ return bm;
- } catch (final OutOfMemoryError e) {
- Log.e(TAG, "decode bitmap failed: " + e.getMessage());
- options = null;
- }
+ } catch (final OutOfMemoryError e) {
+ Log.e(TAG, "decode bitmap failed: " + e.getMessage());
+ options = null;
+ }
- return null;
- }
-
- public static final void showResultDialog(Context context, String msg,
- String title) {
- if(msg == null) return;
- String rmsg = msg.replace(",", "\n");
- Log.d("Util", rmsg);
- new AlertDialog.Builder(context).setTitle(title).setMessage(rmsg)
- .setNegativeButton("知道了", null).create().show();
- }
+ return null;
+ }
+
+ public static final void showResultDialog(Context context, String msg,
+ String title) {
+ if(msg == null) return;
+ String rmsg = msg.replace(",", "\n");
+ Log.d("Util", rmsg);
+ new AlertDialog.Builder(context).setTitle(title).setMessage(rmsg)
+ .setNegativeButton("知道了", null).create().show();
+ }
- public static final void showProgressDialog(Context context, String title,
- String message) {
- dismissDialog();
- if (TextUtils.isEmpty(title)) {
- title = "请稍候";
- }
- if (TextUtils.isEmpty(message)) {
- message = "正在加载...";
- }
- mProgressDialog = ProgressDialog.show(context, title, message);
- }
-
- public static AlertDialog showConfirmCancelDialog(Context context,
- String title, String message,
- DialogInterface.OnClickListener posListener) {
- AlertDialog dlg = new AlertDialog.Builder(context).setMessage(message)
- .setPositiveButton("确认", posListener)
- .setNegativeButton("取消", null).create();
- dlg.setCanceledOnTouchOutside(false);
- dlg.show();
- return dlg;
- }
+ public static final void showProgressDialog(Context context, String title,
+ String message) {
+ dismissDialog();
+ if (TextUtils.isEmpty(title)) {
+ title = "请稍候";
+ }
+ if (TextUtils.isEmpty(message)) {
+ message = "正在加载...";
+ }
+ mProgressDialog = ProgressDialog.show(context, title, message);
+ }
+
+ public static AlertDialog showConfirmCancelDialog(Context context,
+ String title, String message,
+ DialogInterface.OnClickListener posListener) {
+ AlertDialog dlg = new AlertDialog.Builder(context).setMessage(message)
+ .setPositiveButton("确认", posListener)
+ .setNegativeButton("取消", null).create();
+ dlg.setCanceledOnTouchOutside(false);
+ dlg.show();
+ return dlg;
+ }
- public static final void dismissDialog() {
- if (mProgressDialog != null) {
- mProgressDialog.dismiss();
- mProgressDialog = null;
- }
- }
+ public static final void dismissDialog() {
+ if (mProgressDialog != null) {
+ mProgressDialog.dismiss();
+ mProgressDialog = null;
+ }
+ }
- /**
- * 打印消息并且用Toast显示消息
- *
- * @param activity
- * @param message
- * @param logLevel
- * 填d, w, e分别代表debug, warn, error; 默认是debug
- */
- public static final void toastMessage(final Activity activity,
- final String message, String logLevel) {
- if ("w".equals(logLevel)) {
- Log.w("sdkDemo", message);
- } else if ("e".equals(logLevel)) {
- Log.e("sdkDemo", message);
- } else {
- Log.d("sdkDemo", message);
- }
- activity.runOnUiThread(new Runnable() {
- @Override
- public void run() {
- // TODO Auto-generated method stub
- if (mToast != null) {
- mToast.cancel();
- mToast = null;
- }
- mToast = Toast.makeText(activity, message, Toast.LENGTH_SHORT);
- mToast.show();
- }
- });
- }
+ /**
+ * 打印消息并且用Toast显示消息
+ *
+ * @param activity
+ * @param message
+ * @param logLevel
+ * 填d, w, e分别代表debug, warn, error; 默认是debug
+ */
+ public static final void toastMessage(final Activity activity,
+ final String message, String logLevel) {
+ if ("w".equals(logLevel)) {
+ Log.w("sdkDemo", message);
+ } else if ("e".equals(logLevel)) {
+ Log.e("sdkDemo", message);
+ } else {
+ Log.d("sdkDemo", message);
+ }
+ activity.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ // TODO Auto-generated method stub
+ if (mToast != null) {
+ mToast.cancel();
+ mToast = null;
+ }
+ mToast = Toast.makeText(activity, message, Toast.LENGTH_SHORT);
+ mToast.show();
+ }
+ });
+ }
- /**
- * 打印消息并且用Toast显示消息
- *
- * @param activity
- * @param message
- * @param logLevel
- * 填d, w, e分别代表debug, warn, error; 默认是debug
- */
- public static final void toastMessage(final Activity activity,
- final String message) {
- toastMessage(activity, message, null);
- }
+ /**
+ * 打印消息并且用Toast显示消息
+ *
+ * @param activity
+ * @param message
+ * @param logLevel
+ * 填d, w, e分别代表debug, warn, error; 默认是debug
+ */
+ public static final void toastMessage(final Activity activity,
+ final String message) {
+ toastMessage(activity, message, null);
+ }
- /**
- * 根据一个网络连接(String)获取bitmap图像
- *
- * @param imageUri
- * @return
- * @throws MalformedURLException
- */
- public static Bitmap getbitmap(String imageUri) {
- Log.v(TAG, "getbitmap:" + imageUri);
- // 显示网络上的图片
- Bitmap bitmap = null;
- try {
- URL myFileUrl = new URL(imageUri);
- HttpURLConnection conn = (HttpURLConnection) myFileUrl
- .openConnection();
- conn.setDoInput(true);
- conn.connect();
- InputStream is = conn.getInputStream();
- bitmap = BitmapFactory.decodeStream(is);
- is.close();
+ /**
+ * 根据一个网络连接(String)获取bitmap图像
+ *
+ * @param imageUri
+ * @return
+ * @throws MalformedURLException
+ */
+ public static Bitmap getbitmap(String imageUri) {
+ Log.v(TAG, "getbitmap:" + imageUri);
+ // 显示网络上的图片
+ Bitmap bitmap = null;
+ try {
+ URL myFileUrl = new URL(imageUri);
+ HttpURLConnection conn = (HttpURLConnection) myFileUrl
+ .openConnection();
+ conn.setDoInput(true);
+ conn.connect();
+ InputStream is = conn.getInputStream();
+ bitmap = BitmapFactory.decodeStream(is);
+ is.close();
- Log.v(TAG, "image download finished." + imageUri);
+ Log.v(TAG, "image download finished." + imageUri);
} catch (OutOfMemoryError e) {
e.printStackTrace();
bitmap = null;
- } catch (IOException e) {
- e.printStackTrace();
- Log.v(TAG, "getbitmap bmp fail---");
+ } catch (IOException e) {
+ e.printStackTrace();
+ Log.v(TAG, "getbitmap bmp fail---");
bitmap = null;
- }
- return bitmap;
- }
-
- public static void release() {
- mProgressDialog = null;
- mToast = null;
- }
+ }
+ return bitmap;
+ }
+
+ public static void release() {
+ mProgressDialog = null;
+ mToast = null;
+ }
// =========
// =通过URI获取本地图片的path
diff --git a/代码/在这里3.0/src/com/stone/util/Util.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f b/代码/在这里3.0_最终版/bin/classes/com/stone/util/Util.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
similarity index 52%
rename from 代码/在这里3.0/src/com/stone/util/Util.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/util/Util.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
index 653e1f9..c0500b1 100644
--- a/代码/在这里3.0/src/com/stone/util/Util.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
+++ b/代码/在这里3.0_最终版/bin/classes/com/stone/util/Util.java~remotes_origin_zhaozaichun~406ede7f366affa65cb8bad5ffc35ac8737ea11f
@@ -46,46 +46,46 @@ import junit.framework.Assert;
*/
public class Util {
- /**
- * 判断电话号码是否有效
- *
- * @param phoneNumber
- * @return true 有效 / false 无效
- */
- public static boolean isPhoneNumberValid(String phoneNumber) {
+ /**
+ * 判断电话号码是否有效
+ *
+ * @param phoneNumber
+ * @return true 有效 / false 无效
+ */
+ public static boolean isPhoneNumberValid(String phoneNumber) {
- boolean isValid = false;
+ boolean isValid = false;
- String expression = "((^(13|15|18)[0-9]{9}$)|(^0[1,2]{1}\\d{1}-?\\d{8}$)|(^0[3-9] {1}\\d{2}-?\\d{7,8}$)|(^0[1,2]{1}\\d{1}-?\\d{8}-(\\d{1,4})$)|(^0[3-9]{1}\\d{2}-? \\d{7,8}-(\\d{1,4})$))";
- CharSequence inputStr = phoneNumber;
+ String expression = "((^(13|15|18)[0-9]{9}$)|(^0[1,2]{1}\\d{1}-?\\d{8}$)|(^0[3-9] {1}\\d{2}-?\\d{7,8}$)|(^0[1,2]{1}\\d{1}-?\\d{8}-(\\d{1,4})$)|(^0[3-9]{1}\\d{2}-? \\d{7,8}-(\\d{1,4})$))";
+ CharSequence inputStr = phoneNumber;
- Pattern pattern = Pattern.compile(expression);
- Matcher matcher = pattern.matcher(inputStr);
+ Pattern pattern = Pattern.compile(expression);
+ Matcher matcher = pattern.matcher(inputStr);
- if (matcher.matches()) {
- isValid = true;
- }
- return isValid;
- }
+ if (matcher.matches()) {
+ isValid = true;
+ }
+ return isValid;
+ }
- // 判断网络是否连接
- public static boolean isNetworkConnected(Context context) {
- if (context != null) {
- ConnectivityManager mConnectivityManager = (ConnectivityManager) context
- .getSystemService(Context.CONNECTIVITY_SERVICE);
- NetworkInfo mNetworkInfo = mConnectivityManager
- .getActiveNetworkInfo();
- if (mNetworkInfo != null) {
- return mNetworkInfo.isAvailable();
- }
- }
- return false;
- }
+ // 判断网络是否连接
+ public static boolean isNetworkConnected(Context context) {
+ if (context != null) {
+ ConnectivityManager mConnectivityManager = (ConnectivityManager) context
+ .getSystemService(Context.CONNECTIVITY_SERVICE);
+ NetworkInfo mNetworkInfo = mConnectivityManager
+ .getActiveNetworkInfo();
+ if (mNetworkInfo != null) {
+ return mNetworkInfo.isAvailable();
+ }
+ }
+ return false;
+ }
private static final String TAG = "SDK_Sample.Util";
-
- private static Dialog mProgressDialog;
- private static Toast mToast;
+
+ private static Dialog mProgressDialog;
+ private static Toast mToast;
/* Convert byte[] to hex string.这里我们可以将byte转换成int,然后利用Integer.toHexString(int)来转换成16进制字符串。
* @param src byte[] data
@@ -145,12 +145,12 @@ private static final String TAG = "SDK_Sample.Util";
{
//根据默认编码获取字节数组
byte[] bytes = null;
- try {
- bytes = str.getBytes("UTF-8");
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
- if (bytes == null) return null;
+ try {
+ bytes = str.getBytes("UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ if (bytes == null) return null;
StringBuilder sb=new StringBuilder(bytes.length*2);
//将字节数组中每个字节拆解成2位16进制整数
for(int i=0;i (int) file.length()){
- Log.e(TAG, "readFromFile invalid file len:" + file.length());
- return null;
- }
+ if(offset <0){
+ Log.e(TAG, "readFromFile invalid offset:" + offset);
+ return null;
+ }
+ if(len <=0 ){
+ Log.e(TAG, "readFromFile invalid len:" + len);
+ return null;
+ }
+ if(offset + len > (int) file.length()){
+ Log.e(TAG, "readFromFile invalid file len:" + file.length());
+ return null;
+ }
- byte[] b = null;
- try {
- RandomAccessFile in = new RandomAccessFile(fileName, "r");
- b = new byte[len];
- in.seek(offset);
- in.readFully(b);
- in.close();
+ byte[] b = null;
+ try {
+ RandomAccessFile in = new RandomAccessFile(fileName, "r");
+ b = new byte[len];
+ in.seek(offset);
+ in.readFully(b);
+ in.close();
- } catch (Exception e) {
- Log.e(TAG, "readFromFile : errMsg = " + e.getMessage());
- e.printStackTrace();
- }
- return b;
- }
+ } catch (Exception e) {
+ Log.e(TAG, "readFromFile : errMsg = " + e.getMessage());
+ e.printStackTrace();
+ }
+ return b;
+ }
public static int computeSampleSize(BitmapFactory.Options options,
@@ -384,205 +384,205 @@ private static final String TAG = "SDK_Sample.Util";
}
private static final int MAX_DECODE_PICTURE_SIZE = 1920 * 1440;
- public static Bitmap extractThumbNail(final String path, final int height, final int width, final boolean crop) {
- Assert.assertTrue(path != null && !path.equals("") && height > 0 && width > 0);
+ public static Bitmap extractThumbNail(final String path, final int height, final int width, final boolean crop) {
+ Assert.assertTrue(path != null && !path.equals("") && height > 0 && width > 0);
- BitmapFactory.Options options = new BitmapFactory.Options();
+ BitmapFactory.Options options = new BitmapFactory.Options();
- try {
- options.inJustDecodeBounds = true;
- Bitmap tmp = BitmapFactory.decodeFile(path, options);
- if (tmp != null) {
- tmp.recycle();
- tmp = null;
- }
+ try {
+ options.inJustDecodeBounds = true;
+ Bitmap tmp = BitmapFactory.decodeFile(path, options);
+ if (tmp != null) {
+ tmp.recycle();
+ tmp = null;
+ }
- Log.d(TAG, "extractThumbNail: round=" + width + "x" + height + ", crop=" + crop);
- final double beY = options.outHeight * 1.0 / height;
- final double beX = options.outWidth * 1.0 / width;
- Log.d(TAG, "extractThumbNail: extract beX = " + beX + ", beY = " + beY);
- options.inSampleSize = (int) (crop ? (beY > beX ? beX : beY) : (beY < beX ? beX : beY));
- if (options.inSampleSize <= 1) {
- options.inSampleSize = 1;
- }
+ Log.d(TAG, "extractThumbNail: round=" + width + "x" + height + ", crop=" + crop);
+ final double beY = options.outHeight * 1.0 / height;
+ final double beX = options.outWidth * 1.0 / width;
+ Log.d(TAG, "extractThumbNail: extract beX = " + beX + ", beY = " + beY);
+ options.inSampleSize = (int) (crop ? (beY > beX ? beX : beY) : (beY < beX ? beX : beY));
+ if (options.inSampleSize <= 1) {
+ options.inSampleSize = 1;
+ }
- // NOTE: out of memory error
- while (options.outHeight * options.outWidth / options.inSampleSize > MAX_DECODE_PICTURE_SIZE) {
- options.inSampleSize++;
- }
+ // NOTE: out of memory error
+ while (options.outHeight * options.outWidth / options.inSampleSize > MAX_DECODE_PICTURE_SIZE) {
+ options.inSampleSize++;
+ }
- int newHeight = height;
- int newWidth = width;
- if (crop) {
- if (beY > beX) {
- newHeight = (int) (newWidth * 1.0 * options.outHeight / options.outWidth);
- } else {
- newWidth = (int) (newHeight * 1.0 * options.outWidth / options.outHeight);
- }
- } else {
- if (beY < beX) {
- newHeight = (int) (newWidth * 1.0 * options.outHeight / options.outWidth);
- } else {
- newWidth = (int) (newHeight * 1.0 * options.outWidth / options.outHeight);
- }
- }
+ int newHeight = height;
+ int newWidth = width;
+ if (crop) {
+ if (beY > beX) {
+ newHeight = (int) (newWidth * 1.0 * options.outHeight / options.outWidth);
+ } else {
+ newWidth = (int) (newHeight * 1.0 * options.outWidth / options.outHeight);
+ }
+ } else {
+ if (beY < beX) {
+ newHeight = (int) (newWidth * 1.0 * options.outHeight / options.outWidth);
+ } else {
+ newWidth = (int) (newHeight * 1.0 * options.outWidth / options.outHeight);
+ }
+ }
- options.inJustDecodeBounds = false;
+ options.inJustDecodeBounds = false;
- Log.i(TAG, "bitmap required size=" + newWidth + "x" + newHeight + ", orig=" + options.outWidth + "x" + options.outHeight + ", sample=" + options.inSampleSize);
- Bitmap bm = BitmapFactory.decodeFile(path, options);
- if (bm == null) {
- Log.e(TAG, "bitmap decode failed");
- return null;
- }
+ Log.i(TAG, "bitmap required size=" + newWidth + "x" + newHeight + ", orig=" + options.outWidth + "x" + options.outHeight + ", sample=" + options.inSampleSize);
+ Bitmap bm = BitmapFactory.decodeFile(path, options);
+ if (bm == null) {
+ Log.e(TAG, "bitmap decode failed");
+ return null;
+ }
- Log.i(TAG, "bitmap decoded size=" + bm.getWidth() + "x" + bm.getHeight());
- final Bitmap scale = Bitmap.createScaledBitmap(bm, newWidth, newHeight, true);
- if (scale != null) {
- bm.recycle();
- bm = scale;
- }
+ Log.i(TAG, "bitmap decoded size=" + bm.getWidth() + "x" + bm.getHeight());
+ final Bitmap scale = Bitmap.createScaledBitmap(bm, newWidth, newHeight, true);
+ if (scale != null) {
+ bm.recycle();
+ bm = scale;
+ }
- if (crop) {
- final Bitmap cropped = Bitmap.createBitmap(bm, (bm.getWidth() - width) >> 1, (bm.getHeight() - height) >> 1, width, height);
- if (cropped == null) {
- return bm;
- }
+ if (crop) {
+ final Bitmap cropped = Bitmap.createBitmap(bm, (bm.getWidth() - width) >> 1, (bm.getHeight() - height) >> 1, width, height);
+ if (cropped == null) {
+ return bm;
+ }
- bm.recycle();
- bm = cropped;
- Log.i(TAG, "bitmap croped size=" + bm.getWidth() + "x" + bm.getHeight());
- }
- return bm;
+ bm.recycle();
+ bm = cropped;
+ Log.i(TAG, "bitmap croped size=" + bm.getWidth() + "x" + bm.getHeight());
+ }
+ return bm;
- } catch (final OutOfMemoryError e) {
- Log.e(TAG, "decode bitmap failed: " + e.getMessage());
- options = null;
- }
+ } catch (final OutOfMemoryError e) {
+ Log.e(TAG, "decode bitmap failed: " + e.getMessage());
+ options = null;
+ }
- return null;
- }
-
- public static final void showResultDialog(Context context, String msg,
- String title) {
- if(msg == null) return;
- String rmsg = msg.replace(",", "\n");
- Log.d("Util", rmsg);
- new AlertDialog.Builder(context).setTitle(title).setMessage(rmsg)
- .setNegativeButton("知道了", null).create().show();
- }
+ return null;
+ }
+
+ public static final void showResultDialog(Context context, String msg,
+ String title) {
+ if(msg == null) return;
+ String rmsg = msg.replace(",", "\n");
+ Log.d("Util", rmsg);
+ new AlertDialog.Builder(context).setTitle(title).setMessage(rmsg)
+ .setNegativeButton("知道了", null).create().show();
+ }
- public static final void showProgressDialog(Context context, String title,
- String message) {
- dismissDialog();
- if (TextUtils.isEmpty(title)) {
- title = "请稍候";
- }
- if (TextUtils.isEmpty(message)) {
- message = "正在加载...";
- }
- mProgressDialog = ProgressDialog.show(context, title, message);
- }
-
- public static AlertDialog showConfirmCancelDialog(Context context,
- String title, String message,
- DialogInterface.OnClickListener posListener) {
- AlertDialog dlg = new AlertDialog.Builder(context).setMessage(message)
- .setPositiveButton("确认", posListener)
- .setNegativeButton("取消", null).create();
- dlg.setCanceledOnTouchOutside(false);
- dlg.show();
- return dlg;
- }
+ public static final void showProgressDialog(Context context, String title,
+ String message) {
+ dismissDialog();
+ if (TextUtils.isEmpty(title)) {
+ title = "请稍候";
+ }
+ if (TextUtils.isEmpty(message)) {
+ message = "正在加载...";
+ }
+ mProgressDialog = ProgressDialog.show(context, title, message);
+ }
+
+ public static AlertDialog showConfirmCancelDialog(Context context,
+ String title, String message,
+ DialogInterface.OnClickListener posListener) {
+ AlertDialog dlg = new AlertDialog.Builder(context).setMessage(message)
+ .setPositiveButton("确认", posListener)
+ .setNegativeButton("取消", null).create();
+ dlg.setCanceledOnTouchOutside(false);
+ dlg.show();
+ return dlg;
+ }
- public static final void dismissDialog() {
- if (mProgressDialog != null) {
- mProgressDialog.dismiss();
- mProgressDialog = null;
- }
- }
+ public static final void dismissDialog() {
+ if (mProgressDialog != null) {
+ mProgressDialog.dismiss();
+ mProgressDialog = null;
+ }
+ }
- /**
- * 打印消息并且用Toast显示消息
- *
- * @param activity
- * @param message
- * @param logLevel
- * 填d, w, e分别代表debug, warn, error; 默认是debug
- */
- public static final void toastMessage(final Activity activity,
- final String message, String logLevel) {
- if ("w".equals(logLevel)) {
- Log.w("sdkDemo", message);
- } else if ("e".equals(logLevel)) {
- Log.e("sdkDemo", message);
- } else {
- Log.d("sdkDemo", message);
- }
- activity.runOnUiThread(new Runnable() {
- @Override
- public void run() {
- // TODO Auto-generated method stub
- if (mToast != null) {
- mToast.cancel();
- mToast = null;
- }
- mToast = Toast.makeText(activity, message, Toast.LENGTH_SHORT);
- mToast.show();
- }
- });
- }
+ /**
+ * 打印消息并且用Toast显示消息
+ *
+ * @param activity
+ * @param message
+ * @param logLevel
+ * 填d, w, e分别代表debug, warn, error; 默认是debug
+ */
+ public static final void toastMessage(final Activity activity,
+ final String message, String logLevel) {
+ if ("w".equals(logLevel)) {
+ Log.w("sdkDemo", message);
+ } else if ("e".equals(logLevel)) {
+ Log.e("sdkDemo", message);
+ } else {
+ Log.d("sdkDemo", message);
+ }
+ activity.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ // TODO Auto-generated method stub
+ if (mToast != null) {
+ mToast.cancel();
+ mToast = null;
+ }
+ mToast = Toast.makeText(activity, message, Toast.LENGTH_SHORT);
+ mToast.show();
+ }
+ });
+ }
- /**
- * 打印消息并且用Toast显示消息
- *
- * @param activity
- * @param message
- * @param logLevel
- * 填d, w, e分别代表debug, warn, error; 默认是debug
- */
- public static final void toastMessage(final Activity activity,
- final String message) {
- toastMessage(activity, message, null);
- }
+ /**
+ * 打印消息并且用Toast显示消息
+ *
+ * @param activity
+ * @param message
+ * @param logLevel
+ * 填d, w, e分别代表debug, warn, error; 默认是debug
+ */
+ public static final void toastMessage(final Activity activity,
+ final String message) {
+ toastMessage(activity, message, null);
+ }
- /**
- * 根据一个网络连接(String)获取bitmap图像
- *
- * @param imageUri
- * @return
- * @throws MalformedURLException
- */
- public static Bitmap getbitmap(String imageUri) {
- Log.v(TAG, "getbitmap:" + imageUri);
- // 显示网络上的图片
- Bitmap bitmap = null;
- try {
- URL myFileUrl = new URL(imageUri);
- HttpURLConnection conn = (HttpURLConnection) myFileUrl
- .openConnection();
- conn.setDoInput(true);
- conn.connect();
- InputStream is = conn.getInputStream();
- bitmap = BitmapFactory.decodeStream(is);
- is.close();
+ /**
+ * 根据一个网络连接(String)获取bitmap图像
+ *
+ * @param imageUri
+ * @return
+ * @throws MalformedURLException
+ */
+ public static Bitmap getbitmap(String imageUri) {
+ Log.v(TAG, "getbitmap:" + imageUri);
+ // 显示网络上的图片
+ Bitmap bitmap = null;
+ try {
+ URL myFileUrl = new URL(imageUri);
+ HttpURLConnection conn = (HttpURLConnection) myFileUrl
+ .openConnection();
+ conn.setDoInput(true);
+ conn.connect();
+ InputStream is = conn.getInputStream();
+ bitmap = BitmapFactory.decodeStream(is);
+ is.close();
- Log.v(TAG, "image download finished." + imageUri);
+ Log.v(TAG, "image download finished." + imageUri);
} catch (OutOfMemoryError e) {
e.printStackTrace();
bitmap = null;
- } catch (IOException e) {
- e.printStackTrace();
- Log.v(TAG, "getbitmap bmp fail---");
+ } catch (IOException e) {
+ e.printStackTrace();
+ Log.v(TAG, "getbitmap bmp fail---");
bitmap = null;
- }
- return bitmap;
- }
-
- public static void release() {
- mProgressDialog = null;
- mToast = null;
- }
+ }
+ return bitmap;
+ }
+
+ public static void release() {
+ mProgressDialog = null;
+ mToast = null;
+ }
// =========
// =通过URI获取本地图片的path
diff --git a/代码/在这里3.0/src/com/stone/util/Util.java~remotes_origin_zhaozaichun~HEAD b/代码/在这里3.0_最终版/bin/classes/com/stone/util/Util.java~remotes_origin_zhaozaichun~HEAD
similarity index 52%
rename from 代码/在这里3.0/src/com/stone/util/Util.java~remotes_origin_zhaozaichun~HEAD
rename to 代码/在这里3.0_最终版/bin/classes/com/stone/util/Util.java~remotes_origin_zhaozaichun~HEAD
index 653e1f9..c0500b1 100644
--- a/代码/在这里3.0/src/com/stone/util/Util.java~remotes_origin_zhaozaichun~HEAD
+++ b/代码/在这里3.0_最终版/bin/classes/com/stone/util/Util.java~remotes_origin_zhaozaichun~HEAD
@@ -46,46 +46,46 @@ import junit.framework.Assert;
*/
public class Util {
- /**
- * 判断电话号码是否有效
- *
- * @param phoneNumber
- * @return true 有效 / false 无效
- */
- public static boolean isPhoneNumberValid(String phoneNumber) {
+ /**
+ * 判断电话号码是否有效
+ *
+ * @param phoneNumber
+ * @return true 有效 / false 无效
+ */
+ public static boolean isPhoneNumberValid(String phoneNumber) {
- boolean isValid = false;
+ boolean isValid = false;
- String expression = "((^(13|15|18)[0-9]{9}$)|(^0[1,2]{1}\\d{1}-?\\d{8}$)|(^0[3-9] {1}\\d{2}-?\\d{7,8}$)|(^0[1,2]{1}\\d{1}-?\\d{8}-(\\d{1,4})$)|(^0[3-9]{1}\\d{2}-? \\d{7,8}-(\\d{1,4})$))";
- CharSequence inputStr = phoneNumber;
+ String expression = "((^(13|15|18)[0-9]{9}$)|(^0[1,2]{1}\\d{1}-?\\d{8}$)|(^0[3-9] {1}\\d{2}-?\\d{7,8}$)|(^0[1,2]{1}\\d{1}-?\\d{8}-(\\d{1,4})$)|(^0[3-9]{1}\\d{2}-? \\d{7,8}-(\\d{1,4})$))";
+ CharSequence inputStr = phoneNumber;
- Pattern pattern = Pattern.compile(expression);
- Matcher matcher = pattern.matcher(inputStr);
+ Pattern pattern = Pattern.compile(expression);
+ Matcher matcher = pattern.matcher(inputStr);
- if (matcher.matches()) {
- isValid = true;
- }
- return isValid;
- }
+ if (matcher.matches()) {
+ isValid = true;
+ }
+ return isValid;
+ }
- // 判断网络是否连接
- public static boolean isNetworkConnected(Context context) {
- if (context != null) {
- ConnectivityManager mConnectivityManager = (ConnectivityManager) context
- .getSystemService(Context.CONNECTIVITY_SERVICE);
- NetworkInfo mNetworkInfo = mConnectivityManager
- .getActiveNetworkInfo();
- if (mNetworkInfo != null) {
- return mNetworkInfo.isAvailable();
- }
- }
- return false;
- }
+ // 判断网络是否连接
+ public static boolean isNetworkConnected(Context context) {
+ if (context != null) {
+ ConnectivityManager mConnectivityManager = (ConnectivityManager) context
+ .getSystemService(Context.CONNECTIVITY_SERVICE);
+ NetworkInfo mNetworkInfo = mConnectivityManager
+ .getActiveNetworkInfo();
+ if (mNetworkInfo != null) {
+ return mNetworkInfo.isAvailable();
+ }
+ }
+ return false;
+ }
private static final String TAG = "SDK_Sample.Util";
-
- private static Dialog mProgressDialog;
- private static Toast mToast;
+
+ private static Dialog mProgressDialog;
+ private static Toast mToast;
/* Convert byte[] to hex string.这里我们可以将byte转换成int,然后利用Integer.toHexString(int)来转换成16进制字符串。
* @param src byte[] data
@@ -145,12 +145,12 @@ private static final String TAG = "SDK_Sample.Util";
{
//根据默认编码获取字节数组
byte[] bytes = null;
- try {
- bytes = str.getBytes("UTF-8");
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
- if (bytes == null) return null;
+ try {
+ bytes = str.getBytes("UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ if (bytes == null) return null;
StringBuilder sb=new StringBuilder(bytes.length*2);
//将字节数组中每个字节拆解成2位16进制整数
for(int i=0;i (int) file.length()){
- Log.e(TAG, "readFromFile invalid file len:" + file.length());
- return null;
- }
+ if(offset <0){
+ Log.e(TAG, "readFromFile invalid offset:" + offset);
+ return null;
+ }
+ if(len <=0 ){
+ Log.e(TAG, "readFromFile invalid len:" + len);
+ return null;
+ }
+ if(offset + len > (int) file.length()){
+ Log.e(TAG, "readFromFile invalid file len:" + file.length());
+ return null;
+ }
- byte[] b = null;
- try {
- RandomAccessFile in = new RandomAccessFile(fileName, "r");
- b = new byte[len];
- in.seek(offset);
- in.readFully(b);
- in.close();
+ byte[] b = null;
+ try {
+ RandomAccessFile in = new RandomAccessFile(fileName, "r");
+ b = new byte[len];
+ in.seek(offset);
+ in.readFully(b);
+ in.close();
- } catch (Exception e) {
- Log.e(TAG, "readFromFile : errMsg = " + e.getMessage());
- e.printStackTrace();
- }
- return b;
- }
+ } catch (Exception e) {
+ Log.e(TAG, "readFromFile : errMsg = " + e.getMessage());
+ e.printStackTrace();
+ }
+ return b;
+ }
public static int computeSampleSize(BitmapFactory.Options options,
@@ -384,205 +384,205 @@ private static final String TAG = "SDK_Sample.Util";
}
private static final int MAX_DECODE_PICTURE_SIZE = 1920 * 1440;
- public static Bitmap extractThumbNail(final String path, final int height, final int width, final boolean crop) {
- Assert.assertTrue(path != null && !path.equals("") && height > 0 && width > 0);
+ public static Bitmap extractThumbNail(final String path, final int height, final int width, final boolean crop) {
+ Assert.assertTrue(path != null && !path.equals("") && height > 0 && width > 0);
- BitmapFactory.Options options = new BitmapFactory.Options();
+ BitmapFactory.Options options = new BitmapFactory.Options();
- try {
- options.inJustDecodeBounds = true;
- Bitmap tmp = BitmapFactory.decodeFile(path, options);
- if (tmp != null) {
- tmp.recycle();
- tmp = null;
- }
+ try {
+ options.inJustDecodeBounds = true;
+ Bitmap tmp = BitmapFactory.decodeFile(path, options);
+ if (tmp != null) {
+ tmp.recycle();
+ tmp = null;
+ }
- Log.d(TAG, "extractThumbNail: round=" + width + "x" + height + ", crop=" + crop);
- final double beY = options.outHeight * 1.0 / height;
- final double beX = options.outWidth * 1.0 / width;
- Log.d(TAG, "extractThumbNail: extract beX = " + beX + ", beY = " + beY);
- options.inSampleSize = (int) (crop ? (beY > beX ? beX : beY) : (beY < beX ? beX : beY));
- if (options.inSampleSize <= 1) {
- options.inSampleSize = 1;
- }
+ Log.d(TAG, "extractThumbNail: round=" + width + "x" + height + ", crop=" + crop);
+ final double beY = options.outHeight * 1.0 / height;
+ final double beX = options.outWidth * 1.0 / width;
+ Log.d(TAG, "extractThumbNail: extract beX = " + beX + ", beY = " + beY);
+ options.inSampleSize = (int) (crop ? (beY > beX ? beX : beY) : (beY < beX ? beX : beY));
+ if (options.inSampleSize <= 1) {
+ options.inSampleSize = 1;
+ }
- // NOTE: out of memory error
- while (options.outHeight * options.outWidth / options.inSampleSize > MAX_DECODE_PICTURE_SIZE) {
- options.inSampleSize++;
- }
+ // NOTE: out of memory error
+ while (options.outHeight * options.outWidth / options.inSampleSize > MAX_DECODE_PICTURE_SIZE) {
+ options.inSampleSize++;
+ }
- int newHeight = height;
- int newWidth = width;
- if (crop) {
- if (beY > beX) {
- newHeight = (int) (newWidth * 1.0 * options.outHeight / options.outWidth);
- } else {
- newWidth = (int) (newHeight * 1.0 * options.outWidth / options.outHeight);
- }
- } else {
- if (beY < beX) {
- newHeight = (int) (newWidth * 1.0 * options.outHeight / options.outWidth);
- } else {
- newWidth = (int) (newHeight * 1.0 * options.outWidth / options.outHeight);
- }
- }
+ int newHeight = height;
+ int newWidth = width;
+ if (crop) {
+ if (beY > beX) {
+ newHeight = (int) (newWidth * 1.0 * options.outHeight / options.outWidth);
+ } else {
+ newWidth = (int) (newHeight * 1.0 * options.outWidth / options.outHeight);
+ }
+ } else {
+ if (beY < beX) {
+ newHeight = (int) (newWidth * 1.0 * options.outHeight / options.outWidth);
+ } else {
+ newWidth = (int) (newHeight * 1.0 * options.outWidth / options.outHeight);
+ }
+ }
- options.inJustDecodeBounds = false;
+ options.inJustDecodeBounds = false;
- Log.i(TAG, "bitmap required size=" + newWidth + "x" + newHeight + ", orig=" + options.outWidth + "x" + options.outHeight + ", sample=" + options.inSampleSize);
- Bitmap bm = BitmapFactory.decodeFile(path, options);
- if (bm == null) {
- Log.e(TAG, "bitmap decode failed");
- return null;
- }
+ Log.i(TAG, "bitmap required size=" + newWidth + "x" + newHeight + ", orig=" + options.outWidth + "x" + options.outHeight + ", sample=" + options.inSampleSize);
+ Bitmap bm = BitmapFactory.decodeFile(path, options);
+ if (bm == null) {
+ Log.e(TAG, "bitmap decode failed");
+ return null;
+ }
- Log.i(TAG, "bitmap decoded size=" + bm.getWidth() + "x" + bm.getHeight());
- final Bitmap scale = Bitmap.createScaledBitmap(bm, newWidth, newHeight, true);
- if (scale != null) {
- bm.recycle();
- bm = scale;
- }
+ Log.i(TAG, "bitmap decoded size=" + bm.getWidth() + "x" + bm.getHeight());
+ final Bitmap scale = Bitmap.createScaledBitmap(bm, newWidth, newHeight, true);
+ if (scale != null) {
+ bm.recycle();
+ bm = scale;
+ }
- if (crop) {
- final Bitmap cropped = Bitmap.createBitmap(bm, (bm.getWidth() - width) >> 1, (bm.getHeight() - height) >> 1, width, height);
- if (cropped == null) {
- return bm;
- }
+ if (crop) {
+ final Bitmap cropped = Bitmap.createBitmap(bm, (bm.getWidth() - width) >> 1, (bm.getHeight() - height) >> 1, width, height);
+ if (cropped == null) {
+ return bm;
+ }
- bm.recycle();
- bm = cropped;
- Log.i(TAG, "bitmap croped size=" + bm.getWidth() + "x" + bm.getHeight());
- }
- return bm;
+ bm.recycle();
+ bm = cropped;
+ Log.i(TAG, "bitmap croped size=" + bm.getWidth() + "x" + bm.getHeight());
+ }
+ return bm;
- } catch (final OutOfMemoryError e) {
- Log.e(TAG, "decode bitmap failed: " + e.getMessage());
- options = null;
- }
+ } catch (final OutOfMemoryError e) {
+ Log.e(TAG, "decode bitmap failed: " + e.getMessage());
+ options = null;
+ }
- return null;
- }
-
- public static final void showResultDialog(Context context, String msg,
- String title) {
- if(msg == null) return;
- String rmsg = msg.replace(",", "\n");
- Log.d("Util", rmsg);
- new AlertDialog.Builder(context).setTitle(title).setMessage(rmsg)
- .setNegativeButton("知道了", null).create().show();
- }
+ return null;
+ }
+
+ public static final void showResultDialog(Context context, String msg,
+ String title) {
+ if(msg == null) return;
+ String rmsg = msg.replace(",", "\n");
+ Log.d("Util", rmsg);
+ new AlertDialog.Builder(context).setTitle(title).setMessage(rmsg)
+ .setNegativeButton("知道了", null).create().show();
+ }
- public static final void showProgressDialog(Context context, String title,
- String message) {
- dismissDialog();
- if (TextUtils.isEmpty(title)) {
- title = "请稍候";
- }
- if (TextUtils.isEmpty(message)) {
- message = "正在加载...";
- }
- mProgressDialog = ProgressDialog.show(context, title, message);
- }
-
- public static AlertDialog showConfirmCancelDialog(Context context,
- String title, String message,
- DialogInterface.OnClickListener posListener) {
- AlertDialog dlg = new AlertDialog.Builder(context).setMessage(message)
- .setPositiveButton("确认", posListener)
- .setNegativeButton("取消", null).create();
- dlg.setCanceledOnTouchOutside(false);
- dlg.show();
- return dlg;
- }
+ public static final void showProgressDialog(Context context, String title,
+ String message) {
+ dismissDialog();
+ if (TextUtils.isEmpty(title)) {
+ title = "请稍候";
+ }
+ if (TextUtils.isEmpty(message)) {
+ message = "正在加载...";
+ }
+ mProgressDialog = ProgressDialog.show(context, title, message);
+ }
+
+ public static AlertDialog showConfirmCancelDialog(Context context,
+ String title, String message,
+ DialogInterface.OnClickListener posListener) {
+ AlertDialog dlg = new AlertDialog.Builder(context).setMessage(message)
+ .setPositiveButton("确认", posListener)
+ .setNegativeButton("取消", null).create();
+ dlg.setCanceledOnTouchOutside(false);
+ dlg.show();
+ return dlg;
+ }
- public static final void dismissDialog() {
- if (mProgressDialog != null) {
- mProgressDialog.dismiss();
- mProgressDialog = null;
- }
- }
+ public static final void dismissDialog() {
+ if (mProgressDialog != null) {
+ mProgressDialog.dismiss();
+ mProgressDialog = null;
+ }
+ }
- /**
- * 打印消息并且用Toast显示消息
- *
- * @param activity
- * @param message
- * @param logLevel
- * 填d, w, e分别代表debug, warn, error; 默认是debug
- */
- public static final void toastMessage(final Activity activity,
- final String message, String logLevel) {
- if ("w".equals(logLevel)) {
- Log.w("sdkDemo", message);
- } else if ("e".equals(logLevel)) {
- Log.e("sdkDemo", message);
- } else {
- Log.d("sdkDemo", message);
- }
- activity.runOnUiThread(new Runnable() {
- @Override
- public void run() {
- // TODO Auto-generated method stub
- if (mToast != null) {
- mToast.cancel();
- mToast = null;
- }
- mToast = Toast.makeText(activity, message, Toast.LENGTH_SHORT);
- mToast.show();
- }
- });
- }
+ /**
+ * 打印消息并且用Toast显示消息
+ *
+ * @param activity
+ * @param message
+ * @param logLevel
+ * 填d, w, e分别代表debug, warn, error; 默认是debug
+ */
+ public static final void toastMessage(final Activity activity,
+ final String message, String logLevel) {
+ if ("w".equals(logLevel)) {
+ Log.w("sdkDemo", message);
+ } else if ("e".equals(logLevel)) {
+ Log.e("sdkDemo", message);
+ } else {
+ Log.d("sdkDemo", message);
+ }
+ activity.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ // TODO Auto-generated method stub
+ if (mToast != null) {
+ mToast.cancel();
+ mToast = null;
+ }
+ mToast = Toast.makeText(activity, message, Toast.LENGTH_SHORT);
+ mToast.show();
+ }
+ });
+ }
- /**
- * 打印消息并且用Toast显示消息
- *
- * @param activity
- * @param message
- * @param logLevel
- * 填d, w, e分别代表debug, warn, error; 默认是debug
- */
- public static final void toastMessage(final Activity activity,
- final String message) {
- toastMessage(activity, message, null);
- }
+ /**
+ * 打印消息并且用Toast显示消息
+ *
+ * @param activity
+ * @param message
+ * @param logLevel
+ * 填d, w, e分别代表debug, warn, error; 默认是debug
+ */
+ public static final void toastMessage(final Activity activity,
+ final String message) {
+ toastMessage(activity, message, null);
+ }
- /**
- * 根据一个网络连接(String)获取bitmap图像
- *
- * @param imageUri
- * @return
- * @throws MalformedURLException
- */
- public static Bitmap getbitmap(String imageUri) {
- Log.v(TAG, "getbitmap:" + imageUri);
- // 显示网络上的图片
- Bitmap bitmap = null;
- try {
- URL myFileUrl = new URL(imageUri);
- HttpURLConnection conn = (HttpURLConnection) myFileUrl
- .openConnection();
- conn.setDoInput(true);
- conn.connect();
- InputStream is = conn.getInputStream();
- bitmap = BitmapFactory.decodeStream(is);
- is.close();
+ /**
+ * 根据一个网络连接(String)获取bitmap图像
+ *
+ * @param imageUri
+ * @return
+ * @throws MalformedURLException
+ */
+ public static Bitmap getbitmap(String imageUri) {
+ Log.v(TAG, "getbitmap:" + imageUri);
+ // 显示网络上的图片
+ Bitmap bitmap = null;
+ try {
+ URL myFileUrl = new URL(imageUri);
+ HttpURLConnection conn = (HttpURLConnection) myFileUrl
+ .openConnection();
+ conn.setDoInput(true);
+ conn.connect();
+ InputStream is = conn.getInputStream();
+ bitmap = BitmapFactory.decodeStream(is);
+ is.close();
- Log.v(TAG, "image download finished." + imageUri);
+ Log.v(TAG, "image download finished." + imageUri);
} catch (OutOfMemoryError e) {
e.printStackTrace();
bitmap = null;
- } catch (IOException e) {
- e.printStackTrace();
- Log.v(TAG, "getbitmap bmp fail---");
+ } catch (IOException e) {
+ e.printStackTrace();
+ Log.v(TAG, "getbitmap bmp fail---");
bitmap = null;
- }
- return bitmap;
- }
-
- public static void release() {
- mProgressDialog = null;
- mToast = null;
- }
+ }
+ return bitmap;
+ }
+
+ public static void release() {
+ mProgressDialog = null;
+ mToast = null;
+ }
// =========
// =通过URI获取本地图片的path
diff --git a/代码/在这里3.0/bin/dexedLibs/BmobSDK_V3.3.4_0310-01481fe3693773f7d04f0fc1b472e18b.jar b/代码/在这里3.0_最终版/bin/dexedLibs/BmobSDK_V3.3.4_0310-01481fe3693773f7d04f0fc1b472e18b.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/BmobSDK_V3.3.4_0310-01481fe3693773f7d04f0fc1b472e18b.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/BmobSDK_V3.3.4_0310-01481fe3693773f7d04f0fc1b472e18b.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/BmobSDK_V3.3.4_0310-09fc35ea5eef2a4b1b96805588469377.jar b/代码/在这里3.0_最终版/bin/dexedLibs/BmobSDK_V3.3.4_0310-09fc35ea5eef2a4b1b96805588469377.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/BmobSDK_V3.3.4_0310-09fc35ea5eef2a4b1b96805588469377.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/BmobSDK_V3.3.4_0310-09fc35ea5eef2a4b1b96805588469377.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/BmobSDK_V3.3.4_0310-120cf49ebf55a4dac786efa5954f9b8e.jar b/代码/在这里3.0_最终版/bin/dexedLibs/BmobSDK_V3.3.4_0310-120cf49ebf55a4dac786efa5954f9b8e.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/BmobSDK_V3.3.4_0310-120cf49ebf55a4dac786efa5954f9b8e.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/BmobSDK_V3.3.4_0310-120cf49ebf55a4dac786efa5954f9b8e.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/BmobSDK_V3.3.4_0310-671f7fa97cc2413e80820835ea451c72.jar b/代码/在这里3.0_最终版/bin/dexedLibs/BmobSDK_V3.3.4_0310-671f7fa97cc2413e80820835ea451c72.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/BmobSDK_V3.3.4_0310-671f7fa97cc2413e80820835ea451c72.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/BmobSDK_V3.3.4_0310-671f7fa97cc2413e80820835ea451c72.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/BmobSDK_V3.3.4_0310-78b68142b7dee6e08db35dd14fd3abfc.jar b/代码/在这里3.0_最终版/bin/dexedLibs/BmobSDK_V3.3.4_0310-78b68142b7dee6e08db35dd14fd3abfc.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/BmobSDK_V3.3.4_0310-78b68142b7dee6e08db35dd14fd3abfc.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/BmobSDK_V3.3.4_0310-78b68142b7dee6e08db35dd14fd3abfc.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/BmobSDK_V3.3.4_0310-959d491faede09877edd4bca7e87b2f3.jar b/代码/在这里3.0_最终版/bin/dexedLibs/BmobSDK_V3.3.4_0310-959d491faede09877edd4bca7e87b2f3.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/BmobSDK_V3.3.4_0310-959d491faede09877edd4bca7e87b2f3.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/BmobSDK_V3.3.4_0310-959d491faede09877edd4bca7e87b2f3.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/BmobSDK_V3.3.4_0310-ffd28abef7659071f61a6c39b72e86b0.jar b/代码/在这里3.0_最终版/bin/dexedLibs/BmobSDK_V3.3.4_0310-ffd28abef7659071f61a6c39b72e86b0.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/BmobSDK_V3.3.4_0310-ffd28abef7659071f61a6c39b72e86b0.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/BmobSDK_V3.3.4_0310-ffd28abef7659071f61a6c39b72e86b0.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/android-support-v4-6f72f5d452565319aba2c6c0797838b6.jar b/代码/在这里3.0_最终版/bin/dexedLibs/android-support-v4-6f72f5d452565319aba2c6c0797838b6.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/android-support-v4-6f72f5d452565319aba2c6c0797838b6.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/android-support-v4-6f72f5d452565319aba2c6c0797838b6.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/android-support-v4-79ce15fc2f4dc5992491a4b2a425d5c7.jar b/代码/在这里3.0_最终版/bin/dexedLibs/android-support-v4-79ce15fc2f4dc5992491a4b2a425d5c7.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/android-support-v4-79ce15fc2f4dc5992491a4b2a425d5c7.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/android-support-v4-79ce15fc2f4dc5992491a4b2a425d5c7.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/android-support-v4-80ff1756a481d5b674eae8fa8f959dc6.jar b/代码/在这里3.0_最终版/bin/dexedLibs/android-support-v4-80ff1756a481d5b674eae8fa8f959dc6.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/android-support-v4-80ff1756a481d5b674eae8fa8f959dc6.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/android-support-v4-80ff1756a481d5b674eae8fa8f959dc6.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/android-support-v4-8aa32c063ffa95f41612c8459081d1bc.jar b/代码/在这里3.0_最终版/bin/dexedLibs/android-support-v4-8aa32c063ffa95f41612c8459081d1bc.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/android-support-v4-8aa32c063ffa95f41612c8459081d1bc.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/android-support-v4-8aa32c063ffa95f41612c8459081d1bc.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/android-support-v4-d23e36fe94ed2f5fe1bcbc1c552523cd.jar b/代码/在这里3.0_最终版/bin/dexedLibs/android-support-v4-d23e36fe94ed2f5fe1bcbc1c552523cd.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/android-support-v4-d23e36fe94ed2f5fe1bcbc1c552523cd.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/android-support-v4-d23e36fe94ed2f5fe1bcbc1c552523cd.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/android-support-v4-d5b7645909a973b2c9c5f438a5a2651c.jar b/代码/在这里3.0_最终版/bin/dexedLibs/android-support-v4-d5b7645909a973b2c9c5f438a5a2651c.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/android-support-v4-d5b7645909a973b2c9c5f438a5a2651c.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/android-support-v4-d5b7645909a973b2c9c5f438a5a2651c.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/bmobPush_0.1beta-09685184b04a7b261b18f067850da918.jar b/代码/在这里3.0_最终版/bin/dexedLibs/bmobPush_0.1beta-09685184b04a7b261b18f067850da918.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/bmobPush_0.1beta-09685184b04a7b261b18f067850da918.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/bmobPush_0.1beta-09685184b04a7b261b18f067850da918.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/bmobPush_0.1beta-0ce50de8085d48887391dadd68577623.jar b/代码/在这里3.0_最终版/bin/dexedLibs/bmobPush_0.1beta-0ce50de8085d48887391dadd68577623.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/bmobPush_0.1beta-0ce50de8085d48887391dadd68577623.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/bmobPush_0.1beta-0ce50de8085d48887391dadd68577623.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/bmobPush_0.1beta-58692f8f0e90f48a557b18c38e886d35.jar b/代码/在这里3.0_最终版/bin/dexedLibs/bmobPush_0.1beta-58692f8f0e90f48a557b18c38e886d35.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/bmobPush_0.1beta-58692f8f0e90f48a557b18c38e886d35.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/bmobPush_0.1beta-58692f8f0e90f48a557b18c38e886d35.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/bmobPush_0.1beta-91e1aa99003b159b369e64249ce3583e.jar b/代码/在这里3.0_最终版/bin/dexedLibs/bmobPush_0.1beta-91e1aa99003b159b369e64249ce3583e.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/bmobPush_0.1beta-91e1aa99003b159b369e64249ce3583e.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/bmobPush_0.1beta-91e1aa99003b159b369e64249ce3583e.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/bmobPush_0.1beta-98d18c9943ba12312660d0a60f8bfd5c.jar b/代码/在这里3.0_最终版/bin/dexedLibs/bmobPush_0.1beta-98d18c9943ba12312660d0a60f8bfd5c.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/bmobPush_0.1beta-98d18c9943ba12312660d0a60f8bfd5c.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/bmobPush_0.1beta-98d18c9943ba12312660d0a60f8bfd5c.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/bmobPush_0.1beta-c062c8a89f155ab11986da7fd0d18f53.jar b/代码/在这里3.0_最终版/bin/dexedLibs/bmobPush_0.1beta-c062c8a89f155ab11986da7fd0d18f53.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/bmobPush_0.1beta-c062c8a89f155ab11986da7fd0d18f53.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/bmobPush_0.1beta-c062c8a89f155ab11986da7fd0d18f53.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/mta-sdk-1.6.2-2fa5f08231800c4fd960dd72b5e46ebb.jar b/代码/在这里3.0_最终版/bin/dexedLibs/mta-sdk-1.6.2-2fa5f08231800c4fd960dd72b5e46ebb.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/mta-sdk-1.6.2-2fa5f08231800c4fd960dd72b5e46ebb.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/mta-sdk-1.6.2-2fa5f08231800c4fd960dd72b5e46ebb.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/mta-sdk-1.6.2-5321b7907bff562390742689bda315a9.jar b/代码/在这里3.0_最终版/bin/dexedLibs/mta-sdk-1.6.2-5321b7907bff562390742689bda315a9.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/mta-sdk-1.6.2-5321b7907bff562390742689bda315a9.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/mta-sdk-1.6.2-5321b7907bff562390742689bda315a9.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/mta-sdk-1.6.2-8a3c6be80cb392029f162dda27a9f37c.jar b/代码/在这里3.0_最终版/bin/dexedLibs/mta-sdk-1.6.2-8a3c6be80cb392029f162dda27a9f37c.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/mta-sdk-1.6.2-8a3c6be80cb392029f162dda27a9f37c.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/mta-sdk-1.6.2-8a3c6be80cb392029f162dda27a9f37c.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/mta-sdk-1.6.2-f81962e36934419d90510c8fe39a2ebc.jar b/代码/在这里3.0_最终版/bin/dexedLibs/mta-sdk-1.6.2-f81962e36934419d90510c8fe39a2ebc.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/mta-sdk-1.6.2-f81962e36934419d90510c8fe39a2ebc.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/mta-sdk-1.6.2-f81962e36934419d90510c8fe39a2ebc.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/open_sdk_r5756-2fef940668bb2de9b707f63d09a27611.jar b/代码/在这里3.0_最终版/bin/dexedLibs/open_sdk_r5756-2fef940668bb2de9b707f63d09a27611.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/open_sdk_r5756-2fef940668bb2de9b707f63d09a27611.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/open_sdk_r5756-2fef940668bb2de9b707f63d09a27611.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/open_sdk_r5756-4d6383121c5f7b95c2d1da454e208289.jar b/代码/在这里3.0_最终版/bin/dexedLibs/open_sdk_r5756-4d6383121c5f7b95c2d1da454e208289.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/open_sdk_r5756-4d6383121c5f7b95c2d1da454e208289.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/open_sdk_r5756-4d6383121c5f7b95c2d1da454e208289.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/open_sdk_r5756-66959d2f52ef990d4727d4580369efa1.jar b/代码/在这里3.0_最终版/bin/dexedLibs/open_sdk_r5756-66959d2f52ef990d4727d4580369efa1.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/open_sdk_r5756-66959d2f52ef990d4727d4580369efa1.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/open_sdk_r5756-66959d2f52ef990d4727d4580369efa1.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/open_sdk_r5756-70f5db76e348dca88b97348dbf8b8145.jar b/代码/在这里3.0_最终版/bin/dexedLibs/open_sdk_r5756-70f5db76e348dca88b97348dbf8b8145.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/open_sdk_r5756-70f5db76e348dca88b97348dbf8b8145.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/open_sdk_r5756-70f5db76e348dca88b97348dbf8b8145.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/open_sdk_r5756-7d423a3436d13df8dce840906c2f54cb.jar b/代码/在这里3.0_最终版/bin/dexedLibs/open_sdk_r5756-7d423a3436d13df8dce840906c2f54cb.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/open_sdk_r5756-7d423a3436d13df8dce840906c2f54cb.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/open_sdk_r5756-7d423a3436d13df8dce840906c2f54cb.jar
diff --git a/代码/在这里3.0/bin/dexedLibs/open_sdk_r5756-a58fee1a3dd9777b54a788437bd63745.jar b/代码/在这里3.0_最终版/bin/dexedLibs/open_sdk_r5756-a58fee1a3dd9777b54a788437bd63745.jar
similarity index 100%
rename from 代码/在这里3.0/bin/dexedLibs/open_sdk_r5756-a58fee1a3dd9777b54a788437bd63745.jar
rename to 代码/在这里3.0_最终版/bin/dexedLibs/open_sdk_r5756-a58fee1a3dd9777b54a788437bd63745.jar
diff --git a/代码/在这里3.0/bin/jarlist.cache b/代码/在这里3.0_最终版/bin/jarlist.cache
similarity index 100%
rename from 代码/在这里3.0/bin/jarlist.cache
rename to 代码/在这里3.0_最终版/bin/jarlist.cache
diff --git a/代码/在这里3.0/bin/proguard.txt b/代码/在这里3.0_最终版/bin/proguard.txt
similarity index 100%
rename from 代码/在这里3.0/bin/proguard.txt
rename to 代码/在这里3.0_最终版/bin/proguard.txt
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-hdpi/action_hate.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-hdpi/action_hate.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-hdpi/action_hate.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-hdpi/action_hate.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-hdpi/action_rate.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-hdpi/action_rate.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-hdpi/action_rate.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-hdpi/action_rate.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-hdpi/default_ptr_flip.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-hdpi/default_ptr_flip.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-hdpi/default_ptr_flip.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-hdpi/default_ptr_flip.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-hdpi/default_ptr_rotate.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-hdpi/default_ptr_rotate.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-hdpi/default_ptr_rotate.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-hdpi/default_ptr_rotate.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-hdpi/indicator_arrow.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-hdpi/indicator_arrow.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-hdpi/indicator_arrow.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-hdpi/indicator_arrow.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-mdpi/default_ptr_flip.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-mdpi/default_ptr_flip.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-mdpi/default_ptr_flip.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-mdpi/default_ptr_flip.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-mdpi/default_ptr_rotate.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-mdpi/default_ptr_rotate.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-mdpi/default_ptr_rotate.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-mdpi/default_ptr_rotate.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-mdpi/indicator_arrow.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-mdpi/indicator_arrow.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-mdpi/indicator_arrow.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-mdpi/indicator_arrow.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-xhdpi/bg_account.9.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/bg_account.9.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-xhdpi/bg_account.9.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/bg_account.9.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-xhdpi/bg_account_focus.9.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/bg_account_focus.9.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-xhdpi/bg_account_focus.9.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/bg_account_focus.9.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-xhdpi/bg_account_normal.9.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/bg_account_normal.9.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-xhdpi/bg_account_normal.9.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/bg_account_normal.9.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-xhdpi/bg_comment_comment.9.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/bg_comment_comment.9.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-xhdpi/bg_comment_comment.9.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/bg_comment_comment.9.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-xhdpi/bg_comment_floor.9.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/bg_comment_floor.9.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-xhdpi/bg_comment_floor.9.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/bg_comment_floor.9.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-xhdpi/bg_logout_normal.9.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/bg_logout_normal.9.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-xhdpi/bg_logout_normal.9.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/bg_logout_normal.9.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-xhdpi/bg_logout_pressed.9.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/bg_logout_pressed.9.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-xhdpi/bg_logout_pressed.9.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/bg_logout_pressed.9.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-xhdpi/btn_comment_publish.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/btn_comment_publish.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-xhdpi/btn_comment_publish.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/btn_comment_publish.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-xhdpi/default_ptr_flip.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/default_ptr_flip.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-xhdpi/default_ptr_flip.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/default_ptr_flip.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-xhdpi/default_ptr_rotate.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/default_ptr_rotate.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-xhdpi/default_ptr_rotate.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/default_ptr_rotate.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-xhdpi/ic_action_comment.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/ic_action_comment.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-xhdpi/ic_action_comment.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/ic_action_comment.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-xhdpi/ic_action_edit.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/ic_action_edit.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-xhdpi/ic_action_edit.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/ic_action_edit.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-xhdpi/ic_action_fav.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/ic_action_fav.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-xhdpi/ic_action_fav.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/ic_action_fav.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-xhdpi/ic_action_fav_choose.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/ic_action_fav_choose.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-xhdpi/ic_action_fav_choose.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/ic_action_fav_choose.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-xhdpi/ic_action_fav_normal.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/ic_action_fav_normal.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-xhdpi/ic_action_fav_normal.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/ic_action_fav_normal.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-xhdpi/ic_action_love.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/ic_action_love.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-xhdpi/ic_action_love.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/ic_action_love.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-xhdpi/ic_action_share.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/ic_action_share.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-xhdpi/ic_action_share.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/ic_action_share.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-xhdpi/indicator_arrow.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/indicator_arrow.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-xhdpi/indicator_arrow.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/indicator_arrow.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-xhdpi/user_icon_default.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/user_icon_default.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-xhdpi/user_icon_default.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/user_icon_default.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable-xhdpi/user_icon_default_main.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/user_icon_default_main.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable-xhdpi/user_icon_default_main.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable-xhdpi/user_icon_default_main.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/back_blue.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/back_blue.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/back_blue.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/back_blue.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/btn_green_normal.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/btn_green_normal.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/btn_green_normal.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/btn_green_normal.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/btn_green_pressed.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/btn_green_pressed.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/btn_green_pressed.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/btn_green_pressed.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/checkbox_selected.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/checkbox_selected.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/checkbox_selected.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/checkbox_selected.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/checkbox_selected_press.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/checkbox_selected_press.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/checkbox_selected_press.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/checkbox_selected_press.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/checkbox_unselect.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/checkbox_unselect.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/checkbox_unselect.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/checkbox_unselect.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/checkbox_unselect_press.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/checkbox_unselect_press.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/checkbox_unselect_press.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/checkbox_unselect_press.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_1.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_1.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_1.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_1.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_2.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_2.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_2.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_2.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_3.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_3.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_3.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_3.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_5.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_5.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_5.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_5.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_6.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_6.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_6.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_6.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_7.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_7.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_7.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_7.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_71.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_71.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_71.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_71.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_72.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_72.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_72.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_72.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_73.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_73.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_73.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_73.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_74.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_74.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_74.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_74.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_75.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_75.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_75.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_75.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_76.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_76.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_76.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_76.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_77.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_77.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_77.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_77.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_8.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_8.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_8.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_8.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_app.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_app.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_app.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_app.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_app6.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_app6.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_app6.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_app6.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_breakfast.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_breakfast.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_breakfast.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_breakfast.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_car.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_car.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_car.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_car.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_car1.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_car1.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_car1.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_car1.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_car2.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_car2.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_car2.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_car2.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_circle.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_circle.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_circle.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_circle.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_date.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_date.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_date.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_date.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_hbut.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_hbut.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_hbut.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_hbut.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_hide.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_hide.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_hide.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_hide.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_loc.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_loc.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_loc.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_loc.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_menu_copy_holo_light.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_menu_copy_holo_light.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_menu_copy_holo_light.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_menu_copy_holo_light.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_menu_find_holo_light.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_menu_find_holo_light.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_menu_find_holo_light.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_menu_find_holo_light.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_menu_info_details.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_menu_info_details.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_menu_info_details.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_menu_info_details.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_menu_myplaces.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_menu_myplaces.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_menu_myplaces.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_menu_myplaces.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_menu_notifications.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_menu_notifications.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_menu_notifications.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_menu_notifications.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_menu_share.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_menu_share.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_menu_share.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_menu_share.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_mine.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_mine.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_mine.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_mine.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_page_indicator.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_page_indicator.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_page_indicator.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_page_indicator.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_page_indicator_focused.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_page_indicator_focused.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_page_indicator_focused.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_page_indicator_focused.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_phone.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_phone.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_phone.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_phone.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_phone2.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_phone2.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_phone2.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_phone2.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_phone3.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_phone3.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_phone3.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_phone3.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_sale.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_sale.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_sale.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_sale.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_sale1.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_sale1.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_sale1.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_sale1.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_sale2.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_sale2.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_sale2.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_sale2.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_search.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_search.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_search.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_search.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_shelf_category_divider.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_shelf_category_divider.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_shelf_category_divider.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_shelf_category_divider.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_shop.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_shop.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_shop.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_shop.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_shop1.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_shop1.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_shop1.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_shop1.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_shop2.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_shop2.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_shop2.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_shop2.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_star_no.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_star_no.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_star_no.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_star_no.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/ic_star_yes.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_star_yes.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/ic_star_yes.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/ic_star_yes.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/login_button.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/login_button.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/login_button.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/login_button.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/login_button_select.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/login_button_select.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/login_button_select.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/login_button_select.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/qq.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/qq.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/qq.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/qq.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/qq1.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/qq1.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/qq1.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/qq1.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/sgbf.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/sgbf.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/sgbf.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/sgbf.png
diff --git a/代码/在这里3.0/bin/res/crunch/drawable/shap_circle.png b/代码/在这里3.0_最终版/bin/res/crunch/drawable/shap_circle.png
similarity index 100%
rename from 代码/在这里3.0/bin/res/crunch/drawable/shap_circle.png
rename to 代码/在这里3.0_最终版/bin/res/crunch/drawable/shap_circle.png
diff --git a/代码/在这里3.0/bin/resources.ap_ b/代码/在这里3.0_最终版/bin/resources.ap_
similarity index 100%
rename from 代码/在这里3.0/bin/resources.ap_
rename to 代码/在这里3.0_最终版/bin/resources.ap_
diff --git a/代码/在这里3.0/gen/com/stone/shop/BuildConfig.java b/代码/在这里3.0_最终版/gen/com/stone/shop/BuildConfig.java
similarity index 100%
rename from 代码/在这里3.0/gen/com/stone/shop/BuildConfig.java
rename to 代码/在这里3.0_最终版/gen/com/stone/shop/BuildConfig.java
diff --git a/代码/在这里3.0/gen/com/stone/shop/R.java b/代码/在这里3.0_最终版/gen/com/stone/shop/R.java
similarity index 100%
rename from 代码/在这里3.0/gen/com/stone/shop/R.java
rename to 代码/在这里3.0_最终版/gen/com/stone/shop/R.java
diff --git a/代码/在这里3.0/ic_launcher-web.png b/代码/在这里3.0_最终版/ic_launcher-web.png
similarity index 100%
rename from 代码/在这里3.0/ic_launcher-web.png
rename to 代码/在这里3.0_最终版/ic_launcher-web.png
diff --git a/代码/在这里3.0/libs/BmobSDK_V3.3.4_0310.jar b/代码/在这里3.0_最终版/libs/BmobSDK_V3.3.4_0310.jar
similarity index 100%
rename from 代码/在这里3.0/libs/BmobSDK_V3.3.4_0310.jar
rename to 代码/在这里3.0_最终版/libs/BmobSDK_V3.3.4_0310.jar
diff --git a/代码/在这里3.0/libs/android-support-v4.jar b/代码/在这里3.0_最终版/libs/android-support-v4.jar
similarity index 100%
rename from 代码/在这里3.0/libs/android-support-v4.jar
rename to 代码/在这里3.0_最终版/libs/android-support-v4.jar
diff --git a/代码/在这里3.0/libs/bmobPush_0.1beta.jar b/代码/在这里3.0_最终版/libs/bmobPush_0.1beta.jar
similarity index 100%
rename from 代码/在这里3.0/libs/bmobPush_0.1beta.jar
rename to 代码/在这里3.0_最终版/libs/bmobPush_0.1beta.jar
diff --git a/代码/在这里3.0/libs/mta-sdk-1.6.2.jar b/代码/在这里3.0_最终版/libs/mta-sdk-1.6.2.jar
similarity index 100%
rename from 代码/在这里3.0/libs/mta-sdk-1.6.2.jar
rename to 代码/在这里3.0_最终版/libs/mta-sdk-1.6.2.jar
diff --git a/代码/在这里3.0/libs/open_sdk_r5756.jar b/代码/在这里3.0_最终版/libs/open_sdk_r5756.jar
similarity index 100%
rename from 代码/在这里3.0/libs/open_sdk_r5756.jar
rename to 代码/在这里3.0_最终版/libs/open_sdk_r5756.jar
diff --git a/代码/在这里3.0/lint.xml b/代码/在这里3.0_最终版/lint.xml
similarity index 100%
rename from 代码/在这里3.0/lint.xml
rename to 代码/在这里3.0_最终版/lint.xml
diff --git a/代码/在这里3.0/proguard-project.txt b/代码/在这里3.0_最终版/proguard-project.txt
similarity index 100%
rename from 代码/在这里3.0/proguard-project.txt
rename to 代码/在这里3.0_最终版/proguard-project.txt
diff --git a/代码/在这里3.0/project.properties b/代码/在这里3.0_最终版/project.properties
similarity index 96%
rename from 代码/在这里3.0/project.properties
rename to 代码/在这里3.0_最终版/project.properties
index b0ee040..5c5f4c7 100644
--- a/代码/在这里3.0/project.properties
+++ b/代码/在这里3.0_最终版/project.properties
@@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
-target=android-19
+target=android-20
proguard.config=proguard.cfg
diff --git a/代码/在这里3.0/res/anim/cycle_7.xml b/代码/在这里3.0_最终版/res/anim/cycle_7.xml
similarity index 100%
rename from 代码/在这里3.0/res/anim/cycle_7.xml
rename to 代码/在这里3.0_最终版/res/anim/cycle_7.xml
diff --git a/代码/在这里3.0/res/anim/scale.xml b/代码/在这里3.0_最终版/res/anim/scale.xml
similarity index 99%
rename from 代码/在这里3.0/res/anim/scale.xml
rename to 代码/在这里3.0_最终版/res/anim/scale.xml
index 77cdc91..701179d 100644
--- a/代码/在这里3.0/res/anim/scale.xml
+++ b/代码/在这里3.0_最终版/res/anim/scale.xml
@@ -9,7 +9,7 @@ to be accelerated, decelerated, repeated, etc.
"@anim/cycle_7" 是对自定义interpolator 的引用。-->
-
+
-
+
diff --git a/代码/在这里3.0/res/anim/shake.xml b/代码/在这里3.0_最终版/res/anim/shake.xml
similarity index 100%
rename from 代码/在这里3.0/res/anim/shake.xml
rename to 代码/在这里3.0_最终版/res/anim/shake.xml
diff --git a/代码/在这里3.0/res/drawable-hdpi/action_hate.png b/代码/在这里3.0_最终版/res/drawable-hdpi/action_hate.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-hdpi/action_hate.png
rename to 代码/在这里3.0_最终版/res/drawable-hdpi/action_hate.png
diff --git a/代码/在这里3.0/res/drawable-hdpi/action_rate.png b/代码/在这里3.0_最终版/res/drawable-hdpi/action_rate.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-hdpi/action_rate.png
rename to 代码/在这里3.0_最终版/res/drawable-hdpi/action_rate.png
diff --git a/代码/在这里3.0/res/drawable-hdpi/default_ptr_flip.png b/代码/在这里3.0_最终版/res/drawable-hdpi/default_ptr_flip.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-hdpi/default_ptr_flip.png
rename to 代码/在这里3.0_最终版/res/drawable-hdpi/default_ptr_flip.png
diff --git a/代码/在这里3.0/res/drawable-hdpi/default_ptr_rotate.png b/代码/在这里3.0_最终版/res/drawable-hdpi/default_ptr_rotate.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-hdpi/default_ptr_rotate.png
rename to 代码/在这里3.0_最终版/res/drawable-hdpi/default_ptr_rotate.png
diff --git a/代码/在这里3.0/res/drawable-hdpi/ic_launcher.png b/代码/在这里3.0_最终版/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-hdpi/ic_launcher.png
rename to 代码/在这里3.0_最终版/res/drawable-hdpi/ic_launcher.png
diff --git a/代码/在这里3.0/res/drawable-hdpi/indicator_arrow.png b/代码/在这里3.0_最终版/res/drawable-hdpi/indicator_arrow.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-hdpi/indicator_arrow.png
rename to 代码/在这里3.0_最终版/res/drawable-hdpi/indicator_arrow.png
diff --git a/代码/在这里3.0/res/drawable-hdpi/w01.png b/代码/在这里3.0_最终版/res/drawable-hdpi/w01.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-hdpi/w01.png
rename to 代码/在这里3.0_最终版/res/drawable-hdpi/w01.png
diff --git a/代码/在这里3.0/res/drawable-hdpi/w03.png b/代码/在这里3.0_最终版/res/drawable-hdpi/w03.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-hdpi/w03.png
rename to 代码/在这里3.0_最终版/res/drawable-hdpi/w03.png
diff --git a/代码/在这里3.0/res/drawable-hdpi/w04.png b/代码/在这里3.0_最终版/res/drawable-hdpi/w04.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-hdpi/w04.png
rename to 代码/在这里3.0_最终版/res/drawable-hdpi/w04.png
diff --git a/代码/在这里3.0/res/drawable-hdpi/w05.png b/代码/在这里3.0_最终版/res/drawable-hdpi/w05.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-hdpi/w05.png
rename to 代码/在这里3.0_最终版/res/drawable-hdpi/w05.png
diff --git a/代码/在这里3.0/res/drawable-ldpi/w01.png b/代码/在这里3.0_最终版/res/drawable-ldpi/w01.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-ldpi/w01.png
rename to 代码/在这里3.0_最终版/res/drawable-ldpi/w01.png
diff --git a/代码/在这里3.0/res/drawable-ldpi/w02.png b/代码/在这里3.0_最终版/res/drawable-ldpi/w02.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-ldpi/w02.png
rename to 代码/在这里3.0_最终版/res/drawable-ldpi/w02.png
diff --git a/代码/在这里3.0/res/drawable-ldpi/w03.png b/代码/在这里3.0_最终版/res/drawable-ldpi/w03.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-ldpi/w03.png
rename to 代码/在这里3.0_最终版/res/drawable-ldpi/w03.png
diff --git a/代码/在这里3.0/res/drawable-ldpi/w04.png b/代码/在这里3.0_最终版/res/drawable-ldpi/w04.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-ldpi/w04.png
rename to 代码/在这里3.0_最终版/res/drawable-ldpi/w04.png
diff --git a/代码/在这里3.0/res/drawable-ldpi/w05.png b/代码/在这里3.0_最终版/res/drawable-ldpi/w05.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-ldpi/w05.png
rename to 代码/在这里3.0_最终版/res/drawable-ldpi/w05.png
diff --git a/代码/在这里3.0/res/drawable-mdpi/default_ptr_flip.png b/代码/在这里3.0_最终版/res/drawable-mdpi/default_ptr_flip.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-mdpi/default_ptr_flip.png
rename to 代码/在这里3.0_最终版/res/drawable-mdpi/default_ptr_flip.png
diff --git a/代码/在这里3.0/res/drawable-mdpi/default_ptr_rotate.png b/代码/在这里3.0_最终版/res/drawable-mdpi/default_ptr_rotate.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-mdpi/default_ptr_rotate.png
rename to 代码/在这里3.0_最终版/res/drawable-mdpi/default_ptr_rotate.png
diff --git a/代码/在这里3.0/res/drawable-mdpi/ic_launcher.png b/代码/在这里3.0_最终版/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-mdpi/ic_launcher.png
rename to 代码/在这里3.0_最终版/res/drawable-mdpi/ic_launcher.png
diff --git a/代码/在这里3.0/res/drawable-mdpi/indicator_arrow.png b/代码/在这里3.0_最终版/res/drawable-mdpi/indicator_arrow.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-mdpi/indicator_arrow.png
rename to 代码/在这里3.0_最终版/res/drawable-mdpi/indicator_arrow.png
diff --git a/代码/在这里3.0/res/drawable-mdpi/w01.png b/代码/在这里3.0_最终版/res/drawable-mdpi/w01.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-mdpi/w01.png
rename to 代码/在这里3.0_最终版/res/drawable-mdpi/w01.png
diff --git a/代码/在这里3.0/res/drawable-mdpi/w02.png b/代码/在这里3.0_最终版/res/drawable-mdpi/w02.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-mdpi/w02.png
rename to 代码/在这里3.0_最终版/res/drawable-mdpi/w02.png
diff --git a/代码/在这里3.0/res/drawable-mdpi/w03.png b/代码/在这里3.0_最终版/res/drawable-mdpi/w03.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-mdpi/w03.png
rename to 代码/在这里3.0_最终版/res/drawable-mdpi/w03.png
diff --git a/代码/在这里3.0/res/drawable-mdpi/w04.png b/代码/在这里3.0_最终版/res/drawable-mdpi/w04.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-mdpi/w04.png
rename to 代码/在这里3.0_最终版/res/drawable-mdpi/w04.png
diff --git a/代码/在这里3.0/res/drawable-mdpi/w05.png b/代码/在这里3.0_最终版/res/drawable-mdpi/w05.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-mdpi/w05.png
rename to 代码/在这里3.0_最终版/res/drawable-mdpi/w05.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/bg_account.9.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/bg_account.9.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/bg_account.9.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/bg_account.9.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/bg_account_focus.9.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/bg_account_focus.9.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/bg_account_focus.9.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/bg_account_focus.9.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/bg_account_normal.9.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/bg_account_normal.9.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/bg_account_normal.9.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/bg_account_normal.9.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/bg_comment_comment.9.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/bg_comment_comment.9.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/bg_comment_comment.9.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/bg_comment_comment.9.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/bg_comment_floor.9.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/bg_comment_floor.9.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/bg_comment_floor.9.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/bg_comment_floor.9.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/bg_logout_normal.9.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/bg_logout_normal.9.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/bg_logout_normal.9.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/bg_logout_normal.9.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/bg_logout_pressed.9.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/bg_logout_pressed.9.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/bg_logout_pressed.9.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/bg_logout_pressed.9.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/btn_comment_publish.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/btn_comment_publish.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/btn_comment_publish.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/btn_comment_publish.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/default_ptr_flip.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/default_ptr_flip.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/default_ptr_flip.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/default_ptr_flip.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/default_ptr_rotate.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/default_ptr_rotate.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/default_ptr_rotate.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/default_ptr_rotate.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/ic_action_comment.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/ic_action_comment.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/ic_action_comment.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/ic_action_comment.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/ic_action_edit.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/ic_action_edit.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/ic_action_edit.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/ic_action_edit.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/ic_action_fav.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/ic_action_fav.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/ic_action_fav.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/ic_action_fav.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/ic_action_fav_choose.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/ic_action_fav_choose.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/ic_action_fav_choose.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/ic_action_fav_choose.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/ic_action_fav_normal.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/ic_action_fav_normal.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/ic_action_fav_normal.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/ic_action_fav_normal.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/ic_action_love.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/ic_action_love.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/ic_action_love.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/ic_action_love.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/ic_action_share.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/ic_action_share.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/ic_action_share.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/ic_action_share.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/ic_launcher.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/ic_launcher.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/ic_launcher.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/indicator_arrow.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/indicator_arrow.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/indicator_arrow.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/indicator_arrow.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/user_icon_default.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/user_icon_default.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/user_icon_default.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/user_icon_default.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/user_icon_default_main.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/user_icon_default_main.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/user_icon_default_main.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/user_icon_default_main.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/w01.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/w01.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/w01.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/w01.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/w02.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/w02.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/w02.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/w02.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/w03.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/w03.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/w03.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/w03.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/w04.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/w04.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/w04.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/w04.png
diff --git a/代码/在这里3.0/res/drawable-xhdpi/w05.png b/代码/在这里3.0_最终版/res/drawable-xhdpi/w05.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xhdpi/w05.png
rename to 代码/在这里3.0_最终版/res/drawable-xhdpi/w05.png
diff --git a/代码/在这里3.0/res/drawable-xxhdpi/ic_launcher.png b/代码/在这里3.0_最终版/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xxhdpi/ic_launcher.png
rename to 代码/在这里3.0_最终版/res/drawable-xxhdpi/ic_launcher.png
diff --git a/代码/在这里3.0/res/drawable-xxhdpi/w01.png b/代码/在这里3.0_最终版/res/drawable-xxhdpi/w01.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xxhdpi/w01.png
rename to 代码/在这里3.0_最终版/res/drawable-xxhdpi/w01.png
diff --git a/代码/在这里3.0/res/drawable-xxhdpi/w02.png b/代码/在这里3.0_最终版/res/drawable-xxhdpi/w02.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xxhdpi/w02.png
rename to 代码/在这里3.0_最终版/res/drawable-xxhdpi/w02.png
diff --git a/代码/在这里3.0/res/drawable-xxhdpi/w03.png b/代码/在这里3.0_最终版/res/drawable-xxhdpi/w03.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xxhdpi/w03.png
rename to 代码/在这里3.0_最终版/res/drawable-xxhdpi/w03.png
diff --git a/代码/在这里3.0/res/drawable-xxhdpi/w04.png b/代码/在这里3.0_最终版/res/drawable-xxhdpi/w04.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xxhdpi/w04.png
rename to 代码/在这里3.0_最终版/res/drawable-xxhdpi/w04.png
diff --git a/代码/在这里3.0/res/drawable-xxhdpi/w05.png b/代码/在这里3.0_最终版/res/drawable-xxhdpi/w05.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable-xxhdpi/w05.png
rename to 代码/在这里3.0_最终版/res/drawable-xxhdpi/w05.png
diff --git a/代码/在这里3.0/res/drawable/abs__tab_selected_focused_holo.9.png b/代码/在这里3.0_最终版/res/drawable/abs__tab_selected_focused_holo.9.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/abs__tab_selected_focused_holo.9.png
rename to 代码/在这里3.0_最终版/res/drawable/abs__tab_selected_focused_holo.9.png
diff --git a/代码/在这里3.0/res/drawable/abs__tab_selected_holo.9.png b/代码/在这里3.0_最终版/res/drawable/abs__tab_selected_holo.9.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/abs__tab_selected_holo.9.png
rename to 代码/在这里3.0_最终版/res/drawable/abs__tab_selected_holo.9.png
diff --git a/代码/在这里3.0/res/drawable/abs__tab_selected_pressed_holo.9.png b/代码/在这里3.0_最终版/res/drawable/abs__tab_selected_pressed_holo.9.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/abs__tab_selected_pressed_holo.9.png
rename to 代码/在这里3.0_最终版/res/drawable/abs__tab_selected_pressed_holo.9.png
diff --git a/代码/在这里3.0/res/drawable/abs__tab_unselected_pressed_holo.9.png b/代码/在这里3.0_最终版/res/drawable/abs__tab_unselected_pressed_holo.9.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/abs__tab_unselected_pressed_holo.9.png
rename to 代码/在这里3.0_最终版/res/drawable/abs__tab_unselected_pressed_holo.9.png
diff --git a/代码/在这里3.0/res/drawable/actionbar_background.xml b/代码/在这里3.0_最终版/res/drawable/actionbar_background.xml
similarity index 100%
rename from 代码/在这里3.0/res/drawable/actionbar_background.xml
rename to 代码/在这里3.0_最终版/res/drawable/actionbar_background.xml
diff --git a/代码/在这里3.0/res/drawable/back_blue.png b/代码/在这里3.0_最终版/res/drawable/back_blue.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/back_blue.png
rename to 代码/在这里3.0_最终版/res/drawable/back_blue.png
diff --git a/代码/在这里3.0/res/drawable/bg1.jpg b/代码/在这里3.0_最终版/res/drawable/bg1.jpg
similarity index 100%
rename from 代码/在这里3.0/res/drawable/bg1.jpg
rename to 代码/在这里3.0_最终版/res/drawable/bg1.jpg
diff --git a/代码/在这里3.0/res/drawable/bg3.jpg b/代码/在这里3.0_最终版/res/drawable/bg3.jpg
similarity index 100%
rename from 代码/在这里3.0/res/drawable/bg3.jpg
rename to 代码/在这里3.0_最终版/res/drawable/bg3.jpg
diff --git a/代码/在这里3.0/res/drawable/btn_green_normal.png b/代码/在这里3.0_最终版/res/drawable/btn_green_normal.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/btn_green_normal.png
rename to 代码/在这里3.0_最终版/res/drawable/btn_green_normal.png
diff --git a/代码/在这里3.0/res/drawable/btn_green_pressed.png b/代码/在这里3.0_最终版/res/drawable/btn_green_pressed.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/btn_green_pressed.png
rename to 代码/在这里3.0_最终版/res/drawable/btn_green_pressed.png
diff --git a/代码/在这里3.0/res/drawable/checkbox_bg1.xml b/代码/在这里3.0_最终版/res/drawable/checkbox_bg1.xml
similarity index 100%
rename from 代码/在这里3.0/res/drawable/checkbox_bg1.xml
rename to 代码/在这里3.0_最终版/res/drawable/checkbox_bg1.xml
diff --git a/代码/在这里3.0/res/drawable/checkbox_selected.png b/代码/在这里3.0_最终版/res/drawable/checkbox_selected.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/checkbox_selected.png
rename to 代码/在这里3.0_最终版/res/drawable/checkbox_selected.png
diff --git a/代码/在这里3.0/res/drawable/checkbox_selected_press.png b/代码/在这里3.0_最终版/res/drawable/checkbox_selected_press.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/checkbox_selected_press.png
rename to 代码/在这里3.0_最终版/res/drawable/checkbox_selected_press.png
diff --git a/代码/在这里3.0/res/drawable/checkbox_unselect.png b/代码/在这里3.0_最终版/res/drawable/checkbox_unselect.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/checkbox_unselect.png
rename to 代码/在这里3.0_最终版/res/drawable/checkbox_unselect.png
diff --git a/代码/在这里3.0/res/drawable/checkbox_unselect_press.png b/代码/在这里3.0_最终版/res/drawable/checkbox_unselect_press.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/checkbox_unselect_press.png
rename to 代码/在这里3.0_最终版/res/drawable/checkbox_unselect_press.png
diff --git a/代码/在这里3.0/res/drawable/custom_ratingbar.xml b/代码/在这里3.0_最终版/res/drawable/custom_ratingbar.xml
similarity index 100%
rename from 代码/在这里3.0/res/drawable/custom_ratingbar.xml
rename to 代码/在这里3.0_最终版/res/drawable/custom_ratingbar.xml
diff --git a/代码/在这里3.0/res/drawable/edittext_focus.xml b/代码/在这里3.0_最终版/res/drawable/edittext_focus.xml
similarity index 100%
rename from 代码/在这里3.0/res/drawable/edittext_focus.xml
rename to 代码/在这里3.0_最终版/res/drawable/edittext_focus.xml
diff --git a/代码/在这里3.0/res/drawable/edittext_normal.xml b/代码/在这里3.0_最终版/res/drawable/edittext_normal.xml
similarity index 85%
rename from 代码/在这里3.0/res/drawable/edittext_normal.xml
rename to 代码/在这里3.0_最终版/res/drawable/edittext_normal.xml
index a10c381..fb6b308 100644
--- a/代码/在这里3.0/res/drawable/edittext_normal.xml
+++ b/代码/在这里3.0_最终版/res/drawable/edittext_normal.xml
@@ -3,6 +3,6 @@
+ android:color="#888888"/>
diff --git a/代码/在这里3.0/res/drawable/ic_1.png b/代码/在这里3.0_最终版/res/drawable/ic_1.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_1.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_1.png
diff --git a/代码/在这里3.0/res/drawable/ic_2.png b/代码/在这里3.0_最终版/res/drawable/ic_2.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_2.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_2.png
diff --git a/代码/在这里3.0/res/drawable/ic_3.png b/代码/在这里3.0_最终版/res/drawable/ic_3.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_3.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_3.png
diff --git a/代码/在这里3.0/res/drawable/ic_41.png b/代码/在这里3.0_最终版/res/drawable/ic_41.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_41.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_41.png
diff --git a/代码/在这里3.0/res/drawable/ic_42.png b/代码/在这里3.0_最终版/res/drawable/ic_42.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_42.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_42.png
diff --git a/代码/在这里3.0/res/drawable/ic_5.png b/代码/在这里3.0_最终版/res/drawable/ic_5.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_5.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_5.png
diff --git a/代码/在这里3.0/res/drawable/ic_6.png b/代码/在这里3.0_最终版/res/drawable/ic_6.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_6.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_6.png
diff --git a/代码/在这里3.0/res/drawable/ic_7.png b/代码/在这里3.0_最终版/res/drawable/ic_7.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_7.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_7.png
diff --git a/代码/在这里3.0/res/drawable/ic_71.png b/代码/在这里3.0_最终版/res/drawable/ic_71.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_71.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_71.png
diff --git a/代码/在这里3.0/res/drawable/ic_72.png b/代码/在这里3.0_最终版/res/drawable/ic_72.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_72.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_72.png
diff --git a/代码/在这里3.0/res/drawable/ic_73.png b/代码/在这里3.0_最终版/res/drawable/ic_73.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_73.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_73.png
diff --git a/代码/在这里3.0/res/drawable/ic_74.png b/代码/在这里3.0_最终版/res/drawable/ic_74.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_74.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_74.png
diff --git a/代码/在这里3.0/res/drawable/ic_75.png b/代码/在这里3.0_最终版/res/drawable/ic_75.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_75.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_75.png
diff --git a/代码/在这里3.0/res/drawable/ic_76.png b/代码/在这里3.0_最终版/res/drawable/ic_76.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_76.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_76.png
diff --git a/代码/在这里3.0/res/drawable/ic_77.png b/代码/在这里3.0_最终版/res/drawable/ic_77.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_77.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_77.png
diff --git a/代码/在这里3.0/res/drawable/ic_8.png b/代码/在这里3.0_最终版/res/drawable/ic_8.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_8.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_8.png
diff --git a/代码/在这里3.0/res/drawable/ic_81.png b/代码/在这里3.0_最终版/res/drawable/ic_81.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_81.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_81.png
diff --git a/代码/在这里3.0/res/drawable/ic_82.png b/代码/在这里3.0_最终版/res/drawable/ic_82.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_82.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_82.png
diff --git a/代码/在这里3.0/res/drawable/ic_app.png b/代码/在这里3.0_最终版/res/drawable/ic_app.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_app.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_app.png
diff --git a/代码/在这里3.0/res/drawable/ic_app1.png b/代码/在这里3.0_最终版/res/drawable/ic_app1.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_app1.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_app1.png
diff --git a/代码/在这里3.0/res/drawable/ic_app6.png b/代码/在这里3.0_最终版/res/drawable/ic_app6.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_app6.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_app6.png
diff --git a/代码/在这里3.0/res/drawable/ic_banner1.png b/代码/在这里3.0_最终版/res/drawable/ic_banner1.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_banner1.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_banner1.png
diff --git a/代码/在这里3.0/res/drawable/ic_banner_hide.png b/代码/在这里3.0_最终版/res/drawable/ic_banner_hide.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_banner_hide.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_banner_hide.png
diff --git a/代码/在这里3.0/res/drawable/ic_banner_image_default1.png b/代码/在这里3.0_最终版/res/drawable/ic_banner_image_default1.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_banner_image_default1.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_banner_image_default1.png
diff --git a/代码/在这里3.0/res/drawable/ic_banner_image_default11.png b/代码/在这里3.0_最终版/res/drawable/ic_banner_image_default11.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_banner_image_default11.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_banner_image_default11.png
diff --git a/代码/在这里3.0/res/drawable/ic_banner_image_default2.png b/代码/在这里3.0_最终版/res/drawable/ic_banner_image_default2.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_banner_image_default2.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_banner_image_default2.png
diff --git a/代码/在这里3.0/res/drawable/ic_banner_image_default22.png b/代码/在这里3.0_最终版/res/drawable/ic_banner_image_default22.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_banner_image_default22.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_banner_image_default22.png
diff --git a/代码/在这里3.0/res/drawable/ic_banner_image_default3.png b/代码/在这里3.0_最终版/res/drawable/ic_banner_image_default3.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_banner_image_default3.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_banner_image_default3.png
diff --git a/代码/在这里3.0/res/drawable/ic_banner_image_default4.png b/代码/在这里3.0_最终版/res/drawable/ic_banner_image_default4.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_banner_image_default4.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_banner_image_default4.png
diff --git a/代码/在这里3.0/res/drawable/ic_banner_image_default55.png b/代码/在这里3.0_最终版/res/drawable/ic_banner_image_default55.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_banner_image_default55.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_banner_image_default55.png
diff --git a/代码/在这里3.0/res/drawable/ic_banner_image_default77.png b/代码/在这里3.0_最终版/res/drawable/ic_banner_image_default77.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_banner_image_default77.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_banner_image_default77.png
diff --git a/代码/在这里3.0/res/drawable/ic_breakfast.png b/代码/在这里3.0_最终版/res/drawable/ic_breakfast.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_breakfast.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_breakfast.png
diff --git a/代码/在这里3.0/res/drawable/ic_car.png b/代码/在这里3.0_最终版/res/drawable/ic_car.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_car.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_car.png
diff --git a/代码/在这里3.0/res/drawable/ic_car1.png b/代码/在这里3.0_最终版/res/drawable/ic_car1.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_car1.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_car1.png
diff --git a/代码/在这里3.0/res/drawable/ic_car2.png b/代码/在这里3.0_最终版/res/drawable/ic_car2.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_car2.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_car2.png
diff --git a/代码/在这里3.0/res/drawable/ic_circle.png b/代码/在这里3.0_最终版/res/drawable/ic_circle.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_circle.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_circle.png
diff --git a/代码/在这里3.0/res/drawable/ic_date.png b/代码/在这里3.0_最终版/res/drawable/ic_date.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_date.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_date.png
diff --git a/代码/在这里3.0/res/drawable/ic_hbut.png b/代码/在这里3.0_最终版/res/drawable/ic_hbut.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_hbut.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_hbut.png
diff --git a/代码/在这里3.0/res/drawable/ic_hide.png b/代码/在这里3.0_最终版/res/drawable/ic_hide.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_hide.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_hide.png
diff --git a/代码/在这里3.0/res/drawable/ic_loc.png b/代码/在这里3.0_最终版/res/drawable/ic_loc.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_loc.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_loc.png
diff --git a/代码/在这里3.0/res/drawable/ic_menu_copy_holo_light.png b/代码/在这里3.0_最终版/res/drawable/ic_menu_copy_holo_light.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_menu_copy_holo_light.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_menu_copy_holo_light.png
diff --git a/代码/在这里3.0/res/drawable/ic_menu_find_holo_light.png b/代码/在这里3.0_最终版/res/drawable/ic_menu_find_holo_light.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_menu_find_holo_light.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_menu_find_holo_light.png
diff --git a/代码/在这里3.0/res/drawable/ic_menu_info_details.png b/代码/在这里3.0_最终版/res/drawable/ic_menu_info_details.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_menu_info_details.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_menu_info_details.png
diff --git a/代码/在这里3.0/res/drawable/ic_menu_myplaces.png b/代码/在这里3.0_最终版/res/drawable/ic_menu_myplaces.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_menu_myplaces.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_menu_myplaces.png
diff --git a/代码/在这里3.0/res/drawable/ic_menu_notifications.png b/代码/在这里3.0_最终版/res/drawable/ic_menu_notifications.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_menu_notifications.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_menu_notifications.png
diff --git a/代码/在这里3.0/res/drawable/ic_menu_share.png b/代码/在这里3.0_最终版/res/drawable/ic_menu_share.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_menu_share.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_menu_share.png
diff --git a/代码/在这里3.0/res/drawable/ic_mine.png b/代码/在这里3.0_最终版/res/drawable/ic_mine.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_mine.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_mine.png
diff --git a/代码/在这里3.0/res/drawable/ic_page_indicator.png b/代码/在这里3.0_最终版/res/drawable/ic_page_indicator.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_page_indicator.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_page_indicator.png
diff --git a/代码/在这里3.0/res/drawable/ic_page_indicator_focused.png b/代码/在这里3.0_最终版/res/drawable/ic_page_indicator_focused.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_page_indicator_focused.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_page_indicator_focused.png
diff --git a/代码/在这里3.0/res/drawable/ic_phone.png b/代码/在这里3.0_最终版/res/drawable/ic_phone.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_phone.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_phone.png
diff --git a/代码/在这里3.0/res/drawable/ic_phone2.png b/代码/在这里3.0_最终版/res/drawable/ic_phone2.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_phone2.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_phone2.png
diff --git a/代码/在这里3.0/res/drawable/ic_phone3.png b/代码/在这里3.0_最终版/res/drawable/ic_phone3.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_phone3.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_phone3.png
diff --git a/代码/在这里3.0/res/drawable/ic_sale.png b/代码/在这里3.0_最终版/res/drawable/ic_sale.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_sale.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_sale.png
diff --git a/代码/在这里3.0/res/drawable/ic_sale1.png b/代码/在这里3.0_最终版/res/drawable/ic_sale1.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_sale1.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_sale1.png
diff --git a/代码/在这里3.0/res/drawable/ic_sale2.png b/代码/在这里3.0_最终版/res/drawable/ic_sale2.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_sale2.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_sale2.png
diff --git a/代码/在这里3.0/res/drawable/ic_search.png b/代码/在这里3.0_最终版/res/drawable/ic_search.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_search.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_search.png
diff --git a/代码/在这里3.0/res/drawable/ic_shelf_category_divider.png b/代码/在这里3.0_最终版/res/drawable/ic_shelf_category_divider.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_shelf_category_divider.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_shelf_category_divider.png
diff --git a/代码/在这里3.0/res/drawable/ic_shop.png b/代码/在这里3.0_最终版/res/drawable/ic_shop.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_shop.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_shop.png
diff --git a/代码/在这里3.0/res/drawable/ic_shop1.png b/代码/在这里3.0_最终版/res/drawable/ic_shop1.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_shop1.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_shop1.png
diff --git a/代码/在这里3.0/res/drawable/ic_shop2.png b/代码/在这里3.0_最终版/res/drawable/ic_shop2.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_shop2.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_shop2.png
diff --git a/代码/在这里3.0/res/drawable/ic_shop_info_bg.jpg b/代码/在这里3.0_最终版/res/drawable/ic_shop_info_bg.jpg
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_shop_info_bg.jpg
rename to 代码/在这里3.0_最终版/res/drawable/ic_shop_info_bg.jpg
diff --git a/代码/在这里3.0/res/drawable/ic_shop_info_bg2.jpg b/代码/在这里3.0_最终版/res/drawable/ic_shop_info_bg2.jpg
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_shop_info_bg2.jpg
rename to 代码/在这里3.0_最终版/res/drawable/ic_shop_info_bg2.jpg
diff --git a/代码/在这里3.0/res/drawable/ic_shop_info_bg22.jpg b/代码/在这里3.0_最终版/res/drawable/ic_shop_info_bg22.jpg
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_shop_info_bg22.jpg
rename to 代码/在这里3.0_最终版/res/drawable/ic_shop_info_bg22.jpg
diff --git a/代码/在这里3.0/res/drawable/ic_star_no.png b/代码/在这里3.0_最终版/res/drawable/ic_star_no.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_star_no.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_star_no.png
diff --git a/代码/在这里3.0/res/drawable/ic_star_yes.png b/代码/在这里3.0_最终版/res/drawable/ic_star_yes.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/ic_star_yes.png
rename to 代码/在这里3.0_最终版/res/drawable/ic_star_yes.png
diff --git a/代码/在这里3.0/res/drawable/login_button.png b/代码/在这里3.0_最终版/res/drawable/login_button.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/login_button.png
rename to 代码/在这里3.0_最终版/res/drawable/login_button.png
diff --git a/代码/在这里3.0/res/drawable/login_button_select.png b/代码/在这里3.0_最终版/res/drawable/login_button_select.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/login_button_select.png
rename to 代码/在这里3.0_最终版/res/drawable/login_button_select.png
diff --git a/代码/在这里3.0/res/drawable/qq.png b/代码/在这里3.0_最终版/res/drawable/qq.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/qq.png
rename to 代码/在这里3.0_最终版/res/drawable/qq.png
diff --git a/代码/在这里3.0/res/drawable/qq1.png b/代码/在这里3.0_最终版/res/drawable/qq1.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/qq1.png
rename to 代码/在这里3.0_最终版/res/drawable/qq1.png
diff --git a/代码/在这里3.0/res/drawable/selector_edittext.xml b/代码/在这里3.0_最终版/res/drawable/selector_edittext.xml
similarity index 100%
rename from 代码/在这里3.0/res/drawable/selector_edittext.xml
rename to 代码/在这里3.0_最终版/res/drawable/selector_edittext.xml
diff --git a/代码/在这里3.0/res/drawable/selector_edittext_account.xml b/代码/在这里3.0_最终版/res/drawable/selector_edittext_account.xml
similarity index 100%
rename from 代码/在这里3.0/res/drawable/selector_edittext_account.xml
rename to 代码/在这里3.0_最终版/res/drawable/selector_edittext_account.xml
diff --git a/代码/在这里3.0/res/drawable/selector_load_more.xml b/代码/在这里3.0_最终版/res/drawable/selector_load_more.xml
similarity index 74%
rename from 代码/在这里3.0/res/drawable/selector_load_more.xml
rename to 代码/在这里3.0_最终版/res/drawable/selector_load_more.xml
index 48bfcff..96a0156 100644
--- a/代码/在这里3.0/res/drawable/selector_load_more.xml
+++ b/代码/在这里3.0_最终版/res/drawable/selector_load_more.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/代码/在这里3.0/res/drawable/selector_logout.xml b/代码/在这里3.0_最终版/res/drawable/selector_logout.xml
similarity index 73%
rename from 代码/在这里3.0/res/drawable/selector_logout.xml
rename to 代码/在这里3.0_最终版/res/drawable/selector_logout.xml
index 3ca65b9..05caf8e 100644
--- a/代码/在这里3.0/res/drawable/selector_logout.xml
+++ b/代码/在这里3.0_最终版/res/drawable/selector_logout.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/代码/在这里3.0/res/drawable/sgbf.png b/代码/在这里3.0_最终版/res/drawable/sgbf.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/sgbf.png
rename to 代码/在这里3.0_最终版/res/drawable/sgbf.png
diff --git a/代码/在这里3.0/res/drawable/shap_circle.png b/代码/在这里3.0_最终版/res/drawable/shap_circle.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/shap_circle.png
rename to 代码/在这里3.0_最终版/res/drawable/shap_circle.png
diff --git a/代码/在这里3.0/res/drawable/shap_divider.xml b/代码/在这里3.0_最终版/res/drawable/shap_divider.xml
similarity index 100%
rename from 代码/在这里3.0/res/drawable/shap_divider.xml
rename to 代码/在这里3.0_最终版/res/drawable/shap_divider.xml
diff --git a/代码/在这里3.0/res/drawable/shape_color_frame.xml b/代码/在这里3.0_最终版/res/drawable/shape_color_frame.xml
similarity index 86%
rename from 代码/在这里3.0/res/drawable/shape_color_frame.xml
rename to 代码/在这里3.0_最终版/res/drawable/shape_color_frame.xml
index 43ddd6e..9e3253e 100644
--- a/代码/在这里3.0/res/drawable/shape_color_frame.xml
+++ b/代码/在这里3.0_最终版/res/drawable/shape_color_frame.xml
@@ -8,6 +8,6 @@
android:topRightRadius="0dp"
android:bottomLeftRadius="10dp"
android:bottomRightRadius="0dp" />
-
-
+
+
diff --git a/代码/在这里3.0/res/drawable/shape_grid_item.xml b/代码/在这里3.0_最终版/res/drawable/shape_grid_item.xml
similarity index 61%
rename from 代码/在这里3.0/res/drawable/shape_grid_item.xml
rename to 代码/在这里3.0_最终版/res/drawable/shape_grid_item.xml
index 2f9482e..820958a 100644
--- a/代码/在这里3.0/res/drawable/shape_grid_item.xml
+++ b/代码/在这里3.0_最终版/res/drawable/shape_grid_item.xml
@@ -3,7 +3,7 @@
-
-
-
+
+
+
diff --git a/代码/在这里3.0/res/drawable/shape_left_radius_color_square.xml b/代码/在这里3.0_最终版/res/drawable/shape_left_radius_color_square.xml
similarity index 82%
rename from 代码/在这里3.0/res/drawable/shape_left_radius_color_square.xml
rename to 代码/在这里3.0_最终版/res/drawable/shape_left_radius_color_square.xml
index 7c6d37b..5a43417 100644
--- a/代码/在这里3.0/res/drawable/shape_left_radius_color_square.xml
+++ b/代码/在这里3.0_最终版/res/drawable/shape_left_radius_color_square.xml
@@ -8,6 +8,6 @@
android:topRightRadius="0dp"
android:bottomRightRadius="0dp"
/>
-
-
+
+
diff --git a/代码/在这里3.0/res/drawable/shape_radius.xml b/代码/在这里3.0_最终版/res/drawable/shape_radius.xml
similarity index 97%
rename from 代码/在这里3.0/res/drawable/shape_radius.xml
rename to 代码/在这里3.0_最终版/res/drawable/shape_radius.xml
index ac0596b..0933bbe 100644
--- a/代码/在这里3.0/res/drawable/shape_radius.xml
+++ b/代码/在这里3.0_最终版/res/drawable/shape_radius.xml
@@ -3,5 +3,5 @@
android:shape="rectangle" >
-
+
diff --git a/代码/在这里3.0/res/drawable/shape_radius_color_square.xml b/代码/在这里3.0_最终版/res/drawable/shape_radius_color_square.xml
similarity index 73%
rename from 代码/在这里3.0/res/drawable/shape_radius_color_square.xml
rename to 代码/在这里3.0_最终版/res/drawable/shape_radius_color_square.xml
index 6693a5e..6ad0923 100644
--- a/代码/在这里3.0/res/drawable/shape_radius_color_square.xml
+++ b/代码/在这里3.0_最终版/res/drawable/shape_radius_color_square.xml
@@ -3,6 +3,6 @@
-
-
+
+
diff --git a/代码/在这里3.0/res/drawable/shape_radius_square.xml b/代码/在这里3.0_最终版/res/drawable/shape_radius_square.xml
similarity index 79%
rename from 代码/在这里3.0/res/drawable/shape_radius_square.xml
rename to 代码/在这里3.0_最终版/res/drawable/shape_radius_square.xml
index 041ac07..bd35e0f 100644
--- a/代码/在这里3.0/res/drawable/shape_radius_square.xml
+++ b/代码/在这里3.0_最终版/res/drawable/shape_radius_square.xml
@@ -5,6 +5,6 @@
-
-
+
+
diff --git a/代码/在这里3.0/res/drawable/splash.png b/代码/在这里3.0_最终版/res/drawable/splash.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/splash.png
rename to 代码/在这里3.0_最终版/res/drawable/splash.png
diff --git a/代码/在这里3.0/res/drawable/tab_bg_selector.xml b/代码/在这里3.0_最终版/res/drawable/tab_bg_selector.xml
similarity index 100%
rename from 代码/在这里3.0/res/drawable/tab_bg_selector.xml
rename to 代码/在这里3.0_最终版/res/drawable/tab_bg_selector.xml
diff --git a/代码/在这里3.0/res/drawable/w01.png b/代码/在这里3.0_最终版/res/drawable/w01.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/w01.png
rename to 代码/在这里3.0_最终版/res/drawable/w01.png
diff --git a/代码/在这里3.0/res/drawable/w02.png b/代码/在这里3.0_最终版/res/drawable/w02.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/w02.png
rename to 代码/在这里3.0_最终版/res/drawable/w02.png
diff --git a/代码/在这里3.0/res/drawable/w03.png b/代码/在这里3.0_最终版/res/drawable/w03.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/w03.png
rename to 代码/在这里3.0_最终版/res/drawable/w03.png
diff --git a/代码/在这里3.0/res/drawable/w04.png b/代码/在这里3.0_最终版/res/drawable/w04.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/w04.png
rename to 代码/在这里3.0_最终版/res/drawable/w04.png
diff --git a/代码/在这里3.0/res/drawable/w05.png b/代码/在这里3.0_最终版/res/drawable/w05.png
similarity index 100%
rename from 代码/在这里3.0/res/drawable/w05.png
rename to 代码/在这里3.0_最终版/res/drawable/w05.png
diff --git a/代码/在这里3.0/res/drawable/welcome_background.jpg b/代码/在这里3.0_最终版/res/drawable/welcome_background.jpg
similarity index 100%
rename from 代码/在这里3.0/res/drawable/welcome_background.jpg
rename to 代码/在这里3.0_最终版/res/drawable/welcome_background.jpg
diff --git a/代码/在这里3.0/res/layout/activity_about.xml b/代码/在这里3.0_最终版/res/layout/activity_about.xml
similarity index 82%
rename from 代码/在这里3.0/res/layout/activity_about.xml
rename to 代码/在这里3.0_最终版/res/layout/activity_about.xml
index 43e2ee5..0f4c553 100644
--- a/代码/在这里3.0/res/layout/activity_about.xml
+++ b/代码/在这里3.0_最终版/res/layout/activity_about.xml
@@ -49,13 +49,13 @@
android:gravity="left"
android:lineSpacingExtra="5dp"
android:lineSpacingMultiplier="1.4"
- android:text="\n 在这里,是由NUDT计算机学院团队神龙小分队开发的一款社区移动生活类手机App.
+ android:text="\n 在这里,是由NUDT计算机学院团队神龙小分队开发的一款社区移动生活类手机App.
在这里集多功能与一身,可以轻松让你获得校园一手资讯,集教学、娱乐、购物、出行于一身,相信会是你生活的得力助手。
-\n 神龙小分队一直致力于在这里的开发工作,希望能够得到更多校友的支持与建议,我们将不断的更新和完善。同时也乐意和相关的校友合作,欢迎联系神龙小分队。
+\n 神龙小分队一直致力于在这里的开发工作,希望能够得到更多校友的支持与建议,我们将不断的更新和完善。同时也乐意和相关的校友合作,欢迎联系神龙小分队。
\n\n联系方式:
-\n联系人 神龙小分队
-\n电话 15575939962
-\nQQ 1453505201"
+\n联系人 神龙小分队
+\n电话 15575939962
+\nQQ 1453505201"
android:textSize="12sp"
android:typeface="monospace" />
diff --git a/代码/在这里3.0/res/layout/activity_award.xml b/代码/在这里3.0_最终版/res/layout/activity_award.xml
similarity index 100%
rename from 代码/在这里3.0/res/layout/activity_award.xml
rename to 代码/在这里3.0_最终版/res/layout/activity_award.xml
diff --git a/代码/在这里3.0/res/layout/activity_base.xml b/代码/在这里3.0_最终版/res/layout/activity_base.xml
similarity index 100%
rename from 代码/在这里3.0/res/layout/activity_base.xml
rename to 代码/在这里3.0_最终版/res/layout/activity_base.xml
diff --git a/代码/在这里3.0/res/layout/activity_bxt.xml b/代码/在这里3.0_最终版/res/layout/activity_bxt.xml
similarity index 100%
rename from 代码/在这里3.0/res/layout/activity_bxt.xml
rename to 代码/在这里3.0_最终版/res/layout/activity_bxt.xml
diff --git a/代码/在这里3.0/res/layout/activity_bxt_news.xml b/代码/在这里3.0_最终版/res/layout/activity_bxt_news.xml
similarity index 100%
rename from 代码/在这里3.0/res/layout/activity_bxt_news.xml
rename to 代码/在这里3.0_最终版/res/layout/activity_bxt_news.xml
diff --git a/代码/在这里3.0/res/layout/activity_car.xml b/代码/在这里3.0_最终版/res/layout/activity_car.xml
similarity index 100%
rename from 代码/在这里3.0/res/layout/activity_car.xml
rename to 代码/在这里3.0_最终版/res/layout/activity_car.xml
diff --git a/代码/在这里3.0/res/layout/activity_classroom.xml b/代码/在这里3.0_最终版/res/layout/activity_classroom.xml
similarity index 100%
rename from 代码/在这里3.0/res/layout/activity_classroom.xml
rename to 代码/在这里3.0_最终版/res/layout/activity_classroom.xml
diff --git a/代码/在这里3.0/res/layout/activity_comment.xml b/代码/在这里3.0_最终版/res/layout/activity_comment.xml
similarity index 100%
rename from 代码/在这里3.0/res/layout/activity_comment.xml
rename to 代码/在这里3.0_最终版/res/layout/activity_comment.xml
diff --git a/代码/在这里3.0/res/layout/activity_edit.xml b/代码/在这里3.0_最终版/res/layout/activity_edit.xml
similarity index 100%
rename from 代码/在这里3.0/res/layout/activity_edit.xml
rename to 代码/在这里3.0_最终版/res/layout/activity_edit.xml
diff --git a/代码/在这里3.0/res/layout/activity_feedback.xml b/代码/在这里3.0_最终版/res/layout/activity_feedback.xml
similarity index 100%
rename from 代码/在这里3.0/res/layout/activity_feedback.xml
rename to 代码/在这里3.0_最终版/res/layout/activity_feedback.xml
diff --git a/代码/在这里3.0/res/layout/activity_home.xml b/代码/在这里3.0_最终版/res/layout/activity_home.xml
similarity index 99%
rename from 代码/在这里3.0/res/layout/activity_home.xml
rename to 代码/在这里3.0_最终版/res/layout/activity_home.xml
index 5f30c60..9c7c0b4 100644
--- a/代码/在这里3.0/res/layout/activity_home.xml
+++ b/代码/在这里3.0_最终版/res/layout/activity_home.xml
@@ -71,7 +71,7 @@
android:typeface="monospace" />
-
+
-
+
@@ -212,8 +212,8 @@
android:hint="宿舍楼号"
android:textSize="14sp" />
-
-
-