Skip to content

android / dayu

Go to a project
Commit 091d5fc0 by wukun
Options

1113

parent 725662a8
Inline Side-by-side
Showing with 343 additions and 15 deletions
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
......@@ -71,6 +71,7 @@ import com.dayu.utils.badgeNumberManger.BadgeNumberManager;
import com.dayu.widgets.BadgeView;
import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.RegisterDialog;
import com.dayu.widgets.RegisterErrorDialog;
import com.dayu.widgets.listener.onDownloadListener;
import com.google.gson.Gson;
import com.umeng.socialize.UMShareAPI;
......@@ -247,6 +248,18 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
dialog.show();
}
private void showRegisterErrorDialog() {
RegisterErrorDialog dialog = new RegisterErrorDialog(mActivity,mUserId);
dialog.setOnclickListener(new RegisterErrorDialog.onClickListener() {
@Override
public void onClick(View view) {
ARouter.getInstance().build(RouterPath.PATH_REGISTER).navigation();
dialog.dismiss();
}
});
dialog.show();
}
private void showInReviewDiaglog() {
CustomDialog dialog = new CustomDialog(mActivity, R.style.CustomDialog, "师傅好!\n我们正在认真审核您提交的注册信息，请稍等哦~\n加入大鱼师傅微信沟通群：\n",
(dialog1, confirm) -> {
......@@ -545,9 +558,11 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
if (detectSatus != 1) {
Api.getService(com.dayu.base.api.APIService.class).getDetectStatus(mUserId).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(integer -> {
if (integer == 2 || integer == 3) {
if (integer == 2 ) {
showCertificationDialog();
} else if (integer == 4) {
} else if(3 == integer){
showRegisterErrorDialog();
}else if (integer == 4) {
showInReviewDiaglog();
}
}));
......
baseSDK/src/main/java/com/dayu/base/api/APIService.java
......@@ -8,6 +8,7 @@ import com.dayu.base.api.protocol.BaseResponse;
import com.dayu.base.api.protocol.EngineerBean;
import com.dayu.base.api.protocol.OpenRedPacketBean;
import com.dayu.base.api.protocol.RedPacketBean;
import com.dayu.base.api.protocol.RegisterErrorBean;
import com.dayu.base.api.protocol.TrackId;
import com.dayu.base.api.protocol.TreeAddressBean;
import com.dayu.common.Constants;
......@@ -195,4 +196,9 @@ public interface APIService {
@GET(Constants.API_7100 + "/account/detectStatus/accountId/{accountId}")
Observable<BaseResponse<Integer>> getDetectStatus(@Path("accountId") int accountId);
/**
* 账号审核未通过,获取原因
*/
@GET(Constants.API_7100 + "/auditInfo/accountId/{accountId}")
Observable<BaseResponse<RegisterErrorBean>> getRegisterError(@Path("accountId") int accountId);
}
baseSDK/src/main/java/com/dayu/base/api/protocol/RegisterErrorBean.java 0 → 100644
package com.dayu.base.api.protocol;
public class RegisterErrorBean {
private String remark;
private String approverName;
private String createTime;
private String created;
private int id;
private int approverId;
private int status;
private int targetId;
private int auditType;
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
public String getApproverName() {
return approverName;
}
public void setApproverName(String approverName) {
this.approverName = approverName;
}
public String getCreateTime() {
return createTime;
}
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
public String getCreated() {
return created;
}
public void setCreated(String created) {
this.created = created;
}
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
}
public int getApproverId() {
return approverId;
}
public void setApproverId(int approverId) {
this.approverId = approverId;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
public int getTargetId() {
return targetId;
}
public void setTargetId(int targetId) {
this.targetId = targetId;
}
public int getAuditType() {
return auditType;
}
public void setAuditType(int auditType) {
this.auditType = auditType;
}
}
baseSDK/src/main/java/com/dayu/common/Constants.java
......@@ -88,7 +88,7 @@ public class Constants {
// public static String ENVIROMENT = "release";
// public static String PHOTO = "online";
// public static int LOG_LEVEL = LogUtils.LEVEL_OFF;
// public static String BASE_URL = "https://mobile.kf.ai";
// public static String BASE_URL = "https://mobile.serviceupup.com";
// public static String WEB_SOP = "https://sop.kf.ai/#/sop";
// public static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
// public static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
......
baseSDK/src/main/java/com/dayu/widgets/RegisterErrorDialog.java 0 → 100644
package com.dayu.widgets;
import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import com.dayu.base.api.APIService;
import com.dayu.base.api.Api;
import com.dayu.baselibrary.R;
/**
* Created by wuk
* on 2023/11/1.
*/
public class RegisterErrorDialog extends Dialog {
private onClickListener mListener;
private String mContent;
private int mUserId;
public RegisterErrorDialog(@NonNull Context context,int mUserId) {
super(context);
this.mUserId = mUserId;
}
public RegisterErrorDialog(@NonNull Context context, int themeResId, String content) {
super(context, themeResId);
mContent = content;
}
public RegisterErrorDialog(@NonNull Context context, String content) {
super(context);
mContent = content;
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.dialog_register_error);
setCanceledOnTouchOutside(false);
setCancelable(false);
initView();
}
public void initView() {
ImageView close = findViewById(R.id.iv_close);
TextView register = findViewById(R.id.register);
TextView tvContent = findViewById(R.id.tv_content);
close.setOnClickListener(view -> dismiss());
register.setOnClickListener(view -> {
if (mListener != null) {
mListener.onClick(view);
}
});
Api.getService(APIService.class).getRegisterError(mUserId).compose(Api.applySchedulers())
.subscribe(
registerErrorBean -> {
try {
tvContent.setText("师傅好!\n你提交的注册申请末通过审核\n原因是:"+registerErrorBean.getRemark()+"\n 请重新提交");
} catch (Exception e) {
e.printStackTrace();
}
}
);
}
public void setOnclickListener(onClickListener listener) {
mListener = listener;
}
public interface onClickListener {
void onClick(View view);
}
}
baseSDK/src/main/res/layout/dialog_register_error.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingStart="5dp"
android:paddingTop="5dp"
android:text="温馨提示"
android:textColor="@color/default_text_color"
android:textSize="20sp" />
<ImageView
android:id="@+id/iv_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_close" />
</LinearLayout>
<TextView
android:id="@+id/tv_content"
android:layout_width="270dp"
android:layout_height="wrap_content"
android:paddingTop="20dp"
android:layout_marginTop="@dimen/dp_3"
android:textSize="16sp"
android:textColor="@color/common_red"
android:gravity="center"/>
<TextView
android:id="@+id/register"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginStart="30dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="30dp"
android:layout_marginBottom="@dimen/dp_10"
android:background="@drawable/tab_blue_react"
android:gravity="center"
android:text="马上注册"
android:textColor="@color/white"
android:textSize="14sp" />
</LinearLayout>
\ No newline at end of file
build.gradle
......@@ -5,8 +5,8 @@ buildscript {
ext.build_tools_version = "29.0.2"
ext.min_sdk_version = 21
ext.target_sdk_version = 29
ext.version_code = 316
ext.verson_name = "3.1.6"
ext.version_code = 317
ext.verson_name = "3.1.7"
ext.gradle_version = '4.0.1'
ext.isReleaseMinify = false
ext.isDebugMinify = false
......
saleCenter/src/main/java/com/bigfish/salecenter/ui/fragment/SaleProductFragment.java
......@@ -39,6 +39,7 @@ import com.dayu.utils.CommonUtils;
import com.dayu.utils.UserManager;
import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.RegisterDialog;
import com.dayu.widgets.RegisterErrorDialog;
import com.dayu.widgets.WechatShareDialog;
import com.dayu.widgets.listener.OnItemClickListener;
import com.umeng.socialize.bean.SHARE_MEDIA;
......@@ -297,9 +298,11 @@ public class SaleProductFragment extends BaseFragment<SaleProductPresent, Fragme
if (detectSatus != 1) {
Api.getService(com.dayu.base.api.APIService.class).getDetectStatus(mUserId).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(integer -> {
if (integer == 2 || integer == 3) {
if (integer == 2) {
showCertificationDialog();
} else if (integer == 4) {
} else if (3 == integer){
showRegisterErrorDialog();
}else if (integer == 4) {
showInReviewDiaglog();
} else {
toDetail(item);
......@@ -323,6 +326,18 @@ public class SaleProductFragment extends BaseFragment<SaleProductPresent, Fragme
dialog.show();
}
private void showRegisterErrorDialog() {
RegisterErrorDialog dialog = new RegisterErrorDialog(mActivity,mUserId);
dialog.setOnclickListener(new RegisterErrorDialog.onClickListener() {
@Override
public void onClick(View view) {
ARouter.getInstance().build(RouterPath.PATH_REGISTER).navigation();
dialog.dismiss();
}
});
dialog.show();
}
private void showInReviewDiaglog() {
CustomDialog dialog = new CustomDialog(mActivity, R.style.CustomDialog, "师傅好!\n我们正在认真审核您提交的注册信息，请稍等哦~\n加入大鱼师傅微信沟通群：\n",
(dialog1, confirm) -> {
......
userCenter/src/main/java/com/dayu/usercenter/presenter/homeuser/HomeUserPresenter.java
......@@ -50,6 +50,13 @@ public class HomeUserPresenter extends HomeUserContract.Presenter {
getWechtData();
getBankInfo();
// getAddrInfo();
getaAuditInfo();
}
private void getaAuditInfo() {
}
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity/PersonInfoActivity.java
......@@ -20,6 +20,7 @@ import com.dayu.utils.MPermissionUtils;
import com.dayu.utils.UserManager;
import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.RegisterDialog;
import com.dayu.widgets.RegisterErrorDialog;
import com.luck.picture.lib.basic.PictureSelectionModel;
import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
......@@ -153,9 +154,11 @@ public class PersonInfoActivity extends BaseActivity<PersonInfoPresenter, Activi
if (detectSatus != 1) {
Api.getService(com.dayu.base.api.APIService.class).getDetectStatus(mUserId).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(integer -> {
if (integer == 2 || integer == 3) {
if (integer == 2) {
showCertificationDialog();
} else if (integer == 4) {
} else if (3 == integer){
showRegisterErrorDialog();
}else if (integer == 4) {
showInReviewDiaglog();
}
}));
......@@ -175,6 +178,18 @@ public class PersonInfoActivity extends BaseActivity<PersonInfoPresenter, Activi
dialog.show();
}
private void showRegisterErrorDialog() {
RegisterErrorDialog dialog = new RegisterErrorDialog(mActivity,mUserId);
dialog.setOnclickListener(new RegisterErrorDialog.onClickListener() {
@Override
public void onClick(View view) {
ARouter.getInstance().build(RouterPath.PATH_REGISTER).navigation();
dialog.dismiss();
}
});
dialog.show();
}
private void showInReviewDiaglog() {
CustomDialog dialog = new CustomDialog(mActivity, R.style.CustomDialog, "师傅好!\n我们正在认真审核您提交的注册信息，请稍等哦~\n加入大师傅微信沟通群：\n",
(dialog1, confirm) -> {
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/UserInfoActivity.java
......@@ -25,6 +25,7 @@ import com.dayu.utils.CommonUtils;
import com.dayu.utils.UserManager;
import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.RegisterDialog;
import com.dayu.widgets.RegisterErrorDialog;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
......@@ -155,9 +156,11 @@ public class UserInfoActivity extends BaseActivity<UserInfoPresenter, ActivityUs
if (detectSatus != 1) {
Api.getService(com.dayu.base.api.APIService.class).getDetectStatus(mUserId).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(integer -> {
if (integer == 2 || integer == 3) {
if (integer == 2) {
showCertificationDialog();
} else if (integer == 4) {
} else if (3 == integer){
showRegisterErrorDialog();
}else if (integer == 4) {
showInReviewDiaglog();
} else {
startActivity(EditBankActivity.class);
......@@ -181,6 +184,18 @@ public class UserInfoActivity extends BaseActivity<UserInfoPresenter, ActivityUs
dialog.show();
}
private void showRegisterErrorDialog() {
RegisterErrorDialog dialog = new RegisterErrorDialog(mActivity,mUserId);
dialog.setOnclickListener(new RegisterErrorDialog.onClickListener() {
@Override
public void onClick(View view) {
ARouter.getInstance().build(RouterPath.PATH_REGISTER).navigation();
dialog.dismiss();
}
});
dialog.show();
}
private void showInReviewDiaglog() {
CustomDialog dialog = new CustomDialog(mActivity, R.style.CustomDialog, "师傅好!\n我们正在认真审核您提交的注册信息，请稍等哦~\n加入大鱼师傅微信沟通群：\n",
(dialog1, confirm) -> {
......
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
......@@ -53,6 +53,7 @@ import com.dayu.utils.ToastUtils;
import com.dayu.utils.UserManager;
import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.RegisterDialog;
import com.dayu.widgets.RegisterErrorDialog;
import com.dayu.widgets.WechatShareDialog;
import com.dayu.widgets.WheelDialog;
import com.umeng.socialize.bean.SHARE_MEDIA;
......@@ -489,9 +490,11 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
if (detectSatus != 1) {
Api.getService(com.dayu.base.api.APIService.class).getDetectStatus(mUserId).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(integer -> {
if (integer == 2 || integer == 3) {
if (integer == 2) {
showCertificationDialog();
} else if (integer == 4) {
}else if (integer == 3){
showRegisterErrorDialog();
}else if (integer == 4) {
showInReviewDiaglog();
} else {
goOn();
......@@ -516,6 +519,18 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
mActivity.startActivity(intent, bundle);
}
private void showRegisterErrorDialog() {
RegisterErrorDialog dialog = new RegisterErrorDialog(mActivity,mUserId);
dialog.setOnclickListener(new RegisterErrorDialog.onClickListener() {
@Override
public void onClick(View view) {
ARouter.getInstance().build(RouterPath.PATH_REGISTER).navigation();
dialog.dismiss();
}
});
dialog.show();
}
//提示去认证身份
private void showCertificationDialog() {
RegisterDialog dialog = new RegisterDialog(mActivity);
......
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/UserLicenceFragment.java
......@@ -19,6 +19,7 @@ import com.dayu.usercenter.ui.activity.CommeWebViewActivity;
import com.dayu.utils.UserManager;
import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.RegisterDialog;
import com.dayu.widgets.RegisterErrorDialog;
/**
* Created by mReturn
......@@ -71,9 +72,11 @@ public class UserLicenceFragment extends BaseFragment<UserLicencePresent, Fragme
if (detectSatus != 1) {
Api.getService(com.dayu.base.api.APIService.class).getDetectStatus(mUserId).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(integer -> {
if (integer == 2 || integer == 3) {
if (integer == 2 ) {
showCertificationDialog();
} else if (integer == 4) {
} else if (3 == integer){
showRegisterErrorDialog();
}else if (integer == 4) {
showInReviewDiaglog();
} else {
dumpDetail(item);
......@@ -106,6 +109,18 @@ public class UserLicenceFragment extends BaseFragment<UserLicencePresent, Fragme
dialog.show();
}
private void showRegisterErrorDialog() {
RegisterErrorDialog dialog = new RegisterErrorDialog(mActivity,mUserId);
dialog.setOnclickListener(new RegisterErrorDialog.onClickListener() {
@Override
public void onClick(View view) {
ARouter.getInstance().build(RouterPath.PATH_REGISTER).navigation();
dialog.dismiss();
}
});
dialog.show();
}
private void showInReviewDiaglog() {
CustomDialog dialog = new CustomDialog(mActivity, R.style.CustomDialog, "师傅好!\n我们正在认真审核您提交的注册信息，请稍等哦~\n加入大鱼师傅微信沟通群：\n",
(dialog1, confirm) -> {
......
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