Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
android
/
dayu
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
85ef039a
authored
4 years ago
by
mReturn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
V2.5.0
parent
0f54a19c
master
…
dev
dev_xx
dev_xx_241116
dev_xx_250108_toast
dev_xx_250224_report
dev_xx_web
v2.7.2
v2.7.1
v2.7.0
v2.6.9
v2.6.7
v2.6.6
v2.6.5
v2.6.4
v2.6.3
v2.6.2
v2.6.1
v2.6.0
v2.5.9
v2.5.7
v2.5.5
v2.5.4
v2.5.3
v2.5.2
dev20230405
Show whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
142 additions
and
69 deletions
app/src/main/AndroidManifest.xml
baseSDK/src/main/AndroidManifest.xml
baseSDK/src/main/java/com/dayu/common/Constants.java
baseSDK/src/main/java/com/dayu/utils/CommonUtils.java
baseSDK/src/main/res/values/strings.xml
learnCenter/src/main/java/com/dayu/learncenter/adapter/LearnAdapter.java
learnCenter/src/main/java/com/dayu/learncenter/api/bean/CommonLearnBean.java
learnCenter/src/main/java/com/dayu/learncenter/api/bean/CourseDeatilBean.java
learnCenter/src/main/java/com/dayu/learncenter/event/CourseChangeEvent.java → learnCenter/src/main/java/com/dayu/learncenter/event/CourseModifyEvent.java
learnCenter/src/main/java/com/dayu/learncenter/event/CoursePubEvent.java
learnCenter/src/main/java/com/dayu/learncenter/presenter/pubcourse/PubCoursePresenter.java
learnCenter/src/main/java/com/dayu/learncenter/ui/activity/CourseDetailActivity.java
learnCenter/src/main/java/com/dayu/learncenter/ui/activity/EditCourseActivity.java
learnCenter/src/main/java/com/dayu/learncenter/ui/activity/PubCourseActivity.java
learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/CommonLearnFragment.java
learnCenter/src/main/res/layout/activity_pub_course.xml
learnCenter/src/main/res/layout/fragment_home_learn.xml
orderCenter/src/main/java/com/dayu/order/presenter/orderpart_receive/PartRecievePresenter.java
orderCenter/src/main/java/com/dayu/order/ui/activity/OrderPartReceiveActivity.java
orderCenter/src/main/java/com/dayu/order/ui/activity/OrderPartSendActivity.java
orderCenter/src/main/res/layout/item_multi_process_order.xml
saleCenter/src/main/java/com/bigfish/salecenter/adapter/SaleProductAdapter.java
app/src/main/AndroidManifest.xml
View file @
85ef039a
...
...
@@ -148,6 +148,7 @@
android:launchMode=
"singleTask"
android:screenOrientation=
"portrait"
android:configChanges=
"orientation|screenSize|keyboardHidden"
android:windowSoftInputMode=
"stateHidden|adjustPan"
/>
<activity
android:name=
"com.dayu.bigfish.ui.ManagerActivity"
...
...
This diff is collapsed.
Click to expand it.
baseSDK/src/main/AndroidManifest.xml
View file @
85ef039a
...
...
@@ -14,11 +14,12 @@
<action
android:name=
"android.net.wifi.STATE_CHANGE"
/>
</intent-filter>
</receiver>
<activity
android:name=
"com.dayu.base.ui.activity.PreviewActivty"
/>
<activity
android:name=
"com.dayu.base.ui.activity.ImgGalleryActivty"
android:
screenOrientation=
"portrait"
/>
<activity
android:name=
"com.dayu.base.ui.activity.CameraActivity"
android:screenOrientation=
"portrait"
/>
<activity
android:
name=
"com.dayu.base.ui.activity.ImgGalleryActivty"
android:screenOrientation=
"portrait"
/>
<activity
android:name=
"com.dayu.base.ui.activity.CameraActivity"
/>
</application>
</manifest>
This diff is collapsed.
Click to expand it.
baseSDK/src/main/java/com/dayu/common/Constants.java
View file @
85ef039a
...
...
@@ -50,32 +50,32 @@ public class Constants {
/**
* uat测试环境配置.
*/
public
static
final
String
ENVIROMENT
=
"uat"
;
public
static
final
int
LOG_LEVEL
=
LogUtils
.
LEVEL_ALL
;
public
static
final
String
BASE_URL
=
"http://47.95.223.6:3112"
;
public
final
static
String
UP_PHOTO
=
"/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply"
;
public
final
static
String
UP_VIDEO
=
"/file/uploadVideoOne?targetPath=test/video"
;
public
final
static
String
WEB_SOP
=
"http://47.95.223.6:9004/#/sop"
;
public
final
static
String
WEB_SOP_DETAIL
=
"http://47.95.223.6:9004/#/sopdetail"
;
public
final
static
String
WEB_ZHI_SHI
=
"http://47.95.223.6:9004/#/detail"
;
public
final
static
String
CHECK_MULTI_WEB_SOP
=
"http://47.95.223.6:9004/#/manyServiceResult"
;
public
final
static
String
MULTI_WEB_SOP
=
"http://47.95.223.6:9004/#/manySop"
;
public
static
final
boolean
IS_DEBUG
=
true
;
//
public static final String ENVIROMENT = "uat";
//
public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
//
public static final String BASE_URL = "http://47.95.223.6:3112";
//
public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
//
public final static String UP_VIDEO = "/file/uploadVideoOne?targetPath=test/video";
//
public final static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
//
public final static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
//
public final static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
//
public final static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
//
public final static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
//
public static final boolean IS_DEBUG = true;
/**
* 正式环境.
*/
//
public static final String ENVIROMENT = "release";
//
public static final int LOG_LEVEL = LogUtils.LEVEL_OFF;
//
public static final String BASE_URL = "https://mobile.kf.ai";
//
public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
//
public final static String UP_VIDEO = "/file/uploadVideoOne?targetPath=online/video";
//
public final static String WEB_SOP = "https://sop.kf.ai/#/sop";
//
public final static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
//
public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
//
public final static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
//
public final static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
//
public static final boolean IS_DEBUG = false;
public
static
final
String
ENVIROMENT
=
"release"
;
public
static
final
int
LOG_LEVEL
=
LogUtils
.
LEVEL_OFF
;
public
static
final
String
BASE_URL
=
"https://mobile.kf.ai"
;
public
final
static
String
UP_PHOTO
=
"/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply"
;
public
final
static
String
UP_VIDEO
=
"/file/uploadVideoOne?targetPath=online/video"
;
public
final
static
String
WEB_SOP
=
"https://sop.kf.ai/#/sop"
;
public
final
static
String
WEB_SOP_DETAIL
=
"https://sop.kf.ai/#/sopdetail"
;
public
final
static
String
WEB_ZHI_SHI
=
"https://sop.kf.ai/#/detail"
;
public
final
static
String
CHECK_MULTI_WEB_SOP
=
"https://sop.kf.ai/#/manyServiceResult"
;
public
final
static
String
MULTI_WEB_SOP
=
"https://sop.kf.ai/#/manySop"
;
public
static
final
boolean
IS_DEBUG
=
false
;
/**
* 统一配置.
...
...
This diff is collapsed.
Click to expand it.
baseSDK/src/main/java/com/dayu/utils/CommonUtils.java
View file @
85ef039a
...
...
@@ -252,6 +252,9 @@ public class CommonUtils {
return
duration
;
}
public
static
void
setVideoThumb
(
Context
context
,
JzvdStd
jzvdStd
,
String
url
)
{
// jzvdStd.thumbImageView.setScaleType(ImageView.ScaleType.FIT_CENTER);
// GlideImageLoader.loadFit(context, jzvdStd.thumbImageView,url, R.drawable.icon_video_default);
// url = url.replace("http:","https:")+"?x-oss-process=video/snapshot,t_0,f_jpg,ar_auto";
GlideImageLoader
.
load
(
context
,
jzvdStd
.
thumbImageView
,
url
,
R
.
drawable
.
icon_video_default
);
}
...
...
This diff is collapsed.
Click to expand it.
baseSDK/src/main/res/values/strings.xml
View file @
85ef039a
...
...
@@ -807,7 +807,7 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ
<string
name=
"sale_collect"
>
重点收藏
</string>
<string
name=
"in_sale"
>
销售中
</string>
<string
name=
"sale_done"
>
已完成
</string>
<string
name=
"input_sale_product"
>
输入您要找的商品
</string>
<string
name=
"input_sale_product"
>
查找商品
</
string>
<string
name=
"input_sale_order"
>
查找销售订单
</string>
<string
name=
"brand_model"
>
品名:
</string>
<string
name=
"sale_single_price"
>
单价:
</string>
...
...
@@ -987,6 +987,7 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ
<string
name=
"zone_str"
>
区/县
</string>
<!-- learn -->
<string
name=
"learn_title"
>
学习交流
</string>
<string
name=
"learn_str"
>
学习
</string>
<string
name=
"find_course"
>
查找课程
</string>
<array
name=
"learn_top_tab_item"
>
...
...
@@ -1002,8 +1003,9 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ
<string
name=
"upload_video"
>
上传视频:
</string>
<string
name=
"pls_choose_video"
>
请选择视频
</string>
<string
name=
"learn_tips"
>
温馨提示:
</string>
<string
name=
"learn_tip1"
>
1、请勿发布反动和涉黄内容的视频,平台有权下架并追究发布者的法律责任。
</string>
<string
name=
"learn_tip2"
>
2、大鱼平台将对优质课程(点赞数)和热门课程(阅读数)的发布者进行现金奖励。
</string>
<string
name=
"learn_tip1"
>
1、建议横屏拍摄视频,长度不超过3分钟,以方便师傅们在手机上观看。
</string>
<string
name=
"learn_tip2"
>
2、请勿发布反动和涉黄内容的视频,平台有权下架并追究发布者的法律责任。
</string>
<string
name=
"learn_tip3"
>
3、大鱼平台将对优质课程(点赞数)和热门课程(阅读数)的发布者进行现金奖励。
</string>
<string
name=
"confirm_pub"
>
确认发布
</string>
<string
name=
"limit_10_words"
>
限10个字
</string>
<string
name=
"limit_100_words"
>
限100字
</string>
...
...
This diff is collapsed.
Click to expand it.
learnCenter/src/main/java/com/dayu/learncenter/adapter/LearnAdapter.java
View file @
85ef039a
...
...
@@ -40,6 +40,7 @@ public class LearnAdapter extends CoreAdapter<CommonLearnBean, ItemCommonLearnBi
}
holder
.
ivLike
.
setImageResource
(
item
.
getPointStatus
()
==
1
?
R
.
drawable
.
icon_like_red
:
R
.
drawable
.
icon_like_gray
);
holder
.
tvDisable
.
setVisibility
(
type
==
3
&&
item
.
getStatus
()
!=
1
?
View
.
VISIBLE
:
View
.
GONE
);
// holder.rlCover.setVisibility(item.isShowCover()? View.VISIBLE : View.GONE);
holder
.
jzVideo
.
setUp
(
item
.
getUrl
(),
""
,
JzvdStd
.
SCREEN_NORMAL
,
JZMediaIjk
.
class
);
CommonUtils
.
setVideoThumb
(
mContext
,
holder
.
jzVideo
,
item
.
getUrl
());
...
...
This diff is collapsed.
Click to expand it.
learnCenter/src/main/java/com/dayu/learncenter/api/bean/CommonLearnBean.java
View file @
85ef039a
...
...
@@ -47,7 +47,15 @@ public class CommonLearnBean {
private
String
url
;
private
int
pointStatus
;
private
int
firstUrl
;
private
boolean
showCover
=
true
;
public
boolean
isShowCover
()
{
return
showCover
;
}
public
void
setShowCover
(
boolean
showCover
)
{
this
.
showCover
=
showCover
;
}
public
int
getPointStatus
()
{
return
pointStatus
;
...
...
This diff is collapsed.
Click to expand it.
learnCenter/src/main/java/com/dayu/learncenter/api/bean/CourseDeatilBean.java
View file @
85ef039a
...
...
@@ -247,7 +247,7 @@ public class CourseDeatilBean implements Serializable {
private
int
id
;
private
int
pointStatus
;
private
int
progressPercentage
;
private
int
progressTimes
;
private
long
progressTimes
;
private
String
startTime
;
private
int
status
;
...
...
@@ -315,11 +315,11 @@ public class CourseDeatilBean implements Serializable {
this
.
progressPercentage
=
progressPercentage
;
}
public
int
getProgressTimes
()
{
public
long
getProgressTimes
()
{
return
progressTimes
;
}
public
void
setProgressTimes
(
int
progressTimes
)
{
public
void
setProgressTimes
(
long
progressTimes
)
{
this
.
progressTimes
=
progressTimes
;
}
...
...
This diff is collapsed.
Click to expand it.
learnCenter/src/main/java/com/dayu/learncenter/event/Course
Change
Event.java
→
learnCenter/src/main/java/com/dayu/learncenter/event/Course
Modify
Event.java
View file @
85ef039a
package
com
.
dayu
.
learncenter
.
event
;
public
class
Course
Change
Event
{
public
class
Course
Modify
Event
{
}
This diff is collapsed.
Click to expand it.
learnCenter/src/main/java/com/dayu/learncenter/event/CoursePubEvent.java
0 → 100644
View file @
85ef039a
package
com
.
dayu
.
learncenter
.
event
;
public
class
CoursePubEvent
{
}
This diff is collapsed.
Click to expand it.
learnCenter/src/main/java/com/dayu/learncenter/presenter/pubcourse/PubCoursePresenter.java
View file @
85ef039a
package
com
.
dayu
.
learncenter
.
presenter
.
pubcourse
;
import
android.databinding.ObservableField
;
import
android.media.MediaMetadataRetriever
;
import
android.text.TextUtils
;
import
com.cjt2325.cameralibrary.util.LogUtil
;
...
...
@@ -12,8 +10,8 @@ import com.dayu.learncenter.R;
import
com.dayu.learncenter.api.LearnService
;
import
com.dayu.learncenter.api.data.EditCourseData
;
import
com.dayu.learncenter.api.data.PubCourseData
;
import
com.dayu.learncenter.event.Course
Change
Event
;
import
com.dayu.learncenter.
presenter.common_learn.CommonLearnContrac
t
;
import
com.dayu.learncenter.event.Course
Modify
Event
;
import
com.dayu.learncenter.
event.CoursePubEven
t
;
import
com.dayu.utils.CommonUtils
;
import
com.dayu.utils.ToastUtils
;
import
com.dayu.utils.UserManager
;
...
...
@@ -52,14 +50,12 @@ public class PubCoursePresenter extends PubCourseContract.Presenter {
}
public
void
pubVideo
(
String
videoPath
,
PubCourseData
data
)
{
LogUtil
.
e
(
"pugVideo 00"
);
// ToastUtils.showShortToast("length: "+CommonUtils.getVideoLength(videoPath));
mPubData
=
data
;
if
(!
TextUtils
.
isEmpty
(
data
.
url
)){
videoUrl
=
data
.
url
;
}
if
(
TextUtils
.
isEmpty
(
videoUrl
))
{
LogUtil
.
e
(
"pugVideo 01 "
+
videoPath
);
uploadVideo
(
videoPath
,
false
);
}
else
{
pubCourse
();
...
...
@@ -77,7 +73,6 @@ public class PubCoursePresenter extends PubCourseContract.Presenter {
uploadVideo
(
videoPath
,
true
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
LogUtil
.
e
(
"pugVideo error "
+
e
.
toString
());
}
}
else
{
modifyCourse
();
...
...
@@ -87,13 +82,9 @@ public class PubCoursePresenter extends PubCourseContract.Presenter {
private
void
uploadVideo
(
String
videoPath
,
boolean
isModify
)
{
mView
.
showDialog
();
File
file
=
new
File
(
videoPath
);
LogUtil
.
e
(
"pugVideo 02 "
+
file
.
length
()+
" "
+
file
.
getName
());
RequestBody
requestFile
=
RequestBody
.
create
(
MediaType
.
parse
(
"multipart/form-data"
),
file
);
LogUtil
.
e
(
"pugVideo 020 "
+
requestFile
);
MultipartBody
.
Part
body
=
MultipartBody
.
Part
.
createFormData
(
"fileUpload"
,
file
.
getName
(),
requestFile
);
LogUtil
.
e
(
"pugVideo 021 "
+
body
);
BaseApiFactory
.
uploadVideo
(
body
).
subscribe
(
baseObserver
(
data
->
{
LogUtil
.
e
(
"pugVideo 022 "
);
if
(!
TextUtils
.
isEmpty
(
data
))
{
videoUrl
=
data
;
if
(
isModify
){
...
...
@@ -108,7 +99,6 @@ public class PubCoursePresenter extends PubCourseContract.Presenter {
}
private
void
pubCourse
()
{
LogUtil
.
e
(
"pugVideo 03"
);
mView
.
showDialog
();
mPubData
.
url
=
videoUrl
;
Api
.
getService
(
LearnService
.
class
).
pubCourse
(
mPubData
).
compose
(
Api
.
applySchedulers
())
...
...
@@ -116,7 +106,7 @@ public class PubCoursePresenter extends PubCourseContract.Presenter {
if
(
success
)
{
ToastUtils
.
showShortToast
(
R
.
string
.
pub_course_success
);
mView
.
dumpBack
();
EventBus
.
getDefault
().
post
(
new
Course
Change
Event
());
EventBus
.
getDefault
().
post
(
new
Course
Pub
Event
());
}
else
{
ToastUtils
.
showShortToast
(
R
.
string
.
pub_course_fail
);
}
...
...
@@ -131,7 +121,7 @@ public class PubCoursePresenter extends PubCourseContract.Presenter {
if
(
success
)
{
ToastUtils
.
showShortToast
(
R
.
string
.
modify_course_success
);
mView
.
dumpBack
();
EventBus
.
getDefault
().
post
(
new
Course
Change
Event
());
EventBus
.
getDefault
().
post
(
new
Course
Modify
Event
());
}
else
{
ToastUtils
.
showShortToast
(
R
.
string
.
modify_course_fail
);
}
...
...
This diff is collapsed.
Click to expand it.
learnCenter/src/main/java/com/dayu/learncenter/ui/activity/CourseDetailActivity.java
View file @
85ef039a
...
...
@@ -17,11 +17,13 @@ import com.dayu.common.Constants;
import
com.dayu.learncenter.R
;
import
com.dayu.learncenter.api.LearnService
;
import
com.dayu.learncenter.api.bean.CourseDeatilBean
;
import
com.dayu.learncenter.api.data.StudyCourseData
;
import
com.dayu.learncenter.databinding.ActivityCourseDetailBinding
;
import
com.dayu.utils.CommonUtils
;
import
com.dayu.utils.ProgressUtil
;
import
com.dayu.widgets.JZMediaIjk
;
import
com.dayu.widgets.KeyboardStateObserver
;
import
com.dayu.widgets.MyJzvdStd
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
@@ -114,7 +116,7 @@ public class CourseDetailActivity extends BaseActivity<SImplePresenter, Activity
mBind
.
tvTheme
.
setText
(
data
.
getName
());
mBind
.
tvDesc
.
setText
(
data
.
getBrief
());
mBind
.
tvPuber
.
setText
(
data
.
getCreated
());
mBind
.
jzVideo
.
setUp
(
data
.
getUrl
(),
""
,
JzvdStd
.
SCREEN_NORMAL
,
JZMediaIjk
.
class
);
mBind
.
jzVideo
.
setUp
(
data
.
getUrl
(),
""
,
JzvdStd
.
SCREEN_NORMAL
,
JZMediaIjk
.
class
);
CommonUtils
.
setVideoThumb
(
mActivity
,
mBind
.
jzVideo
,
data
.
getUrl
());
steVideoListener
();
mBind
.
tvLooks
.
setText
(
data
.
getLearners
()
+
""
);
...
...
@@ -138,8 +140,52 @@ public class CourseDetailActivity extends BaseActivity<SImplePresenter, Activity
//播放监听
private
void
steVideoListener
()
{
mBind
.
jzVideo
.
setPlayCallBack
(
new
MyJzvdStd
.
PlayCallBack
()
{
@Override
public
void
onstart
()
{
if
(
courseDetail
.
getCourseStudyVO
()
==
null
)
{
studyCourse
(
courseDetail
.
getId
(),
0
,
0
,
1
);
}
else
{
if
(
courseDetail
.
getCourseStudyVO
().
getStatus
()
==
2
&&
courseDetail
.
getCourseStudyVO
().
getProgressTimes
()
>
0
)
{
mBind
.
jzVideo
.
seekToInAdvance
=
courseDetail
.
getCourseStudyVO
().
getProgressTimes
();
}
if
(
courseDetail
.
getCourseStudyVO
().
getStatus
()
!=
2
&&
courseDetail
.
getCourseStudyVO
().
getStatus
()
!=
3
)
studyCourse
(
courseDetail
.
getId
(),
0
,
0
,
1
);
}
}
@Override
public
void
onPrepare
()
{
}
@Override
public
void
onPause
()
{
if
(
courseDetail
.
getCourseStudyVO
()
!=
null
&&
courseDetail
.
getCourseStudyVO
().
getStatus
()
!=
3
)
studyCourse
(
courseDetail
.
getId
(),
mBind
.
jzVideo
.
curProgress
,
mBind
.
jzVideo
.
curPosition
,
2
);
}
@Override
public
void
onComplete
()
{
if
(
courseDetail
.
getCourseStudyVO
()
!=
null
&&
courseDetail
.
getCourseStudyVO
().
getStatus
()
!=
3
)
studyCourse
(
courseDetail
.
getId
(),
100
,
mBind
.
jzVideo
.
curPosition
,
3
);
}
});
}
//学习课程
public
void
studyCourse
(
int
courseId
,
int
progress
,
long
progressTime
,
int
status
)
{
StudyCourseData
studyData
=
new
StudyCourseData
(
courseId
,
mUserId
,
mUserInfo
.
getMobile
(),
mUserInfo
.
getAccountName
(),
progress
,
progressTime
,
status
);
Api
.
getService
(
LearnService
.
class
).
studyCourse
(
studyData
).
compose
(
Api
.
applySchedulers
())
.
subscribe
(
mPresenter
.
baseObserver
(
success
->
{
// ToastUtils.showShortToast("result "+success);
}));
}
// ------------------------------------------------- 评论 --------------------------------------
private
void
initCommentAdapter
()
{
mCommentAdapter
=
new
CommentAdapter
(
false
);
mCommentAdapter
.
setData
(
commentList
);
...
...
This diff is collapsed.
Click to expand it.
learnCenter/src/main/java/com/dayu/learncenter/ui/activity/EditCourseActivity.java
View file @
85ef039a
...
...
@@ -179,7 +179,7 @@ public class EditCourseActivity extends BaseActivity<PubCoursePresenter, Activit
if
(
pos
==
0
)
{
recordVideo
();
}
else
{
MediaChooseUtils
.
chooseSigleVideo
(
this
,
18
0
);
MediaChooseUtils
.
chooseSigleVideo
(
this
,
18
1
);
}
});
}
...
...
This diff is collapsed.
Click to expand it.
learnCenter/src/main/java/com/dayu/learncenter/ui/activity/PubCourseActivity.java
View file @
85ef039a
...
...
@@ -105,7 +105,7 @@ public class PubCourseActivity extends BaseActivity<PubCoursePresenter, Activity
if
(
pos
==
0
)
{
recordVideo
();
}
else
{
MediaChooseUtils
.
chooseSigleVideo
(
this
,
18
0
);
MediaChooseUtils
.
chooseSigleVideo
(
this
,
18
1
);
}
});
}
...
...
This diff is collapsed.
Click to expand it.
learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/CommonLearnFragment.java
View file @
85ef039a
...
...
@@ -13,12 +13,12 @@ import com.dayu.common.MyTextWatcher;
import
com.dayu.learncenter.R
;
import
com.dayu.learncenter.adapter.LearnAdapter
;
import
com.dayu.learncenter.databinding.FragmentCommonLearnBinding
;
import
com.dayu.learncenter.event.CourseChangeEvent
;
import
com.dayu.learncenter.event.CourseModifyEvent
;
import
com.dayu.learncenter.event.CoursePubEvent
;
import
com.dayu.learncenter.presenter.common_learn.CommonLearnContract
;
import
com.dayu.learncenter.presenter.common_learn.CommonLearnPresenter
;
import
com.dayu.learncenter.ui.activity.CourseDetailActivity
;
import
com.dayu.learncenter.ui.activity.EditCourseActivity
;
import
com.dayu.learncenter.ui.activity.PubCourseActivity
;
import
com.dayu.utils.CommonUtils
;
import
org.greenrobot.eventbus.EventBus
;
...
...
@@ -111,11 +111,11 @@ public class CommonLearnFragment extends BaseFragment<CommonLearnPresenter, Frag
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
);
bundle
.
putInt
(
Constants
.
ID
,
item
.
getId
());
if
(
type
==
3
)
{
startActivity
(
EditCourseActivity
.
class
,
bundle
);
}
else
{
startActivity
(
CourseDetailActivity
.
class
,
bundle
);
}
});
...
...
@@ -131,6 +131,7 @@ public class CommonLearnFragment extends BaseFragment<CommonLearnPresenter, Frag
if
(
jzvd
!=
null
&&
Jzvd
.
CURRENT_JZVD
!=
null
&&
jzvd
.
jzDataSource
.
containsTheUrl
(
Jzvd
.
CURRENT_JZVD
.
jzDataSource
.
getCurrentUrl
()))
{
if
(
Jzvd
.
CURRENT_JZVD
!=
null
&&
Jzvd
.
CURRENT_JZVD
.
screen
!=
Jzvd
.
SCREEN_FULLSCREEN
)
{
Jzvd
.
goOnPlayOnPause
();
Jzvd
.
releaseAllVideos
();
}
}
...
...
@@ -151,8 +152,13 @@ public class CommonLearnFragment extends BaseFragment<CommonLearnPresenter, Frag
}
@Subscribe
public
void
refershData
(
Course
ChangeEvent
event
)
{
public
void
refershData
(
Course
PubEvent
event
)
{
if
(
type
==
1
||
type
==
3
)
mPresenter
.
refresh
();
}
@Subscribe
public
void
onModify
(
CourseModifyEvent
event
)
{
mPresenter
.
refresh
();
}
}
This diff is collapsed.
Click to expand it.
learnCenter/src/main/res/layout/activity_pub_course.xml
View file @
85ef039a
...
...
@@ -130,12 +130,18 @@
<TextView
style=
"@style/common_text_style"
android:text=
"@string/learn_tip1"
android:layout_marginTop=
"25dp"
android:layout_marginTop=
"5dp"
android:textColor=
"@color/common_red"
/>
<TextView
style=
"@style/common_text_style"
android:text=
"@string/learn_tip2"
android:layout_marginTop=
"25dp"
android:layout_marginTop=
"5dp"
/>
<TextView
style=
"@style/common_text_style"
android:text=
"@string/learn_tip3"
android:layout_marginTop=
"5dp"
android:layout_marginBottom=
"15dp"
/>
...
...
This diff is collapsed.
Click to expand it.
learnCenter/src/main/res/layout/fragment_home_learn.xml
View file @
85ef039a
...
...
@@ -16,7 +16,7 @@
<TextView
style=
"@style/text_title"
android:text=
"@string/learn_
str
"
/>
android:text=
"@string/learn_
title
"
/>
</RelativeLayout>
...
...
@@ -42,8 +42,8 @@
<ImageView
android:id=
"@+id/iv_pub_course"
android:layout_width=
"
5
0dp"
android:layout_height=
"
5
0dp"
android:layout_width=
"
6
0dp"
android:layout_height=
"
6
0dp"
android:layout_alignParentBottom=
"true"
android:layout_alignParentRight=
"true"
android:layout_marginBottom=
"50dp"
...
...
This diff is collapsed.
Click to expand it.
orderCenter/src/main/java/com/dayu/order/presenter/orderpart_receive/PartRecievePresenter.java
View file @
85ef039a
...
...
@@ -82,8 +82,9 @@ public class PartRecievePresenter extends PartReceiveContract.Presenter {
//收货
private
void
receivePart
(
List
<
String
>
imgs
)
{
mView
.
showDialog
();
List
<
ReceivePartData
.
PicItem
>
pics
=
n
ew
ArrayList
<>()
;
List
<
ReceivePartData
.
PicItem
>
pics
=
n
ull
;
if
(
imgs
!=
null
&&
imgs
.
size
()
>
0
)
{
pics
=
new
ArrayList
<>();
for
(
String
url
:
imgs
)
{
ReceivePartData
data
=
new
ReceivePartData
();
ReceivePartData
.
PicItem
item
=
data
.
new
PicItem
(
url
);
...
...
This diff is collapsed.
Click to expand it.
orderCenter/src/main/java/com/dayu/order/ui/activity/OrderPartReceiveActivity.java
View file @
85ef039a
...
...
@@ -84,7 +84,7 @@ public class OrderPartReceiveActivity extends BaseActivity<PartRecievePresenter,
@Override
public
List
<
String
>
getImgs
()
{
List
<
String
>
imgs
=
mImages
;
List
<
String
>
imgs
=
new
ArrayList
<>(
mImages
)
;
imgs
.
remove
(
"add"
);
return
imgs
;
}
...
...
This diff is collapsed.
Click to expand it.
orderCenter/src/main/java/com/dayu/order/ui/activity/OrderPartSendActivity.java
View file @
85ef039a
...
...
@@ -59,7 +59,7 @@ public class OrderPartSendActivity extends BaseActivity<PartSendPresenter, Activ
@Override
public
List
<
String
>
getImgs
()
{
List
<
String
>
imgs
=
mImages
;
List
<
String
>
imgs
=
new
ArrayList
<>(
mImages
)
;
imgs
.
remove
(
"add"
);
return
imgs
;
}
...
...
This diff is collapsed.
Click to expand it.
orderCenter/src/main/res/layout/item_multi_process_order.xml
View file @
85ef039a
...
...
@@ -12,9 +12,9 @@
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"82dp"
android:layout_marginBottom=
"10dp"
android:layout_marginLeft=
"10dp"
android:layout_marginRight=
"10dp"
android:layout_marginBottom=
"10dp"
android:background=
"@color/white"
android:paddingLeft=
"@dimen/dp_15"
>
...
...
@@ -22,8 +22,8 @@
android:id=
"@+id/tv_repair_type"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:layout_alignParentStart=
"true"
android:layout_alignParentLeft=
"true"
android:layout_alignParentTop=
"true"
android:layout_marginTop=
"@dimen/dp_20"
android:text=
'@{item.providerTypeName}'
...
...
@@ -55,8 +55,9 @@
android:layout_alignParentRight=
"true"
android:layout_centerVertical=
"true"
android:layout_marginRight=
"15sp"
android:text=
'@{
item.status==1?@string/process:
@string/order_finish}'
android:text=
'@{@string/order_finish}'
android:textColor=
"@color/bg_button"
android:textSize=
"@dimen/sp_14"
/>
<!--android:text='@{item.status==1?@string/process:@string/order_finish}'-->
</RelativeLayout>
</layout>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
saleCenter/src/main/java/com/bigfish/salecenter/adapter/SaleProductAdapter.java
View file @
85ef039a
...
...
@@ -31,8 +31,10 @@ public class SaleProductAdapter extends CoreAdapter<ProductListBean,ItemSaleProd
holder
.
tvCommision
.
setText
(
CommonUtils
.
getIntMoneyStr
(
mContext
,
item
.
getSalesPrice
()));
if
(
item
.
getCollectionStatus
()
==
1
){
holder
.
btnCollect
.
setText
(
R
.
string
.
un_collect
);
holder
.
btnCollect
.
setBackgroundResource
(
R
.
drawable
.
btn_grayaa_commom
);
}
else
{
holder
.
btnCollect
.
setText
(
R
.
string
.
special_collect
);
holder
.
btnCollect
.
setBackgroundResource
(
R
.
drawable
.
btn_blue_commom
);
}
holder
.
btnCollect
.
setOnClickListener
(
v
->
{
mPresenter
.
onCollectClick
(
item
).
subscribe
(
mPresenter
.
baseObserver
(
...
...
This diff is collapsed.
Click to expand it.
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