Merge branch 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0' into 'dev_RoboBus_P_230220_1.0.1'

Dev robobus m1 p app module 1.0.0 230112 1.0.0

See merge request zhjt/AndroidApp/MoGoEagleEye!603
This commit is contained in:
wangmingjun
2023-02-22 06:56:10 +00:00
3 changed files with 3 additions and 3 deletions

View File

@@ -141,6 +141,7 @@ class PM2DrivingInfoFragment :
}
private fun updateNoStationView(){
station_name_tv.setTextColor(resources.getColor(R.color.m2_no_line_tv_color))
station_name_title_tv.text = resources.getString(R.string.m2_p_station_title_tv)
station_name_tv.text = resources.getString(R.string.m2_p_empty_tv)
remain_mt.text = resources.getString(R.string.m2_p_empty_remain_km_minute)
@@ -174,6 +175,7 @@ class PM2DrivingInfoFragment :
fun updateStationsInfo(stations: MutableList<PM2Station>, i: Int, isArrived: Boolean){
if (stations.size == 0) return
if (0<= i && i<stations.size){
station_name_tv.setTextColor(resources.getColor(R.color.m2_line_name_tv_color))
station_name_tv.text = stations[i].name
}
if (isArrived){//到站

View File

@@ -181,7 +181,7 @@ class AdvanceVideoView @JvmOverloads constructor(
}
override fun onProgress(url: String?, length: Int) {
Logger.d(ImageAndVideoRotation.TAG, "download-onProgress")
// Logger.d(ImageAndVideoRotation.TAG, "download-onProgress")
}
override fun onFinished(url: String?, threadBean: ThreadBean?) {

View File

@@ -428,8 +428,6 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
}
private void changeAutopilotBtnView(int autopilotStatus, boolean isAnimateRunning) {
CallerLogger.INSTANCE.d(M_BUS + TAG, "onStateChangeChangeAutopilotBtnView: "
+ autopilotStatus + "isAnimateRunning = " + isAnimateRunning);
if (isAnimateRunning && IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING
!= autopilotStatus) {
// 主动开启自动驾驶中不为2为0、1则继续loading