Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
YDL-Component-Medical
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
杨凯
YDL-Component-Medical
Commits
2b2eb4ee
Commit
2b2eb4ee
authored
Nov 06, 2019
by
严久程
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
课程模块
parent
a9a7a92e
Hide whitespace changes
Inline
Side-by-side
Showing
34 changed files
with
65 additions
and
167 deletions
+65
-167
CourseListAdapter.java
m-course/src/main/java/com/yidianling/course/CourseListAdapter.java
+1
-1
CourseListFragment.java
m-course/src/main/java/com/yidianling/course/CourseListFragment.java
+2
-3
CourseListItemView.java
m-course/src/main/java/com/yidianling/course/CourseListItemView.java
+1
-1
CourseNewListAdapter.java
m-course/src/main/java/com/yidianling/course/CourseNewListAdapter.java
+1
-1
CoursePosterActivity.kt
m-course/src/main/java/com/yidianling/course/CoursePosterActivity.kt
+1
-1
FlutterCourseHomeFragment.kt
m-course/src/main/java/com/yidianling/course/FlutterCourseHomeFragment.kt
+1
-1
Course.java
m-course/src/main/java/com/yidianling/course/bean/Course.java
+1
-1
CourseAddOrderBean.kt
m-course/src/main/java/com/yidianling/course/bean/CourseAddOrderBean.kt
+1
-1
CourseListDataBean.kt
m-course/src/main/java/com/yidianling/course/bean/CourseListDataBean.kt
+1
-1
CoursePlayBean.kt
m-course/src/main/java/com/yidianling/course/bean/CoursePlayBean.kt
+1
-1
CourseTopicActivity.kt
m-course/src/main/java/com/yidianling/course/courseNew/CourseTopicActivity.kt
+2
-2
CourseTopicAdapter.kt
m-course/src/main/java/com/yidianling/course/courseNew/CourseTopicAdapter.kt
+1
-2
CourseListContainerActivity.kt
m-course/src/main/java/com/yidianling/course/courseNew/courseList/CourseListContainerActivity.kt
+2
-3
CourseCommentActivity.kt
m-course/src/main/java/com/yidianling/course/coursePlay/CourseCommentActivity.kt
+2
-2
CoursePlayPresenter.kt
m-course/src/main/java/com/yidianling/course/coursePlay/presenter/CoursePlayPresenter.kt
+1
-1
CourseSearchActicity.kt
m-course/src/main/java/com/yidianling/course/courseSearch/CourseSearchActicity.kt
+1
-1
CourseSearchAdapter.kt
m-course/src/main/java/com/yidianling/course/courseSearch/CourseSearchAdapter.kt
+1
-1
CourseSearchBean.java
m-course/src/main/java/com/yidianling/course/courseSearch/CourseSearchBean.java
+1
-1
CourseSearchApiUtils.kt
m-course/src/main/java/com/yidianling/course/courseSearch/http/CourseSearchApiUtils.kt
+0
-1
CourseSpecialListParam.kt
m-course/src/main/java/com/yidianling/course/course_special_list/bean/CourseSpecialListParam.kt
+1
-1
ICourseSpecialListContract.kt
m-course/src/main/java/com/yidianling/course/course_special_list/contract/ICourseSpecialListContract.kt
+1
-1
CourseSpecialListApi.kt
m-course/src/main/java/com/yidianling/course/course_special_list/http/CourseSpecialListApi.kt
+0
-24
CourseSpecialListDataManager.kt
m-course/src/main/java/com/yidianling/course/course_special_list/http/CourseSpecialListDataManager.kt
+0
-13
CourseSpecialListHttpImpl.kt
m-course/src/main/java/com/yidianling/course/course_special_list/http/CourseSpecialListHttpImpl.kt
+0
-50
ICourseSpecialListHttp.kt
m-course/src/main/java/com/yidianling/course/course_special_list/http/ICourseSpecialListHttp.kt
+0
-23
CourseSpecialListModelImpl.kt
m-course/src/main/java/com/yidianling/course/course_special_list/model/CourseSpecialListModelImpl.kt
+4
-3
CourseSpecialListPresenterImpl.kt
m-course/src/main/java/com/yidianling/course/course_special_list/presenter/CourseSpecialListPresenterImpl.kt
+7
-2
TopicCourseBean.kt
m-course/src/main/java/com/yidianling/course/model/TopicCourseBean.kt
+1
-1
Command.java
m-course/src/main/java/com/yidianling/course/net/Command.java
+1
-1
NetApiStore.java
m-course/src/main/java/com/yidianling/course/net/NetApiStore.java
+13
-12
RetrofitUtils.java
m-course/src/main/java/com/yidianling/course/net/RetrofitUtils.java
+12
-6
CouponHintView.kt
m-course/src/main/java/com/yidianling/course/widget/CouponHintView.kt
+1
-2
CourseItemNewView.kt
m-course/src/main/java/com/yidianling/course/widget/CourseItemNewView.kt
+1
-1
CourseRedPacketView.kt
m-course/src/main/java/com/yidianling/course/widget/CourseRedPacketView.kt
+1
-1
No files found.
m-course/src/main/java/com/yidianling/course/CourseListAdapter.java
View file @
2b2eb4ee
...
@@ -5,7 +5,7 @@ import android.view.View;
...
@@ -5,7 +5,7 @@ import android.view.View;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
import
com.ydl.ydlcommon.adapter.CommonAdapter
;
import
com.ydl.ydlcommon.adapter.CommonAdapter
;
import
com.yidianling.course.
coursePlay.moudle
.Course
;
import
com.yidianling.course.
bean
.Course
;
/**
/**
* Created by zqk on 6/22/17.
* Created by zqk on 6/22/17.
...
...
m-course/src/main/java/com/yidianling/course/CourseListFragment.java
View file @
2b2eb4ee
...
@@ -17,11 +17,10 @@ import com.ydl.ydlcommon.bean.ShareData;
...
@@ -17,11 +17,10 @@ import com.ydl.ydlcommon.bean.ShareData;
import
com.ydl.ydlcommon.data.http.RxUtils
;
import
com.ydl.ydlcommon.data.http.RxUtils
;
import
com.ydl.ydlcommon.utils.BuryPointUtils
;
import
com.ydl.ydlcommon.utils.BuryPointUtils
;
import
com.ydl.ydlcommon.utils.NetworkParamsUtils
;
import
com.ydl.ydlcommon.utils.NetworkParamsUtils
;
import
com.ydl.ydlcommon.utils.UMEventUtils
;
import
com.yidianling.common.tools.LogUtil
;
import
com.yidianling.common.tools.LogUtil
;
import
com.yidianling.course.courseNew.LoadMoreView
;
import
com.yidianling.course.courseNew.LoadMoreView
;
import
com.yidianling.course.
coursePlay.common.
net.RetrofitUtils
;
import
com.yidianling.course.net.RetrofitUtils
;
import
com.yidianling.course.
coursePlay.moudle
.Course
;
import
com.yidianling.course.
bean
.Course
;
import
com.yidianling.course.router.CourseIn
;
import
com.yidianling.course.router.CourseIn
;
import
in.srain.cube.views.loadmore.LoadMoreContainer
;
import
in.srain.cube.views.loadmore.LoadMoreContainer
;
import
in.srain.cube.views.loadmore.LoadMoreHandler
;
import
in.srain.cube.views.loadmore.LoadMoreHandler
;
...
...
m-course/src/main/java/com/yidianling/course/CourseListItemView.java
View file @
2b2eb4ee
...
@@ -10,7 +10,7 @@ import android.widget.TextView;
...
@@ -10,7 +10,7 @@ import android.widget.TextView;
import
com.ydl.ydl_router.manager.YDLRouterManager
;
import
com.ydl.ydl_router.manager.YDLRouterManager
;
import
com.yidianling.course.coursePlay.CourseCommentActivity
;
import
com.yidianling.course.coursePlay.CourseCommentActivity
;
import
com.yidianling.course.
coursePlay.moudle
.Course
;
import
com.yidianling.course.
bean
.Course
;
import
com.yidianling.course.widget.CourseItemNewView
;
import
com.yidianling.course.widget.CourseItemNewView
;
import
butterknife.BindView
;
import
butterknife.BindView
;
...
...
m-course/src/main/java/com/yidianling/course/CourseNewListAdapter.java
View file @
2b2eb4ee
...
@@ -5,7 +5,7 @@ import android.view.View;
...
@@ -5,7 +5,7 @@ import android.view.View;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
import
com.ydl.ydlcommon.adapter.CommonAdapter
;
import
com.ydl.ydlcommon.adapter.CommonAdapter
;
import
com.yidianling.course.
coursePlay.moudle
.Course
;
import
com.yidianling.course.
bean
.Course
;
import
com.yidianling.course.widget.CourseItemNewView
;
import
com.yidianling.course.widget.CourseItemNewView
;
public
class
CourseNewListAdapter
extends
CommonAdapter
<
Course
>
{
public
class
CourseNewListAdapter
extends
CommonAdapter
<
Course
>
{
...
...
m-course/src/main/java/com/yidianling/course/CoursePosterActivity.kt
View file @
2b2eb4ee
...
@@ -18,7 +18,7 @@ import com.ydl.ydlcommon.utils.StatusBarUtils
...
@@ -18,7 +18,7 @@ import com.ydl.ydlcommon.utils.StatusBarUtils
import
com.ydl.ydlcommon.view.dialog.YDLShareDialog
import
com.ydl.ydlcommon.view.dialog.YDLShareDialog
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.course.bean.PostersShareBean
import
com.yidianling.course.bean.PostersShareBean
import
com.yidianling.course.
coursePlay.common.
net.RetrofitUtils
import
com.yidianling.course.net.RetrofitUtils
import
com.yidianling.course.widget.CoursePosterTemplate
import
com.yidianling.course.widget.CoursePosterTemplate
import
com.yidianling.course.widget.CustomPagerTransformer
import
com.yidianling.course.widget.CustomPagerTransformer
import
io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.android.schedulers.AndroidSchedulers
...
...
m-course/src/main/java/com/yidianling/course/FlutterCourseHomeFragment.kt
View file @
2b2eb4ee
...
@@ -17,7 +17,7 @@ import com.ydl.ydlcommon.utils.actionutil.BIConstants
...
@@ -17,7 +17,7 @@ import com.ydl.ydlcommon.utils.actionutil.BIConstants
import
com.ydl.ydlcommon.utils.remind.ToastHelper
import
com.ydl.ydlcommon.utils.remind.ToastHelper
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.course.bean.CourseCouponBean
import
com.yidianling.course.bean.CourseCouponBean
import
com.yidianling.course.
coursePlay.common.
net.RetrofitUtils
import
com.yidianling.course.net.RetrofitUtils
import
com.yidianling.course.flutterPlugin.CourseSendPlugin
import
com.yidianling.course.flutterPlugin.CourseSendPlugin
import
com.yidianling.course.widget.CourseCouponDialog
import
com.yidianling.course.widget.CourseCouponDialog
import
com.yidianling.router.RouterManager
import
com.yidianling.router.RouterManager
...
...
m-course/src/main/java/com/yidianling/course/
coursePlay/moudle
/Course.java
→
m-course/src/main/java/com/yidianling/course/
bean
/Course.java
View file @
2b2eb4ee
package
com
.
yidianling
.
course
.
coursePlay
.
moudle
;
package
com
.
yidianling
.
course
.
bean
;
import
com.ydl.ydlcommon.bean.ShareData
;
import
com.ydl.ydlcommon.bean.ShareData
;
import
com.yidianling.course.bean.CourseHostInfoBean
;
import
com.yidianling.course.bean.CourseHostInfoBean
;
...
...
m-course/src/main/java/com/yidianling/course/
coursePlay/moudle
/CourseAddOrderBean.kt
→
m-course/src/main/java/com/yidianling/course/
bean
/CourseAddOrderBean.kt
View file @
2b2eb4ee
package
com.yidianling.course.
coursePlay.moudle
package
com.yidianling.course.
bean
/**
/**
* 参加课程返回值
* 参加课程返回值
...
...
m-course/src/main/java/com/yidianling/course/
coursePlay/moudle
/CourseListDataBean.kt
→
m-course/src/main/java/com/yidianling/course/
bean
/CourseListDataBean.kt
View file @
2b2eb4ee
package
com.yidianling.course.
coursePlay.moudle
package
com.yidianling.course.
bean
import
com.ydl.ydlcommon.bean.YDLBaseDataBean
import
com.ydl.ydlcommon.bean.YDLBaseDataBean
...
...
m-course/src/main/java/com/yidianling/course/
coursePlay/moudle
/CoursePlayBean.kt
→
m-course/src/main/java/com/yidianling/course/
bean
/CoursePlayBean.kt
View file @
2b2eb4ee
package
com.yidianling.course.
coursePlay.moudle
package
com.yidianling.course.
bean
import
com.ydl.ydlcommon.bean.ShareData
import
com.ydl.ydlcommon.bean.ShareData
import
java.util.*
import
java.util.*
...
...
m-course/src/main/java/com/yidianling/course/courseNew/CourseTopicActivity.kt
View file @
2b2eb4ee
...
@@ -20,8 +20,8 @@ import com.ydl.ydlcommon.utils.UMEventUtils
...
@@ -20,8 +20,8 @@ import com.ydl.ydlcommon.utils.UMEventUtils
import
com.yidianling.common.tools.LogUtil
import
com.yidianling.common.tools.LogUtil
import
com.yidianling.common.tools.RxNetTool
import
com.yidianling.common.tools.RxNetTool
import
com.yidianling.course.R
import
com.yidianling.course.R
import
com.yidianling.course.
coursePlay.common.
net.RetrofitUtils
import
com.yidianling.course.net.RetrofitUtils
import
com.yidianling.course.
coursePlay.moudle
.Course
import
com.yidianling.course.
bean
.Course
import
com.yidianling.course.model.TopicCourseBean
import
com.yidianling.course.model.TopicCourseBean
import
io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.schedulers.Schedulers
import
io.reactivex.schedulers.Schedulers
...
...
m-course/src/main/java/com/yidianling/course/courseNew/CourseTopicAdapter.kt
View file @
2b2eb4ee
...
@@ -7,10 +7,9 @@ import android.view.View
...
@@ -7,10 +7,9 @@ import android.view.View
import
android.view.ViewGroup
import
android.view.ViewGroup
import
com.ydl.webview.H5Params
import
com.ydl.webview.H5Params
import
com.ydl.webview.NewH5Activity
import
com.ydl.webview.NewH5Activity
import
com.ydl.ydlcommon.utils.UMEventUtils
import
com.ydl.ydlcommon.view.BaseViewHolder
import
com.ydl.ydlcommon.view.BaseViewHolder
import
com.yidianling.course.CourseConstants
import
com.yidianling.course.CourseConstants
import
com.yidianling.course.
coursePlay.moudle
.Course
import
com.yidianling.course.
bean
.Course
import
com.yidianling.course.widget.CourseItemNewView
import
com.yidianling.course.widget.CourseItemNewView
/**
/**
...
...
m-course/src/main/java/com/yidianling/course/courseNew/courseList/CourseListContainerActivity.kt
View file @
2b2eb4ee
...
@@ -24,7 +24,6 @@ import com.ydl.ydlcommon.bean.ShareData
...
@@ -24,7 +24,6 @@ import com.ydl.ydlcommon.bean.ShareData
import
com.ydl.ydlcommon.data.http.RxUtils
import
com.ydl.ydlcommon.data.http.RxUtils
import
com.ydl.ydlcommon.ui.LogoLoadingView
import
com.ydl.ydlcommon.ui.LogoLoadingView
import
com.ydl.ydlcommon.utils.NetworkParamsUtils
import
com.ydl.ydlcommon.utils.NetworkParamsUtils
import
com.ydl.ydlcommon.utils.UMEventUtils
import
com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import
com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
import
com.ydl.ydlcommon.utils.actionutil.BIConstants
import
com.ydl.ydlcommon.utils.actionutil.BIConstants
import
com.ydl.ydlcommon.utils.remind.ToastHelper
import
com.ydl.ydlcommon.utils.remind.ToastHelper
...
@@ -37,8 +36,8 @@ import com.yidianling.course.courseNew.LoadMoreView
...
@@ -37,8 +36,8 @@ import com.yidianling.course.courseNew.LoadMoreView
import
com.yidianling.course.courseNew.courseList.widget.CourseFilterPopupWindow
import
com.yidianling.course.courseNew.courseList.widget.CourseFilterPopupWindow
import
com.yidianling.course.courseNew.courseList.widget.CourseGoodPopupWindow
import
com.yidianling.course.courseNew.courseList.widget.CourseGoodPopupWindow
import
com.yidianling.course.courseNew.courseList.widget.CourseSortPopupWindow
import
com.yidianling.course.courseNew.courseList.widget.CourseSortPopupWindow
import
com.yidianling.course.
coursePlay.common.
net.RetrofitUtils
import
com.yidianling.course.net.RetrofitUtils
import
com.yidianling.course.
coursePlay.moudle
.Course
import
com.yidianling.course.
bean
.Course
import
com.yidianling.course.model.CourseCategoryBean
import
com.yidianling.course.model.CourseCategoryBean
import
com.yidianling.course.router.CourseIn
import
com.yidianling.course.router.CourseIn
import
com.yidianling.course.widget.SearchBarView
import
com.yidianling.course.widget.SearchBarView
...
...
m-course/src/main/java/com/yidianling/course/coursePlay/CourseCommentActivity.kt
View file @
2b2eb4ee
...
@@ -14,8 +14,8 @@ import com.ydl.ydlcommon.utils.log.LogHelper
...
@@ -14,8 +14,8 @@ import com.ydl.ydlcommon.utils.log.LogHelper
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.course.CourseConstants
import
com.yidianling.course.CourseConstants
import
com.yidianling.course.R
import
com.yidianling.course.R
import
com.yidianling.course.
coursePlay.common.
net.Command
import
com.yidianling.course.net.Command
import
com.yidianling.course.
coursePlay.common.
net.RetrofitUtils
import
com.yidianling.course.net.RetrofitUtils
import
io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.schedulers.Schedulers
import
io.reactivex.schedulers.Schedulers
import
kotlinx.android.synthetic.main.activity_course_commeny.*
import
kotlinx.android.synthetic.main.activity_course_commeny.*
...
...
m-course/src/main/java/com/yidianling/course/coursePlay/presenter/CoursePlayPresenter.kt
View file @
2b2eb4ee
...
@@ -4,7 +4,7 @@ import android.annotation.SuppressLint
...
@@ -4,7 +4,7 @@ import android.annotation.SuppressLint
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.course.bean.CourseMediaDetailBean
import
com.yidianling.course.bean.CourseMediaDetailBean
import
com.yidianling.course.coursePlay.CoursePlayActivity
import
com.yidianling.course.coursePlay.CoursePlayActivity
import
com.yidianling.course.
coursePlay.common.
net.RetrofitUtils
import
com.yidianling.course.net.RetrofitUtils
import
io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.schedulers.Schedulers
import
io.reactivex.schedulers.Schedulers
...
...
m-course/src/main/java/com/yidianling/course/courseSearch/CourseSearchActicity.kt
View file @
2b2eb4ee
...
@@ -20,7 +20,7 @@ import com.ydl.ydlcommon.router.IYDLRouterConstant
...
@@ -20,7 +20,7 @@ import com.ydl.ydlcommon.router.IYDLRouterConstant
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.common.tools.ToastUtil
import
com.yidianling.course.CourseConstants
import
com.yidianling.course.CourseConstants
import
com.yidianling.course.R
import
com.yidianling.course.R
import
com.yidianling.course.
coursePlay.moudle
.Course
import
com.yidianling.course.
bean
.Course
import
com.yidianling.course.courseSearch.http.CourseSearchApiUtils
import
com.yidianling.course.courseSearch.http.CourseSearchApiUtils
import
com.yidianling.course.courseSearch.view.ICourseSearchView
import
com.yidianling.course.courseSearch.view.ICourseSearchView
import
com.yidianling.course.widget.SearchBarView
import
com.yidianling.course.widget.SearchBarView
...
...
m-course/src/main/java/com/yidianling/course/courseSearch/CourseSearchAdapter.kt
View file @
2b2eb4ee
...
@@ -4,7 +4,7 @@ import android.content.Context
...
@@ -4,7 +4,7 @@ import android.content.Context
import
android.support.v7.widget.RecyclerView
import
android.support.v7.widget.RecyclerView
import
android.view.ViewGroup
import
android.view.ViewGroup
import
com.yidianling.common.tools.RxImageTool
import
com.yidianling.common.tools.RxImageTool
import
com.yidianling.course.
coursePlay.moudle
.Course
import
com.yidianling.course.
bean
.Course
import
com.yidianling.course.courseSearch.view.ICourseSearchView
import
com.yidianling.course.courseSearch.view.ICourseSearchView
import
com.yidianling.course.widget.CourseItemNewView
import
com.yidianling.course.widget.CourseItemNewView
...
...
m-course/src/main/java/com/yidianling/course/courseSearch/CourseSearchBean.java
View file @
2b2eb4ee
package
com
.
yidianling
.
course
.
courseSearch
;
package
com
.
yidianling
.
course
.
courseSearch
;
import
com.yidianling.course.
coursePlay.moudle
.Course
;
import
com.yidianling.course.
bean
.Course
;
import
java.util.List
;
import
java.util.List
;
...
...
m-course/src/main/java/com/yidianling/course/courseSearch/http/CourseSearchApiUtils.kt
View file @
2b2eb4ee
...
@@ -2,7 +2,6 @@ package com.yidianling.course.courseSearch.http
...
@@ -2,7 +2,6 @@ package com.yidianling.course.courseSearch.http
import
com.ydl.ydlcommon.data.http.BaseAPIResponse
import
com.ydl.ydlcommon.data.http.BaseAPIResponse
import
com.ydl.ydlnet.YDLHttpUtils
import
com.ydl.ydlnet.YDLHttpUtils
import
com.yidianling.course.coursePlay.common.net.NetApiStore
import
com.yidianling.course.courseSearch.CourseSearchBean
import
com.yidianling.course.courseSearch.CourseSearchBean
import
io.reactivex.Observable
import
io.reactivex.Observable
...
...
m-course/src/main/java/com/yidianling/course/course_special_list/
http
/CourseSpecialListParam.kt
→
m-course/src/main/java/com/yidianling/course/course_special_list/
bean
/CourseSpecialListParam.kt
View file @
2b2eb4ee
package
com.yidianling.course.course_special_list.
http
package
com.yidianling.course.course_special_list.
bean
import
com.ydl.ydlcommon.data.http.BaseCommand
import
com.ydl.ydlcommon.data.http.BaseCommand
...
...
m-course/src/main/java/com/yidianling/course/course_special_list/contract/ICourseSpecialListContract.kt
View file @
2b2eb4ee
...
@@ -6,7 +6,7 @@ import com.ydl.ydlcommon.mvp.base.IPresenter
...
@@ -6,7 +6,7 @@ import com.ydl.ydlcommon.mvp.base.IPresenter
import
com.ydl.ydlcommon.mvp.base.IView
import
com.ydl.ydlcommon.mvp.base.IView
import
com.yidianling.course.course_special_list.bean.CourseSpecialItemBean
import
com.yidianling.course.course_special_list.bean.CourseSpecialItemBean
import
com.yidianling.course.course_special_list.bean.CourseSpecialListBean
import
com.yidianling.course.course_special_list.bean.CourseSpecialListBean
import
com.yidianling.course.course_special_list.
http
.CourseSpecialListParam
import
com.yidianling.course.course_special_list.
bean
.CourseSpecialListParam
import
io.reactivex.Observable
import
io.reactivex.Observable
/**
/**
...
...
m-course/src/main/java/com/yidianling/course/course_special_list/http/CourseSpecialListApi.kt
deleted
100644 → 0
View file @
a9a7a92e
package
com.yidianling.course.course_special_list.http
import
com.ydl.ydlcommon.data.http.BaseAPIResponse
import
com.yidianling.course.course_special_list.bean.CourseSpecialListBean
import
io.reactivex.Observable
import
retrofit2.http.GET
import
retrofit2.http.HEAD
import
retrofit2.http.QueryMap
/**
* @author yuanwai
* @描述:课程专题列表Api
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2018/9/18
*/
interface
CourseSpecialListApi
{
//课程专题列表
//todo
@GET
(
"auth/course/listCoursesBySpecialId"
)
fun
courseSpecialList
(
@QueryMap
params
:
Map
<
String
,
String
>):
Observable
<
BaseAPIResponse
<
CourseSpecialListBean
>>
}
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/course_special_list/http/CourseSpecialListDataManager.kt
deleted
100644 → 0
View file @
a9a7a92e
package
com.yidianling.course.course_special_list.http
/**
* @author yuanwai
* @描述:课程专题列表接口实现模型
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2018/9/18
*/
object
CourseSpecialListDataManager
{
fun
getHttp
():
ICourseSpecialListHttp
=
CourseSpecialListHttpImpl
.
getInstance
()
}
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/course_special_list/http/CourseSpecialListHttpImpl.kt
deleted
100644 → 0
View file @
a9a7a92e
package
com.yidianling.course.course_special_list.http
import
com.ydl.ydlcommon.data.http.BaseAPIResponse
import
com.ydl.ydlcommon.data.http.BaseCommand
import
com.ydl.ydlcommon.data.http.FormatText
import
com.ydl.ydlcommon.utils.NetworkParamsUtils
import
com.ydl.ydlnet.YDLHttpUtils
import
com.yidianling.course.course_special_list.bean.CourseSpecialListBean
import
io.reactivex.Observable
/**
* @author yuanwai
* @描述:课程专题列表接口实现类
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2018/9/18
*/
class
CourseSpecialListHttpImpl
private
constructor
()
:
ICourseSpecialListHttp
{
companion
object
{
fun
getInstance
():
CourseSpecialListHttpImpl
{
return
Holder
.
INSTANCE
}
fun
clearCourseSpecialListApi
()
{
Holder
.
INSTANCE
.
courseSpecialListApi
=
null
}
}
object
Holder
{
val
INSTANCE
=
CourseSpecialListHttpImpl
()
}
fun
getPostList
(
crq
:
BaseCommand
):
List
<
FormatText
>
{
return
NetworkParamsUtils
.
getPostList
(
crq
)
}
fun
getMaps
(
list
:
List
<
FormatText
>):
Map
<
String
,
String
>
{
return
NetworkParamsUtils
.
getMaps
(
list
)
}
private
var
courseSpecialListApi
:
CourseSpecialListApi
?
=
null
override
fun
courseSpecialList
(
param
:
CourseSpecialListParam
):
Observable
<
BaseAPIResponse
<
CourseSpecialListBean
>>
{
val
list
=
getPostList
(
param
)
return
YDLHttpUtils
.
obtainApi
(
CourseSpecialListApi
::
class
.
java
!!
).
courseSpecialList
(
getMaps
(
list
))
}
}
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/course_special_list/http/ICourseSpecialListHttp.kt
deleted
100644 → 0
View file @
a9a7a92e
package
com.yidianling.course.course_special_list.http
import
com.ydl.ydlcommon.data.http.BaseAPIResponse
import
com.yidianling.course.course_special_list.bean.CourseSpecialListBean
import
io.reactivex.Observable
/**
* @author yuanwai
* @描述:课程专题列表请求接口
* @Copyright Copyright (c) 2018
* @Company 壹点灵
* @date 2018/9/18
*/
interface
ICourseSpecialListHttp
{
/**
* 课程专题列表
*
*
*/
fun
courseSpecialList
(
param
:
CourseSpecialListParam
):
Observable
<
BaseAPIResponse
<
CourseSpecialListBean
>>
}
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/course_special_list/model/CourseSpecialListModelImpl.kt
View file @
2b2eb4ee
package
com.yidianling.course.course_special_list.model
package
com.yidianling.course.course_special_list.model
import
com.ydl.ydlcommon.data.http.RxUtils
import
com.ydl.ydlcommon.data.http.RxUtils
import
com.yidianling.course.net.RetrofitUtils
import
com.yidianling.course.course_special_list.bean.CourseSpecialListBean
import
com.yidianling.course.course_special_list.bean.CourseSpecialListBean
import
com.yidianling.course.course_special_list.contract.ICourseSpecialListContract
import
com.yidianling.course.course_special_list.contract.ICourseSpecialListContract
import
com.yidianling.course.course_special_list.http.CourseSpecialListDataManager
import
com.yidianling.course.course_special_list.bean.CourseSpecialListParam
import
com.yidianling.course.course_special_list.http.CourseSpecialListParam
import
io.reactivex.Observable
import
io.reactivex.Observable
/**
/**
...
@@ -17,7 +17,7 @@ import io.reactivex.Observable
...
@@ -17,7 +17,7 @@ import io.reactivex.Observable
class
CourseSpecialListModelImpl
:
ICourseSpecialListContract
.
Model
{
class
CourseSpecialListModelImpl
:
ICourseSpecialListContract
.
Model
{
override
fun
specialListRequest
(
param
:
CourseSpecialListParam
):
Observable
<
CourseSpecialListBean
>
{
override
fun
specialListRequest
(
param
:
CourseSpecialListParam
):
Observable
<
CourseSpecialListBean
>
{
return
CourseSpecialListDataManager
.
getHttp
().
courseSpecialLi
st
(
param
)
return
RetrofitUtils
.
specialListReque
st
(
param
)
.
compose
(
RxUtils
.
resultJavaData
())
.
compose
(
RxUtils
.
resultJavaData
())
}
}
}
}
\ No newline at end of file
m-course/src/main/java/com/yidianling/course/course_special_list/presenter/CourseSpecialListPresenterImpl.kt
View file @
2b2eb4ee
...
@@ -7,7 +7,7 @@ import com.ydl.ydlcommon.mvp.base.BasePresenter
...
@@ -7,7 +7,7 @@ import com.ydl.ydlcommon.mvp.base.BasePresenter
import
com.yidianling.common.tools.RxNetTool
import
com.yidianling.common.tools.RxNetTool
import
com.yidianling.course.course_special_list.bean.CourseSpecialItemBean
import
com.yidianling.course.course_special_list.bean.CourseSpecialItemBean
import
com.yidianling.course.course_special_list.contract.ICourseSpecialListContract
import
com.yidianling.course.course_special_list.contract.ICourseSpecialListContract
import
com.yidianling.course.course_special_list.
http
.CourseSpecialListParam
import
com.yidianling.course.course_special_list.
bean
.CourseSpecialListParam
import
com.yidianling.course.course_special_list.model.CourseSpecialListModelImpl
import
com.yidianling.course.course_special_list.model.CourseSpecialListModelImpl
import
io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.functions.Consumer
import
io.reactivex.functions.Consumer
...
@@ -68,7 +68,12 @@ class CourseSpecialListPresenterImpl (var view: ICourseSpecialListContract.View)
...
@@ -68,7 +68,12 @@ class CourseSpecialListPresenterImpl (var view: ICourseSpecialListContract.View)
* @param loadMore 是否为上拉加载更多
* @param loadMore 是否为上拉加载更多
*/
*/
private
fun
requestList
(
page
:
Int
,
loadMore
:
Boolean
){
private
fun
requestList
(
page
:
Int
,
loadMore
:
Boolean
){
val
disposable
=
mModel
.
specialListRequest
(
CourseSpecialListParam
(
page
,
0
))
val
disposable
=
mModel
.
specialListRequest
(
CourseSpecialListParam
(
page
,
0
)
)
.
subscribeOn
(
Schedulers
.
io
())
.
subscribeOn
(
Schedulers
.
io
())
.
map
{
it
}
.
map
{
it
}
.
filter
{
it
!=
null
}
.
filter
{
it
!=
null
}
...
...
m-course/src/main/java/com/yidianling/course/model/TopicCourseBean.kt
View file @
2b2eb4ee
package
com.yidianling.course.model
package
com.yidianling.course.model
import
com.ydl.ydlcommon.bean.ShareData
import
com.ydl.ydlcommon.bean.ShareData
import
com.yidianling.course.
coursePlay.moudle
.Course
import
com.yidianling.course.
bean
.Course
/**
/**
* Created by Jim on 2018/7/16 0016.
* Created by Jim on 2018/7/16 0016.
...
...
m-course/src/main/java/com/yidianling/course/
coursePlay/common/
net/Command.java
→
m-course/src/main/java/com/yidianling/course/net/Command.java
View file @
2b2eb4ee
package
com
.
yidianling
.
course
.
coursePlay
.
common
.
net
;
package
com
.
yidianling
.
course
.
net
;
import
com.ydl.ydlcommon.data.http.BaseCommand
;
import
com.ydl.ydlcommon.data.http.BaseCommand
;
import
com.ydl.ydlcommon.router.YdlCommonOut
;
import
com.ydl.ydlcommon.router.YdlCommonOut
;
...
...
m-course/src/main/java/com/yidianling/course/
coursePlay/common/
net/NetApiStore.java
→
m-course/src/main/java/com/yidianling/course/net/NetApiStore.java
View file @
2b2eb4ee
package
com
.
yidianling
.
course
.
coursePlay
.
common
.
net
;
package
com
.
yidianling
.
course
.
net
;
import
com.ydl.ydlcommon.data.http.BaseAPIResponse
;
import
com.ydl.ydlcommon.data.http.BaseAPIResponse
;
import
com.ydl.ydlcommon.data.http.BaseResponse
;
import
com.ydl.ydlcommon.data.http.BaseResponse
;
...
@@ -6,10 +6,11 @@ import com.yidianling.course.bean.CouponHintResponseBean;
...
@@ -6,10 +6,11 @@ import com.yidianling.course.bean.CouponHintResponseBean;
import
com.yidianling.course.bean.CourseCouponBean
;
import
com.yidianling.course.bean.CourseCouponBean
;
import
com.yidianling.course.bean.CourseMediaDetailBean
;
import
com.yidianling.course.bean.CourseMediaDetailBean
;
import
com.yidianling.course.bean.PostersShareBean
;
import
com.yidianling.course.bean.PostersShareBean
;
import
com.yidianling.course.coursePlay.moudle.Course
;
import
com.yidianling.course.bean.Course
;
import
com.yidianling.course.coursePlay.moudle.CourseAddOrderBean
;
import
com.yidianling.course.bean.CourseAddOrderBean
;
import
com.yidianling.course.coursePlay.moudle.CourseListDataBean
;
import
com.yidianling.course.bean.CourseListDataBean
;
import
com.yidianling.course.coursePlay.moudle.CoursePlayBean
;
import
com.yidianling.course.bean.CoursePlayBean
;
import
com.yidianling.course.course_special_list.bean.CourseSpecialListBean
;
import
com.yidianling.course.model.CourseCategoryBean
;
import
com.yidianling.course.model.CourseCategoryBean
;
import
com.yidianling.course.model.TopicCourseBean
;
import
com.yidianling.course.model.TopicCourseBean
;
...
@@ -18,13 +19,7 @@ import java.util.Map;
...
@@ -18,13 +19,7 @@ import java.util.Map;
import
io.reactivex.Observable
;
import
io.reactivex.Observable
;
import
okhttp3.RequestBody
;
import
okhttp3.RequestBody
;
import
retrofit2.http.Body
;
import
retrofit2.http.*
;
import
retrofit2.http.FieldMap
;
import
retrofit2.http.FormUrlEncoded
;
import
retrofit2.http.GET
;
import
retrofit2.http.POST
;
import
retrofit2.http.Query
;
import
retrofit2.http.Url
;
/**
/**
* Created by Jim on 2018/2/26 0026.
* Created by Jim on 2018/2/26 0026.
...
@@ -116,4 +111,10 @@ public interface NetApiStore {
...
@@ -116,4 +111,10 @@ public interface NetApiStore {
//获取课程播放页 java 接口
//获取课程播放页 java 接口
@GET
(
"auth/course/get/all/audio-video"
)
@GET
(
"auth/course/get/all/audio-video"
)
Observable
<
BaseResponse
<
CourseMediaDetailBean
>>
getCoursePlayData
(
@Query
(
"courseId"
)
String
courseId
);
Observable
<
BaseResponse
<
CourseMediaDetailBean
>>
getCoursePlayData
(
@Query
(
"courseId"
)
String
courseId
);
//课程专题列表
//todo
@GET
(
"auth/course/listCoursesBySpecialId"
)
Observable
<
BaseAPIResponse
<
CourseSpecialListBean
>>
courseSpecialList
(
@QueryMap
Map
<
String
,
String
>
params
);
}
}
m-course/src/main/java/com/yidianling/course/
coursePlay/common/
net/RetrofitUtils.java
→
m-course/src/main/java/com/yidianling/course/net/RetrofitUtils.java
View file @
2b2eb4ee
package
com
.
yidianling
.
course
.
coursePlay
.
common
.
net
;
package
com
.
yidianling
.
course
.
net
;
import
android.content.Context
;
import
android.content.Context
;
import
com.ydl.ydlcommon.data.http.BaseAPIResponse
;
import
com.ydl.ydlcommon.data.http.BaseAPIResponse
;
...
@@ -8,9 +8,11 @@ import com.ydl.ydlcommon.utils.NetworkParamsUtils;
...
@@ -8,9 +8,11 @@ import com.ydl.ydlcommon.utils.NetworkParamsUtils;
import
com.ydl.ydlcommon.utils.remind.HttpErrorUtils
;
import
com.ydl.ydlcommon.utils.remind.HttpErrorUtils
;
import
com.ydl.ydlnet.YDLHttpUtils
;
import
com.ydl.ydlnet.YDLHttpUtils
;
import
com.yidianling.course.bean.*
;
import
com.yidianling.course.bean.*
;
import
com.yidianling.course.coursePlay.moudle.Course
;
import
com.yidianling.course.bean.Course
;
import
com.yidianling.course.coursePlay.moudle.CourseListDataBean
;
import
com.yidianling.course.bean.CourseListDataBean
;
import
com.yidianling.course.coursePlay.moudle.CoursePlayBean
;
import
com.yidianling.course.bean.CoursePlayBean
;
import
com.yidianling.course.course_special_list.bean.CourseSpecialListBean
;
import
com.yidianling.course.course_special_list.bean.CourseSpecialListParam
;
import
com.yidianling.course.model.CourseCategoryBean
;
import
com.yidianling.course.model.CourseCategoryBean
;
import
com.yidianling.course.model.TopicCourseBean
;
import
com.yidianling.course.model.TopicCourseBean
;
import
io.reactivex.Observable
;
import
io.reactivex.Observable
;
...
@@ -104,16 +106,20 @@ public class RetrofitUtils {
...
@@ -104,16 +106,20 @@ public class RetrofitUtils {
}
}
public
static
Observable
<
BaseAPIResponse
<
CourseListDataBean
>>
getCourseList
(
String
url
)
{
public
static
Observable
<
BaseAPIResponse
<
CourseListDataBean
>>
getCourseList
(
String
url
)
{
return
YDLHttpUtils
.
Companion
.
obtainApi
(
NetApiStore
.
class
).
getCourseList
(
YdlRetrofitUtils
.
SERVER_API_JAVA_URL
+
"auth/course/getList?"
+
url
);
return
YDLHttpUtils
.
Companion
.
obtainApi
(
NetApiStore
.
class
).
getCourseList
(
YdlRetrofitUtils
.
SERVER_API_JAVA_URL
+
"auth/course/getList?"
+
url
);
}
}
/**
/**
* 获取课程播放页 java 接口
* 获取课程播放页 java 接口
*
*/
*/
public
static
Observable
<
BaseResponse
<
CourseMediaDetailBean
>>
getCoursePlayData
(
String
courseId
)
{
public
static
Observable
<
BaseResponse
<
CourseMediaDetailBean
>>
getCoursePlayData
(
String
courseId
)
{
return
YDLHttpUtils
.
Companion
.
obtainApi
(
NetApiStore
.
class
).
getCoursePlayData
(
courseId
);
return
YDLHttpUtils
.
Companion
.
obtainApi
(
NetApiStore
.
class
).
getCoursePlayData
(
courseId
);
}
}
public
static
Observable
<
BaseAPIResponse
<
CourseSpecialListBean
>>
specialListRequest
(
CourseSpecialListParam
param
)
{
List
<
FormatText
>
list
=
NetworkParamsUtils
.
getPostList
(
param
);
return
YDLHttpUtils
.
Companion
.
obtainApi
(
NetApiStore
.
class
).
courseSpecialList
(
NetworkParamsUtils
.
getMaps
(
list
));
}
}
}
m-course/src/main/java/com/yidianling/course/widget/CouponHintView.kt
View file @
2b2eb4ee
...
@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
...
@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
import
android.content.Context
import
android.content.Context
import
android.text.TextUtils
import
android.text.TextUtils
import
android.util.AttributeSet
import
android.util.AttributeSet
import
android.util.Log
import
android.view.View
import
android.view.View
import
android.widget.RelativeLayout
import
android.widget.RelativeLayout
import
com.ydl.ydl_router.manager.YDLRouterManager
import
com.ydl.ydl_router.manager.YDLRouterManager
...
@@ -14,7 +13,7 @@ import com.ydl.ydlcommon.router.IYDLRouterConstant
...
@@ -14,7 +13,7 @@ import com.ydl.ydlcommon.router.IYDLRouterConstant
import
com.yidianling.course.R
import
com.yidianling.course.R
import
com.yidianling.course.bean.CouponHintParam
import
com.yidianling.course.bean.CouponHintParam
import
com.yidianling.course.bean.CouponHintResponseBean
import
com.yidianling.course.bean.CouponHintResponseBean
import
com.yidianling.course.
coursePlay.common.
net.RetrofitUtils
import
com.yidianling.course.net.RetrofitUtils
import
io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.functions.Consumer
import
io.reactivex.functions.Consumer
import
kotlinx.android.synthetic.main.coupon_hint_view.view.*
import
kotlinx.android.synthetic.main.coupon_hint_view.view.*
...
...
m-course/src/main/java/com/yidianling/course/widget/CourseItemNewView.kt
View file @
2b2eb4ee
...
@@ -12,7 +12,7 @@ import com.ydl.ydl_image.module.GlideApp
...
@@ -12,7 +12,7 @@ import com.ydl.ydl_image.module.GlideApp
import
com.yidianling.common.tools.RxImageTool
import
com.yidianling.common.tools.RxImageTool
import
com.yidianling.course.CourseConstants
import
com.yidianling.course.CourseConstants
import
com.yidianling.course.R
import
com.yidianling.course.R
import
com.yidianling.course.
coursePlay.moudle
.Course
import
com.yidianling.course.
bean
.Course
/**
/**
* @author jiucheng
* @author jiucheng
...
...
m-course/src/main/java/com/yidianling/course/widget/CourseRedPacketView.kt
View file @
2b2eb4ee
...
@@ -12,7 +12,7 @@ import com.ydl.ydlcommon.data.http.ThrowableConsumer
...
@@ -12,7 +12,7 @@ import com.ydl.ydlcommon.data.http.ThrowableConsumer
import
com.ydl.ydlcommon.router.IYDLRouterConstant
import
com.ydl.ydlcommon.router.IYDLRouterConstant
import
com.yidianling.course.R
import
com.yidianling.course.R
import
com.yidianling.course.bean.RedListParam
import
com.yidianling.course.bean.RedListParam
import
com.yidianling.course.
coursePlay.common.
net.RetrofitUtils
import
com.yidianling.course.net.RetrofitUtils
import
io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.android.schedulers.AndroidSchedulers
import
io.reactivex.functions.Consumer
import
io.reactivex.functions.Consumer
import
kotlinx.android.synthetic.main.course_redpacket_view.view.*
import
kotlinx.android.synthetic.main.course_redpacket_view.view.*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment