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

[3.2.0] 1、UI走查调整 2、-a环境大理/烟台绑定二维码url调整

Browse Source
This commit is contained in:
wangmingjun
2023-05-16 15:25:10 +08:00
parent 6def045a62
commit f79321b852
16 changed files with 103 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java
View File

@@ -52,32 +52,39 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
BlinkAnimationUtil.clearAnimation(viewHolder.stationCircle);
if (position == 0){ //第一个 起点
viewHolder.curArrowBg.setVisibility(View.GONE);
viewHolder.curArrowBottomBg.setVisibility(View.VISIBLE);
Log.d("onBindViewHolder" , "position0 = "+position);
viewHolder.stationCircle.setImageResource(R.drawable.bg_bus_p_start_tag_bg);
if (station.getDrivingStatus() == STATION_STATUS_STOPPED && !station.isLeaving()){//到达未离开
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_clock_17417B));
BlinkAnimationUtil.setAnimation(viewHolder.stationCircle);
viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.MARQUEE);
viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_1F82FB));
}else {
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_clock_992D3E5F));
viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.END);
viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
}
}else{
viewHolder.curArrowBg.setVisibility(View.VISIBLE);
viewHolder.curArrowBottomBg.setVisibility(View.VISIBLE);
BusPassengerStation preStation = mStations.get(position -1);
if (station.getDrivingStatus() == STATION_STATUS_LEAVING ||
(station.getDrivingStatus() == STATION_STATUS_STOPPED && station.isLeaving())){ //过站
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_clock_992D3E5F));
viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
viewHolder.stationCircle.setImageResource(R.drawable.bus_p_point_gray);
viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.END);
Log.d("onBindViewHolder" , "position 1 = "+position);
} else if (station.getDrivingStatus() == STATION_STATUS_STOPPED && !station.isLeaving()){//刚到站未离开的
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_clock_17417B));
viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_1F82FB));
viewHolder.stationCircle.setImageResource(R.drawable.bus_p_arrive_line_green);
if (position == mStations.size() - 1){
viewHolder.stationCircle.setImageResource(R.drawable.bg_bus_p_end_tag_bg);
viewHolder.curArrowBottomBg.setVisibility(View.GONE);
}
Log.d("onBindViewHolder" , "position2 = "+position);
BlinkAnimationUtil.setAnimation(viewHolder.stationCircle);
@@ -85,19 +92,26 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
}else if (station.getDrivingStatus() == STATION_STATUS_ARRIVING && preStation.isLeaving()){//即将到站
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_panel_cur_station_tips_color));
viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_1F82FB));
viewHolder.stationCircle.setImageResource(R.drawable.bus_p_arrive_line_blue);
Log.d("onBindViewHolder" , "position3 = "+position);
if (position == mStations.size() - 1){
viewHolder.curArrowBottomBg.setVisibility(View.GONE);
}
}else if (station.getDrivingStatus() == STATION_STATUS_ARRIVING &&
(preStation.getDrivingStatus() == STATION_STATUS_ARRIVING
|| preStation.getDrivingStatus() == STATION_STATUS_STOPPED)){ //未到站的并且前面也是未到站或者刚到站的
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_panel_cur_station_tips_color));
viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_1F82FB));
viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_1F82FB));
viewHolder.stationCircle.setImageResource(R.drawable.bus_p_point_blue);
viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.END);
if (position == mStations.size() - 1){
viewHolder.stationCircle.setImageResource(R.drawable.bg_bus_p_end_tag_bg);
viewHolder.curArrowBottomBg.setVisibility(View.GONE);
}
Log.d("onBindViewHolder" , "position4 = "+position);
}
@@ -114,11 +128,13 @@ class StationViewHolder extends RecyclerView.ViewHolder{
public MarqueeTextView stationName;
public ImageView stationCircle;
public ImageView curArrowBg;
public ImageView curArrowBottomBg;
public StationViewHolder(@NonNull View itemView) {
super(itemView);
stationName = itemView.findViewById(R.id.bus_p_station);
stationCircle = itemView.findViewById(R.id.bus_p_circle);
curArrowBg = itemView.findViewById(R.id.bus_p_cur_arrow_bg);
curArrowBottomBg = itemView.findViewById(R.id.bus_p_cur_arrow_bottom_bg);
}
}

4
OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml
View File

@@ -8,8 +8,8 @@
<ImageView
android:id="@+id/no_order_data_iv"
android:layout_width="@dimen/dp_386"
android:layout_height="@dimen/dp_350"
android:layout_width="@dimen/dp_200"
android:layout_height="@dimen/dp_210"
android:src="@drawable/bus_p_no_order_data"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"

22
OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
View File

@@ -65,7 +65,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/bus_p_route_info_margin_left"
android:layout_marginTop="@dimen/bus_p_route_info_margin_top"
android:layout_marginTop="@dimen/dp_90"
android:includeFontPadding="false"
android:letterSpacing="-0.05"
android:text="0"
@@ -90,18 +90,19 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/auto_status_iv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/dp_100"
android:layout_height="@dimen/dp_58"
android:src="@drawable/auto_close"
android:layout_marginTop="@dimen/dp_10"
app:layout_constraintLeft_toLeftOf="@+id/bus_p_speed_tv"
app:layout_constraintTop_toBottomOf="@+id/bus_p_speed_tv"/>
<com.mogo.eagle.core.function.hmi.ui.vehicle.TurnLightViewStatus
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/dp_104"
android:layout_height="@dimen/dp_58"
app:day_light_mode="true"
app:visible="false"
android:layout_marginRight="@dimen/dp_20"
android:layout_marginLeft="@dimen/dp_20"
app:layout_constraintTop_toTopOf="@+id/auto_status_iv"
app:layout_constraintBottom_toBottomOf="@+id/auto_status_iv"
app:layout_constraintLeft_toRightOf="@+id/auto_status_iv"/>
@@ -110,9 +111,10 @@
android:layout_width="@dimen/bus_p_route_line_dividing_view_height"
android:layout_height="@dimen/dp_156"
android:background="@color/bus_p_clock_6617417B"
android:layout_marginTop="@dimen/dp_110"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@+id/bus_p_speed_tv" />
app:layout_constraintTop_toTopOf="parent" />
<TextClock
android:layout_marginStart="@dimen/dp_64"
@@ -123,9 +125,9 @@
android:format24Hour="HH:mm"
android:gravity="center"
android:textColor="@color/bus_p_clock_17417B"
android:layout_marginBottom="@dimen/dp_5"
app:layout_constraintLeft_toRightOf="@+id/dividing_line_1"
app:layout_constraintTop_toTopOf="@+id/dividing_line_1"
app:layout_constraintTop_toTopOf="@+id/bus_p_speed_tv"
app:layout_constraintBottom_toBottomOf="@+id/bus_p_speed_tv"
android:includeFontPadding="false"
android:textSize="@dimen/dp_66" />
@@ -154,7 +156,7 @@
android:textColor="@color/bus_p_clock_17417B"
app:layout_constraintLeft_toLeftOf="@+id/textClockDate"
app:layout_constraintTop_toBottomOf="@+id/textClockDate"
android:layout_marginTop="@dimen/dp_18"
android:layout_marginTop="@dimen/dp_6"
android:includeFontPadding="false"
android:textSize="@dimen/dp_26" />

24
OCH/mogo-och-bus-passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml
View File

@@ -27,18 +27,30 @@
<ImageView
android:id="@+id/bus_p_cur_arrow_bg"
android:layout_width="@dimen/dp_10"
android:layout_height="@dimen/dp_72"
android:scaleType="fitXY"
android:layout_width="@dimen/dp_6"
android:layout_height="0dp"
android:layout_marginBottom="@dimen/dp_44"
android:background="@color/acc_default_txt_color"
app:layout_constraintLeft_toLeftOf="@+id/bus_p_circle"
app:layout_constraintRight_toRightOf="@+id/bus_p_circle"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@+id/bus_p_circle"/>
<ImageView
android:id="@+id/bus_p_cur_arrow_bottom_bg"
android:layout_width="@dimen/dp_6"
android:layout_height="@dimen/dp_16"
android:background="@color/acc_default_txt_color"
app:layout_constraintLeft_toLeftOf="@+id/bus_p_circle"
app:layout_constraintRight_toRightOf="@+id/bus_p_circle"
app:layout_constraintBottom_toBottomOf="@+id/bus_p_circle"/>
<ImageView
android:id="@+id/bus_p_circle"
android:layout_width="62dp"
android:layout_height="62dp"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_60"
android:scaleType="center"
android:src="@drawable/bus_p_point_blue"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="@+id/bus_p_station"

2
OCH/mogo-och-bus-passenger/src/jinlvvan/res/values/dimens.xml
View File

@@ -40,7 +40,7 @@
<dimen name="bus_p_cur_station_circle_width">20dp</dimen>
<dimen name="bus_p_cur_station_circle_height">50dp</dimen>
<dimen name="bus_p_mid_station_circle_cor">6dp</dimen>
<dimen name="bus_p_station_txt_size">50dp</dimen>
<dimen name="bus_p_station_txt_size">38dp</dimen>
<dimen name="bus_p_station_tag_txt_size">36dp</dimen>
<dimen name="bus_p_station_item_height">80dp</dimen>
<dimen name="bus_p_station_item_middle_height">100dp</dimen>

BIN
OCH/mogo-och-bus-passenger/src/main/assets/map_style.data
View File

Binary file not shown.

BIN
OCH/mogo-och-bus-passenger/src/main/assets/map_style_extra.data
View File

Binary file not shown.

4
OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/utils/BlinkAnimationUtil.java
View File

@@ -22,8 +22,8 @@ public class BlinkAnimationUtil {
AnimatorSet animationSet = new AnimatorSet();
imageView.setTag(imageView.getId(),animationSet);
ObjectAnimator valueAnimator = ObjectAnimator.ofFloat(imageView, "alpha",0.2f, 1.0f);
ObjectAnimator valueAnimatorDisappare = ObjectAnimator.ofFloat(imageView, "alpha",1.0f, 0.2f);
ObjectAnimator valueAnimator = ObjectAnimator.ofFloat(imageView, "alpha",0.3f, 1.0f);
ObjectAnimator valueAnimatorDisappare = ObjectAnimator.ofFloat(imageView, "alpha",1.0f, 0.3f);
valueAnimator.setDuration(1000);
valueAnimatorDisappare.setDuration(800);

16
OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/adapter/BusPassengerLineStationsAdapter.java
View File

@@ -52,32 +52,39 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
BlinkAnimationUtil.clearAnimation(viewHolder.stationCircle);
if (position == 0){ //第一个 起点
viewHolder.curArrowBg.setVisibility(View.GONE);
viewHolder.curArrowBottomBg.setVisibility(View.VISIBLE);
Log.d("onBindViewHolder" , "position0 = "+position);
viewHolder.stationCircle.setImageResource(R.drawable.bg_bus_p_start_tag_bg);
if (station.getDrivingStatus() == STATION_STATUS_STOPPED && !station.isLeaving()){//到达未离开
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_clock_17417B));
BlinkAnimationUtil.setAnimation(viewHolder.stationCircle);
viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.MARQUEE);
viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_1F82FB));
}else {
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_clock_992D3E5F));
viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.END);
viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
}
}else{
viewHolder.curArrowBg.setVisibility(View.VISIBLE);
viewHolder.curArrowBottomBg.setVisibility(View.VISIBLE);
BusStationBean preStation = mStations.get(position -1);
if (station.getDrivingStatus() == STATION_STATUS_LEAVING ||
(station.getDrivingStatus() == STATION_STATUS_STOPPED && station.isLeaving())){ //过站
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_clock_992D3E5F));
viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
viewHolder.stationCircle.setImageResource(R.drawable.bus_p_point_gray);
viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.END);
Log.d("onBindViewHolder" , "position 1 = "+position);
} else if (station.getDrivingStatus() == STATION_STATUS_STOPPED && !station.isLeaving()){//刚到站未离开的
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_clock_17417B));
viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_1F82FB));
viewHolder.stationCircle.setImageResource(R.drawable.bus_p_arrive_line_green);
if (position == mStations.size() - 1){
viewHolder.stationCircle.setImageResource(R.drawable.bg_bus_p_end_tag_bg);
viewHolder.curArrowBottomBg.setVisibility(View.GONE);
}
Log.d("onBindViewHolder" , "position2 = "+position);
BlinkAnimationUtil.setAnimation(viewHolder.stationCircle);
@@ -85,19 +92,26 @@ public class BusPassengerLineStationsAdapter extends RecyclerView.Adapter<Recycl
}else if (station.getDrivingStatus() == STATION_STATUS_ARRIVING && preStation.isLeaving()){//即将到站
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_panel_cur_station_tips_color));
viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_A9B6CA));
viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_1F82FB));
viewHolder.stationCircle.setImageResource(R.drawable.bus_p_arrive_line_blue);
Log.d("onBindViewHolder" , "position3 = "+position);
if (position == mStations.size() - 1){
viewHolder.curArrowBottomBg.setVisibility(View.GONE);
}
}else if (station.getDrivingStatus() == STATION_STATUS_ARRIVING &&
(preStation.getDrivingStatus() == STATION_STATUS_ARRIVING
|| preStation.getDrivingStatus() == STATION_STATUS_STOPPED)){ //未到站的并且前面也是未到站或者刚到站的
viewHolder.stationName.setTextColor(mContext.getResources().getColor(R.color.bus_p_panel_cur_station_tips_color));
viewHolder.curArrowBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_1F82FB));
viewHolder.curArrowBottomBg.setBackgroundColor(mContext.getColor(R.color.bus_p_clock_1F82FB));
viewHolder.stationCircle.setImageResource(R.drawable.bus_p_point_blue);
viewHolder.stationName.setEllipsize(TextUtils.TruncateAt.END);
if (position == mStations.size() - 1){
viewHolder.stationCircle.setImageResource(R.drawable.bg_bus_p_end_tag_bg);
viewHolder.curArrowBottomBg.setVisibility(View.GONE);
}
Log.d("onBindViewHolder" , "position4 = "+position);
}
@@ -113,11 +127,13 @@ class StationViewHolder extends RecyclerView.ViewHolder{
public MarqueeTextView stationName;
public ImageView stationCircle;
public ImageView curArrowBg;
public ImageView curArrowBottomBg;
public StationViewHolder(@NonNull View itemView) {
super(itemView);
stationName = itemView.findViewById(R.id.bus_p_station);
stationCircle = itemView.findViewById(R.id.bus_p_circle);
curArrowBg = itemView.findViewById(R.id.bus_p_cur_arrow_bg);
curArrowBottomBg = itemView.findViewById(R.id.bus_p_cur_arrow_bottom_bg);
}
}

4
OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_no_data_common_view.xml
View File

@@ -8,8 +8,8 @@
<ImageView
android:id="@+id/no_order_data_iv"
android:layout_width="@dimen/dp_386"
android:layout_height="@dimen/dp_350"
android:layout_width="@dimen/dp_200"
android:layout_height="@dimen/dp_210"
android:src="@drawable/bus_p_no_order_data"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"

22
OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_route_fragment.xml
View File

@@ -56,7 +56,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/bus_p_route_info_margin_left"
android:layout_marginTop="@dimen/bus_p_route_info_margin_top"
android:layout_marginTop="@dimen/dp_90"
android:includeFontPadding="false"
android:letterSpacing="-0.05"
android:text="0"
@@ -81,19 +81,20 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/auto_status_iv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/dp_100"
android:layout_height="@dimen/dp_58"
android:src="@drawable/auto_close"
android:layout_marginTop="@dimen/dp_10"
app:layout_constraintLeft_toLeftOf="@+id/bus_p_speed_tv"
app:layout_constraintTop_toBottomOf="@+id/bus_p_speed_tv"/>
<com.mogo.eagle.core.function.hmi.ui.vehicle.TurnLightViewStatus
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/dp_104"
android:layout_height="@dimen/dp_58"
app:day_light_mode="true"
app:visible="false"
android:layout_marginRight="@dimen/dp_20"
android:layout_marginLeft="@dimen/dp_20"
app:layout_constraintTop_toTopOf="@+id/auto_status_iv"
app:layout_constraintBottom_toBottomOf="@+id/auto_status_iv"
app:layout_constraintLeft_toRightOf="@+id/auto_status_iv"/>
@@ -104,7 +105,8 @@
android:background="@color/bus_p_clock_6617417B"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@+id/bus_p_speed_tv" />
android:layout_marginTop="@dimen/dp_110"
app:layout_constraintTop_toTopOf="parent" />
<TextClock
android:layout_marginStart="@dimen/dp_64"
@@ -115,9 +117,9 @@
android:format24Hour="HH:mm"
android:gravity="center"
android:textColor="@color/bus_p_clock_17417B"
android:layout_marginBottom="@dimen/dp_5"
app:layout_constraintLeft_toRightOf="@+id/dividing_line_1"
app:layout_constraintTop_toTopOf="@+id/dividing_line_1"
app:layout_constraintTop_toTopOf="@+id/bus_p_speed_tv"
app:layout_constraintBottom_toBottomOf="@+id/bus_p_speed_tv"
android:includeFontPadding="false"
android:textSize="@dimen/dp_66" />
@@ -146,7 +148,7 @@
android:textColor="@color/bus_p_clock_17417B"
app:layout_constraintLeft_toLeftOf="@+id/textClockDate"
app:layout_constraintTop_toBottomOf="@+id/textClockDate"
android:layout_marginTop="@dimen/dp_18"
android:layout_marginTop="@dimen/dp_6"
android:includeFontPadding="false"
android:textSize="@dimen/dp_26" />

25
OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_stations_common_item.xml
View File

@@ -15,29 +15,42 @@
android:ellipsize="marquee"
android:marqueeRepeatLimit="marquee_forever"
android:layout_marginRight="@dimen/dp_60"
android:layout_marginTop="@dimen/dp_68"
android:textStyle="bold"
android:textColor="@color/bus_p_station_txt_color"
android:layout_marginLeft="@dimen/dp_90"
app:customGap="0.5"
app:useCustomGap="true"
android:layout_marginTop="@dimen/dp_68"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<ImageView
android:id="@+id/bus_p_cur_arrow_bg"
android:layout_width="@dimen/dp_10"
android:layout_height="@dimen/dp_72"
android:layout_width="@dimen/dp_6"
android:layout_height="0dp"
android:layout_marginBottom="@dimen/dp_44"
android:background="@color/acc_default_txt_color"
app:layout_constraintLeft_toLeftOf="@+id/bus_p_circle"
app:layout_constraintRight_toRightOf="@+id/bus_p_circle"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@+id/bus_p_circle"/>
<ImageView
android:id="@+id/bus_p_cur_arrow_bottom_bg"
android:layout_width="@dimen/dp_6"
android:layout_height="@dimen/dp_16"
android:background="@color/acc_default_txt_color"
app:layout_constraintLeft_toLeftOf="@+id/bus_p_circle"
app:layout_constraintRight_toRightOf="@+id/bus_p_circle"
app:layout_constraintBottom_toBottomOf="@+id/bus_p_circle"/>
<ImageView
android:id="@+id/bus_p_circle"
android:layout_width="62dp"
android:layout_height="62dp"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_60"
android:scaleType="center"
android:src="@drawable/bus_p_point_blue"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="@+id/bus_p_station"

2
OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/values/dimens.xml
View File

@@ -40,7 +40,7 @@
<dimen name="bus_p_cur_station_circle_width">20dp</dimen>
<dimen name="bus_p_cur_station_circle_height">50dp</dimen>
<dimen name="bus_p_mid_station_circle_cor">6dp</dimen>
<dimen name="bus_p_station_txt_size">50dp</dimen>
<dimen name="bus_p_station_txt_size">38dp</dimen>
<dimen name="bus_p_station_tag_txt_size">36dp</dimen>
<dimen name="bus_p_station_item_height">80dp</dimen>
<dimen name="bus_p_station_item_middle_height">100dp</dimen>

BIN
OCH/mogo-och-shuttle-passenger/src/main/assets/map_style.data
View File

Binary file not shown.

BIN
OCH/mogo-och-shuttle-passenger/src/main/assets/map_style_extra.data
View File

Binary file not shown.

4
app/config/urlConfig.json
View File

@@ -43,7 +43,7 @@
"socket_tech_url": "https://och-a.zhidaozhixing.com/arch/",
"eagle_mis_url": "http://eagle-mis-a.zhidaozhixing.com/",
"eagle_dns_url": "http://eagle-dns-a.zhidaozhixing.com/",
"bind_driver_qr_url": "https://tech.zhidaohulian.com?pipe=asafety&sn=%1$s",
"bind_driver_qr_url": "https://och-mini-eh.zhidaozhixing.com?pipe=ehsafety&sn=%1$s",
"chart_socket_url":"wss://acp-eh.zhidaozhixing.com/ws"
},
"online": {
@@ -78,7 +78,7 @@
"socket_tech_url": "https://och-a.zhidaozhixing.com/arch/",
"eagle_mis_url": "http://eagle-mis-a.zhidaozhixing.com/",
"eagle_dns_url": "http://eagle-dns-a.zhidaozhixing.com/",
"bind_driver_qr_url": "https://tech.zhidaohulian.com?pipe=asafety&sn=%1$s",
"bind_driver_qr_url": "https://och-mini-yt.zhidaozhixing.com?pipe=ytsafety&sn=%1$s",
"chart_socket_url":""
},
"online": {