diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/DelayCheckApiServices.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/DelayCheckApiServices.java index a4089b37e3..612df49588 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/DelayCheckApiServices.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/net/DelayCheckApiServices.java @@ -17,10 +17,10 @@ import retrofit2.http.POST; */ public interface DelayCheckApiServices { - @GET("/") + @GET("/yycp-test-service/net/delay/heartbeat") Observable emptyInterface(); - @POST("/") + @POST("/yycp-test-service/net/delay/log") @FormUrlEncoded - Observable uploadDelayCheckData(@FieldMap Map params); + Observable uploadDelayCheckData(@FieldMap Map params); } diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/DelayCheckUtil.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/DelayCheckUtil.java index 174f722de9..f0e68e77ec 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/DelayCheckUtil.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/DelayCheckUtil.java @@ -7,6 +7,8 @@ import android.os.SystemClock; import com.mogo.commons.data.BaseData; import com.mogo.commons.network.SubscribeImpl; +import com.mogo.commons.network.Utils; +import com.mogo.map.location.MogoLocation; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.extensions.net.DelayCheckApiServices; import com.mogo.module.extensions.net.DztHttpConstant; @@ -47,7 +49,7 @@ public class DelayCheckUtil implements Handler.Callback { handler.sendEmptyMessageDelayed(MSG_CHECK_NET_CONNECT_STATUS, FIRST_CHECK_NET_CONNECT_STATUS_DELAY); } - private long requestTime, netDelay; + private long requestTime, netDelay, requestSystemTime; @Override public boolean handleMessage(Message msg) { @@ -70,6 +72,7 @@ public class DelayCheckUtil implements Handler.Callback { private void startEmptyRequest() { requestTime = SystemClock.elapsedRealtime(); + requestSystemTime = System.currentTimeMillis(); MogoApisHandler.getInstance().getApis().getNetworkApi() .create(DelayCheckApiServices.class, DztHttpConstant.getBaseUrl()) .emptyInterface().subscribeOn(Schedulers.io()).observeOn(Schedulers.io()) @@ -78,7 +81,6 @@ public class DelayCheckUtil implements Handler.Callback { public void onSuccess(BaseData o) { super.onSuccess(o); netDelay = SystemClock.elapsedRealtime() - requestTime; - startUpload(); } @@ -97,8 +99,22 @@ public class DelayCheckUtil implements Handler.Callback { }); } - private void startUpload(){ - Map params = new HashMap<>(); + private void startUpload() { + MogoLocation lastLocation = MogoApisHandler.getInstance().getApis().getMapServiceApi().getSingletonLocationClient(context).getLastKnowLocation(); + if (lastLocation == null) { + handler.sendEmptyMessageDelayed(MSG_START_DELAY_CHECK, DELAY_CHECK_DELAY); + return; + } + Map params = new HashMap<>(8); + params.put("sn", Utils.getSn()); + params.put("startTime", requestSystemTime); + params.put("endTime", System.currentTimeMillis()); + params.put("netState", NetworkUtils.netStrengthLevel); + params.put("place", lastLocation.getAddress()); + params.put("cityCode", lastLocation.getCityCode()); + params.put("lat", lastLocation.getLatitude()); + params.put("lon", lastLocation.getLongitude()); + MogoApisHandler.getInstance().getApis().getNetworkApi() .create(DelayCheckApiServices.class, DztHttpConstant.getBaseUrl()) .uploadDelayCheckData(params).observeOn(Schedulers.io()).subscribeOn(Schedulers.io()) diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_traffic_panel_bg.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_traffic_panel_bg.png new file mode 100644 index 0000000000..a1d9781b94 Binary files /dev/null and b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/module_ext_traffic_panel_bg.png differ diff --git a/modules/mogo-module-extensions/src/main/res/layout/include_navi_in_vr.xml b/modules/mogo-module-extensions/src/main/res/layout/include_navi_in_vr.xml index 1a2d4c4241..507d0730b8 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/include_navi_in_vr.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/include_navi_in_vr.xml @@ -10,26 +10,17 @@ android:layout_height="@dimen/module_ext_navi_in_vr_height" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" - android:layout_marginTop="@dimen/module_ext_navi_in_vr_margin_top" - android:layout_marginStart="@dimen/module_ext_navi_in_vr_margin_start" - android:background="@drawable/module_ext_navi_in_vr_bg" /> + android:background="@drawable/module_ext_traffic_panel_bg" /> - + + + @@ -64,7 +55,7 @@ android:layout_height="@dimen/module_ext_navi_in_vr_navi_icon_size" android:src="@drawable/tc_11" app:layout_constraintBottom_toTopOf="@id/module_ext_id_navi_in_vr_traffic_bg" - app:layout_constraintLeft_toLeftOf="@id/module_ext_id_navi_in_vr_bg" + app:layout_constraintLeft_toLeftOf="@id/module_ext_id_navi_in_vr_traffic_bg" app:layout_constraintTop_toTopOf="@id/module_ext_id_navi_in_vr_bg" /> @@ -156,13 +148,14 @@ android:layout_height="wrap_content" app:constraint_referenced_ids="module_ext_id_tv_speed,module_ext_id_tv_speed_unit" android:visibility="gone" - tools:visibility="visible" /> + tools:visibility="gone" /> @@ -171,7 +164,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:visibility="visible" - app:constraint_referenced_ids="module_ext_id_navi_in_vr_bg,module_ext_id_navi_in_vr_speed_bg,module_ext_id_navi_in_vr_traffic_bg,module_ext_id_traffic_light_turn_left,module_ext_id_traffic_light_turn_around,module_ext_id_traffic_light_straight,module_ext_id_traffic_light_turn_right" + app:constraint_referenced_ids="module_ext_id_navi_in_vr_bg,module_ext_id_navi_in_vr_traffic_bg,module_ext_id_traffic_light_turn_left,module_ext_id_traffic_light_turn_around,module_ext_id_traffic_light_straight,module_ext_id_traffic_light_turn_right" tools:visibility="visible" /> diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index ea9ab4a5eb..ccdb9ff0d4 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -212,8 +212,8 @@ 86px - 464px - 304px + 530px + 380px 40px 28px 100px @@ -223,14 +223,14 @@ 458px 298px 140px - 3px + 60px 100px 30px 30px - 36px + 70px 22px 78px - 26px + 66px 43px 40px 20px