diff --git a/.idea/misc.xml b/.idea/misc.xml index 733acb1920..97b9126cee 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java index b5826b2631..80d9a4d381 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java @@ -75,6 +75,7 @@ class OchBusOrderModel { /** * 站点信息变更推送 + * 新订单、取消订单、到达站点等都会导致停靠站点变更，故都会收到此推送 */ private IMogoOnMessageListener< OchBusStationsChangedMsg > mOnBusStationsChangedMsg = new IMogoOnMessageListener< OchBusStationsChangedMsg >() { @Override diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java index 191bd9c882..f7033b08b7 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java @@ -71,7 +71,7 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog private IOchBusApiService mService; /** - * 运营状态 + * 运营状态、后端更具运营状态来判断车辆是否派单 */ private boolean mIsWorking = false; @@ -104,8 +104,8 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog double lat = 40.1974932972; double lon = 116.7354579447; -// lat = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLat(); -// lon = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon(); + lat = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLat(); + lon = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon(); OchBusRoutesRequest request = new OchBusRoutesRequest( Utils.getSn(), lat, lon ); RequestBody requestBody = RequestBody.create( MediaType.get( "application/json;charset=UTF-8" ), GsonUtil.jsonFromObject( request ) ); @@ -171,7 +171,6 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog if ( isGoingToNextStation ) { mView.hideSlidePanel(); - mView.hideNotice(); } resetNextStopStation( lastStopStation ); @@ -216,10 +215,16 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog return nextStationIndex; } + /** + * 延时查询站点信心 + */ private void queryBusStationDelay() { handler.sendEmptyMessageDelayed( MSG_QUERY_BUS_STATION, QUERY_BUS_STATION_DELAY ); } + /** + * 在踩刹车、控制方向盘等操作后，会停止自动加水，重启自动驾驶的话相当于重新设置自动驾驶目的地 + */ public void restartAutopilot() { Logger.d( TAG, "重启自动驾驶===" + isGoingToNextStation ); if ( isGoingToNextStation ) { @@ -228,7 +233,7 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog } /** - * 测试 + * 测试、重置站点状态 */ public void debugResetStationStatus() { OchBusResetRequest request = new OchBusResetRequest( Utils.getSn(), 1 ); @@ -294,7 +299,6 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog if ( mView != null ) { mView.refreshBusStations( stationList, currentStationIndex, nextStationIndex ); mView.hideSlidePanel(); - mView.hideNotice(); } if ( isGoingToNextStation ) { @@ -403,14 +407,20 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog } ); } + /** + * 播报下车乘客信息 + * + * @param o + */ private void playLeavePassengersMsg( QueryLeaveAwayPassengersResponse o ) { if ( currentStationIndex > stationList.size() - 1 ) { return; } String station = stationList.get( currentStationIndex ).getSiteName(); StringBuilder builder = new StringBuilder( "已到达" ); - if ( station.endsWith( "站" ) ) { - builder.append( station ); + builder.append( station ); + if ( !station.endsWith( "站" ) ) { + builder.append( "站" ); } if ( o == null || o.result == null || o.result.info == null || o.result.info.isEmpty() ) { // diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java index 2adc2544cf..775f882092 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java @@ -84,6 +84,8 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i } else { flatMode(); } + // 出租车不需要开启按钮 + tvOperationStatus.setVisibility(View.GONE); } private void initListeners() { diff --git a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml index f56920ea03..4bb3ff660b 100644 --- a/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml +++ b/OCH/mogo-och-taxi/src/main/res/layout/module_och_taxi_panel.xml @@ -1,8 +1,9 @@ @@ -49,18 +50,18 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="5px" - android:text="后路站" android:textColor="@color/module_och_order_status_textColor" android:textSize="@dimen/module_och_taxi_order_start_station_textSize" android:textStyle="bold" app:layout_constraintLeft_toRightOf="@+id/greenDot" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + tools:text="后路站" /> + app:layout_constraintLeft_toRightOf="@+id/greenDot" + tools:text="后路站1" /> 464px 310px - 30px - 24px - 24px + 20px + 20px + 20px 1px - 30px - 23px - 30px - 146px - 30px - 23px - 30px - 23px + 20px + 20px + 20px + 140px + 20px + 20px + 17px + 20px 26px 20px 20px - 80px + 64px 3px - 27px + 20px 20px - 28px - 27px + 24px + 17px \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/res/values/colors.xml b/OCH/mogo-och-taxi/src/main/res/values/colors.xml index 4b3e606705..0bc7d761be 100644 --- a/OCH/mogo-och-taxi/src/main/res/values/colors.xml +++ b/OCH/mogo-och-taxi/src/main/res/values/colors.xml @@ -1,9 +1,9 @@ #FFFFFF - #4D151B37 + #707DBE #8198E8 #8198E8 #8198E8 - #1FA7FF + #FFFFFF \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/res/values/dimens.xml b/OCH/mogo-och-taxi/src/main/res/values/dimens.xml index a592d33798..2ca27f9ddf 100644 --- a/OCH/mogo-och-taxi/src/main/res/values/dimens.xml +++ b/OCH/mogo-och-taxi/src/main/res/values/dimens.xml @@ -2,25 +2,25 @@ 464px 310px - 30px - 24px - 24px + 20px + 20px + 20px 1px - 30px - 23px - 30px - 146px - 30px - 23px - 30px - 23px + 20px + 20px + 20px + 140px + 20px + 20px + 17px + 20px 26px 20px 20px - 80px + 64px 3px - 27px + 20px 20px - 28px - 27px + 24px + 17px \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/res/values/strings.xml b/OCH/mogo-och-taxi/src/main/res/values/strings.xml index 4e50beb6cb..c19fbdb1be 100644 --- a/OCH/mogo-och-taxi/src/main/res/values/strings.xml +++ b/OCH/mogo-och-taxi/src/main/res/values/strings.xml @@ -7,9 +7,9 @@ 3.2 km 请携带好随身物品，注意侧后\n方来车，感谢体验蘑菇智行自\n动驾驶车！ 去往下车地点 - 已到达上车地点，等待乘客上车 - 收到新订单，正在前往上车地点 - 已到达乘客下车地点 + 已到达，等待乘客上车 + 收到新订单，前往上车地点 + 已到达下车地点 订单已完成 订单已取消 \ No newline at end of file diff --git a/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java b/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java index a7df0f3a7e..39c96cd74e 100644 --- a/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java +++ b/OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java @@ -32,13 +32,10 @@ public abstract class BaseOchFragment> e private static final String TAG = "BaseOchFragment"; protected SlidePanelView slidePanelView; - private View tvNoticeContainer; - private TextView tvNotice; private CheckedTextView ctvAutopilotStatus; protected TextView tvOperationStatus; private FrameLayout flStationPanelContainer; - private FrameAnimImageView fivNoticeHead; private final SlidePanelView.OnSlidePanelMoveToEndListener onSlideToEndListener = () -> { // 此处做一个代理，处理一下共有情况 @@ -55,17 +52,13 @@ public abstract class BaseOchFragment> e @Override protected void initViews() { slidePanelView = findViewById(R.id.module_mogo_och_slide_panel); - tvNoticeContainer = findViewById(R.id.module_mogo_och_notice_container); - tvNotice = findViewById(R.id.module_mogo_och_notice); ctvAutopilotStatus = findViewById(R.id.module_mogo_och_autopilot_status); flStationPanelContainer = findViewById(R.id.module_mogo_och_station_panel_container); - fivNoticeHead = findViewById(R.id.module_mogo_och_notice_head); tvOperationStatus = findViewById( R.id.module_mogo_och_operation_status ); panelView = LayoutInflater.from(getContext()).inflate(getStationPanelViewId(), flStationPanelContainer); slidePanelView.setOnSlidePanelMoveToEndListener(onSlideToEndListener); - fivNoticeHead.setAnimRes(sHappy1); ctvAutopilotStatus.setOnClickListener(new OnPreventFastClickListener() { @Override @@ -123,19 +116,7 @@ public abstract class BaseOchFragment> e public void showNotice(String notice) { getActivity().runOnUiThread(() -> { - tvNotice.setText(notice); AIAssist.getInstance(getContext()).speakTTSVoice(notice); - tvNoticeContainer.setVisibility(View.VISIBLE); - fivNoticeHead.setVisibility(View.VISIBLE); - fivNoticeHead.startAnim(); - }); - } - - public void hideNotice() { - getActivity().runOnUiThread(() -> { - tvNoticeContainer.setVisibility(View.GONE); - fivNoticeHead.setVisibility(View.GONE); - fivNoticeHead.stopAnim(); }); } @@ -196,35 +177,5 @@ public abstract class BaseOchFragment> e */ public abstract void restartAutopilot(); - private final int[] sHappy1 = { - R.drawable.ic_happy1_00000, - R.drawable.ic_happy1_00001, - R.drawable.ic_happy1_00002, - R.drawable.ic_happy1_00003, - R.drawable.ic_happy1_00004, - R.drawable.ic_happy1_00005, - R.drawable.ic_happy1_00006, - R.drawable.ic_happy1_00007, - R.drawable.ic_happy1_00008, - R.drawable.ic_happy1_00009, - R.drawable.ic_happy1_00010, - R.drawable.ic_happy1_00011, - R.drawable.ic_happy1_00012, - R.drawable.ic_happy1_00013, - R.drawable.ic_happy1_00014, - R.drawable.ic_happy1_00015, - R.drawable.ic_happy1_00016, - R.drawable.ic_happy1_00017, - R.drawable.ic_happy1_00018, - R.drawable.ic_happy1_00019, - R.drawable.ic_happy1_00020, - R.drawable.ic_happy1_00021, - R.drawable.ic_happy1_00022, - R.drawable.ic_happy1_00023, - R.drawable.ic_happy1_00024, - R.drawable.ic_happy1_00025, - R.drawable.ic_happy1_00026, - R.drawable.ic_happy1_00027, - R.drawable.ic_happy1_00028 - }; + } diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00000.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00000.png deleted file mode 100755 index a2be364289..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00000.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00001.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00001.png deleted file mode 100755 index 9f8cb899c3..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00001.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00002.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00002.png deleted file mode 100755 index ee79ff71b6..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00002.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00003.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00003.png deleted file mode 100755 index 906eca63b2..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00003.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00004.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00004.png deleted file mode 100755 index df57c90358..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00004.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00005.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00005.png deleted file mode 100755 index d2c935fa4b..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00005.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00006.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00006.png deleted file mode 100755 index b3cf32b2bb..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00006.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00007.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00007.png deleted file mode 100755 index bbe4856056..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00007.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00008.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00008.png deleted file mode 100755 index 7eab8a09a5..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00008.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00009.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00009.png deleted file mode 100755 index ac6c5aecfe..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00009.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00010.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00010.png deleted file mode 100755 index b5e5beb991..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00010.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00011.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00011.png deleted file mode 100755 index d9305f539f..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00011.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00012.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00012.png deleted file mode 100755 index c98c20fd84..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00012.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00013.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00013.png deleted file mode 100755 index 7ae4f4dcca..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00013.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00014.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00014.png deleted file mode 100755 index f3623fb358..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00014.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00015.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00015.png deleted file mode 100755 index 15f966b2fb..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00015.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00016.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00016.png deleted file mode 100755 index 4fdb8fb868..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00016.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00017.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00017.png deleted file mode 100755 index 80b1dcbc36..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00017.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00018.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00018.png deleted file mode 100755 index eeb361183b..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00018.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00019.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00019.png deleted file mode 100755 index 7258889df0..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00019.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00020.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00020.png deleted file mode 100755 index 4eb85e0276..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00020.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00021.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00021.png deleted file mode 100755 index 020819278d..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00021.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00022.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00022.png deleted file mode 100755 index a3196f73ea..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00022.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00023.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00023.png deleted file mode 100755 index b0cd970ea0..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00023.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00024.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00024.png deleted file mode 100755 index 1e5106d7bf..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00024.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00025.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00025.png deleted file mode 100755 index aa44c54394..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00025.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00026.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00026.png deleted file mode 100755 index f071ea4658..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00026.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00027.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00027.png deleted file mode 100755 index 904984b70c..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00027.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00028.png b/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00028.png deleted file mode 100755 index fc3a408dbc..0000000000 Binary files a/OCH/mogo-och/src/main/res/drawable-xhdpi/ic_happy1_00028.png and /dev/null differ diff --git a/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml b/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml index a5cf07bc35..e8f53311de 100644 --- a/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml +++ b/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml @@ -57,40 +57,6 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" /> - - - - - - - -