Commit 027a59de418b9fe8f07882cc0525d38f6de80ddc

Authored by 王琳
1 parent 4e9e3f45

更新用户SDK,更新demo

app/libs/libcnliveuser.jar
No preview for this file type
app/src/main/java/com/cnlive/libs/BaseActivity.java
@@ -2,6 +2,7 @@ package com.cnlive.libs; @@ -2,6 +2,7 @@ package com.cnlive.libs;
2 2
3 import android.os.Bundle; 3 import android.os.Bundle;
4 import android.support.v7.app.AppCompatActivity; 4 import android.support.v7.app.AppCompatActivity;
  5 +import android.widget.Toast;
5 6
6 import com.cnlive.libs.user.model.UserData; 7 import com.cnlive.libs.user.model.UserData;
7 8
@@ -15,4 +16,8 @@ public class BaseActivity extends AppCompatActivity { @@ -15,4 +16,8 @@ public class BaseActivity extends AppCompatActivity {
15 protected void onCreate(Bundle savedInstanceState) { 16 protected void onCreate(Bundle savedInstanceState) {
16 super.onCreate(savedInstanceState); 17 super.onCreate(savedInstanceState);
17 } 18 }
  19 +
  20 + protected void showToast(String msg) {
  21 + Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
  22 + }
18 } 23 }
app/src/main/java/com/cnlive/libs/LoginActivity.java
@@ -7,6 +7,7 @@ import android.view.View; @@ -7,6 +7,7 @@ import android.view.View;
7 import android.widget.Button; 7 import android.widget.Button;
8 import android.widget.EditText; 8 import android.widget.EditText;
9 import android.widget.TextView; 9 import android.widget.TextView;
  10 +import android.widget.Toast;
10 11
11 import com.cnlive.libs.user.IUserService; 12 import com.cnlive.libs.user.IUserService;
12 import com.cnlive.libs.user.UserUtil; 13 import com.cnlive.libs.user.UserUtil;
@@ -78,6 +79,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener @@ -78,6 +79,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
78 UserUtil.login(userName.getText().toString(), userPassword.getText().toString(), "frmId", new Callback() { 79 UserUtil.login(userName.getText().toString(), userPassword.getText().toString(), "frmId", new Callback() {
79 @Override 80 @Override
80 public void onState(int what, String extra, Object obj) { 81 public void onState(int what, String extra, Object obj) {
  82 + showToast(extra + " : " + obj.toString());
81 switch (what) { 83 switch (what) {
82 case IUserService.SUCCESS: 84 case IUserService.SUCCESS:
83 //成功 obj返回用户信息 85 //成功 obj返回用户信息
@@ -115,6 +117,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener @@ -115,6 +117,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
115 UserUtil.thirdPartyLogin(1, "thirdPartyId", "nickName", "gender", "location", "faceUrl", "frmId", new Callback() { 117 UserUtil.thirdPartyLogin(1, "thirdPartyId", "nickName", "gender", "location", "faceUrl", "frmId", new Callback() {
116 @Override 118 @Override
117 public void onState(int what, String extra, Object obj) { 119 public void onState(int what, String extra, Object obj) {
  120 + showToast(extra + " : " + obj.toString());
118 switch (what) { 121 switch (what) {
119 case IUserService.SUCCESS: 122 case IUserService.SUCCESS:
120 //成功 obj返回用户信息 123 //成功 obj返回用户信息
@@ -150,4 +153,9 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener @@ -150,4 +153,9 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
150 break; 153 break;
151 } 154 }
152 } 155 }
  156 +
  157 + @Override
  158 + protected void showToast(String msg) {
  159 + super.showToast(msg);
  160 + }
153 } 161 }
app/src/main/java/com/cnlive/libs/OtherActivity.java
@@ -6,9 +6,11 @@ import android.view.View; @@ -6,9 +6,11 @@ import android.view.View;
6 import android.widget.Button; 6 import android.widget.Button;
7 import android.widget.EditText; 7 import android.widget.EditText;
8 import android.widget.TextView; 8 import android.widget.TextView;
  9 +import android.widget.Toast;
9 10
10 import com.cnlive.libs.user.IUserService; 11 import com.cnlive.libs.user.IUserService;
11 import com.cnlive.libs.user.UserUtil; 12 import com.cnlive.libs.user.UserUtil;
  13 +import com.cnlive.libs.user.model.MoreUserData;
12 import com.cnlive.libs.user.model.UserData; 14 import com.cnlive.libs.user.model.UserData;
13 import com.cnlive.libs.util.data.network.Callback; 15 import com.cnlive.libs.util.data.network.Callback;
14 16
@@ -25,12 +27,14 @@ public class OtherActivity extends BaseActivity implements View.OnClickListener @@ -25,12 +27,14 @@ public class OtherActivity extends BaseActivity implements View.OnClickListener
25 private static final String TAG_BIND_THIRD = "BindThirdParty"; 27 private static final String TAG_BIND_THIRD = "BindThirdParty";
26 private static final String TAG_SEND_MSG_BEF_FINDBACK = "SendMsgBefFindBack"; 28 private static final String TAG_SEND_MSG_BEF_FINDBACK = "SendMsgBefFindBack";
27 29
  30 + private MoreUserData moreUserData;
  31 +
28 //demo中上传的头像文件 32 //demo中上传的头像文件
29 File file = new File("/sdcard/timg.jpg"); 33 File file = new File("/sdcard/timg.jpg");
30 34
31 private EditText feedbackMsg; 35 private EditText feedbackMsg;
32 private Button feedback, uploadFace; 36 private Button feedback, uploadFace;
33 - private TextView modifyMobile, updateUserExtInfo, queryUserInfo, modifyUserInfo, modifyPwdWithMobile, bindThird, sendMessage,queryMoreUserInfo; 37 + private TextView modifyMobile, updateUserExtInfo, queryUserInfo, modifyUserInfo, modifyPwdWithMobile, bindThird, sendMessage, queryMoreUserInfo;
34 38
35 39
36 private String uid; 40 private String uid;
@@ -101,6 +105,7 @@ public class OtherActivity extends BaseActivity implements View.OnClickListener @@ -101,6 +105,7 @@ public class OtherActivity extends BaseActivity implements View.OnClickListener
101 UserUtil.uploadFace(uid, "33eb04e9ca7001e878eb8a57e2a1068d7b48c2909fc341", file, new Callback() { 105 UserUtil.uploadFace(uid, "33eb04e9ca7001e878eb8a57e2a1068d7b48c2909fc341", file, new Callback() {
102 @Override 106 @Override
103 public void onState(int what, String extra, Object obj) { 107 public void onState(int what, String extra, Object obj) {
  108 + showToast(extra + " : " + obj.toString());
104 switch (what) { 109 switch (what) {
105 case IUserService.SUCCESS: 110 case IUserService.SUCCESS:
106 //成功 obj返回头像url 111 //成功 obj返回头像url
@@ -137,6 +142,7 @@ public class OtherActivity extends BaseActivity implements View.OnClickListener @@ -137,6 +142,7 @@ public class OtherActivity extends BaseActivity implements View.OnClickListener
137 UserUtil.feedback("id", feedbackMsg.getText().toString(), new Callback() { 142 UserUtil.feedback("id", feedbackMsg.getText().toString(), new Callback() {
138 @Override 143 @Override
139 public void onState(int what, String extra, Object obj) { 144 public void onState(int what, String extra, Object obj) {
  145 + showToast(extra + " : " + obj.toString());
140 switch (what) { 146 switch (what) {
141 case IUserService.SUCCESS: 147 case IUserService.SUCCESS:
142 //成功 148 //成功
@@ -169,6 +175,7 @@ public class OtherActivity extends BaseActivity implements View.OnClickListener @@ -169,6 +175,7 @@ public class OtherActivity extends BaseActivity implements View.OnClickListener
169 UserUtil.updateMobile(uid, "18811122371", "123456", new Callback() { 175 UserUtil.updateMobile(uid, "18811122371", "123456", new Callback() {
170 @Override 176 @Override
171 public void onState(int what, String extra, Object obj) { 177 public void onState(int what, String extra, Object obj) {
  178 + showToast(extra + " : " + obj.toString());
172 switch (what) { 179 switch (what) {
173 case IUserService.SUCCESS: 180 case IUserService.SUCCESS:
174 //成功 181 //成功
@@ -226,6 +233,7 @@ public class OtherActivity extends BaseActivity implements View.OnClickListener @@ -226,6 +233,7 @@ public class OtherActivity extends BaseActivity implements View.OnClickListener
226 UserUtil.updateUserExtInfo(uid, "didjosdfs", new Callback() { 233 UserUtil.updateUserExtInfo(uid, "didjosdfs", new Callback() {
227 @Override 234 @Override
228 public void onState(int what, String extra, Object obj) { 235 public void onState(int what, String extra, Object obj) {
  236 + showToast(extra + " : " + obj.toString());
229 switch (what) { 237 switch (what) {
230 case IUserService.SUCCESS: 238 case IUserService.SUCCESS:
231 //成功 239 //成功
@@ -260,6 +268,7 @@ public class OtherActivity extends BaseActivity implements View.OnClickListener @@ -260,6 +268,7 @@ public class OtherActivity extends BaseActivity implements View.OnClickListener
260 UserUtil.queryUserInfo(uid, uid, new Callback() { 268 UserUtil.queryUserInfo(uid, uid, new Callback() {
261 @Override 269 @Override
262 public void onState(int what, String extra, Object obj) { 270 public void onState(int what, String extra, Object obj) {
  271 + showToast(extra + " : " + obj.toString());
263 switch (what) { 272 switch (what) {
264 case IUserService.SUCCESS: 273 case IUserService.SUCCESS:
265 //成功 obj返回用户信息 274 //成功 obj返回用户信息
@@ -294,6 +303,7 @@ public class OtherActivity extends BaseActivity implements View.OnClickListener @@ -294,6 +303,7 @@ public class OtherActivity extends BaseActivity implements View.OnClickListener
294 UserUtil.modifyUserInfo(uid, "nickName", "Lynn", new Callback() { 303 UserUtil.modifyUserInfo(uid, "nickName", "Lynn", new Callback() {
295 @Override 304 @Override
296 public void onState(int what, String extra, Object obj) { 305 public void onState(int what, String extra, Object obj) {
  306 + showToast(extra + " : " + obj.toString());
297 switch (what) { 307 switch (what) {
298 case IUserService.SUCCESS: 308 case IUserService.SUCCESS:
299 //成功 309 //成功
@@ -362,6 +372,7 @@ public class OtherActivity extends BaseActivity implements View.OnClickListener @@ -362,6 +372,7 @@ public class OtherActivity extends BaseActivity implements View.OnClickListener
362 UserUtil.modifyPwdWithMob("mobile", "verficationCode", "newPwd", new Callback() { 372 UserUtil.modifyPwdWithMob("mobile", "verficationCode", "newPwd", new Callback() {
363 @Override 373 @Override
364 public void onState(int what, String extra, Object obj) { 374 public void onState(int what, String extra, Object obj) {
  375 + showToast(extra + " : " + obj.toString());
365 switch (what) { 376 switch (what) {
366 case IUserService.SUCCESS: 377 case IUserService.SUCCESS:
367 //成功 378 //成功
@@ -403,6 +414,7 @@ public class OtherActivity extends BaseActivity implements View.OnClickListener @@ -403,6 +414,7 @@ public class OtherActivity extends BaseActivity implements View.OnClickListener
403 UserUtil.bindThird(uid, 1, "thirdPartyId", new Callback() { 414 UserUtil.bindThird(uid, 1, "thirdPartyId", new Callback() {
404 @Override 415 @Override
405 public void onState(int what, String extra, Object obj) { 416 public void onState(int what, String extra, Object obj) {
  417 + showToast(extra + " : " + obj.toString());
406 switch (what) { 418 switch (what) {
407 case IUserService.SUCCESS: 419 case IUserService.SUCCESS:
408 //成功 420 //成功
@@ -451,6 +463,7 @@ public class OtherActivity extends BaseActivity implements View.OnClickListener @@ -451,6 +463,7 @@ public class OtherActivity extends BaseActivity implements View.OnClickListener
451 UserUtil.sendMessage(IUserService.RETRIEVE_OR_MODIFY_PASSWORD, "mobile", new Callback() { 463 UserUtil.sendMessage(IUserService.RETRIEVE_OR_MODIFY_PASSWORD, "mobile", new Callback() {
452 @Override 464 @Override
453 public void onState(int what, String extra, Object obj) { 465 public void onState(int what, String extra, Object obj) {
  466 + showToast(extra + " : " + obj.toString());
454 switch (what) { 467 switch (what) {
455 case IUserService.SUCCESS: 468 case IUserService.SUCCESS:
456 //成功 469 //成功
@@ -497,31 +510,37 @@ public class OtherActivity extends BaseActivity implements View.OnClickListener @@ -497,31 +510,37 @@ public class OtherActivity extends BaseActivity implements View.OnClickListener
497 * @param srcUids 被查询多个用户IDs(多个ID以英文,号分割) 510 * @param srcUids 被查询多个用户IDs(多个ID以英文,号分割)
498 * @param callback 回调 511 * @param callback 回调
499 */ 512 */
500 - UserUtil.queryMoreUserInfo(uid, uid, new Callback() {  
501 - @Override  
502 - public void onState(int what, String extra, Object obj) {  
503 - switch (what){  
504 - case IUserService.SUCCESS:  
505 - //成功 obj返回用户信息  
506 - userData = (UserData) obj;  
507 - break;  
508 - case IUserService.ERROR_PARAM:  
509 - Log.e(TAG_QUERY_USER_INFO, IUserService.message_error_param);  
510 - break;  
511 - case IUserService.ERROR_TOKEN_INVALID:  
512 - Log.e(TAG_QUERY_USER_INFO, IUserService.message_error_token_invalid);  
513 - break;  
514 - case IUserService.ERROR_TOKEN_CHECKING:  
515 - Log.e(TAG_QUERY_USER_INFO, IUserService.message_error_token_checking);  
516 - break;  
517 - case IUserService.ERROR_NOT_FOUND_RECORD:  
518 - Log.e(TAG_QUERY_USER_INFO, IUserService.message_error_not_found_record);  
519 - break;  
520 - } 513 + UserUtil.queryMoreUserInfo(uid, uid + "," + uid, new Callback() {
  514 + @Override
  515 + public void onState(int what, String extra, Object obj) {
  516 + showToast(extra + " : " + obj.toString());
  517 + switch (what) {
  518 + case IUserService.SUCCESS:
  519 + //成功 obj返回用户信息列表
  520 + moreUserData = (MoreUserData) obj;
  521 + break;
  522 + case IUserService.ERROR_PARAM:
  523 + Log.e(TAG_QUERY_USER_INFO, IUserService.message_error_param);
  524 + break;
  525 + case IUserService.ERROR_TOKEN_INVALID:
  526 + Log.e(TAG_QUERY_USER_INFO, IUserService.message_error_token_invalid);
  527 + break;
  528 + case IUserService.ERROR_TOKEN_CHECKING:
  529 + Log.e(TAG_QUERY_USER_INFO, IUserService.message_error_token_checking);
  530 + break;
  531 + case IUserService.ERROR_NOT_FOUND_RECORD:
  532 + Log.e(TAG_QUERY_USER_INFO, IUserService.message_error_not_found_record);
  533 + break;
  534 + }
521 535
522 - }  
523 - }); 536 + }
  537 + });
524 break; 538 break;
525 } 539 }
526 } 540 }
  541 +
  542 + @Override
  543 + protected void showToast(String msg) {
  544 + super.showToast(msg);
  545 + }
527 } 546 }
app/src/main/java/com/cnlive/libs/QuickLoginActivity.java
@@ -5,6 +5,7 @@ import android.util.Log; @@ -5,6 +5,7 @@ import android.util.Log;
5 import android.view.View; 5 import android.view.View;
6 import android.widget.Button; 6 import android.widget.Button;
7 import android.widget.EditText; 7 import android.widget.EditText;
  8 +import android.widget.Toast;
8 9
9 import com.cnlive.libs.user.IUserService; 10 import com.cnlive.libs.user.IUserService;
10 import com.cnlive.libs.user.UserUtil; 11 import com.cnlive.libs.user.UserUtil;
@@ -57,6 +58,7 @@ public class QuickLoginActivity extends BaseActivity implements View.OnClickList @@ -57,6 +58,7 @@ public class QuickLoginActivity extends BaseActivity implements View.OnClickList
57 UserUtil.sendMessage(IUserService.QUICK_LOGIN, mobile.getText().toString(), new Callback() { 58 UserUtil.sendMessage(IUserService.QUICK_LOGIN, mobile.getText().toString(), new Callback() {
58 @Override 59 @Override
59 public void onState(int what, String extra, Object obj) { 60 public void onState(int what, String extra, Object obj) {
  61 + showToast(extra + " : " + obj.toString());
60 switch (what) { 62 switch (what) {
61 case IUserService.SUCCESS: 63 case IUserService.SUCCESS:
62 //成功 64 //成功
@@ -103,10 +105,11 @@ public class QuickLoginActivity extends BaseActivity implements View.OnClickList @@ -103,10 +105,11 @@ public class QuickLoginActivity extends BaseActivity implements View.OnClickList
103 UserUtil.quickLogin(mobile.getText().toString(), code.getText().toString(), "", new Callback() { 105 UserUtil.quickLogin(mobile.getText().toString(), code.getText().toString(), "", new Callback() {
104 @Override 106 @Override
105 public void onState(int what, String extra, Object obj) { 107 public void onState(int what, String extra, Object obj) {
  108 + showToast(extra + " : " + obj.toString());
106 switch (what) { 109 switch (what) {
107 case IUserService.SUCCESS: 110 case IUserService.SUCCESS:
108 //成功 obj返回用户信息 111 //成功 obj返回用户信息
109 - userData = ((UserData)obj); 112 + userData = ((UserData) obj);
110 break; 113 break;
111 case IUserService.ERROR_PARAM: 114 case IUserService.ERROR_PARAM:
112 Log.e(QUICK_LOGIN, IUserService.message_error_param); 115 Log.e(QUICK_LOGIN, IUserService.message_error_param);
@@ -138,4 +141,9 @@ public class QuickLoginActivity extends BaseActivity implements View.OnClickList @@ -138,4 +141,9 @@ public class QuickLoginActivity extends BaseActivity implements View.OnClickList
138 break; 141 break;
139 } 142 }
140 } 143 }
  144 +
  145 + @Override
  146 + protected void showToast(String msg) {
  147 + super.showToast(msg);
  148 + }
141 } 149 }
app/src/main/java/com/cnlive/libs/RegisterActivity.java
@@ -58,6 +58,7 @@ public class RegisterActivity extends BaseActivity implements View.OnClickListen @@ -58,6 +58,7 @@ public class RegisterActivity extends BaseActivity implements View.OnClickListen
58 "invitationCode", "frmId", new Callback() { 58 "invitationCode", "frmId", new Callback() {
59 @Override 59 @Override
60 public void onState(int what, String extra, Object obj) { 60 public void onState(int what, String extra, Object obj) {
  61 + showToast(extra + " : " + obj.toString());
61 switch (what) { 62 switch (what) {
62 case IUserService.SUCCESS: 63 case IUserService.SUCCESS:
63 //成功 obj返回用户信息 64 //成功 obj返回用户信息
@@ -115,6 +116,7 @@ public class RegisterActivity extends BaseActivity implements View.OnClickListen @@ -115,6 +116,7 @@ public class RegisterActivity extends BaseActivity implements View.OnClickListen
115 UserUtil.sendMessage(IUserService.REGISTER_OR_MODIFY_MOBILE, userName.getText().toString(), new Callback() { 116 UserUtil.sendMessage(IUserService.REGISTER_OR_MODIFY_MOBILE, userName.getText().toString(), new Callback() {
116 @Override 117 @Override
117 public void onState(int what, String extra, Object object) { 118 public void onState(int what, String extra, Object object) {
  119 + showToast(extra + " : " + object.toString());
118 switch (what) { 120 switch (what) {
119 case IUserService.SUCCESS: 121 case IUserService.SUCCESS:
120 //成功 122 //成功
@@ -155,4 +157,9 @@ public class RegisterActivity extends BaseActivity implements View.OnClickListen @@ -155,4 +157,9 @@ public class RegisterActivity extends BaseActivity implements View.OnClickListen
155 break; 157 break;
156 } 158 }
157 } 159 }
  160 +
  161 + @Override
  162 + protected void showToast(String msg) {
  163 + super.showToast(msg);
  164 + }
158 } 165 }