Skip to content

android / dayu

Go to a project
Commit 17ae5561 by mReturn
Options

fix

parent 5ed2f2e6
Inline Side-by-side
Showing with 30 additions and 20 deletions
.idea/misc.xml
......@@ -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
......@@ -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
......@@ -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
......@@ -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 -> {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment