商家详情

app/src/main/res/layout/activity_setting.xml

@@ -27,6 +27,11 @@
                 style="@style/toolbar_title" />
         </androidx.appcompat.widget.Toolbar>
 
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -333,10 +338,13 @@
                 android:layout_marginRight="15dp"
                 android:layout_gravity="center"
                 android:layout_marginTop="33.3dp"
+                android:layout_marginBottom="@dimen/dp_30"
                 android:background="@drawable/tab_blue_react"
                 android:onClick="@{()->presenter.exite()}"
                 android:text="@string/tv_exit_login"
                 android:textColor="@color/cl_white" />
         </LinearLayout>
+
+        </ScrollView>
     </LinearLayout>
 </layout>
\ No newline at end of file

orderCenter/src/main/java/com/dayu/order/presenter/orderdetail/OrderDetailClockContract.java

@@ -33,6 +33,9 @@ public interface OrderDetailClockContract {
         void showVerifyDialog(String code, String message, String data);
 
         void showNoCashDialog(String message);
+
+        void showStudyDialog(String message);
+
     }
 
     abstract class Presenter extends BaseListPresenter<OrderDetailClockContract.View> {

orderCenter/src/main/java/com/dayu/order/presenter/orderdetail/OrderDetailClockPresenter.java

@@ -215,7 +215,7 @@ public class OrderDetailClockPresenter extends OrderDetailClockContract.Presente
                     } else if ("ORDER0042".equals(responeThrowable.subCode)) {
                         mView.showNoCashDialog(responeThrowable.message);
                     } else if ("ORDER0046".equals(responeThrowable.subCode)) {
-                        mView.showNoCashDialog(responeThrowable.message);
+                        mView.showStudyDialog(responeThrowable.message);
                     }
                 }));
     }

orderCenter/src/main/java/com/dayu/order/presenter/receivingorder/ReceivingContract.java

@@ -18,6 +18,8 @@ public interface ReceivingContract {
         void showCashDialog( double cash,int engineer, int orders, String appointmentTime);
 
         void showNoCashDialog(String message);
+
+        void showStudyDialog(String message);
     }
 
     abstract class Presenter extends BaseOrderPresenter<View> {

orderCenter/src/main/java/com/dayu/order/presenter/receivingorder/ReceivingPresenter.java

@@ -71,7 +71,7 @@ public class ReceivingPresenter extends ReceivingContract.Presenter {
                     } else if ("ORDER0042".equals(responeThrowable.subCode)) {
                         mView.showNoCashDialog(responeThrowable.message);
                     } else if ("ORDER0046".equals(responeThrowable.subCode)) {
-                        mView.showNoCashDialog(responeThrowable.message);
+                        mView.showStudyDialog(responeThrowable.message);
                     }
                 }));
     }
@@ -88,7 +88,7 @@ public class ReceivingPresenter extends ReceivingContract.Presenter {
                     } else if ("ORDER0042".equals(responeThrowable.subCode)) {
                         mView.showNoCashDialog(responeThrowable.message);
                     } else if ("ORDER0046".equals(responeThrowable.subCode)) {
-                        mView.showNoCashDialog(responeThrowable.message);
+                        mView.showStudyDialog(responeThrowable.message);
                     }
                 }));
     }

orderCenter/src/main/java/com/dayu/order/ui/activity/OrderDetailsClockActivity.java

@@ -32,6 +32,7 @@ import com.dayu.order.presenter.orderdetail.OrderDetailClockPresenter;
 import com.dayu.provider.event.RefreshServe;
 import com.dayu.provider.event.RefreshTab;
 import com.dayu.provider.router.RouterPath;
+import com.dayu.usercenter.ui.activity.BusinessDetailActivity;
 import com.dayu.utils.CommonUtils;
 import com.dayu.utils.ProgressUtil;
 import com.dayu.utils.ToastUtils;
@@ -64,6 +65,8 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres
 
     static int TAKE_PHOTO = 100;
     private int detailId;
+    private int providerId;
+
     @Override
     public void setPresenter() {
         mBind.setPresenter(mPresenter);
@@ -90,6 +93,7 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(OrderDetailsClockActivity.this);
 
         detailId = detail.getId();
+        providerId = detail.getCreateProviderId();
 
         mBind.tvOrderNum.setText(detail.getOrderNum());
         mBind.tvOrderState.setText(detail.getProvinceName() + detail.getCityName() + detail.getDistrictName());
@@ -120,7 +124,7 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres
             } else if (7 != detail.getSubStatus()) {
 //                mBind.tvButton.setText("第" + detail.getFinishedDays() + "天打卡");
                 Spu s = detail.getSpus().get(0);
-                mBind.tvButton.setText(s.getFinNum()%2 != 0? "下班打卡" : "上班打卡");
+                mBind.tvButton.setText(s.getFinNum()%2 == 0? "下班打卡" : "上班打卡");
             } else {
                 mBind.tvButton.setText(getString(R.string.submit_order));
             }
@@ -391,11 +395,20 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres
                     } else if (code.equals("STATISTIC0014")) { //城市不匹配
                         ARouter.getInstance().build(RouterPath.PATH_BUSINESS_TYPE).navigation();
                     } else if (code.equals("STATISTIC0015")) { //没有授权认证
+//                        Bundle bundle1 = new Bundle();
+//                        UserInfo info = UserManager.getInstance().getUser();
+//                        bundle1.putString(Constants.URL, data + "&accountId=" + mPresenter.getmUserId() + "&token=" + info.getToken());
+//                        bundle1.putString(Constants.TITLE, "商家详情");
+//                        ARouter.getInstance().build(RouterPath.PATH_WEBVIEW).withBundle(Constants.BUNDLE, bundle1).navigation();
+
                         Bundle bundle1 = new Bundle();
-                        UserInfo info = UserManager.getInstance().getUser();
-                        bundle1.putString(Constants.URL, data + "&accountId=" + mPresenter.getmUserId() + "&token=" + info.getToken());
                         bundle1.putString(Constants.TITLE, "商家详情");
-                        ARouter.getInstance().build(RouterPath.PATH_WEBVIEW).withBundle(Constants.BUNDLE, bundle1).navigation();
+                        int licenceAuthorityId = providerId;
+                        bundle1.putInt("licenceAuthorityId",licenceAuthorityId);
+                        bundle1.putInt("mUserId",mPresenter.getmUserId());
+                        Intent intent = new Intent(this, BusinessDetailActivity.class);
+                        intent.putExtra(Constants.BUNDLE, bundle1);
+                        startActivity(intent);
                     } else if (code.equals("STATISTIC0016")) { //没有权限接
 
                     }
@@ -427,6 +440,26 @@ public class OrderDetailsClockActivity extends BaseActivity<OrderDetailClockPres
     }
 
     @Override
+    public void showStudyDialog(String message) {
+        CustomDialog dialog = new CustomDialog(mActivity, R.style.CustomDialog, message,
+                (dialog1, confirm) -> {
+                    if (confirm) {
+                        Bundle bundle1 = new Bundle();
+                        bundle1.putString(Constants.TITLE, "商家详情");
+                        int licenceAuthorityId = providerId;
+                        bundle1.putInt("licenceAuthorityId",licenceAuthorityId);
+                        bundle1.putInt("mUserId",mUserId);
+                        Intent intent = new Intent(this, BusinessDetailActivity.class);
+                        intent.putExtra(Constants.BUNDLE, bundle1);
+                        startActivity(intent);
+                    }
+                });
+        dialog.setTitle("温馨提醒")
+                .setPositiveButton("马上去学习");
+        dialog.show();
+    }
+
+    @Override
     public void initBtn() {
 
     }

orderCenter/src/main/java/com/dayu/order/ui/activity/ReceivingActivity.java

@@ -83,4 +83,9 @@ public class ReceivingActivity extends BaseActivity<ReceivingPresenter, Activity
     public void showNoCashDialog(String message) {
 
     }
+
+    @Override
+    public void showStudyDialog(String message) {
+
+    }
 }

orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderReceivingFragment.java

@@ -24,6 +24,7 @@ import com.dayu.provider.event.RefreshApoiment;
 import com.dayu.provider.event.RefreshEvent;
 import com.dayu.provider.event.TakeOrderSuccessEvent;
 import com.dayu.provider.router.RouterPath;
+import com.dayu.usercenter.ui.activity.BusinessDetailActivity;
 import com.dayu.utils.LogUtils;
 import com.dayu.utils.ProgressUtil;
 import com.dayu.utils.ToastUtils;
@@ -48,6 +49,8 @@ public class OrderReceivingFragment extends BaseFragment<ReceivingPresenter, Fra
         ReceivingContract.View {
     private OrderAdapter mAdapter;
 
+    private Order currentItem;
+
     @Override
     public int getLayoutId() {
         return R.layout.fragment_commom_recycle;
@@ -104,6 +107,7 @@ public class OrderReceivingFragment extends BaseFragment<ReceivingPresenter, Fra
             if (view.getId() == R.id.item_text_phone) {
                 showDialog();
                 Order order = (Order) adapter.getItem(position);
+                currentItem = order;
                 OrderApiFactory.verifyOrder(order.getId() + "", mUserId).subscribe(mPresenter.baseObserver(bean -> {
                     if (bean.isSuccess()) {
                         Api.getService(APIService.class).getAddressInfo(mUserId).compose(Api.applySchedulers())
@@ -127,6 +131,7 @@ public class OrderReceivingFragment extends BaseFragment<ReceivingPresenter, Fra
                 }));
             } else if (view.getId() == R.id.redeploy) {
                 Order order = (Order) adapter.getItem(position);
+                currentItem = order;
                 OrderApiFactory.verifyOrder(order.getId() + "", mUserId).subscribe(mPresenter.baseObserver(bean -> {
                     if (bean.isSuccess()) {
                         Bundle bundle = new Bundle();
@@ -226,10 +231,19 @@ public class OrderReceivingFragment extends BaseFragment<ReceivingPresenter, Fra
                     } else if (code.equals("STATISTIC0014")) { //城市不匹配
                         ARouter.getInstance().build(RouterPath.PATH_BUSINESS_TYPE).navigation();
                     } else if (code.equals("STATISTIC0015")) { //没有授权认证
+//                        Bundle bundle1 = new Bundle();
+//                        bundle1.putString(Constants.URL, data + "&accountId=" + mUserId + "&token=" + mUserInfo.getToken());
+//                        bundle1.putString(Constants.TITLE, "商家详情");
+//                        ARouter.getInstance().build(RouterPath.PATH_WEBVIEW).withBundle(Constants.BUNDLE, bundle1).navigation();
+
                         Bundle bundle1 = new Bundle();
-                        bundle1.putString(Constants.URL, data + "&accountId=" + mUserId + "&token=" + mUserInfo.getToken());
                         bundle1.putString(Constants.TITLE, "商家详情");
-                        ARouter.getInstance().build(RouterPath.PATH_WEBVIEW).withBundle(Constants.BUNDLE, bundle1).navigation();
+                        int licenceAuthorityId = currentItem.getCreateProviderId();
+                        bundle1.putInt("licenceAuthorityId",licenceAuthorityId);
+                        bundle1.putInt("mUserId",mUserId);
+                        Intent intent = new Intent(mActivity, BusinessDetailActivity.class);
+                        intent.putExtra(Constants.BUNDLE, bundle1);
+                        startActivity(intent);
                     } else if (code.equals("STATISTIC0016")) { //没有权限接
 
                     }
@@ -271,6 +285,26 @@ public class OrderReceivingFragment extends BaseFragment<ReceivingPresenter, Fra
         dialog.show();
     }
 
+    @Override
+    public void showStudyDialog(String message) {
+        CustomDialog dialog = new CustomDialog(mActivity, R.style.CustomDialog, message,
+                (dialog1, confirm) -> {
+                    if (confirm) {
+                        Bundle bundle1 = new Bundle();
+                        bundle1.putString(Constants.TITLE, "商家详情");
+                        int licenceAuthorityId = currentItem.getCreateProviderId();
+                        bundle1.putInt("licenceAuthorityId",licenceAuthorityId);
+                        bundle1.putInt("mUserId",mUserId);
+                        Intent intent = new Intent(mActivity, BusinessDetailActivity.class);
+                        intent.putExtra(Constants.BUNDLE, bundle1);
+                        startActivity(intent);
+                    }
+                });
+        dialog.setTitle("温馨提醒")
+                .setPositiveButton("马上去学习");
+        dialog.show();
+    }
+
     private void showCertificationDialog() {
         CustomDialog customDialog = new CustomDialog(mActivity, R.style.CustomDialog, UIUtils.getString(R.string.engineer_identity_not_audite)
                 , (dialog, confirm) -> {

userCenter/src/main/java/com/dayu/usercenter/api/UserService2.java

@@ -13,6 +13,7 @@ import com.dayu.usercenter.model.BusinessDetailData;
 import com.dayu.usercenter.model.ChangeNickData;
 import com.dayu.usercenter.model.CoursesVideoData;
 import com.dayu.usercenter.model.EditBankData;
+import com.dayu.usercenter.model.ExamListData;
 import com.dayu.usercenter.model.FinishedStudyData;
 import com.dayu.usercenter.model.LicencePayData;
 import com.dayu.usercenter.model.SaveSceneData;
@@ -444,6 +445,13 @@ public interface UserService2 {
 
 
     /**
+     * 商家详情-在线考试
+     */
+    @GET(Constants.API_7900+"/paper/accountId/{accountId}")
+    Observable<BaseResponse<ExamListData>> getExamList(@Path("accountId") int accountId, @Query("accountId") int accountId1, @Query("providerId") int providerId, @Query("page") int page, @Query("pageSize") int pageSize);
+
+
+    /**
      * 申请商家认证
      * @param finishedStudyData
      * @return

userCenter/src/main/java/com/dayu/usercenter/model/ExamListData.java

+package com.dayu.usercenter.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ExamListData {
+
+
+    ArrayList<Exam> data;
+
+    public void setData(ArrayList<Exam> data) {
+        this.data = data;
+    }
+
+    public ArrayList<Exam> getData() {
+        return data;
+    }
+
+    public class Exam{
+        private String title;
+        private String detailUrl;
+
+        public void setTitle(String name) {
+            this.title = name;
+        }
+
+        public String getTitle() {
+            return title;
+        }
+
+        public String getDetailUrl() {
+            return detailUrl;
+        }
+
+        public void setDetailUrl(String detailUrl) {
+            this.detailUrl = detailUrl;
+        }
+    }
+
+
+}

userCenter/src/main/java/com/dayu/usercenter/ui/activity/BusinessDetailActivity.java

 package com.dayu.usercenter.ui.activity;
 
+import android.content.Intent;
+import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 
@@ -11,6 +13,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
 import com.dayu.base.api.APIService;
 import com.dayu.base.api.Api;
 import com.dayu.base.ui.activity.BaseActivity;
+import com.dayu.common.Constants;
 import com.dayu.event.CheckPayData;
 import com.dayu.event.PayData;
 import com.dayu.event.StudyCourseData;
@@ -21,18 +24,22 @@ import com.dayu.usercenter.api.UserService2;
 import com.dayu.usercenter.databinding.ActivityBusinessDetailBinding;
 import com.dayu.usercenter.model.BusinessDetailData;
 import com.dayu.usercenter.model.CoursesVideoData;
+import com.dayu.usercenter.model.ExamListData;
 import com.dayu.usercenter.model.FinishedStudyData;
 import com.dayu.usercenter.presenter.businessdetail.BusinessDetailContract;
 import com.dayu.usercenter.presenter.businessdetail.BusinessDetailPresenter;
 import com.dayu.utils.CommonUtils;
 import com.dayu.utils.GlideImageLoader;
+import com.dayu.utils.UIUtils;
 import com.dayu.utils.UserManager;
 import com.dayu.widgets.CustomDialog;
 import com.dayu.widgets.MyJzvdStd;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import cn.jzvd.Jzvd;
+import retrofit2.http.Path;
 
 /**
  * 商家详情
@@ -43,6 +50,9 @@ public class BusinessDetailActivity extends BaseActivity<BusinessDetailPresenter
     private String currentPrice;
     private List<CoursesVideoData> videoDataList;
     private CoursesVideoAdapter coursesVideoAdapter;
+
+    private ArrayList<ExamListData.Exam> examDataList;
+    private CoursesVideoAdapter examListAdapter;
     private int licenceAuthorityId;
     private int mUserId;
 
@@ -70,6 +80,8 @@ public class BusinessDetailActivity extends BaseActivity<BusinessDetailPresenter
 
         getVideo(licenceAuthorityId, mUserId);
 
+        getExamList(licenceAuthorityId, mUserId);
+
         mBind.rlClick.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -333,6 +345,64 @@ public class BusinessDetailActivity extends BaseActivity<BusinessDetailPresenter
                 }));
     }
 
+    /**
+     * 在线考试
+     * @param licenceAuthorityId
+     * @param mUserId
+     */
+    private void getExamList(int licenceAuthorityId, int mUserId) {
+        Api.getService(UserService2.class).getExamList(mUserId,mUserId, licenceAuthorityId, 1, 5).compose(Api.applySchedulers())
+                .subscribe(mPresenter.baseObserver(data -> {
+
+                    ArrayList<ExamListData.Exam> examList = data.getData();
+
+                    if (!examList.isEmpty()){
+                        mBind.rlExamTitle.setVisibility(View.VISIBLE);
+                        mBind.rlExam.setVisibility(View.VISIBLE);
+
+                        examDataList = new ArrayList<ExamListData.Exam>();
+
+                        for (int i = 0; i < 5; i++) {
+                            //在线考试列表最多展示5个
+                            if (examList.size() > i){
+                                examDataList.add(examList.get(i));
+                            }
+                        }
+
+                        BaseQuickAdapter<ExamListData.Exam, BaseViewHolder> mAdapter
+                                = new BaseQuickAdapter<ExamListData.Exam, BaseViewHolder>(R.layout.item_supdata, examDataList) {
+                            @Override
+                            protected void convert(BaseViewHolder baseViewHolder, ExamListData.Exam exam) {
+                                baseViewHolder.setText(R.id.tv_name_business, exam.getTitle());
+                                baseViewHolder.setTextColor(R.id.tv_name_business, UIUtils.getColor(R.color.cl_home_button));
+                            }
+                        };
+                        mAdapter.setOnItemClickListener((adapter,view,pos)->{
+                            ExamListData.Exam exam = examDataList.get(pos);
+                            String url = exam.getDetailUrl() +"&token=" + UserManager.getInstance().getUser().getToken();
+
+                            Intent intent = new Intent(BusinessDetailActivity.this, CommeWebViewActivity.class);
+                            Bundle bundle = new Bundle();
+                            bundle.putString(Constants.TITLE, exam.getTitle());
+                            bundle.putString(Constants.URL, url);
+                            intent.putExtra(Constants.BUNDLE, bundle);
+                            startActivity(intent);
+
+                        });
+                        mBind.rlExam.setLayoutManager(new LinearLayoutManager(mActivity));
+                        mBind.rlExam.setAdapter(mAdapter);
+
+
+
+                    }else {//没有在线考试 不展示列表和标题
+                        mBind.rlExamTitle.setVisibility(View.GONE);
+                        mBind.rlExam.setVisibility(View.GONE);
+                    }
+                }));
+    }
+
+
+
     @Override
     public void onPause() {
         super.onPause();

userCenter/src/main/res/layout/activity_business_detail.xml

@@ -89,7 +89,7 @@
                             android:gravity="center|left"
                             android:background="@color/white"/>
                     </androidx.core.widget.NestedScrollView>
-Y
+
 
                     <LinearLayout
                         android:id="@+id/ll_video"
@@ -168,11 +168,12 @@ Y
 
 
                         </LinearLayout>
+
+
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/rl_video"
                             android:layout_width="match_parent"
-                            android:layout_height="140dp"/>
-
+                            android:layout_height="140dp" />
 
                         <TextView
                             android:id="@+id/tv_tips"
@@ -188,6 +189,21 @@ Y
 
 
                     <TextView
+                        android:id="@+id/rl_exam_title"
+                        android:layout_width="match_parent"
+                        android:layout_height="35dp"
+                        android:text="在线考试"
+                        android:textSize="20dp"
+                        android:paddingLeft="20dp"
+                        android:gravity="center|left"
+                        android:background="@color/cl_selector_hui"/>
+
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rl_exam"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="60dp"/>
+                    <TextView
                         android:layout_width="match_parent"
                         android:layout_height="35dp"
                         android:text="服务项目"