Skip to content

android / dayu

Go to a project
Commit b48aad92 by mReturn
Options

修改昵称

parent c4b587ef
Inline Side-by-side
Showing with 242 additions and 28 deletions
baseSDK/src/main/java/com/dayu/common/Constants.java
......@@ -42,35 +42,35 @@ public class Constants {
/**
* dev环境配置.
*/
public static String ENVIROMENT = "debug";
public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
public static String BASE_URL = "http://47.94.101.239:3112";
public static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
public static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
public static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
public static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
public static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=dev/video";
public static final boolean IS_DEBUG = true;
public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
// public static String ENVIROMENT = "debug";
// public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
// public static String BASE_URL = "http://47.94.101.239:3112";
// public static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
// public static String CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
// public static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
// public static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
// public static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
// public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
// public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=dev/video";
// public static final boolean IS_DEBUG = true;
// public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
/**
* uat测试环境配置.
*/
// public static String ENVIROMENT = "uat";
// public static int LOG_LEVEL = LogUtils.LEVEL_ALL;
// public static String BASE_URL = "http://47.95.223.6:3112";
// public static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
// public static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
// public static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
// public static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
// public static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
// public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
// public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=test/video";
// public static final boolean IS_DEBUG = false;
// public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
public static String ENVIROMENT = "uat";
public static int LOG_LEVEL = LogUtils.LEVEL_ALL;
public static String BASE_URL = "http://47.95.223.6:3112";
public static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
public static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
public static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
public static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
public static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
public static final String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
public static final String UP_VIDEO = "/file/uploadVideoOne?targetPath=test/video";
public static final boolean IS_DEBUG = false;
public static String VIDEO_SHARE_URL = "http://uat.kf.ai:9099/#/shareVideo?type=_type&id="; //uat 学习视频分享链接 type(课程: course 直播: live)
......
baseSDK/src/main/java/com/dayu/event/UserInfo.java
......@@ -36,6 +36,15 @@ public class UserInfo {
private int detectStatus;
private List<Integer> roles;
private String mobile;
private String nickName;
public String getNickName() {
return nickName;
}
public void setNickName(String nickName) {
this.nickName = nickName;
}
private int liveStatus; //1.开启主播权限
private int ianmaiStatus; //1.开启连麦权限
......
baseSDK/src/main/res/values/strings.xml
......@@ -1026,6 +1026,10 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸­äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ
<string name="moment_permission_4">应用需要录音权限来拍摄视频</string>
<string name="request_permission_failure">获取权限失败</string>
<string name="copy_success">复制成功</string>
<string name="edit_nick">修改昵称</string>
<string name="nick_">昵称：</string>
<string name="pls_input_nick">请输入昵称</string>
<string name="edit_success">修改成功</string>
</resources>
......
build.gradle
......@@ -5,8 +5,8 @@ buildscript {
ext.build_tools_version = "27.0.3"
ext.min_sdk_version = 17
ext.target_sdk_version = 26
ext.version_code = 261
ext.verson_name = "2.6.1"
ext.version_code = 262
ext.verson_name = "2.6.2"
ext.gradle_version = '3.1.4'
ext.isReleaseMinify = false
ext.isDebugMinify = false
......
userCenter/src/main/java/com/dayu/usercenter/api/UserService2.java
......@@ -7,6 +7,7 @@ import com.dayu.common.Constants;
import com.dayu.usercenter.model.AddUserCardData;
import com.dayu.usercenter.model.ApplyLicenceData;
import com.dayu.usercenter.model.ApplyWithdrawData;
import com.dayu.usercenter.model.ChangeNickData;
import com.dayu.usercenter.model.EditBankData;
import com.dayu.usercenter.model.SaveSceneData;
import com.dayu.usercenter.model.bean.BusinessSceneBean;
......@@ -278,6 +279,13 @@ public interface UserService2 {
Observable<BaseResponse<Boolean>> appplyWithdraw(@Body ApplyWithdrawData data);
/**
* 申请提现
*/
@PUT(Constants.API_7100+"/accountExt/modifyAccountExt")
Observable<BaseResponse<Boolean>> changeNick(@Body ChangeNickData data);
@GET("/api-third/WXUser/getWxQrCode")
......
userCenter/src/main/java/com/dayu/usercenter/data/protocol/EngineerInfo.java
......@@ -36,6 +36,16 @@ public class EngineerInfo extends BaseObservable implements Serializable {
private String invitationCode;
private int liveStatus;
private int lianmaiStatus;
private String nickName;
public String getNickName() {
return nickName;
}
public void setNickName(String nickName) {
this.nickName = nickName;
}
public int getLianmaiStatus() {
return lianmaiStatus;
......
userCenter/src/main/java/com/dayu/usercenter/event/ChangeNickEvent.java 0 → 100644
package com.dayu.usercenter.event;
public class ChangeNickEvent {
}
userCenter/src/main/java/com/dayu/usercenter/model/ChangeNickData.java 0 → 100644
package com.dayu.usercenter.model;
public class ChangeNickData {
public int accountId;
public String nickName;
public ChangeNickData() {
}
public ChangeNickData(int accountId, String nickName) {
this.accountId = accountId;
this.nickName = nickName;
}
}
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/EditNickActivity.java 0 → 100644
package com.dayu.usercenter.ui.activity2;
import android.text.TextUtils;
import com.dayu.base.api.Api;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.base.ui.presenter.SImplePresenter;
import com.dayu.usercenter.R;
import com.dayu.usercenter.api.UserService2;
import com.dayu.usercenter.databinding.ActivityEditNickBinding;
import com.dayu.usercenter.event.ChangeNickEvent;
import com.dayu.usercenter.model.ChangeNickData;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UserManager;
import com.dayu.utils.UtilsUserAccountMatcher;
import org.greenrobot.eventbus.EventBus;
public class EditNickActivity extends BaseActivity<SImplePresenter,ActivityEditNickBinding> {
@Override
public void setPresenter() {
}
@Override
public int getLayoutId() {
return R.layout.activity_edit_nick;
}
@Override
public void initView() {
initUser();
mBind.titleBack.setOnClickListener(view -> dumpBack());
mBind.tvSubmit.setOnClickListener(view -> changeNick());
mBind.edtNick.setText(mUserInfo.getNickName());
}
private void changeNick() {
String nickName = mBind.edtNick.getText().toString();
if (TextUtils.isEmpty(nickName.trim())){
showToast(R.string.pls_input_nick);
return;
}
if (UtilsUserAccountMatcher.containsEmoji(nickName)) {
ToastUtils.showShortToast(R.string.no_emoij);
return;
}
showDialog();
ChangeNickData data = new ChangeNickData(mUserId,nickName);
Api.getService(UserService2.class).changeNick(data).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(success->{
if (success){
showToast(R.string.edit_success);
mUserInfo.setNickName(nickName);
UserManager.getInstance().saveUser(mUserInfo);
EventBus.getDefault().post(new ChangeNickEvent());
finish();
}
}));
}
}
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/ShareUserCardActivity.java
......@@ -5,6 +5,7 @@ import android.annotation.SuppressLint;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.text.TextUtils;
import com.badoo.mobile.util.WeakHandler;
import com.dayu.base.api.Api;
......@@ -51,7 +52,8 @@ public class ShareUserCardActivity extends BaseActivity<SImplePresenter, Activit
@Override
public void initView() {
initUser();
mBind.tvName.setText("我是"+mUserInfo.getAccountName()+",很高兴为您服务!");
String name = TextUtils.isEmpty(mUserInfo.getNickName())?mUserInfo.getAccountName():mUserInfo.getNickName();
mBind.tvName.setText("我是"+name+",很高兴为您服务!");
GlideImageLoader.load(this, mBind.ivAvatar, mUserInfo.getHeaderImg(), R.drawable.user);
mBind.titleBack.setOnClickListener(v -> finish());
......
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
......@@ -21,6 +21,7 @@ import com.dayu.usercenter.data.protocol.EngineerInfo;
import com.dayu.usercenter.data.protocol.OrderRecord;
import com.dayu.usercenter.data.protocol.TodayAchievement;
import com.dayu.usercenter.databinding.FragmentHomeUserBinding;
import com.dayu.usercenter.event.ChangeNickEvent;
import com.dayu.usercenter.event.EditAddressEvent;
import com.dayu.usercenter.event.EditBankEvent;
import com.dayu.usercenter.event.RefreshUserInfoEvent;
......@@ -34,6 +35,7 @@ import com.dayu.usercenter.presenter.homeuser.HomeUserPresenter;
import com.dayu.usercenter.ui.activity.PersonInfoActivity;
import com.dayu.usercenter.ui.activity2.CommonRecordActivity;
import com.dayu.usercenter.ui.activity2.EditBankActivity;
import com.dayu.usercenter.ui.activity2.EditNickActivity;
import com.dayu.usercenter.ui.activity2.ShareUserCardActivity;
import com.dayu.usercenter.ui.activity2.UserInfoActivity;
import com.dayu.utils.CommonUtils;
......@@ -84,6 +86,7 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
mBind.refreshLayout.setOnRefreshListener(refreshLayout -> mPresenter.getAllData(mUserId));
mBind.tvStartLive.setOnClickListener(view -> ARouter.getInstance().build(RouterPath.PATH_PREPARELIVE).navigation());
mBind.tvSendCard.setOnClickListener(view -> sendUserCard());
mBind.ivEditNick.setOnClickListener(view -> startActivity(EditNickActivity.class));
mBind.tvFetch.setOnClickListener(view ->{
if (canWithdrawMoney > 0){
applyWithdraw();
......@@ -172,6 +175,7 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
@Override
public void getPersonalInfoSuccess(EngineerInfo info) {
// mBind.tvStartLive.setVisibility(View.VISIBLE);
setUserNick(info.getNickName());
mBind.tvStartLive.setVisibility(info.getLiveStatus() == 1 ? View.VISIBLE : View.GONE);
if (TextUtils.isEmpty(info.getIdentity())) {
SPUtils.put("USER_IDENTITY", "");
......@@ -208,9 +212,11 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
UserInfo userInfo = UserManager.getInstance().getUser();
if (userInfo != null) {
userInfo.setHeaderImg(info.getAccountUrl());
userInfo.setNickName(info.getNickName());
userInfo.setLiveStatus(info.getLiveStatus());
userInfo.setLiveStatus(info.getLianmaiStatus());
UserManager.getInstance().saveUser(userInfo);
}
}
......@@ -317,8 +323,9 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
WechatShareDialog.getInstance().showBottomDialog(mActivity, pos -> {
if (pos == 0){
String name = TextUtils.isEmpty(mUserInfo.getNickName())?mUserInfo.getAccountName():mUserInfo.getNickName();
String path = Constants.USER_PROGRAM_PATH+mUserId;
String title = "我是"+mUserInfo.getAccountName()+",很高兴为您服务!";
String title = "我是"+name+",很高兴为您服务!";
CommonUtils.shareProgramPath(mActivity, mUserInfo.getHeaderImg(), title, "",path, SHARE_MEDIA.WEIXIN, null);
AddUserCardData data = new AddUserCardData(mUserId,"微信");
Api.getService(UserService2.class).addSendUserRecord(data).compose(Api.applySchedulers()).subscribe();
......@@ -417,4 +424,14 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
public void afterEditAddr(EditAddressEvent event) {
mPresenter.getAddrInfo();
}
@Subscribe
public void afterChangeNick(ChangeNickEvent event) {
initUser();
setUserNick(mUserInfo.getNickName());
}
private void setUserNick(String nickName) {
if (!TextUtils.isEmpty(nickName))
mBind.tvNick.setText("("+nickName+")");
}
}
userCenter/src/main/release/AndroidManifest.xml
......@@ -107,6 +107,9 @@
<activity
android:name=".ui.activity2.TestRecordActivity"
android:screenOrientation="portrait" />
<activity
android:name=".ui.activity2.EditNickActivity"
android:screenOrientation="portrait" />
</application>
</manifest>
userCenter/src/main/res/layout/activity_edit_nick.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/cl_home_listview_bg"
android:orientation="vertical"
android:visibility="visible">
<RelativeLayout
android:id="@+id/title_idea"
style="@style/title">
<TextView
android:id="@+id/text_idea"
style="@style/text_title"
android:text="@string/edit_nick" />
<ImageView
android:id="@+id/title_back"
style="@style/title_image_back" />
<ImageView
style="@style/card_line"
android:layout_alignParentBottom="true" />
</RelativeLayout>
</RelativeLayout>
<LinearLayout style="@style/ll_user_edit">
<TextView
style="@style/tv_user_edit"
android:text="@string/nick_" />
<EditText
android:id="@+id/edt_nick"
style="@style/edt_user_edit"
android:maxLength="20"
/>
</LinearLayout>
<View
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1" />
<TextView
android:id="@+id/tv_submit"
style="@style/btn_bottom_common"
android:layout_margin="20dp"
android:text="@string/submit" />
</LinearLayout>
</layout>
userCenter/src/main/res/layout/fragment_home_user.xml
......@@ -124,6 +124,28 @@
android:textColor="@color/cl_home_title_text_color"
android:textSize="14.7sp"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_nick"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="3dp"
android:layout_toRightOf="@id/tv_name"
android:layout_alignBaseline="@id/tv_name"
android:textColor="#666"
android:textSize="12sp"
android:layout_marginRight="40dp"
android:singleLine="true"
android:ellipsize="end"
/>
<ImageView
android:id="@+id/iv_edit_nick"
android:layout_width="25dp"
android:layout_height="25dp"
android:src="@drawable/ic_eidt_gray"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:layout_marginTop="10dp"
/>
<ImageView
android:id="@+id/iv_audited"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment