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
17ae5561
authored
Jan 11, 2020
by
mReturn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
5ed2f2e6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
20 deletions
.idea/misc.xml
app/proguard-rules.pro
baseSDK/build.gradle
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
.idea/misc.xml
View file @
17ae5561
...
...
@@ -29,7 +29,7 @@
</value>
</option>
</component>
<component
name=
"ProjectRootManager"
version=
"2"
languageLevel=
"JDK_1_8"
project-jdk-name=
"
1.8
"
project-jdk-type=
"JavaSDK"
>
<component
name=
"ProjectRootManager"
version=
"2"
languageLevel=
"JDK_1_8"
project-jdk-name=
"
JDK
"
project-jdk-type=
"JavaSDK"
>
<output
url=
"file://$PROJECT_DIR$/build/classes"
/>
</component>
<component
name=
"ProjectType"
>
...
...
app/proguard-rules.pro
View file @
17ae5561
...
...
@@ -247,6 +247,17 @@ public static final int *;
#---------------------------------4.反射相关的类和方法-----------------------
#---------------------------------Jiaozivideo-----------------------
-keep public class cn.jzvd.JZMediaSystem {*; }
-keep public class cn.jzvd.demo.CustomMedia.CustomMedia {*; }
-keep public class cn.jzvd.demo.CustomMedia.JZMediaIjk {*; }
-keep public class cn.jzvd.demo.CustomMedia.JZMediaSystemAssertFolder {*; }
-keep class tv.danmaku.ijk.media.player.
*
* {*; }
-dontwarn tv.danmaku.ijk.media.player.*
-keep interface tv.danmaku.ijk.media.player.
*
* { *; }
...
...
baseSDK/build.gradle
View file @
17ae5561
...
...
@@ -74,7 +74,5 @@ dependencies {
api
'cn.jzvd:jiaozivideoplayer:7.1.0'
api
'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.35'
api
'com.badoo.mobile:android-weak-handler:1.1'
api
'tv.danmaku.ijk.media:ijkplayer-java:0.8.4'
api
'tv.danmaku.ijk.media:ijkplayer-armv7a:0.8.4'
api
'tv.danmaku.ijk.media:ijkplayer-x86:0.8.4'
// api 'com.google.android.exoplayer:exoplayer:2.7.1'
}
orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java
View file @
17ae5561
...
...
@@ -334,22 +334,23 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
latitude
=
location
.
getLatitude
();
longitude
=
location
.
getLongitude
();
}
if
(
mItem
.
getSubStatus
()
==
1
)
{
mPresenter
.
startOrder
(
mItem
.
getId
(),
latitude
,
longitude
)
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribe
(
mPresenter
.
baseObserver
(
integer
->
{
LocationUtils
.
stop
();
ProgressUtil
.
stopLoad
();
mItem
.
setSubStatus
(
2
);
mBind
.
tvItemProcess
.
setText
(
mContext
.
getString
(
R
.
string
.
begain_server
));
},
responeThrowable
->
{
if
(
"ORDER0005"
.
equals
(
responeThrowable
.
subCode
))
{
EventBus
.
getDefault
().
post
(
new
RefreshTab
(
3
));
EventBus
.
getDefault
().
post
(
new
RefreshServe
(
1
));
}
}));
MobclickAgent
.
onEvent
(
mContext
,
"start_off"
);
}
else
if
(
mItem
.
getSubStatus
()
==
2
)
{
// if (mItem.getSubStatus() == 1) {
// mPresenter.startOrder(mItem.getId(), latitude, longitude)
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(mPresenter.baseObserver(integer -> {
// LocationUtils.stop();
// ProgressUtil.stopLoad();
// mItem.setSubStatus(2);
// mBind.tvItemProcess.setText(mContext.getString(R.string.begain_server));
// }, responeThrowable -> {
// if ("ORDER0005".equals(responeThrowable.subCode)) {
// EventBus.getDefault().post(new RefreshTab(3));
// EventBus.getDefault().post(new RefreshServe(1));
// }
// }));
// MobclickAgent.onEvent(mContext, "start_off");
// } else
if
(
mItem
.
getSubStatus
()
==
1
||
mItem
.
getSubStatus
()
==
2
)
{
mPresenter
.
startServer
(
mItem
.
getId
(),
latitude
,
longitude
)
.
observeOn
(
AndroidSchedulers
.
mainThread
())
.
subscribe
(
mPresenter
.
baseObserver
(
integer
->
{
...
...
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