Commit 0ab588c9bb27d1631ae99a97b6821e68aa651d47

Authored by 韩亚云
1 parent 976a33be

登录module同步

cloud/user/build.gradle
... ... @@ -49,5 +49,6 @@ dependencies {
49 49 implementation "com.cnlive.libs:emoj:$rootProject.libEmoj"
50 50 //图片选择器
51 51 implementation "com.cnlive.libs:mediapicker:$rootProject.libMediaPicker"
  52 + compile project(path: ':cloud:third_tool')
52 53  
53 54 }
... ...
cloud/user/src/main/java/com/cnlive/strike/user/frame/presenter/QuickLoginPresenter.java
... ... @@ -10,10 +10,10 @@ import com.cnlive.core.network.model.BaseResult;
10 10 import com.cnlive.core.network.HttpConn;
11 11 import com.cnlive.core.network.NetCallBack;
12 12 import com.cnlive.core.libs.base.util.TimerWaitUtil;
  13 +import com.cnlive.login.model.OtherUserInfo;
13 14 import com.cnlive.strike.user.R;
14 15 import com.cnlive.strike.user.UserUtilAction;
15 16 import com.cnlive.strike.user.auth.UserService;
16   -import com.cnlive.strike.user.frame.data.OtherUserInfo;
17 17 import com.cnlive.strike.user.frame.data.QuickLoginData;
18 18 import com.cnlive.strike.user.frame.view.QuickLoginView;
19 19 import com.cnlive.strike.user.model.CNLiveUserInfo;
... ...
cloud/user/src/main/java/com/cnlive/strike/user/frame/view/QuickLoginView.java
... ... @@ -21,7 +21,6 @@ import com.cnlive.core.libs.base.frame.view.BaseView;
21 21 import com.cnlive.core.libs.base.util.AlertUtil;
22 22 import com.cnlive.core.libs.base.util.DoublePressed;
23 23 import com.cnlive.strike.user.R;
24   -import com.cnlive.strike.user.frame.data.OtherUserInfo;
25 24 import com.cnlive.strike.user.model.LoginSuccessInfo;
26 25 import com.cnlive.strike.user.sms.OnSmsCatchListener;
27 26 import com.cnlive.strike.user.sms.SmsVerifyCatcher;
... ...
cloud/user/src/main/java/com/cnlive/strike/user/model/UserData.java deleted 100644 → 0
1   -package com.cnlive.strike.user.model;
2   -
3   -/**
4   - * Created by Lynn on 2018/10/15.
5   - */
6   -
7   -public class UserData {
8   - private String uid;
9   - private String nickName;
10   - private String gender;
11   - private String location;
12   - private String faceUrl;
13   - private String mobile;
14   - private String email;
15   - private String extInfo;
16   - private String qqUid;
17   - private String wxUid;
18   - private String sinaUid;
19   - private String renrenUid;
20   - private String hUid;
21   - private String platformId;
22   - private String token;
23   - private String callbackAcitvityStatushttpPostUrl;
24   - private boolean isNewUser;
25   - private String bigFaceUrl;
26   - private String countryCode = "86";//手机号国家码
27   -
28   - public String getUid() {
29   - return uid;
30   - }
31   -
32   - public void setUid(String uid) {
33   - this.uid = uid;
34   - }
35   -
36   - public String getNickName() {
37   - return nickName;
38   - }
39   -
40   - public void setNickName(String nickName) {
41   - this.nickName = nickName;
42   - }
43   -
44   - public String getLocation() {
45   - return location;
46   - }
47   -
48   - public void setLocation(String location) {
49   - this.location = location;
50   - }
51   -
52   - public String getGender() {
53   - return gender;
54   - }
55   -
56   - public void setGender(String gender) {
57   - this.gender = gender;
58   - }
59   -
60   - public String getFaceUrl() {
61   - return faceUrl;
62   - }
63   -
64   - public void setFaceUrl(String faceUrl) {
65   - this.faceUrl = faceUrl;
66   - }
67   -
68   - public String getToken() {
69   - return token;
70   - }
71   -
72   - public void setToken(String token) {
73   - this.token = token;
74   - }
75   -
76   - public String getExtInfo() {
77   - return extInfo;
78   - }
79   -
80   - public void setExtInfo(String extInfo) {
81   - this.extInfo = extInfo;
82   - }
83   -
84   - public String getMobile() {
85   - return mobile;
86   - }
87   -
88   - public void setMobile(String mobile) {
89   - this.mobile = mobile;
90   - }
91   -
92   - public String getEmail() {
93   - return email;
94   - }
95   -
96   - public void setEmail(String email) {
97   - this.email = email;
98   - }
99   -
100   - public String getQqUid() {
101   - return qqUid;
102   - }
103   -
104   - public void setQqUid(String qqUid) {
105   - this.qqUid = qqUid;
106   - }
107   -
108   - public String getWxUid() {
109   - return wxUid;
110   - }
111   -
112   - public void setWxUid(String wxUid) {
113   - this.wxUid = wxUid;
114   - }
115   -
116   - public String getSinaUid() {
117   - return sinaUid;
118   - }
119   -
120   - public void setSinaUid(String sinaUid) {
121   - this.sinaUid = sinaUid;
122   - }
123   -
124   - public String getRenrenUid() {
125   - return renrenUid;
126   - }
127   -
128   - public void setRenrenUid(String renrenUid) {
129   - this.renrenUid = renrenUid;
130   - }
131   -
132   - public String gethUid() {
133   - return hUid;
134   - }
135   -
136   - public void sethUid(String hUid) {
137   - this.hUid = hUid;
138   - }
139   -
140   - public String getPlatformId() {
141   - return platformId;
142   - }
143   -
144   - public void setPlatformId(String platformId) {
145   - this.platformId = platformId;
146   - }
147   -
148   - public boolean isNewUser() {
149   - return isNewUser;
150   - }
151   -
152   - public void setNewUser(boolean newUser) {
153   - isNewUser = newUser;
154   - }
155   -
156   - public String getBigFaceUrl() {
157   - return bigFaceUrl;
158   - }
159   -
160   - public void setBigFaceUrl(String bigFaceUrl) {
161   - this.bigFaceUrl = bigFaceUrl;
162   - }
163   -
164   - public String getCountryCode() {
165   - return countryCode;
166   - }
167   -
168   - public void setCountryCode(String countryCode) {
169   - this.countryCode = countryCode;
170   - }
171   -
172   - public String getCallbackAcitvityStatushttpPostUrl() {
173   - return callbackAcitvityStatushttpPostUrl;
174   - }
175   -
176   - public void setCallbackAcitvityStatushttpPostUrl(String callbackAcitvityStatushttpPostUrl) {
177   - this.callbackAcitvityStatushttpPostUrl = callbackAcitvityStatushttpPostUrl;
178   - }
179   -
180   - @Override
181   - public String toString() {
182   - return "UserData{" +
183   - "uid='" + uid + '\'' +
184   - ", nickName='" + nickName + '\'' +
185   - ", gender='" + gender + '\'' +
186   - ", location='" + location + '\'' +
187   - ", faceUrl='" + faceUrl + '\'' +
188   - ", mobile='" + mobile + '\'' +
189   - ", email='" + email + '\'' +
190   - ", extInfo='" + extInfo + '\'' +
191   - ", qqUid='" + qqUid + '\'' +
192   - ", wxUid='" + wxUid + '\'' +
193   - ", sinaUid='" + sinaUid + '\'' +
194   - ", renrenUid='" + renrenUid + '\'' +
195   - ", hUid='" + hUid + '\'' +
196   - ", platformId='" + platformId + '\'' +
197   - ", token='" + token + '\'' +
198   - ", callbackAcitvityStatushttpPostUrl='" + callbackAcitvityStatushttpPostUrl + '\'' +
199   - ", isNewUser=" + isNewUser +
200   - ", bigFaceUrl='" + bigFaceUrl + '\'' +
201   - ", countryCode='" + countryCode + '\'' +
202   - '}';
203   - }
204   -}