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

Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map

Browse Source
This commit is contained in:
wangcongtao
2020-12-20 11:34:51 +08:00
parent 8fcf7931ca 760e9ff4c3
commit 91b743ad6b
22 changed files with 164 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketData.java
View File

@@ -16,6 +16,8 @@ public class WebSocketData implements Serializable {
private long upUtcTime;
private String cityCode;
public long getSeq() {
return seq;
}
@@ -63,4 +65,12 @@ public class WebSocketData implements Serializable {
public void setUpUtcTime(long upUtcTime) {
this.upUtcTime = upUtcTime;
}
public String getCityCode() {
return cityCode;
}
public void setCityCode(String cityCode) {
this.cityCode = cityCode;
}
}

8
foudations/mogo-base-websocket-sdk/src/main/java/com/mogo/base/websocket/WebSocketManager.java
View File

@@ -8,6 +8,7 @@ import androidx.annotation.Keep;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.mogo.commons.network.Utils;
import com.mogo.map.location.MogoLocation;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.service.connection.IMogoMsgAckListener;
import com.mogo.service.connection.IMogoOnWebSocketMessageListener;
@@ -140,15 +141,20 @@ public class WebSocketManager implements IMogoWebSocketManager, ISocketMsgSettin
webSocketData.setMsgType(listener.getUpLinkType().getMsgType());
webSocketData.setSn(Utils.getSn());
webSocketData.setData(GsonUtil.jsonFromObject(body));
MogoLocation lastKnown = MogoApisHandler.getInstance().getApis().getMapServiceApi().getSingletonLocationClient(context).getLastKnowLocation();
if (lastKnown != null) {
webSocketData.setCityCode(lastKnown.getCityCode());
}
String msg = GsonUtil.jsonFromObject(webSocketData);
Logger.d(TAG,"sendMsg : " + msg);
handlerThread.sendMsg(msg);
}
}
private Context context;
@Override
public void init(Context context) {
this.context = context;
}
@Override

110
modules/mogo-module-common/src/main/java/com/mogo/module/common/animation/BezierAnimationView.java
View File

@@ -8,6 +8,7 @@ import android.animation.ValueAnimator;
import android.content.Context;
import android.graphics.PointF;
import android.graphics.drawable.Drawable;
import android.os.Handler;
import android.util.AttributeSet;
import android.util.Log;
import android.view.View;
@@ -27,11 +28,14 @@ public class BezierAnimationView extends RelativeLayout implements View.OnClickL
private Context context;
private int[] animation_drawable = {
R.drawable.icon_common_heart_animation_vr00,
R.drawable.icon_heart_unchoose_other,
R.drawable.icon_map_marker_pondingl2,
R.drawable.icon_map_marker_living};
private Random random = new Random();
private int width = 500, height = 210;
private int width = 180, height = 140;
private int drawableWidth, drawableHeight;
private int resource = 0;
private Handler handler = new Handler();
private Runnable runnable;
public BezierAnimationView(Context context) {
this(context, null);
@@ -54,13 +58,24 @@ public class BezierAnimationView extends RelativeLayout implements View.OnClickL
@Override
public void onClick(View view) {
Log.d("执行点赞动画", "ppp");
bezierAnimation();
runnable = new Runnable() {
@Override
public void run() {
try {
Log.d("点赞--", "");
bezierAnimation(resource);
handler.postDelayed(this, 500);
} catch (Exception e) {
e.printStackTrace();
}
}
};
runnable.run();
}
private void bezierAnimation() {
private void bezierAnimation(int resource) {
final ImageView imageView = new ImageView(context);
imageView.setBackgroundResource(animation_drawable[random.nextInt(animation_drawable.length - 1)]);
imageView.setBackgroundResource(animation_drawable[resource]);
RelativeLayout.LayoutParams params = new LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
params.addRule(ALIGN_BOTTOM);
params.addRule(CENTER_HORIZONTAL);
@@ -79,63 +94,66 @@ public class BezierAnimationView extends RelativeLayout implements View.OnClickL
}
});
animatorSet.start();
Log.d(TAG, "动画执行到--" + String.valueOf(resource));
}
private AnimatorSet getAnimatorSet(ImageView imageView) {
AnimatorSet enter = new AnimatorSet();
/*
* 缩放动画
* */
//1、缩放动画
AnimatorSet scaleAnimator = new AnimatorSet();
ObjectAnimator alpha = ObjectAnimator.ofFloat(imageView, "alpha", 0.8f, 1f);
ObjectAnimator scaleX = ObjectAnimator.ofFloat(imageView, "scaleX", 0.8f, 1f);
ObjectAnimator scaleY = ObjectAnimator.ofFloat(imageView, "scaleY", 0.8f, 1f);
scaleAnimator.setDuration(500);
ObjectAnimator alpha = ObjectAnimator.ofFloat(imageView, "alpha", 0.3f, 1f);
ObjectAnimator scaleX = ObjectAnimator.ofFloat(imageView, "scaleX", 0.3f, 1f);
ObjectAnimator scaleY = ObjectAnimator.ofFloat(imageView, "scaleY", 0.3f, 1f);
scaleAnimator.setDuration(1000);
scaleAnimator.playTogether(alpha, scaleX, scaleY);
/*
* 贝塞尔动画
* */
ValueAnimator bezierAnimator = getBezierValueAnimator(imageView);
/*
* 两个动画按顺序播放
* */
//2、贝塞尔动画
ValueAnimator bezierAnimator = getBezierAnimator(imageView);
//3、两个动画按顺序播放
enter.playSequentially(scaleAnimator, bezierAnimator);
return enter;
}
/**
* 获取贝塞尔曲线动画
* 贝塞尔动画
*
* @param target
* @return
*/
private ValueAnimator getBezierValueAnimator(View target) {
private ValueAnimator getBezierAnimator(final ImageView imageView) {
//初始化一个BezierEvaluator
BezierEvaluator evaluator = new BezierEvaluator(getPointF(1), getPointF(1));
//1、构建贝塞尔曲线的四个点
PointF point0 = new PointF((width - drawableWidth) / 2, height - drawableHeight);
PointF point1 = new PointF(random.nextInt(width), random.nextInt(height / 2));
PointF point2 = new PointF(random.nextInt(width), random.nextInt(height / 2) + height / 2);
PointF point3 = new PointF(random.nextInt(width - drawableWidth), 0);
// 起点固定，终点随机
ValueAnimator animator = ValueAnimator.ofObject(evaluator, new PointF((width - 40) / 2, height - 80),
new PointF(random.nextInt(getWidth()), 0));
animator.addUpdateListener(new BezierListener(target));
animator.setTarget(target);
animator.setDuration(3000);
return animator;
//2、创建贝塞尔属性动画
BezierEvaluator evaluator = new BezierEvaluator(point0, point1);
final ValueAnimator valueAnimator = ObjectAnimator.ofObject(evaluator, point2, point3);
valueAnimator.setInterpolator(new LinearInterpolator());
valueAnimator.setDuration(1000);
//3、监听贝塞尔曲线估值器返回值
valueAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
@Override
public void onAnimationUpdate(ValueAnimator animation) {
//4、获取BezierEvaluator中evaluate()返回的运行轨迹坐标点，设置点赞图片路线
PointF pointF = (PointF) animation.getAnimatedValue();
imageView.setX(pointF.x);
imageView.setY(pointF.y);
//6、获取BezierEvaluator中evaluate()返回的参数t，设置消失动画
float t = animation.getAnimatedFraction();
imageView.setAlpha(1 - t + 0.2f);
}
});
if (resource >= 3) {
handler.removeCallbacks(runnable);
return null;
} else {
resource += 1;
}
return valueAnimator;
}
/**
* 获取一条路径的两个控制点
*
* @param scale
*/
private PointF getPointF(int scale) {
PointF pointF = new PointF();
//减去100 是为了控制 x轴活动范围
pointF.x = random.nextInt((width));
//再Y轴上 为了确保第二个控制点 在第一个点之上,我把Y分成了上下两半
pointF.y = random.nextInt((height)) / scale;
return pointF;
}
}

50
modules/mogo-module-common/src/main/java/com/mogo/module/common/animation/BezierEvaluator.java
View File

@@ -11,34 +11,44 @@ import android.graphics.PointF;
*/
public class BezierEvaluator implements TypeEvaluator<PointF> {
private PointF pointF1;
private PointF pointF2;
private PointF point1;
private PointF point2;
public BezierEvaluator(PointF point1, PointF point2) {
this.pointF1 = point1;
this.pointF2 = point2;
this.point1 = point1;
this.point2 = point2;
}
@Override
public PointF evaluate(float time, PointF startValue, PointF endValue) {
float timeLeft = 1.0f - time;
//结果
public PointF evaluate(float t, PointF point0, PointF point3) {
PointF point = new PointF();
//t 取值为 [0,1]
PointF point0 = (PointF)startValue;//起点
PointF point3 = (PointF)endValue;//终点
/**
* 三阶贝塞尔公式
*
* B(t)=(1 - t)^3 P0
* + 3 t (1 - t)^2 P1
* + 3 t^2 (1 - t) P2
* + t^3 P3
*/
point.x = point0.x * (1 - t) * (1 - t) * (1 - t)
+ 3 * point1.x * t * (1 - t) * (1 - t)
+ 3 * point2.x * t * t * (1 - t)
+ point3.x * t * t * t;
// 贝塞尔公式
point.x = timeLeft * timeLeft * timeLeft * (point0.x)
+ 3 * timeLeft * timeLeft * time * (pointF1.x)
+ 3 * timeLeft * time * time * (pointF2.x)
+ time * time * time * (point3.x);
point.y = timeLeft * timeLeft * timeLeft * (point0.y)
+ 3 * timeLeft * timeLeft * time * (pointF1.y)
+ 3 * timeLeft * time * time * (pointF2.y)
+ time * time * time * (point3.y);
/**
* 三阶贝塞尔公式
*
* B(t)=(1 - t)^3 P0
* + 3 t (1 - t)^2 P1
* + 3 t^2 (1 - t) P2
* + t^3 P3
*/
point.y = point0.y * (1 - t) * (1 - t) * (1 - t)
+ 3 * point1.y * t * (1 - t) * (1 - t)
+ 3 * point2.y * t * t * (1 - t)
+ point3.y * t * t * t;
return point;
}

9
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/DelayCheckUtil.java
View File

@@ -28,12 +28,13 @@ public class DelayCheckUtil implements Handler.Callback {
private final Handler handler = new Handler(this);
private static final int MSG_CHECK_NET_CONNECT_STATUS = 1001;
private static final long FIRST_CHECK_NET_CONNECT_STATUS_DELAY = 10 * 60 * 1000;
private static final long CHECK_NET_CONNECT_STATUS_DELAY = 5000L;
private static final int MSG_START_DELAY_CHECK = 1002;
private static final long DELAY_CHECK_DELAY = 10 * 60 * 1000;
private Context context;
private final Context context;
public DelayCheckUtil(Context context) {
this.context = context;
@@ -43,7 +44,7 @@ public class DelayCheckUtil implements Handler.Callback {
* 每5s检查一下网络状态，网络状态为连接状态时，开始空接口请求以及后续的参数上报
*/
public void waitingForCheck() {
handler.sendEmptyMessageDelayed(MSG_CHECK_NET_CONNECT_STATUS, CHECK_NET_CONNECT_STATUS_DELAY);
handler.sendEmptyMessageDelayed(MSG_CHECK_NET_CONNECT_STATUS, FIRST_CHECK_NET_CONNECT_STATUS_DELAY);
}
private long requestTime, netDelay;
@@ -85,11 +86,13 @@ public class DelayCheckUtil implements Handler.Callback {
@Override
public void onError(Throwable e) {
super.onError(e);
handler.sendEmptyMessageDelayed(MSG_CHECK_NET_CONNECT_STATUS, CHECK_NET_CONNECT_STATUS_DELAY);
}
@Override
public void onError(String message, int code) {
super.onError(message, code);
handler.sendEmptyMessageDelayed(MSG_CHECK_NET_CONNECT_STATUS, CHECK_NET_CONNECT_STATUS_DELAY);
}
});
}
@@ -110,11 +113,13 @@ public class DelayCheckUtil implements Handler.Callback {
@Override
public void onError(String message, int code) {
super.onError(message, code);
handler.sendEmptyMessageDelayed(MSG_CHECK_NET_CONNECT_STATUS, CHECK_NET_CONNECT_STATUS_DELAY);
}
@Override
public void onError(Throwable e) {
super.onError(e);
handler.sendEmptyMessageDelayed(MSG_CHECK_NET_CONNECT_STATUS, CHECK_NET_CONNECT_STATUS_DELAY);
}
});
}

14
modules/mogo-module-smp/src/main/res/drawable/bg_module_small_map_view_border.xml
View File

@@ -2,25 +2,23 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 边 -->
<item>
<shape android:shape="rectangle">
<shape android:shape="oval">
<padding
android:bottom="2dp"
android:left="2dp"
android:right="2dp"
android:top="2dp" />
<corners android:radius="720px" />
<gradient
android:angle="180"
android:endColor="#7997ff"
android:startColor="#284190"
android:type="linear"
android:useLevel="true" />
android:angle="315"
android:endColor="#284190"
android:startColor="#7997ff"
android:type="linear" />
</shape>
</item>
<!-- 中心背景 -->
<item>
<shape android:shape="rectangle">
<shape android:shape="oval">
<solid android:color="#3F51B5" />
<corners android:radius="720px" />
</shape>

8
modules/mogo-module-v2x/src/main/res/raw/scenario_fatigue_driving_data.json
View File

@@ -14,11 +14,11 @@
"zoom": true,
"zoomScale": 15,
"location": {
"lat":39.966668,
"lon":116.411211
"lat":39.969088,
"lon":116.41808
},
"lat":39.966668,
"lon":116.411211,
"lat":39.969088,
"lon":116.41808,
"userHead": "https://yycp-static-1255510688.cos.ap-beijing.myqcloud.com/defaultUserHeadImg/5.png",
"msgImgUrl": "https://upload.jianshu.io/users/upload_avatars/7663825/7c28763e-002b-4e89-8dea-5b8da210ef2c.jpg"
}

4
modules/mogo-module-v2x/src/main/res/raw/scenario_push_animation_event_data.json
View File

@@ -13,8 +13,8 @@
"zoom": true,
"zoomScale": 15,
"location": {
"lat": 39.9754100000,
"lon": 116.4178276100
"lat":39.969088,
"lon":116.41808
},
"userHead": "https://yycp-static-1255510688.cos.ap-beijing.myqcloud.com/defaultUserHeadImg/5.png",
"msgImgUrl": "https://upload.jianshu.io/users/upload_avatars/7663825/7c28763e-002b-4e89-8dea-5b8da210ef2c.jpg"

4
modules/mogo-module-v2x/src/main/res/raw/scenario_push_cross_crash.json
View File

@@ -13,8 +13,8 @@
"zoom": true,
"zoomScale": 15,
"location": {
"lat": 39.9754100000,
"lon": 116.4178276100
"lat":39.969088,
"lon":116.41808
},
"userHead": "https://yycp-static-1255510688.cos.ap-beijing.myqcloud.com/defaultUserHeadImg/5.png",
"msgImgUrl": "https://upload.jianshu.io/users/upload_avatars/7663825/7c28763e-002b-4e89-8dea-5b8da210ef2c.jpg"

8
modules/mogo-module-v2x/src/main/res/raw/scenario_push_event_data.json
View File

@@ -13,11 +13,11 @@
"zoom": true,
"zoomScale": 15,
"location": {
"lat": 39.971417,
"lon": 116.415853
"lat":39.969088,
"lon":116.41808
},
"lat": 39.968678,
"lon": 116.405467,
"lat":39.969088,
"lon":116.41808,
"userHead": "tUserHeadImg/5.png",
"msgImgUrl": "https://upload.jianshu.io/users/upload_avatars/7663825/7c28763e-002b-4e89-8dea-5b8da210ef2c.jpg"
}

8
modules/mogo-module-v2x/src/main/res/raw/scenario_push_live_event_data.json
View File

@@ -13,11 +13,11 @@
"zoom": true,
"zoomScale": 15,
"location": {
"lat": 39.971417,
"lon": 116.415853
"lat":39.969088,
"lon":116.41808
},
"lat": 39.968678,
"lon": 116.405467,
"lat":39.969088,
"lon":116.41808,
"headImgUrl": "https://yycp-static-1255510688.cos.ap-beijing.myqcloud.com/defaultUserHeadImg/5.png",
"msgImgUrl": "https://upload.jianshu.io/users/upload_avatars/7663825/7c28763e-002b-4e89-8dea-5b8da210ef2c.jpg"
}

4
modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_barrier_data.json
View File

@@ -11,8 +11,8 @@
"tts": "前方发现障碍物注意避让",
"zoom": false,
"zoomScale": 15,
"lat": 40.196512,
"lon": 116.736461,
"lat":39.969088,
"lon":116.41808,
"userHead": "",
"msgImgUrl": "",
"polyline": [

4
modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_behind_danger_car_data.json
View File

@@ -11,8 +11,8 @@
"tts": "发现后方车辆超速，注意保持车道",
"zoom": false,
"zoomScale": 15,
"lat": 40.196512,
"lon": 116.736461,
"lat":39.969088,
"lon":116.41808,
"userHead": "",
"msgImgUrl": "",
"polyline": [

4
modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_car_break_data.json
View File

@@ -11,8 +11,8 @@
"tts": "前车急刹注意减速",
"zoom": false,
"zoomScale": 15,
"lat": 40.195206,
"lon": 116.727433,
"lat":39.969088,
"lon":116.41808,
"userHead": "",
"msgImgUrl": "",
"polyline": [

4
modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_shuangshan.json
View File

@@ -14,8 +14,8 @@
"zoomScale": 15,
"userHead": "",
"msgImgUrl": "",
"lat": 40.196512,
"lon": 116.736461,
"lat":39.969088,
"lon":116.41808,
"polyline": [
[
116.725091,

4
modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu.json
View File

@@ -14,8 +14,8 @@
"zoomScale": 15,
"userHead": "",
"msgImgUrl": "",
"lat": 40.195571,
"lon": 116.729344,
"lat":39.969088,
"lon":116.41808,
"polyline": [
[
116.725091,

4
modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_hehind_vip_data.json
View File

@@ -11,8 +11,8 @@
"tts": "发现后方VIP车辆,注意避让",
"zoom": false,
"zoomScale": 15,
"lat": 40.196512,
"lon": 116.736461,
"lat":39.969088,
"lon":116.41808,
"userHead": "",
"msgImgUrl": "",
"polyline": [

4
modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_reverse_car_data.json
View File

@@ -11,8 +11,8 @@
"tts": "对向来车注意减速",
"zoom": false,
"zoomScale": 15,
"lat": 40.196175,
"lon": 116.731011,
"lat":39.969088,
"lon":116.41808,
"userHead": "",
"msgImgUrl": "",
"polyline": [

4
modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_vip_light_change_data.json
View File

@@ -11,8 +11,8 @@
"tts": "已为您变灯，可优先通行",
"zoom": false,
"zoomScale": 15,
"lat": 40.196512,
"lon": 116.736461,
"lat":39.969088,
"lon":116.41808,
"userHead": "",
"msgImgUrl": "",
"polyline": [

4
modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_xingren_yujing_data.json
View File

@@ -11,8 +11,8 @@
"tts": "检测到路口行人穿行注意避让",
"zoom": false,
"zoomScale": 15,
"lat": 40.196512,
"lon": 116.736461,
"lat":39.969088,
"lon":116.41808,
"userHead": "",
"msgImgUrl": "",
"polyline": [

8
modules/mogo-module-v2x/src/main/res/raw/scenario_road_event_data.json
View File

@@ -5,8 +5,8 @@
"location":{
"address":"北三环环球贸易中心",
"angle":270,
"lat":39.966668,
"lon":116.411211
"lat":39.969088,
"lon":116.41808
},
"noveltyInfo":{
"addr":"北三环环球贸易中心",
@@ -27,8 +27,8 @@
"location":{
"address":"北三环环球贸易中心",
"angle":270,
"lat":39.966668,
"lon":116.411211
"lat":39.969088,
"lon":116.41808
},
"poiType":"10003",
"type":"CARD_TYPE_ROAD_CONDITION",

4
modules/mogo-module-v2x/src/main/res/raw/scenario_seek_help.json
View File

@@ -3,8 +3,8 @@
{
"createTime":1593678359872,
"distance":1100,
"lat":39.866668,
"lon":116.411211,
"lat":39.969088,
"lon":116.41808,
"sn":"ZD801B1932L00041",
"targetId":20007,
"targetName":"故障车",