CNLive Android Team / CNUserDemo · Commits

Commit 7f4f05e6901b8474db560c8bfcfed83cef231da9

Authored by 王琳
1 parent f70fd7d3

更新用户jar包

Inline Side-by-side
Showing 7 changed files with 34 additions and 110 deletions
app/libs/libcnliveuser.jar
View file @7f4f05e
No preview for this file type
app/libs/libcnliveutil.jar
View file @7f4f05e
No preview for this file type
app/src/main/java/com/cnlive/libs/BaseActivity.java
  View file @7f4f05e
... ... @@ -24,7 +24,7 @@ public class BaseActivity extends AppCompatActivity {
24 24 protected void onCreate(Bundle savedInstanceState) {
25 25 super.onCreate(savedInstanceState);
26 26 //初始化用户SDK
27   - cnLiveUser = new CNLiveUser(cnUserCallBack);
  27 + cnLiveUser = new CNLiveUser(cnUserCallBack, cnUserBuilder);
28 28 }
29 29  
30 30 //通过CNUserUtilCallback处理SDK状态,通过what和extra可以获取错误码和错误信息
... ...
app/src/main/java/com/cnlive/libs/LoginActivity.java
  View file @7f4f05e
... ... @@ -62,36 +62,22 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
62 62 break;
63 63 case R.id.login:
64 64 //用户名&密码登录
65   - cnLiveUser.initUser(setCNUserData());
  65 + cnUserBuilder.setUserName(String.valueOf(userName.getText()));//用户名
  66 + cnUserBuilder.setPwd(String.valueOf(userPassword.getText()));//密码
  67 +// cnUserBuilder.setFrmId("frmId");//渠道ID
66 68 cnLiveUser.login();
67 69 break;
68 70 case R.id.third_party_login:
69 71 //第三方登陆
70   - cnLiveUser.initUser(thirdPartyLoginData());
  72 + cnUserBuilder.setThirdPartyPlat(1);// 第三方平台编号 [platform ： 1:sina weibo 2:qq weibo 3:weixin 4:renren
  73 + cnUserBuilder.setThirdPartyId("id");//第三方用户ID
  74 + cnUserBuilder.setNickName("nickname");//用户昵称?重复
  75 +// cnUserBuilder.setGender("n");//性别，m：男、f：女、n：未知
  76 +// cnUserBuilder.setLocation("location");//用户所在地 非必传
  77 +// cnUserBuilder.setFaceUrl("faceUrl");//头像
  78 +// cnUserBuilder.setFrmId("frmId");//渠道ID
71 79 cnLiveUser.thirdPartyLogin();
72 80 break;
73 81 }
74 82 }
75   -
76   - //下面注释掉的参数为非必传参数
77   -
78   - protected CNUserBuilder.Builder setCNUserData() {
79   - cnUserBuilder.setUuid("uuid");//设备ID
80   - cnUserBuilder.setUserName(String.valueOf(userName.getText()));//用户名
81   - cnUserBuilder.setPwd(String.valueOf(userPassword.getText()));//密码
82   -// cnUserBuilder.setFrmId("frmId");//渠道ID
83   - return cnUserBuilder;
84   - }
85   -
86   - private CNUserBuilder.Builder thirdPartyLoginData() {
87   - cnUserBuilder.setThirdPartyPlat(1);// 第三方平台编号 [platform ： 1:sina weibo 2:qq weibo 3:weixin 4:renren
88   - cnUserBuilder.setThirdPartyId("id");//第三方用户ID
89   - cnUserBuilder.setNickName("nickname");//用户昵称?重复
90   - cnUserBuilder.setUuid("uuid");//设备ID
91   -// cnUserBuilder.setGender("n");//性别，m：男、f：女、n：未知
92   -// cnUserBuilder.setLocation("location");//用户所在地 非必传
93   -// cnUserBuilder.setFaceUrl("faceUrl");//头像
94   -// cnUserBuilder.setFrmId("frmId");//渠道ID
95   - return cnUserBuilder;
96   - }
97 83 }
... ...
app/src/main/java/com/cnlive/libs/OtherActivity.java
  View file @7f4f05e
... ... @@ -61,83 +61,47 @@ public class OtherActivity extends BaseActivity implements View.OnClickListener
61 61  
62 62 @Override
63 63 public void onClick(View view) {
64   - //cnLiveUser.initUser(**); 本方法是用来设置请求接口是要传入的参数
65 64 switch (view.getId()) {
66 65 case R.id.uploadface:
67 66 //上传头像
68   - cnLiveUser.initUser(uploadFaceData());
  67 + cnUserBuilder.setSecret("33eb04e9ca7001e878eb8a57e2a1068d7b48c2909fc341");//app_secret
69 68 cnLiveUser.uploadFace(file);
70 69 break;
71 70 case R.id.feedback:
72 71 //用户反馈
73   - cnLiveUser.initUser(setCNUserData());
  72 + cnUserBuilder.setId("id");
  73 + cnUserBuilder.setMsg(feedbackMsg.getText().toString());
74 74 cnLiveUser.feedback();
75 75 break;
76 76 case R.id.modify_mobile:
77 77 //更新手机号
78   - cnLiveUser.initUser(modifyMobile());
  78 + cnUserBuilder.setMobile("18811122371");//手机号
  79 + cnUserBuilder.setVerificationCode("123456");//手机验证码
79 80 cnLiveUser.updateMobile();
80 81 break;
81 82 case R.id.update_user_ext_info:
82 83 //更新用户附加信息
83   - cnLiveUser.initUser(updateUserExtInfo());
  84 + cnUserBuilder.setExtInfo("sdjfoisdf");//扩展信息（格式自己组织）
84 85 cnLiveUser.updateUserExtInfo();
85 86 break;
86 87 case R.id.query_user_info:
87 88 //查询用户信息
88   - cnLiveUser.initUser(queryUserInfo());
  89 + cnUserBuilder.setSrcUid("1342671");//被查询用户ID
89 90 cnLiveUser.queryUserInfo();
90 91 break;
91 92 case R.id.modify_user_info:
92 93 //更新用户单项信息
93   - cnLiveUser.initUser(modifyUserInfo());
  94 + cnUserBuilder.setType("nickName");//nickName-昵称，gender-性别，email-邮箱, location-联系方式
  95 + cnUserBuilder.setValue("woaa");
94 96 cnLiveUser.modifyUserInfo();
95 97 break;
96 98 case R.id.modify_pwd_through_mobile:
97 99 //通过手机号码修改密码
98   - cnLiveUser.initUser(modifyPwdWithMobile());
  100 + cnUserBuilder.setMobile("18811122371");//手机号
  101 + cnUserBuilder.setVerificationCode("123456");//验证码
  102 + cnUserBuilder.setNewPwd("123456");//新密码
99 103 cnLiveUser.modifyPwdWithMob();
100 104 break;
101 105 }
102 106 }
103   -
104   - protected CNUserBuilder.Builder setCNUserData() {
105   - cnUserBuilder.setId("id");
106   - cnUserBuilder.setMsg(feedbackMsg.getText().toString());
107   - return cnUserBuilder;
108   - }
109   -
110   - protected CNUserBuilder.Builder uploadFaceData() {
111   - cnUserBuilder.setSecret("33eb04e9ca7001e878eb8a57e2a1068d7b48c2909fc341");//app_secret
112   - return cnUserBuilder;
113   - }
114   -
115   - private CNUserBuilder.Builder modifyMobile() {
116   - cnUserBuilder.setMobile("18844444444");//手机号
117   - cnUserBuilder.setVerificationCode("123456");//手机验证码
118   - return cnUserBuilder;
119   - }
120   -
121   - private CNUserBuilder.Builder updateUserExtInfo() {
122   - cnUserBuilder.setExtInfo("sdjfoisdf");//扩展信息（格式自己组织）
123   - return cnUserBuilder;
124   - }
125   -
126   - private CNUserBuilder.Builder queryUserInfo() {
127   - cnUserBuilder.setSrcUid("1342671");//被查询用户ID
128   - return cnUserBuilder;
129   - }
130   -
131   - private CNUserBuilder.Builder modifyUserInfo() {
132   - cnUserBuilder.setType("nickName");//nickName-昵称，gender-性别，email-邮箱, location-联系方式
133   - cnUserBuilder.setValue("woa");
134   - return cnUserBuilder;
135   - }
136   -
137   - private CNUserBuilder.Builder modifyPwdWithMobile() {
138   - cnUserBuilder.setMobile("13811112222");//手机号
139   - cnUserBuilder.setVerificationCode("123456");//验证码
140   - cnUserBuilder.setNewPwd("123456");//新密码
141   - return cnUserBuilder;
142   - }
143 107 }
... ...
app/src/main/java/com/cnlive/libs/QuickLoginActivity.java
  View file @7f4f05e
... ... @@ -39,8 +39,7 @@ public class QuickLoginActivity extends BaseActivity implements View.OnClickList
39 39 switch (view.getId()) {
40 40 case R.id.getNumber:
41 41 //快捷登录前发送手机验证码
42   - cnLiveUser.initUser(setVerificationCode());
43   -
  42 + cnUserBuilder.setMobile(mobile.getText().toString());
44 43 /**
45 44 * 发送手机验证码需要传入一个type值用来区分发送的验证码是用来做什么的
46 45 * QUICK_LOGIN--->快捷登陆前发送手机验证码
... ... @@ -50,24 +49,12 @@ public class QuickLoginActivity extends BaseActivity implements View.OnClickList
50 49 cnLiveUser.sendMessage(UserState.QUICK_LOGIN);
51 50 break;
52 51 case R.id.quick_login:
53   - cnLiveUser.initUser(setCNUserData());
  52 + cnUserBuilder.setUserName(String.valueOf(mobile.getText()));
  53 + cnUserBuilder.setVerificationCode(String.valueOf(code.getText()));
  54 +// cnUserBuilder.setUuid("uuid");
  55 +// cnUserBuilder.setFrmId("frmId");
54 56 cnLiveUser.quickLogin();
55 57 break;
56 58 }
57 59 }
58   -
59   - //下面注释掉的参数为非必传参数
60   -
61   - private CNUserBuilder.Builder setVerificationCode() {
62   - cnUserBuilder.setMobile(mobile.getText().toString());
63   - return cnUserBuilder;
64   - }
65   -
66   - protected CNUserBuilder.Builder setCNUserData() {
67   - cnUserBuilder.setUserName(String.valueOf(mobile.getText()));
68   - cnUserBuilder.setVerificationCode(String.valueOf(code.getText()));
69   - cnUserBuilder.setUuid("uuid");
70   -// cnUserBuilder.setFrmId("frmId");
71   - return cnUserBuilder;
72   - }
73 60 }
... ...
app/src/main/java/com/cnlive/libs/RegisterActivity.java
  View file @7f4f05e
... ... @@ -39,31 +39,18 @@ public class RegisterActivity extends BaseActivity implements View.OnClickListen
39 39 public void onClick(View view) {
40 40 switch (view.getId()) {
41 41 case R.id.register:
42   - cnLiveUser.initUser(setCNUserData());
  42 + cnUserBuilder.setUserName(userName.getText().toString());//邮箱或手机
  43 + cnUserBuilder.setPwd(userPassword.getText().toString());//密码
  44 + cnUserBuilder.setVerificationCode(number.getText().toString());//手机验证码（手机号注册时必填）
  45 +// cnUserBuilder.setInvitationCode("invitationCode");//邀请码
  46 +// cnUserBuilder.setFrmId("frmId");//渠道ID
43 47 cnLiveUser.register();
44 48 break;
45 49 case R.id.getNumber:
46 50 //使用手机号注册前发送手机验证码
47   - cnLiveUser.initUser(setInvitationCode());
  51 + cnUserBuilder.setMobile(userName.getText().toString());
48 52 cnLiveUser.sendMessage(UserState.REGISTER_OR_MODIFY_MOBILE);
49 53 break;
50 54 }
51 55 }
52   -
53   - //下面注释掉的参数为非必传参数
54   -
55   - private CNUserBuilder.Builder setInvitationCode() {
56   - cnUserBuilder.setMobile(userName.getText().toString());
57   - return cnUserBuilder;
58   - }
59   -
60   - protected CNUserBuilder.Builder setCNUserData() {
61   - cnUserBuilder.setUserName(userName.getText().toString());//邮箱或手机
62   - cnUserBuilder.setPwd(userPassword.getText().toString());//密码
63   - cnUserBuilder.setUuid("uuid");
64   - cnUserBuilder.setVerificationCode(number.getText().toString());//手机验证码（手机号注册时必填）
65   -// cnUserBuilder.setInvitationCode("invitationCode");//邀请码
66   -// cnUserBuilder.setFrmId("frmId");//渠道ID
67   - return cnUserBuilder;
68   - }
69 56 }
... ...