yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/demo/shunyi_v2v_merge' into demo/shunyi_v2v_merge

Browse Source
This commit is contained in:
wangcongtao
2020-09-15 16:20:39 +08:00
parent 5e961365e4 a71b8f735e
commit 57740ea6c0
7 changed files with 97 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.idea/codeStyles/Project.xml generated
View File

@@ -3,9 +3,18 @@
<JetCodeStyleSettings>
<option name="PACKAGES_TO_USE_STAR_IMPORTS">
<value>
<package name="java.util" withSubpackages="false" static="false" />
<package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
<package name="io.ktor" withSubpackages="true" static="false" />
<package name="java.util" alias="false" withSubpackages="false" />
<package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
<package name="io.ktor" alias="false" withSubpackages="true" />
</value>
</option>
<option name="PACKAGES_IMPORT_LAYOUT">
<value>
<package name="" alias="false" withSubpackages="true" />
<package name="java" alias="false" withSubpackages="true" />
<package name="javax" alias="false" withSubpackages="true" />
<package name="kotlin" alias="false" withSubpackages="true" />
<package name="" alias="true" withSubpackages="true" />
</value>
</option>
</JetCodeStyleSettings>

1
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java
View File

@@ -100,6 +100,7 @@ public class V2XScenarioHistoryIllegalParkVH extends V2XBaseViewHolder<V2XHistor
v2XHistoryScenarioData.setEventJsonData(mOldScenarioData.getEventJsonData());
v2XHistoryScenarioData.setDispose(true);
V2XSQLiteUtils.updateScenarioHistoryData(mOldScenarioData, v2XHistoryScenarioData);
mOldScenarioData.setDispose(true);
} catch (Exception e) {
e.printStackTrace();
}

2
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
View File

@@ -159,7 +159,6 @@ public class V2XScenarioHistoryOtherSeekHelpVH extends V2XBaseViewHolder<V2XHist
@Override
public void delayedCloseWindow() {
try {
hideControlButton(View.GONE);
// 进行数据库存储
V2XHistoryScenarioData v2XHistoryScenarioData = new V2XHistoryScenarioData();
@@ -168,6 +167,7 @@ public class V2XScenarioHistoryOtherSeekHelpVH extends V2XBaseViewHolder<V2XHist
v2XHistoryScenarioData.setEventJsonData(mOldScenarioData.getEventJsonData());
v2XHistoryScenarioData.setDispose(true);
V2XSQLiteUtils.updateScenarioHistoryData(mOldScenarioData, v2XHistoryScenarioData);
mOldScenarioData.setDispose(true);
V2XEventPanelFragment.Companion.getInstance().hidePanel();
} catch (Exception e) {

4
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java
View File

@@ -105,7 +105,9 @@ public class V2XScenarioHistoryRoadEventVH extends V2XBaseViewHolder<V2XHistoryS
v2XHistoryScenarioData.setTriggerTime(mOldScenarioData.getTriggerTime());
v2XHistoryScenarioData.setEventJsonData(mOldScenarioData.getEventJsonData());
v2XHistoryScenarioData.setDispose(true);
V2XSQLiteUtils.updateScenarioHistoryData(mOldScenarioData,v2XHistoryScenarioData);
V2XSQLiteUtils.updateScenarioHistoryData(mOldScenarioData, v2XHistoryScenarioData);
mOldScenarioData.setDispose(true);
} catch (Exception e) {
e.printStackTrace();
}

47
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java
View File

@@ -10,6 +10,9 @@ import com.mogo.module.v2x.R;
import com.mogo.module.v2x.V2XDemoManager;
import com.mogo.module.v2x.V2XServiceManager;
import com.mogo.module.v2x.entity.net.V2XDemoUserInfoRes;
import com.mogo.module.v2x.entity.net.V2XLiveCrossRoad;
import com.mogo.module.v2x.network.V2XRefreshCallback;
import com.mogo.module.v2x.network.V2XRefreshModel;
import com.mogo.module.v2x.utils.ToastUtils;
import com.mogo.module.v2x.voice.V2XVoiceCallbackListener;
import com.mogo.module.v2x.voice.V2XVoiceManager;
@@ -109,28 +112,28 @@ public class V2XVoiceCallLiveBiz {
}
public void getOpenRoadCameraLive() {
String liveUrl = "rtmp://154.8.189.110:19350/live/10_1";
V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity = buildCallLiveParams(null, liveUrl);
V2XVoiceCallLiveScenario.getInstance().setV2XWindow(new V2XVoiceCrossRoadLiveWindow());
V2XVoiceCallLiveScenario.getInstance().init(v2XMessageEntity);
// V2XRefreshModel.getInstance(mContext).queryCrossRoadsLive(new V2XRefreshCallback<V2XLiveCrossRoad>() {
// @Override
// public void onSuccess(V2XLiveCrossRoad result) {
// if (result != null && result.getResult().getUrl() != null) {
// String liveUrl = result.getResult().getUrl();
// V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity = buildCallLiveParams(null, liveUrl);
// V2XVoiceCallLiveScenario.getInstance().setV2XWindow(new V2XVoiceCrossRoadLiveWindow());
// V2XVoiceCallLiveScenario.getInstance().init(v2XMessageEntity);
// } else {
// Logger.d(MODULE_NAME, "getOpenRoadCameraLive 路口实况直播地址为空");
// }
// }
//
// @Override
// public void onFail(String msg) {
// Logger.d(MODULE_NAME, "getOpenRoadCameraLive : " + msg);
// }
// });
// String liveUrl = "rtmp://154.8.189.110:19350/live/10_1";
// V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity = buildCallLiveParams(null, liveUrl);
// V2XVoiceCallLiveScenario.getInstance().setV2XWindow(new V2XVoiceCrossRoadLiveWindow());
// V2XVoiceCallLiveScenario.getInstance().init(v2XMessageEntity);
V2XRefreshModel.getInstance(mContext).queryCrossRoadsLive(new V2XRefreshCallback<V2XLiveCrossRoad>() {
@Override
public void onSuccess(V2XLiveCrossRoad result) {
if (result != null && result.getResult().getUrl() != null) {
String liveUrl = result.getResult().getUrl();
V2XMessageEntity<V2XPushMessageEntity> v2XMessageEntity = buildCallLiveParams(null, liveUrl);
V2XVoiceCallLiveScenario.getInstance().setV2XWindow(new V2XVoiceCrossRoadLiveWindow());
V2XVoiceCallLiveScenario.getInstance().init(v2XMessageEntity);
} else {
Logger.d(MODULE_NAME, "getOpenRoadCameraLive 路口实况直播地址为空");
}
}
@Override
public void onFail(String msg) {
Logger.d(MODULE_NAME, "getOpenRoadCameraLive : " + msg);
}
});
}
private V2XMessageEntity<V2XPushMessageEntity> buildCallLiveParams(String sn, String liveUrl) {

50
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartLikeView.java
View File

@@ -24,6 +24,8 @@ public class HeartLikeView extends LinearLayout {
private AnimatorSet mAnimatorSet;
private OnClickCallListener mOnClickCallListener;
private boolean isAnimator = false;
public HeartLikeView(Context context) {
this(context, null);
}
@@ -38,35 +40,39 @@ public class HeartLikeView extends LinearLayout {
mIllegalParkingLike = findViewById(R.id.ivIllegalParkingLike);
setOnClickListener(v -> {
if (mAnimatorSet == null) {
mAnimatorSet = (AnimatorSet) AnimatorInflater.loadAnimator(getContext(),
R.anim.v2x_like_heart_animation);
mAnimatorSet.setTarget(mIllegalParkingLike);
}
mAnimatorSet.addListener(new Animator.AnimatorListener() {
@Override
public void onAnimationStart(Animator animation) {
if (!isAnimator) {
isAnimator = true;
if (mAnimatorSet == null) {
mAnimatorSet = (AnimatorSet) AnimatorInflater.loadAnimator(getContext(),
R.anim.v2x_like_heart_animation);
mAnimatorSet.setTarget(mIllegalParkingLike);
}
mAnimatorSet.addListener(new Animator.AnimatorListener() {
@Override
public void onAnimationStart(Animator animation) {
@Override
public void onAnimationEnd(Animator animation) {
if (mOnClickCallListener != null) {
mOnClickCallListener.onClicked(HeartLikeView.this);
}
}
@Override
public void onAnimationCancel(Animator animation) {
@Override
public void onAnimationEnd(Animator animation) {
isAnimator = false;
if (mOnClickCallListener != null) {
mOnClickCallListener.onClicked(HeartLikeView.this);
}
}
}
@Override
public void onAnimationCancel(Animator animation) {
@Override
public void onAnimationRepeat(Animator animation) {
}
}
});
mAnimatorSet.start();
@Override
public void onAnimationRepeat(Animator animation) {
}
});
mAnimatorSet.start();
}
});
}

48
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartUnLikeView.java
View File

@@ -23,6 +23,7 @@ public class HeartUnLikeView extends LinearLayout {
private ImageView mIllegalParkingUnLike;
private AnimatorSet mAnimatorSet;
private OnClickCallListener mOnClickCallListener;
private boolean isAnimator = false;
public HeartUnLikeView(Context context) {
this(context, null);
@@ -38,35 +39,40 @@ public class HeartUnLikeView extends LinearLayout {
mIllegalParkingUnLike = findViewById(R.id.ivIllegalParkingUnLike);
setOnClickListener(v -> {
if (mAnimatorSet == null) {
mAnimatorSet = (AnimatorSet) AnimatorInflater.loadAnimator(getContext(),
R.anim.v2x_unlike_heart_animation);
mAnimatorSet.setTarget(mIllegalParkingUnLike);
}
mAnimatorSet.addListener(new Animator.AnimatorListener() {
@Override
public void onAnimationStart(Animator animation) {
if (!isAnimator) {
isAnimator = true;
if (mAnimatorSet == null) {
mAnimatorSet = (AnimatorSet) AnimatorInflater.loadAnimator(getContext(),
R.anim.v2x_unlike_heart_animation);
mAnimatorSet.setTarget(mIllegalParkingUnLike);
}
mAnimatorSet.addListener(new Animator.AnimatorListener() {
@Override
public void onAnimationStart(Animator animation) {
@Override
public void onAnimationEnd(Animator animation) {
if (mOnClickCallListener != null) {
mOnClickCallListener.onClicked(HeartUnLikeView.this);
}
}
@Override
public void onAnimationCancel(Animator animation) {
@Override
public void onAnimationEnd(Animator animation) {
isAnimator = false;
if (mOnClickCallListener != null) {
mOnClickCallListener.onClicked(HeartUnLikeView.this);
}
}
}
@Override
public void onAnimationCancel(Animator animation) {
@Override
public void onAnimationRepeat(Animator animation) {
}
}
});
mAnimatorSet.start();
@Override
public void onAnimationRepeat(Animator animation) {
}
});
mAnimatorSet.start();
}
});
}