Skip to content

android / dayu

Go to a project
Commit 14e1dec7 by wukun
Options

1217

parent 01383107
Inline Side-by-side
Showing with 274 additions and 40 deletions
learnCenter/src/main/java/com/dayu/learncenter/api/LearnService.java
......@@ -11,8 +11,10 @@ import com.dayu.learncenter.api.bean.CourseDeatilBean;
import com.dayu.learncenter.api.bean.KnowledgeListBean;
import com.dayu.learncenter.api.bean.LearnTabBean;
import com.dayu.learncenter.api.bean.LiveBackVideosBean;
import com.dayu.learncenter.api.data.CheckPayData;
import com.dayu.learncenter.api.data.EditCourseData;
import com.dayu.learncenter.api.data.LiveData;
import com.dayu.learncenter.api.data.PayData;
import com.dayu.learncenter.api.data.PubCourseData;
import com.dayu.learncenter.api.data.StudyCourseData;
......@@ -143,6 +145,16 @@ public interface LearnService {
*/
@POST(Constants.API_7900 + "/live/signType")
Observable<BaseResponse<Boolean>> sendLiveData(@Body LiveData data);
/**
* checkPay
*/
@POST(Constants.API_7900 + "/courses/checkPay")
Observable<BaseResponse<Boolean>> checkPay(@Body CheckPayData data);
/**
* pay
*/
@POST(Constants.API_7900 + "/courses/pay")
Observable<BaseResponse<Boolean>> pay(@Body PayData data);
/**
......
learnCenter/src/main/java/com/dayu/learncenter/api/bean/CommonLearnBean.java
......@@ -51,6 +51,15 @@ public class CommonLearnBean {
private int shares;
private int shareWatchs;
private int topStatus;
private String price;
public String getPrice() {
return price;
}
public void setPrice(String price) {
this.price = price;
}
public int getTopStatus() {
return topStatus;
......
learnCenter/src/main/java/com/dayu/learncenter/api/data/CheckPayData.java 0 → 100644
package com.dayu.learncenter.api.data;
public class CheckPayData {
public int courseId;
public int engineerId;
public CheckPayData(int courseId, int engineerId) {
this.courseId = courseId;
this.engineerId = engineerId;
}
}
learnCenter/src/main/java/com/dayu/learncenter/api/data/PayData.java 0 → 100644
package com.dayu.learncenter.api.data;
public class PayData {
public int courseId;
public int engineerId;
public int status;
public PayData(int courseId, int engineerId,int status) {
this.courseId = courseId;
this.engineerId = engineerId;
this.status = status;
}
}
learnCenter/src/main/java/com/dayu/learncenter/presenter/common_learn/CommonLearnContract.java
......@@ -8,6 +8,10 @@ public interface CommonLearnContract {
interface View extends BaseView {
void shareVideo(CommonLearnBean item);
void likeVideo(CommonLearnBean item);
void palyVideo(CommonLearnBean item);
void ShowDialog(CommonLearnBean item);
void ShowErrorDialog(CommonLearnBean item);
}
abstract class Presenter extends BaseListPresenter<View> {
......
learnCenter/src/main/java/com/dayu/learncenter/presenter/common_learn/CommonLearnPresenter.java
......@@ -11,6 +11,8 @@ import com.dayu.common.Constants;
import com.dayu.event.UserInfo;
import com.dayu.learncenter.api.LearnService;
import com.dayu.learncenter.api.bean.CommonLearnBean;
import com.dayu.learncenter.api.data.CheckPayData;
import com.dayu.learncenter.api.data.PayData;
import com.dayu.learncenter.api.data.StudyCourseData;
import com.dayu.learncenter.event.RefreshLeanTabEvent;
import com.dayu.utils.UserManager;
......@@ -107,6 +109,18 @@ public class CommonLearnPresenter extends CommonLearnContract.Presenter {
}
public void checkPay(CommonLearnBean item){
CheckPayData checkPayData = new CheckPayData(item.getId(),mUserId);
Api.getService(LearnService.class).checkPay(checkPayData).compose(Api.applySchedulers())
.subscribe(baseObserver(success -> {
if (success){
mView.palyVideo(item);
}else{
mView.ShowDialog(item);
}
}));
}
public void shareVideo(CommonLearnBean item) {
mView.shareVideo(item);
}
......@@ -114,4 +128,17 @@ public class CommonLearnPresenter extends CommonLearnContract.Presenter {
public void likeVideo(CommonLearnBean item) {
mView.likeVideo(item);
}
public void pay(CommonLearnBean item) {
PayData payData = new PayData(item.getId(),mUserId,1);
Api.getService(LearnService.class).pay(payData).compose(Api.applySchedulers())
.subscribe(baseObserver(success -> {
if (success){
mView.palyVideo(item);
}else{
mView.ShowErrorDialog(item);
}
}));
}
}
learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/CommonLearnFragment.java
......@@ -27,6 +27,7 @@ import com.dayu.learncenter.ui.activity.CourseDetailActivity;
import com.dayu.learncenter.ui.activity.EditCourseActivity;
import com.dayu.utils.CommonUtils;
import com.dayu.utils.LogUtils;
import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.WechatShareDialog;
import com.umeng.analytics.MobclickAgent;
import com.umeng.socialize.bean.SHARE_MEDIA;
......@@ -123,13 +124,10 @@ public class CommonLearnFragment extends BaseFragment<CommonLearnPresenter, Frag
mAdapter.setPresenter(mPresenter);
mBind.recyclerView.setAdapter(mAdapter);
mAdapter.setOnItemClickListener((item, bind) -> {
Bundle bundle = new Bundle();
bundle.putInt(Constants.ID, item.getId());
if (type == 3) {
startActivity(EditCourseActivity.class, bundle);
} else {
startActivity(CourseDetailActivity.class, bundle);
}
mPresenter.checkPay(item);
});
mBind.recyclerView.addOnChildAttachStateChangeListener(new RecyclerView.OnChildAttachStateChangeListener() {
......@@ -213,4 +211,42 @@ public class CommonLearnFragment extends BaseFragment<CommonLearnPresenter, Frag
}
}));
}
@Override
public void palyVideo(CommonLearnBean item) {
Bundle bundle = new Bundle();
bundle.putInt(Constants.ID, item.getId());
if (type == 3) {
startActivity(EditCourseActivity.class, bundle);
} else {
startActivity(CourseDetailActivity.class, bundle);
}
}
@Override
public void ShowDialog(CommonLearnBean item) {
CustomDialog dialog = new CustomDialog(getActivity(), R.style.CustomDialog, "付费"+ item.getPrice() + "元后观看",
(dialog1, confirm) -> {
if (confirm) {
mPresenter.pay(item);
}
});
dialog.setTitle("温馨提醒")
.setPositiveButton("同意支付");
dialog.show();
}
@Override
public void ShowErrorDialog(CommonLearnBean item) {
CustomDialog dialog = new CustomDialog(getActivity(), R.style.CustomDialog, "账户余额不足!\n请先充值再抢单!",
(dialog1, confirm) -> {
if (confirm) {
mPresenter.pay(item);
}
});
dialog.setTitle("温馨提醒")
.setPositiveButton("确定");
dialog.setOneButton(true);
dialog.show();
}
}
orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
package com.dayu.order.ui.fragment;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
......@@ -30,13 +31,11 @@ import com.dayu.order.api.protocol.bean.GreenPersionSiteInfo;
import com.dayu.order.api.protocol.bean.OrderToolsBean;
import com.dayu.order.api.protocol.data.AddDialRecordData;
import com.dayu.order.common.OperatePhoneEvent;
import com.dayu.order.common.OrderConstant;
import com.dayu.order.databinding.FragmentMultiDetailBinding;
import com.dayu.order.databinding.FragmentOrderDatailsBinding;
import com.dayu.order.databinding.ItemAccessoriesLayoutBinding;
import com.dayu.order.databinding.ItemDetailDeviceCountBinding;
import com.dayu.order.databinding.ItemDetailServerInfoBinding;
import com.dayu.order.ui.activity.PdfWebViewActivity;
import com.dayu.order.ui.view.ToolImageDialog;
import com.dayu.provider.event.TakeOrderSuccessEvent;
import com.dayu.provider.router.RouterPath;
......@@ -154,18 +153,22 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
mFujianAdapter.setOnItemClickListener(new OnItemClickListener<OrderDetail.Accessories, ItemAccessoriesLayoutBinding>() {
@Override
public void OnItemClick(OrderDetail.Accessories item, ItemAccessoriesLayoutBinding bind) {
if (item.getUrl().contains("png") || item.getUrl().contains("PNG")
|| item.getUrl().contains("jpg") || item.getUrl().contains("JPG")
|| item.getUrl().contains("jpeg") || item.getUrl().contains("JPEG")) {
imgMax(item.getUrl());
} else if (item.getUrl().contains(".pdf")) {
Intent intent = new Intent(mActivity, PdfWebViewActivity.class);
intent.putExtra(Constants.PICURL, item.getUrl());
intent.putExtra(OrderConstant.TITLE, item.getName());
startActivity(intent);
} else {
ToastUtils.showShortToast(R.string.error_service_file);
}
// if (item.getUrl().contains("png") || item.getUrl().contains("PNG")
// || item.getUrl().contains("jpg") || item.getUrl().contains("JPG")
// || item.getUrl().contains("jpeg") || item.getUrl().contains("JPEG")) {
// imgMax(item.getUrl());
// } else if (item.getUrl().contains(".pdf")) {
// Intent intent = new Intent(mActivity, PdfWebViewActivity.class);
// intent.putExtra(Constants.PICURL, item.getUrl());
// intent.putExtra(OrderConstant.TITLE, item.getName());
// startActivity(intent);
// } else {
// ToastUtils.showShortToast(R.string.error_service_file);
// }
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse(item.getUrl()));
// startActivity(Intent.createChooser(intent, "Choose browser"));
startActivity(intent);
}
});
mBind.orderRemark.post(() -> {
......
orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetaillsFragment.java
package com.dayu.order.ui.fragment;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
......@@ -17,15 +18,12 @@ import com.dayu.event.UserInfo;
import com.dayu.location.base.LocationUtils;
import com.dayu.order.R;
import com.dayu.order.api.protocol.OrderDetail;
import com.dayu.order.common.OrderConstant;
import com.dayu.order.databinding.FragmentOrderDatailsBinding;
import com.dayu.order.databinding.ItemAccessoriesLayoutBinding;
import com.dayu.order.ui.activity.EditeDetailActivity;
import com.dayu.order.ui.activity.PdfWebViewActivity;
import com.dayu.order.ui.activity.ServerInstructionActivity;
import com.dayu.provider.router.RouterPath;
import com.dayu.utils.GlideImageLoader;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UIUtils;
import com.dayu.utils.UserManager;
import com.dayu.widgets.CustomDialog;
......@@ -139,18 +137,22 @@ public class OrderDetaillsFragment extends DataBindingFragment<FragmentOrderData
mAdapter.setOnItemClickListener(new OnItemClickListener<OrderDetail.Accessories, ItemAccessoriesLayoutBinding>() {
@Override
public void OnItemClick(OrderDetail.Accessories item, ItemAccessoriesLayoutBinding bind) {
if (item.getUrl().contains("png") || item.getUrl().contains("PNG")
|| item.getUrl().contains("jpg") || item.getUrl().contains("JPG")
|| item.getUrl().contains("jpeg") || item.getUrl().contains("JPEG")) {
imgMax(item.getUrl());
} else if (item.getUrl().contains(".pdf")) {
Intent intent = new Intent(mActivity, PdfWebViewActivity.class);
intent.putExtra(Constants.PICURL, item.getUrl());
intent.putExtra(OrderConstant.TITLE, item.getName());
startActivity(intent);
} else {
ToastUtils.showShortToast(R.string.error_pdf);
}
// if (item.getUrl().contains("png") || item.getUrl().contains("PNG")
// || item.getUrl().contains("jpg") || item.getUrl().contains("JPG")
// || item.getUrl().contains("jpeg") || item.getUrl().contains("JPEG")) {
// imgMax(item.getUrl());
// } else if (item.getUrl().contains(".pdf")) {
// Intent intent = new Intent(mActivity, PdfWebViewActivity.class);
// intent.putExtra(Constants.PICURL, item.getUrl());
// intent.putExtra(OrderConstant.TITLE, item.getName());
// startActivity(intent);
// } else {
// ToastUtils.showShortToast(R.string.error_pdf);
// }
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse(item.getUrl()));
// startActivity(Intent.createChooser(intent, "Choose browser"));
startActivity(intent);
}
});
}
......
userCenter/src/main/java/com/dayu/usercenter/event/RefreshUserPriceEvent.java 0 → 100644
package com.dayu.usercenter.event;
public class RefreshUserPriceEvent {
private String dayPrice;
public RefreshUserPriceEvent(String dayPrice) {
this.dayPrice = dayPrice;
}
public String getDayPrice() {
return dayPrice;
}
public void setDayPrice(String dayPrice) {
this.dayPrice = dayPrice;
}
}
userCenter/src/main/java/com/dayu/usercenter/model/bean/ServiceSaveBean.java
......@@ -59,4 +59,8 @@ public class ServiceSaveBean {
public ServiceSaveBean(AccountExt accountExt){
this.accountExt = accountExt;
}
public ServiceSaveBean(String lowestPriceDay){
this.lowestPriceDay = lowestPriceDay;
}
}
userCenter/src/main/java/com/dayu/usercenter/ui/activity2/BusinessTypeActivity.java
......@@ -22,6 +22,7 @@ import com.dayu.provider.router.RouterPath;
import com.dayu.usercenter.R;
import com.dayu.usercenter.api.UserService2;
import com.dayu.usercenter.databinding.ActivityBusinessTypeBinding;
import com.dayu.usercenter.event.RefreshUserPriceEvent;
import com.dayu.usercenter.event.RefreshUserRecordEvent;
import com.dayu.usercenter.model.SaveSceneData;
import com.dayu.usercenter.model.bean.BusinessSceneBean;
......@@ -258,6 +259,7 @@ public class BusinessTypeActivity extends BaseActivity<SImplePresenter, Activity
ToastUtils.showShortToast(bool ? R.string.save_success : R.string.save_fail);
if (bool) {
EventBus.getDefault().post(new RefreshUserRecordEvent());
EventBus.getDefault().post(new RefreshUserPriceEvent(dayPrice));
finish();
}
CommonUtils.hideSoftInput(mActivity);
......
userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
......@@ -3,7 +3,10 @@ package com.dayu.usercenter.ui.fragment;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.ArrayMap;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Toast;
import androidx.recyclerview.widget.LinearLayoutManager;
......@@ -32,8 +35,10 @@ import com.dayu.usercenter.event.ChangeNickEvent;
import com.dayu.usercenter.event.EditAddressEvent;
import com.dayu.usercenter.event.EditBankEvent;
import com.dayu.usercenter.event.RefreshUserInfoEvent;
import com.dayu.usercenter.event.RefreshUserPriceEvent;
import com.dayu.usercenter.event.RefreshUserRecordEvent;
import com.dayu.usercenter.model.AddUserCardData;
import com.dayu.usercenter.model.bean.ServiceSaveBean;
import com.dayu.usercenter.model.bean.UserBankInfoBean;
import com.dayu.usercenter.model.bean.UserIncomeBean;
import com.dayu.usercenter.presenter.homeuser.HomeUserContract;
......@@ -128,8 +133,49 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
mBind.transmitServer.setOnClickListener(v -> sendUserCard());
initAddrListener();
getAddress();
//已保存服务类型数据
Api.getService(UserService2.class).getRelationCategory(mUserId).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(data -> {
showDaySelect(data.getLowestPriceDay());
}));
}
private void showDaySelect(String select) {
ArrayMap list = new ArrayMap<>();
list.put("200元/天", "200");
list.put("300元/天", "300");
list.put("400元/天", "400");
list.put("500元/天", "500");
list.put("600元/天", "600");
ArrayList<String> arrayList = new ArrayList<>();
arrayList.addAll(list.keySet());
ArrayList<String> values = new ArrayList<>();
values.addAll(list.values());
ArrayAdapter<String> adapter = new ArrayAdapter<>(mActivity, android.R.layout.simple_spinner_item, arrayList);
mBind.dayPrice.setAdapter(adapter);
int pos = values.indexOf(select);
mBind.dayPrice.setSelection(pos);
mBind.dayPrice.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
mBind.dayPrice.setSelection(position);
String dayPrice = values.get(position);
ServiceSaveBean serviceSaveBean = new ServiceSaveBean(dayPrice);
Api.getService(UserService2.class).saveServiceTypeNew(serviceSaveBean, mUserId).compose(Api.applySchedulers())
.subscribe(mPresenter.baseObserver(bool -> {
}));
}
@Override
public void onNothingSelected(AdapterView<?> parent) {
}
});
}
@Override
public void setPresenter() {
......@@ -445,6 +491,23 @@ public class HomeUserFragment extends BaseFragment<HomeUserPresenter, FragmentHo
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void refreshUserPriceEvent(RefreshUserPriceEvent event) {
String dayPrice = event.getDayPrice();
ArrayMap list = new ArrayMap<>();
list.put("200元/天", "200");
list.put("300元/天", "300");
list.put("400元/天", "400");
list.put("500元/天", "500");
list.put("600元/天", "600");
ArrayList<String> arrayList = new ArrayList<>();
arrayList.addAll(list.keySet());
ArrayList<String> values = new ArrayList<>();
values.addAll(list.values());
int pos = values.indexOf(dayPrice);
mBind.dayPrice.setSelection(pos);
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void certifiCation(CertificationEvent event) {
mPresenter.getAllData(mUserId);
}
......
userCenter/src/main/res/layout/fragment_home_user.xml
......@@ -376,7 +376,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_marginTop="10dp"
android:layout_marginTop="5dp"
android:gravity="center_vertical"
android:paddingStart="15dp"
android:paddingEnd="15dp">
......@@ -433,6 +433,33 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
style="@style/sale_item_text"
android:layout_width="120dp"
android:layout_height="40dp"
android:background="@color/cl_selector_hui"
android:gravity="center"
android:text="我的收费标准:"
android:textStyle="bold" />
<Spinner
android:id="@+id/dayPrice"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_marginStart="80dp"
android:drawableEnd="@drawable/icon_arrow_down_gray32"
android:gravity="center"
android:inputType="number"
tools:text="100" />
</LinearLayout>
<LinearLayout
style="@style/ll_user_bottom"
android:layout_marginTop="10dp">
......
userCenter/src/main/res/values/styles.xml
......@@ -11,7 +11,7 @@
<style name="ll_user_bottom2">
<item name="android:layout_width">0dp</item>
<item name="android:layout_weight">1</item>
<item name="android:layout_height">86dp</item>
<item name="android:layout_height">66dp</item>
<item name="android:orientation">vertical</item>
<item name="android:gravity">center_horizontal</item>
<item name="android:background">@drawable/personal_center_selector</item>
......@@ -28,9 +28,9 @@
<style name="tv_user_bottom2">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginTop">@dimen/dp_10</item>
<item name="android:layout_marginTop">@dimen/dp_3</item>
<item name="android:textColor">@color/cl_home_button</item>
<item name="android:textSize">22sp</item>
<item name="android:textSize">20sp</item>
</style>
<style name="ll_service_wechat" parent="ll_horizontal">
......
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