Commit 4ac0d0f5 authored by 小费同学阿's avatar 小费同学阿 💬

基础搭建

功能开发
1:bug 修复 企业端修复直接进入隐私条款点击无效问题
parent 8d22322c
......@@ -15,6 +15,7 @@ import com.xx.hbhbcompany.data.staticdata.StaticData;
import com.xx.xxviewlibrary.model.VersionBean;
import com.xx.xxviewlibrary.model.VersionBody;
import java.util.Arrays;
import java.util.List;
import io.reactivex.rxjava3.core.Observable;
......@@ -35,6 +36,17 @@ public class HomeRequest extends BaseRespons {
);
}
/**
* 隐私政策
* */
public Observable<BaseResponse<List<String>>> getProtocols() {
// 假设ApiParams和ApiService已经被正确设置和实现
return getApiService().getProtocols(new ApiParams<>().setParams(Arrays.asList("1",
"2",
"3",
"4",
"5")));
}
/**
* 登陆入参
* userType : 10 系统用户,01 企业用户,02商户用户,13消费者用户
......
......@@ -72,6 +72,8 @@ public class HomeActivity extends BaseActivity<ActivityHomeBinding,HomeViewModel
Interceptor_TOKEN = token;
viewModel.getLogin(username,password);
// 获取协议
viewModel.getProtocols();
}else {
Log.v("账号密码为空跳转登录页","");
startActivity(LoginActivity.class);
......
......@@ -11,6 +11,7 @@ import android.content.SharedPreferences;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.text.Html;
import android.util.Log;
import android.view.View;
......@@ -47,6 +48,7 @@ import com.xx.hbhbcompany.ui.pwd.PwdActivity;
import com.xx.hbhbcompany.ui.pwd.SetPwdActivity;
import com.xx.hbhbcompany.ui.recruitment.RecruitmentActivity;
import com.xx.hbhbcompany.ui.scan.ScanActivity;
import com.xx.hbhbcompany.utils.RetrofitClient;
import com.xx.xxviewlibrary.comm.CommTextDialog;
import com.xx.xxviewlibrary.comm.RefuseDialogBean;
import com.xx.xxviewlibrary.model.VersionBean;
......@@ -72,6 +74,8 @@ public class HomeViewModel extends ListBaseViewModel<HomeRequest> {
RxPermissions rxPermissions;
public MutableLiveData<String> openInstall = new MutableLiveData<>("");
/*首页-资讯信息列表*/
/*隐私条款字段*/
public MutableLiveData<String> agreeContent = new MutableLiveData<>(null);
//获取适配器上下文
ConsultationInformationAdapter consultationInformationAdapter;
//获取适配器上下文
......@@ -234,7 +238,39 @@ public class HomeViewModel extends ListBaseViewModel<HomeRequest> {
});
}
/**
* 获取协议内容
*/
public void getProtocols() {
model.getProtocols().compose(RxUtils.schedulersTransformer()) //线程调度
// .compose(RxUtils.exceptionTransformer()) // 网络错误的异常转换, 这里可以换成自己的ExceptionHandle
.doOnSubscribe(HomeViewModel.this)
.doOnSubscribe(new Consumer<Disposable>() {
@Override
public void accept(Disposable disposable) throws Exception {
}
}).subscribe(new ApiDisposableObserver<List<String>>() {
@Override
public void onSuccess(List<String> resultBean) {
StaticData.Protocols = resultBean;
if (StaticData.Protocols.size() >= 3) {
Bundle bundle = new Bundle();
bundle.putString("title", "隐私条款");
bundle.putString("URL", RetrofitClient.baseH5Url + StaticData.Protocols.get(2));
CharSequence htmlText = Html.fromHtml(bundle.toString());
/*为隐私条款赋值*/
agreeContent.setValue(htmlText.toString());
}
}
@Override
public void onError(String Error) {
}
});
}
/**
* 获取用户信息
*/
......
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 to comment