更新用户jar包

王琳
1 parent f70fd7d3
Showing 7 changed files with 34 additions and 110 deletions
app/libs/libcnliveuser.jar
app/libs/libcnliveutil.jar
app/src/main/java/com/cnlive/libs/BaseActivity.java
app/src/main/java/com/cnlive/libs/LoginActivity.java
app/src/main/java/com/cnlive/libs/OtherActivity.java
app/src/main/java/com/cnlive/libs/QuickLoginActivity.java
app/src/main/java/com/cnlive/libs/RegisterActivity.java
@@ -24,7 +24,7 @@ public class BaseActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         //初始化用户SDK
-        cnLiveUser = new CNLiveUser(cnUserCallBack);
+        cnLiveUser = new CNLiveUser(cnUserCallBack, cnUserBuilder);
     }
     //通过CNUserUtilCallback处理SDK状态,通过what和extra可以获取错误码和错误信息
@@ -62,36 +62,22 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener 
                 break;
             case R.id.login:
                 //用户名&密码登录
-                cnLiveUser.initUser(setCNUserData());
+                cnUserBuilder.setUserName(String.valueOf(userName.getText()));//用户名
+                cnUserBuilder.setPwd(String.valueOf(userPassword.getText()));//密码
+//                cnUserBuilder.setFrmId("frmId");//渠道ID
                 cnLiveUser.login();
                 break;
             case R.id.third_party_login:
                 //第三方登陆
-                cnLiveUser.initUser(thirdPartyLoginData());
+                cnUserBuilder.setThirdPartyPlat(1);// 第三方平台编号 [platform ： 1:sina weibo 2:qq weibo 3:weixin 4:renren
+                cnUserBuilder.setThirdPartyId("id");//第三方用户ID
+                cnUserBuilder.setNickName("nickname");//用户昵称?重复
+//                cnUserBuilder.setGender("n");//性别，m：男、f：女、n：未知
+//                cnUserBuilder.setLocation("location");//用户所在地 非必传
+//                cnUserBuilder.setFaceUrl("faceUrl");//头像
+//                cnUserBuilder.setFrmId("frmId");//渠道ID
                 cnLiveUser.thirdPartyLogin();
                 break;
         }
     }
-
-    //下面注释掉的参数为非必传参数
-
-    protected CNUserBuilder.Builder setCNUserData() {
-        cnUserBuilder.setUuid("uuid");//设备ID
-        cnUserBuilder.setUserName(String.valueOf(userName.getText()));//用户名
-        cnUserBuilder.setPwd(String.valueOf(userPassword.getText()));//密码
-//        cnUserBuilder.setFrmId("frmId");//渠道ID
-        return cnUserBuilder;
-    }
-
-    private CNUserBuilder.Builder thirdPartyLoginData() {
-        cnUserBuilder.setThirdPartyPlat(1);// 第三方平台编号 [platform ： 1:sina weibo 2:qq weibo 3:weixin 4:renren
-        cnUserBuilder.setThirdPartyId("id");//第三方用户ID
-        cnUserBuilder.setNickName("nickname");//用户昵称?重复
-        cnUserBuilder.setUuid("uuid");//设备ID
-//        cnUserBuilder.setGender("n");//性别，m：男、f：女、n：未知
-//        cnUserBuilder.setLocation("location");//用户所在地 非必传
-//        cnUserBuilder.setFaceUrl("faceUrl");//头像
-//        cnUserBuilder.setFrmId("frmId");//渠道ID
-        return cnUserBuilder;
-    }
 }
@@ -61,83 +61,47 @@ public class OtherActivity extends BaseActivity implements View.OnClickListener 
     @Override
     public void onClick(View view) {
-        //cnLiveUser.initUser(**); 本方法是用来设置请求接口是要传入的参数
         switch (view.getId()) {
             case R.id.uploadface:
                 //上传头像
-                cnLiveUser.initUser(uploadFaceData());
+                cnUserBuilder.setSecret("33eb04e9ca7001e878eb8a57e2a1068d7b48c2909fc341");//app_secret
                 cnLiveUser.uploadFace(file);
                 break;
             case R.id.feedback:
                 //用户反馈
-                cnLiveUser.initUser(setCNUserData());
+                cnUserBuilder.setId("id");
+                cnUserBuilder.setMsg(feedbackMsg.getText().toString());
                 cnLiveUser.feedback();
                 break;
             case R.id.modify_mobile:
                 //更新手机号
-                cnLiveUser.initUser(modifyMobile());
+                cnUserBuilder.setMobile("18811122371");//手机号
+                cnUserBuilder.setVerificationCode("123456");//手机验证码
                 cnLiveUser.updateMobile();
                 break;
             case R.id.update_user_ext_info:
                 //更新用户附加信息
-                cnLiveUser.initUser(updateUserExtInfo());
+                cnUserBuilder.setExtInfo("sdjfoisdf");//扩展信息（格式自己组织）
                 cnLiveUser.updateUserExtInfo();
                 break;
             case R.id.query_user_info:
                 //查询用户信息
-                cnLiveUser.initUser(queryUserInfo());
+                cnUserBuilder.setSrcUid("1342671");//被查询用户ID
                 cnLiveUser.queryUserInfo();
                 break;
             case R.id.modify_user_info:
                 //更新用户单项信息
-                cnLiveUser.initUser(modifyUserInfo());
+                cnUserBuilder.setType("nickName");//nickName-昵称，gender-性别，email-邮箱, location-联系方式
+                cnUserBuilder.setValue("woaa");
                 cnLiveUser.modifyUserInfo();
                 break;
             case R.id.modify_pwd_through_mobile:
                 //通过手机号码修改密码
-                cnLiveUser.initUser(modifyPwdWithMobile());
+                cnUserBuilder.setMobile("18811122371");//手机号
+                cnUserBuilder.setVerificationCode("123456");//验证码
+                cnUserBuilder.setNewPwd("123456");//新密码
                 cnLiveUser.modifyPwdWithMob();
                 break;
         }
     }
-
-    protected CNUserBuilder.Builder setCNUserData() {
-        cnUserBuilder.setId("id");
-        cnUserBuilder.setMsg(feedbackMsg.getText().toString());
-        return cnUserBuilder;
-    }
-
-    protected CNUserBuilder.Builder uploadFaceData() {
-        cnUserBuilder.setSecret("33eb04e9ca7001e878eb8a57e2a1068d7b48c2909fc341");//app_secret
-        return cnUserBuilder;
-    }
-
-    private CNUserBuilder.Builder modifyMobile() {
-        cnUserBuilder.setMobile("18844444444");//手机号
-        cnUserBuilder.setVerificationCode("123456");//手机验证码
-        return cnUserBuilder;
-    }
-
-    private CNUserBuilder.Builder updateUserExtInfo() {
-        cnUserBuilder.setExtInfo("sdjfoisdf");//扩展信息（格式自己组织）
-        return cnUserBuilder;
-    }
-
-    private CNUserBuilder.Builder queryUserInfo() {
-        cnUserBuilder.setSrcUid("1342671");//被查询用户ID
-        return cnUserBuilder;
-    }
-
-    private CNUserBuilder.Builder modifyUserInfo() {
-        cnUserBuilder.setType("nickName");//nickName-昵称，gender-性别，email-邮箱, location-联系方式
-        cnUserBuilder.setValue("woa");
-        return cnUserBuilder;
-    }
-
-    private CNUserBuilder.Builder modifyPwdWithMobile() {
-        cnUserBuilder.setMobile("13811112222");//手机号
-        cnUserBuilder.setVerificationCode("123456");//验证码
-        cnUserBuilder.setNewPwd("123456");//新密码
-        return cnUserBuilder;
-    }
 }
@@ -39,8 +39,7 @@ public class QuickLoginActivity extends BaseActivity implements View.OnClickList
         switch (view.getId()) {
             case R.id.getNumber:
                 //快捷登录前发送手机验证码
-                cnLiveUser.initUser(setVerificationCode());
-
+                cnUserBuilder.setMobile(mobile.getText().toString());
                 /**
                  * 发送手机验证码需要传入一个type值用来区分发送的验证码是用来做什么的
                  * QUICK_LOGIN--->快捷登陆前发送手机验证码
@@ -50,24 +49,12 @@ public class QuickLoginActivity extends BaseActivity implements View.OnClickList
                 cnLiveUser.sendMessage(UserState.QUICK_LOGIN);
                 break;
             case R.id.quick_login:
-                cnLiveUser.initUser(setCNUserData());
+                cnUserBuilder.setUserName(String.valueOf(mobile.getText()));
+                cnUserBuilder.setVerificationCode(String.valueOf(code.getText()));
+//                cnUserBuilder.setUuid("uuid");
+//                cnUserBuilder.setFrmId("frmId");
                 cnLiveUser.quickLogin();
                 break;
         }
     }
-
-    //下面注释掉的参数为非必传参数
-
-    private CNUserBuilder.Builder setVerificationCode() {
-        cnUserBuilder.setMobile(mobile.getText().toString());
-        return cnUserBuilder;
-    }
-
-    protected CNUserBuilder.Builder setCNUserData() {
-        cnUserBuilder.setUserName(String.valueOf(mobile.getText()));
-        cnUserBuilder.setVerificationCode(String.valueOf(code.getText()));
-        cnUserBuilder.setUuid("uuid");
-//        cnUserBuilder.setFrmId("frmId");
-        return cnUserBuilder;
-    }
 }
@@ -39,31 +39,18 @@ public class RegisterActivity extends BaseActivity implements View.OnClickListen
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.register:
-                cnLiveUser.initUser(setCNUserData());
+                cnUserBuilder.setUserName(userName.getText().toString());//邮箱或手机
+                cnUserBuilder.setPwd(userPassword.getText().toString());//密码
+                cnUserBuilder.setVerificationCode(number.getText().toString());//手机验证码（手机号注册时必填）
+//                cnUserBuilder.setInvitationCode("invitationCode");//邀请码
+//                cnUserBuilder.setFrmId("frmId");//渠道ID
                 cnLiveUser.register();
                 break;
             case R.id.getNumber:
                 //使用手机号注册前发送手机验证码
-                cnLiveUser.initUser(setInvitationCode());
+                cnUserBuilder.setMobile(userName.getText().toString());
                 cnLiveUser.sendMessage(UserState.REGISTER_OR_MODIFY_MOBILE);
                 break;
         }
     }
-
-    //下面注释掉的参数为非必传参数
-
-    private CNUserBuilder.Builder setInvitationCode() {
-        cnUserBuilder.setMobile(userName.getText().toString());
-        return cnUserBuilder;
-    }
-
-    protected CNUserBuilder.Builder setCNUserData() {
-        cnUserBuilder.setUserName(userName.getText().toString());//邮箱或手机
-        cnUserBuilder.setPwd(userPassword.getText().toString());//密码
-        cnUserBuilder.setUuid("uuid");
-        cnUserBuilder.setVerificationCode(number.getText().toString());//手机验证码（手机号注册时必填）
-//        cnUserBuilder.setInvitationCode("invitationCode");//邀请码
-//        cnUserBuilder.setFrmId("frmId");//渠道ID
-        return cnUserBuilder;
-    }
 }