Commit 8d22322c authored by 小费同学阿's avatar 小费同学阿 💬

基础搭建

功能开发
1:bug 修复 客商端者端修复直接进入隐私条款点击无效问题
parent 7b2784d8
...@@ -7,11 +7,15 @@ import com.xx.merchanthbh.data.http.respons.UserInfoBean; ...@@ -7,11 +7,15 @@ import com.xx.merchanthbh.data.http.respons.UserInfoBean;
import com.xx.xxviewlibrary.model.VersionBean; import com.xx.xxviewlibrary.model.VersionBean;
import com.xx.xxviewlibrary.model.VersionBody; import com.xx.xxviewlibrary.model.VersionBody;
import java.util.Arrays;
import java.util.List;
import io.reactivex.rxjava3.core.Observable; import io.reactivex.rxjava3.core.Observable;
import me.goldze.mvvmhabit.http.ApiParams; import me.goldze.mvvmhabit.http.ApiParams;
import me.goldze.mvvmhabit.http.BasePageResponse; import me.goldze.mvvmhabit.http.BasePageResponse;
import me.goldze.mvvmhabit.http.BaseResponse; import me.goldze.mvvmhabit.http.BaseResponse;
import okhttp3.RequestBody; import okhttp3.RequestBody;
import retrofit2.Response;
public class HomeRequest extends BaseRespons { public class HomeRequest extends BaseRespons {
/** /**
...@@ -99,5 +103,11 @@ public class HomeRequest extends BaseRespons { ...@@ -99,5 +103,11 @@ public class HomeRequest extends BaseRespons {
public Observable<BasePageResponse<MessageBean>> getMessageList(String flag,Integer page) { public Observable<BasePageResponse<MessageBean>> getMessageList(String flag,Integer page) {
return getApiService().getMessageList(flag,page); return getApiService().getMessageList(flag,page);
} }
/**
* 隐私政策
* */
public Observable<BaseResponse<List<String>>> getProtocols() {
// 假设ApiParams和ApiService已经被正确设置和实现
return getApiService().getProtocols(new ApiParams<>().setParams(Arrays.asList("6","7","13","9","10")));
}
} }
...@@ -49,7 +49,6 @@ class LoginRequest: BaseRespons() { ...@@ -49,7 +49,6 @@ class LoginRequest: BaseRespons() {
*/ */
fun getProtocols(): Observable<BaseResponse<List<String>>> fun getProtocols(): Observable<BaseResponse<List<String>>>
{ {
return apiService.getProtocols(ApiParams<Array<String>>().setParams(arrayOf("6","7","13","9","10"))) return apiService.getProtocols(ApiParams<Array<String>>().setParams(arrayOf("6","7","13","9","10")))
} }
......
...@@ -102,7 +102,8 @@ public class HomeActivity extends BaseActivity<ActivityHomeBinding, HomeViewMode ...@@ -102,7 +102,8 @@ public class HomeActivity extends BaseActivity<ActivityHomeBinding, HomeViewMode
Log.v("刚开始获取的token:", token); Log.v("刚开始获取的token:", token);
Interceptor_TOKEN = token; Interceptor_TOKEN = token;
viewModel.getLogin(username,password); viewModel.getLogin(username,password);
// 获取协议
viewModel.getProtocols();
}else { }else {
Log.v("账号密码为空跳转登录页",""); Log.v("账号密码为空跳转登录页","");
startActivity(LoginActivity.class); startActivity(LoginActivity.class);
......
...@@ -11,6 +11,7 @@ import android.content.SharedPreferences; ...@@ -11,6 +11,7 @@ import android.content.SharedPreferences;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.text.Html;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
...@@ -48,6 +49,7 @@ import com.xx.merchanthbh.ui.pwd.PwdActivity; ...@@ -48,6 +49,7 @@ import com.xx.merchanthbh.ui.pwd.PwdActivity;
import com.xx.merchanthbh.ui.pwd.SetPwdActivity; import com.xx.merchanthbh.ui.pwd.SetPwdActivity;
import com.xx.merchanthbh.ui.recruitment.RecruitmentActivity; import com.xx.merchanthbh.ui.recruitment.RecruitmentActivity;
import com.xx.merchanthbh.ui.share.ShareActivity; import com.xx.merchanthbh.ui.share.ShareActivity;
import com.xx.merchanthbh.utils.RetrofitClient;
import com.xx.xxviewlibrary.comm.CommTextDialog; import com.xx.xxviewlibrary.comm.CommTextDialog;
import com.xx.xxviewlibrary.comm.RefuseDialogBean; import com.xx.xxviewlibrary.comm.RefuseDialogBean;
import com.xx.xxviewlibrary.model.VersionBean; import com.xx.xxviewlibrary.model.VersionBean;
...@@ -75,6 +77,8 @@ public class HomeViewModel extends BaseViewModel<HomeRequest> { ...@@ -75,6 +77,8 @@ public class HomeViewModel extends BaseViewModel<HomeRequest> {
/*权限*/ /*权限*/
RxPermissions rxPermissions; RxPermissions rxPermissions;
/*隐私条款字段*/
public MutableLiveData<String> agreeContent = new MutableLiveData<>(null);
public ObservableField<String> title = new ObservableField<>(""); public ObservableField<String> title = new ObservableField<>("");
//今日成交的绑定 //今日成交的绑定
...@@ -334,6 +338,40 @@ public class HomeViewModel extends BaseViewModel<HomeRequest> { ...@@ -334,6 +338,40 @@ public class HomeViewModel extends BaseViewModel<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