Skip to content

Commit 081400c

Browse files
TommyLemonTommyLemon
committed
Server:同步elipes版至idea版；model类都移到apijson.demo.server.model里，并且与客户端同步；Client:同步adt版至studio版；apijson.demo.client.server.model改为apijson.demo.server.model
1 parent 798499f commit 081400c

64 files changed

Lines changed: 609 additions & 363 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/activity_fragment/LoginActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
import apijson.demo.client.application.APIJSONApplication;
4040
import apijson.demo.client.manager.DataManager;
4141
import apijson.demo.client.model.User;
42-
import apijson.demo.client.server.model.Login;
4342
import apijson.demo.client.util.HttpRequest;
43+
import apijson.demo.server.model.Login;
4444

4545
/**登录界面
4646
* @author Lemon

‎APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/activity_fragment/UserActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ private User getUser() {
304304
private void putUser() {
305305
showProgressDialog("正在上传...");
306306
user = getUser();
307-
apijson.demo.client.server.model.User userRequest = new apijson.demo.client.server.model.User(user.getId());
307+
apijson.demo.server.model.User userRequest = new apijson.demo.server.model.User(user.getId());
308308
userRequest.setName(user.getName());
309309
userRequest.setSex(user.getSex());
310310
userRequest.setTag(user.getTag());

‎APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/model/Comment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
/**评论类
1818
* @author Lemon
1919
*/
20-
public class Comment extends apijson.demo.client.server.model.Comment {
20+
public class Comment extends apijson.demo.server.model.Comment {
2121
private static final long serialVersionUID = -1011007127735372824L;
2222

2323
public Comment() {

‎APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/model/Login.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* @author Lemon
1919
*/
2020
@SuppressWarnings("serial")
21-
public class Login extends apijson.demo.client.server.model.Login {
21+
public class Login extends apijson.demo.server.model.Login {
2222

2323
public Login() {
2424
super();

‎APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/model/Moment.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
/**作品类
1818
* @author Lemon
1919
*/
20-
public class Moment extends apijson.demo.client.server.model.Moment {
20+
public class Moment extends apijson.demo.server.model.Moment {
2121
private static final long serialVersionUID = -7821648714756673170L;
2222

2323
public Moment() {
@@ -39,5 +39,9 @@ public Long getId() {
3939
public Long getUserId() {
4040
return value(super.getUserId());
4141
}
42+
43+
public String getFirstPicture() {
44+
return get(getPictureList(), 0);
45+
}
4246

4347
}

‎APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/model/User.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
/**用户类
2020
* @author Lemon
2121
*/
22-
public class User extends apijson.demo.client.server.model.User {
22+
public class User extends apijson.demo.server.model.User {
2323
/**
2424
*/
2525
private static final long serialVersionUID = -8778034378026642371L;
@@ -40,12 +40,6 @@ public Long getId() {
4040
public Long getDate() {
4141
return value(super.getDate());
4242
}
43-
44-
@Override
45-
public Integer getStarred() {
46-
return value(super.getStarred());
47-
}
48-
4943
@Override
5044
public Integer getSex() {
5145
return value(super.getSex());

‎APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/model/Verify.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/**验证码类
2121
* @author Lemon
2222
*/
23-
public class Verify extends apijson.demo.client.server.model.Verify {
23+
public class Verify extends apijson.demo.server.model.Verify {
2424
private static final long serialVersionUID = 4298571449155754300L;
2525

2626
public Verify() {

‎APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/model/Wallet.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
/**钱包类
1919
* @author Lemon
2020
*/
21-
public class Wallet extends apijson.demo.client.server.model.Wallet {
21+
public class Wallet extends apijson.demo.server.model.Wallet {
2222
private static final long serialVersionUID = 4298571449155754300L;
2323

2424

‎APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/client/util/HttpRequest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
import apijson.demo.client.application.APIJSONApplication;
2727
import apijson.demo.client.manager.HttpManager;
2828
import apijson.demo.client.model.CommentItem;
29-
import apijson.demo.client.server.model.Comment;
30-
import apijson.demo.client.server.model.Login;
31-
import apijson.demo.client.server.model.Moment;
32-
import apijson.demo.client.server.model.User;
33-
import apijson.demo.client.server.model.Wallet;
29+
import apijson.demo.server.model.Comment;
30+
import apijson.demo.server.model.Login;
31+
import apijson.demo.server.model.Moment;
32+
import apijson.demo.server.model.User;
33+
import apijson.demo.server.model.Wallet;
3434

3535
/**HTTP请求工具类
3636
* @author Lemon

APIJSON(Server)/APIJSON(Eclipse_JEE)/src/main/java/zuo/biao/apijson/server/model/Comment.java renamed to APIJSON(Android)/APIJSON(ADT)/APIJSONApp/APIJSONApp/src/apijson/demo/server/model/Comment.java

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
See the License for the specific language governing permissions and
1313
limitations under the License.*/
1414

15-
package zuo.biao.apijson.server.model;
15+
package apijson.demo.server.model;
1616

1717
import zuo.biao.apijson.APIJSONRequest;
1818
import zuo.biao.apijson.BaseModel;
@@ -38,11 +38,10 @@
3838
public class Comment extends BaseModel {
3939
private static final long serialVersionUID = -1011007127735372824L;
4040

41+
private Long toId;
42+
private Long userId;
4143
private Long momentId;
42-
private Long parentId;
4344
private String content;
44-
private Long userId;
45-
private Long toUserId;
4645
public Comment() {
4746
super();
4847
}
@@ -51,39 +50,34 @@ public Comment(long id) {
5150
setId(id);
5251
}
5352

53+
54+
public Long getToId() {
55+
return toId;
56+
}
57+
public Comment setToId(Long toId) {
58+
this.toId = toId;
59+
return this;
60+
}
61+
public Long getUserId() {
62+
return userId;
63+
}
64+
public Comment setUserId(Long userId) {
65+
this.userId = userId;
66+
return this;
67+
}
5468
public Long getMomentId() {
5569
return momentId;
5670
}
5771
public Comment setMomentId(Long momentId) {
5872
this.momentId = momentId;
5973
return this;
6074
}
61-
public Long getParentId() {
62-
return parentId;
63-
}
64-
public Comment setParentId(Long parentId) {
65-
this.parentId = parentId;
66-
return this;
67-
}
6875
public String getContent() {
6976
return content;
7077
}
7178
public Comment setContent(String content) {
7279
this.content = content;
7380
return this;
7481
}
75-
public Long getUserId() {
76-
return userId;
77-
}
78-
public Comment setUserId(Long userId) {
79-
this.momentId = userId;
80-
return this;
81-
}
82-
public Long getToUserId() {
83-
return toUserId;
84-
}
85-
public Comment setToUserId(Long toUserId) {
86-
this.toUserId = toUserId;
87-
return this;
88-
}
82+
8983
}

0 commit comments

Comments
 (0)