diff --git a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml index 890383e853..1507c11086 100644 --- a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml +++ b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml @@ -100,15 +100,17 @@ - + app:layout_constraintTop_toTopOf="parent" + android:layout_marginTop="@dimen/dp_14" + android:layout_marginEnd="@dimen/dp_21" + android:visibility="gone" + app:lightUser="passenger" + /> ${newValue}") Log.d(tag, "登录状态变化:${oldValue}-->${newValue}") -// if (newValue == EnumLoginStatus.Login && AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { -// BizLoopManager.setLoopFunction( -// TAGLoopStatus, -// LoopInfo(60 * 2, ::queryLoginStatusByNet, immediately = false, scheduler = Schedulers.io()) -// ) -// } else { -// BizLoopManager.removeLoopFunction(TAGLoopStatus) -// } + if (newValue == EnumLoginStatus.Login && AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { + BizLoopManager.setLoopFunction( + TAGLoopStatus, + LoopInfo(60 * 10, ::queryLoginStatusByNet, immediately = false, scheduler = Schedulers.io()) + ) + } else { + BizLoopManager.removeLoopFunction(TAGLoopStatus) + } LoginStatusManager.invokeLoginStatusChange(loginStatus) } } diff --git a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/BridgeProvider.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/BridgeProvider.kt index 54f444b221..ce800bffe6 100644 --- a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/BridgeProvider.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/BridgeProvider.kt @@ -10,9 +10,12 @@ import com.mogo.eagle.core.utilcode.util.CoordinateUtils import com.mogo.och.bridge.autopilot.location.OchLocationManager import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager import com.mogo.och.bridge.bridge.OchBridgeManager +import com.mogo.och.bridge.bridge.OchVlmManager import com.mogo.och.bridge.trajectory.TrajectoryManager import com.mogo.och.common.module.biz.birdge.BridgeService import com.mogo.och.common.module.biz.birdge.BridgeListener +import com.mogo.och.common.module.biz.birdge.data.RoadMsg +import com.mogo.och.common.module.biz.birdge.data.VlmData import com.mogo.och.common.module.constant.OchCommonConst @@ -29,7 +32,14 @@ class BridgeProvider : BridgeService, CallerBase() { override fun init(context: Context?) { this.context = context + + // 车前引导线+预测数据 OchBridgeManager.load() + +// if(EnvManager.isT1T2Passenger()){ + OchVlmManager.load() +// } + TrajectoryManager.load() } @@ -92,5 +102,17 @@ class BridgeProvider : BridgeService, CallerBase() { } } + fun invokeVlmDataDispatch(vlmData:VlmData){ + M_LISTENERS.forEach { + it.value.onVlmDataListener(vlmData) + } + } + + fun inVokeNdeData(title: String, desc: String, sortedList: List) { + M_LISTENERS.forEach { + it.value.onNdeDataListener(title,desc,sortedList) + } + } + } \ No newline at end of file diff --git a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/BridgeServiceManager.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/BridgeServiceManager.kt index e600572140..048b82028f 100644 --- a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/BridgeServiceManager.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/BridgeServiceManager.kt @@ -3,13 +3,10 @@ package com.mogo.och.bridge import android.annotation.SuppressLint import com.alibaba.android.arouter.launcher.ARouter import com.mogo.eagle.core.data.map.MogoLocation -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OCHCOMMON +import com.mogo.och.common.module.biz.birdge.data.RoadMsg +import com.mogo.och.common.module.biz.birdge.data.VlmData import com.mogo.och.common.module.constant.OchCommonConst -import com.mogo.och.common.module.manager.loop.BizLoopManager -import com.mogo.och.common.module.manager.loop.LoopInfo -import io.reactivex.schedulers.Schedulers -import kotlin.properties.Delegates object BridgeServiceManager { @@ -19,52 +16,12 @@ object BridgeServiceManager { private var bridgeService: BridgeProvider? = ARouter.getInstance().build(OchCommonConst.BIZ_Bridge).navigation() as BridgeProvider - private var trajectoryTime = 0L - private var predictionTime = 0L - - init { - BizLoopManager.setLoopFunction(TAG, - LoopInfo(2, ::checkTimeout, immediately = false, scheduler = Schedulers.io()) - ) - } - - // 是否有车前引导线 - private var haveTrajectoryInfo: Boolean by Delegates.observable(false) { _, oldValue, newValue -> - if (oldValue != newValue) { - bridgeService?.invokeTrajectoryHaveDataListener(newValue) - CallerLogger.d(TAG,"haveTrajectoryInfo 发生变化:${newValue}") - } - trajectoryTime = System.currentTimeMillis() - - } - - // 是否有预测数据 - private var havePredictionInfo: Boolean by Delegates.observable(false) { _, oldValue, newValue -> - if (oldValue != newValue) { - bridgeService?.invokePredictionHavaData(newValue) - CallerLogger.d(TAG,"havePredictionInfo 发生变化:${newValue}") - } - predictionTime = System.currentTimeMillis() - } - - fun checkTimeout(){ - if(System.currentTimeMillis() - trajectoryTime>2_000){ - haveTrajectoryInfo = false - CallerLogger.d(TAG,"超时设置为false:haveTrajectoryInfo ${haveTrajectoryInfo}") - } - if(System.currentTimeMillis() - predictionTime>2_000){ - havePredictionInfo = false - CallerLogger.d(TAG,"超时设置为false:havePredictionInfo ${havePredictionInfo}") - } - } - - fun invokePlanningListener(haveTrajectoryInfos:Boolean){ - this.haveTrajectoryInfo = haveTrajectoryInfos + bridgeService?.invokeTrajectoryHaveDataListener(haveTrajectoryInfos) } fun invokePredictionHaveData(havePredictionInfos:Boolean){ - this.havePredictionInfo = havePredictionInfos + bridgeService?.invokePredictionHavaData(havePredictionInfos) } fun invokeTrajectoryPoints(trajectoryList: MutableList){ @@ -78,4 +35,15 @@ object BridgeServiceManager { this.bridgeService?.invokeTrajectoryPointAndDistance(trajectoryList, distance) } + /** + * 分发vmData + */ + fun invokeVlmData(vlmData: VlmData){ + this.bridgeService?.invokeVlmDataDispatch(vlmData) + } + + fun invokeNdeData(title: String, desc: String, sortedList: List) { + this.bridgeService?.inVokeNdeData(title,desc,sortedList) + } + } \ No newline at end of file diff --git a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/OchAutopilotAnalytics.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/OchAutopilotAnalytics.kt index 8ffb14cca1..04a022858d 100644 --- a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/OchAutopilotAnalytics.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/autopilot/autopilot/OchAutopilotAnalytics.kt @@ -73,6 +73,7 @@ object OchAutopilotAnalytics { params[EVENT_PARAM_AUTOPILOTANALYTICS_GROUP] = EVENT_PARAM_AUTOPILOTANALYTICS_GROUP OchChainLogManager.addCommonParams(params) MogoAnalyticUtils.track(EVENT_KEY_START_AUTOPILOT_PARAMETERS, params) + OchChainLogManager.writeChainLogAutopilot("正式启动自驾把参数传给底层",params.toString(),false) } /** @@ -86,6 +87,7 @@ object OchAutopilotAnalytics { params[EVENT_PARAM_AUTOPILOTANALYTICS_GROUP] = EVENT_PARAM_AUTOPILOTANALYTICS_GROUP OchChainLogManager.addCommonParams(params) MogoAnalyticUtils.track(EVENT_KEY_START_AUTOPILOT_ACK, params) + OchChainLogManager.writeChainLogAutopilot("底盘收到启动自驾的ack",params.toString(),false) } /** @@ -156,6 +158,7 @@ object OchAutopilotAnalytics { mStartAutopilotParams[EVENT_PARAM_AUTOPILOTANALYTICS_GROUP] = EVENT_PARAM_AUTOPILOTANALYTICS_GROUP OchChainLogManager.addCommonParams(mStartAutopilotParams) MogoAnalyticUtils.track(mStartAutopilotKey, mStartAutopilotParams) + OchChainLogManager.writeChainLogAutopilot("启动自驾失败",mStartAutopilotParams.toString(),false) clearStartAutopilotParams() //清空参数数据,防止误传 } @@ -200,6 +203,7 @@ object OchAutopilotAnalytics { mStartAutopilotParams[EVENT_PARAM_AUTOPILOTANALYTICS_GROUP] = EVENT_PARAM_AUTOPILOTANALYTICS_GROUP OchChainLogManager.addCommonParams(mStartAutopilotParams) MogoAnalyticUtils.track(mStartAutopilotKey, mStartAutopilotParams) + OchChainLogManager.writeChainLogAutopilot("启动自驾成功",mStartAutopilotParams.toString(),false) clearStartAutopilotParams() //清空参数数据,防止误传 } else { mStartAutopilotParams[EVENT_PARAM_ENV_ONLINE] = DebugConfig.getNetMode() == DebugConfig.NET_MODE_RELEASE @@ -251,6 +255,7 @@ object OchAutopilotAnalytics { params[EVENT_PARAM_AUTOPILOTANALYTICS_GROUP] = EVENT_PARAM_AUTOPILOTANALYTICS_GROUP OchChainLogManager.addCommonParams(mStartAutopilotParams) MogoAnalyticUtils.track(getEventKeyApUnableStartReason(), params) + OchChainLogManager.writeChainLogAutopilot("触发\"无法开启自驾已知异常\"埋点",params.toString(),false) } /** @@ -263,6 +268,7 @@ object OchAutopilotAnalytics { params[EVENT_PARAM_AUTOPILOTANALYTICS_GROUP] = EVENT_PARAM_AUTOPILOTANALYTICS_GROUP OchChainLogManager.addCommonParams(mStartAutopilotParams) MogoAnalyticUtils.track(getEventKeyClickStartAutopilot(), params) + OchChainLogManager.writeChainLogAutopilot("用户点击启动自驾的时间",params.toString(),false) } /** diff --git a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/bridge/Data.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/bridge/Data.kt new file mode 100644 index 0000000000..834a40af21 --- /dev/null +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/bridge/Data.kt @@ -0,0 +1,42 @@ +package com.mogo.och.bridge.bridge + +data class VlmImageData(val imageSourceTimestamp: Double ,var image: ByteArray?) { + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (javaClass != other?.javaClass) return false + + other as VlmImageData + + return imageSourceTimestamp == other.imageSourceTimestamp + } + + override fun hashCode(): Int { + return imageSourceTimestamp.hashCode() + } + + override fun toString(): String { + return "VlmImageData(imageSourceTimestamp=$imageSourceTimestamp)" + } + + +} + +data class VlmMessageData(val messageSourceTimestamp: Double ,val id:Int?,val message:String?){ + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (javaClass != other?.javaClass) return false + + other as VlmMessageData + +// if (messageSourceTimestamp != other.messageSourceTimestamp) return false + if (id != other.id) return false + + return true + } + + override fun hashCode(): Int { + var result = messageSourceTimestamp.hashCode() + result = 31 * result + (id ?: 0) + return result + } +} diff --git a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/bridge/OchBridgeManager.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/bridge/OchBridgeManager.kt index 9009316cb3..661733f998 100644 --- a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/bridge/OchBridgeManager.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/bridge/OchBridgeManager.kt @@ -1,27 +1,96 @@ package com.mogo.och.bridge.bridge +import android.util.Log +import com.mogo.commons.env.ProjectUtils +import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotIdentifyListener +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningActionsListener +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningTrajectoryListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager +import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager.getWgs84Lat +import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager.getWgs84Lon +import com.mogo.eagle.core.function.call.autopilot.CallerPlanningActionsListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerPlanningTrajectoryListenerManager -import com.mogo.eagle.core.function.call.base.CallerBase +import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OCHCOMMON +import com.mogo.eagle.core.utilcode.util.LocationUtils +import com.mogo.eagle.core.utilcode.util.ThreadUtils +import com.mogo.eagle.core.utilcode.util.UiThreadHandler +import com.mogo.map.MogoMap +import com.mogo.map.MogoMap.Companion.mapInstance +import com.mogo.map.overlay.core.Level +import com.mogo.map.overlay.point.Point import com.mogo.och.bridge.BridgeServiceManager +import com.mogo.och.bridge.R import prediction2025.Prediction2025 import mogo.telematics.pad.MessagePad +import kotlin.properties.Delegates -object OchBridgeManager: CallerBase(), - IMoGoPlanningTrajectoryListener, IMoGoAutopilotIdentifyListener { +object OchBridgeManager: IMoGoPlanningTrajectoryListener, IMoGoAutopilotIdentifyListener, + IMoGoAutopilotPlanningActionsListener { private val TAG = "${M_OCHCOMMON}OchPlanningListenerManager" + private var trajectoryTime = 0L + private var predictionTime = 0L + + private val map by lazy { + mapInstance.getMogoMap(MogoMap.DEFAULT) + } + + @Volatile + private var lastTime: Long = 0L + + @Volatile + private var lastUpdateTime: Long = 0L + + @Volatile + private var isHide = false + fun load(){ CallerPlanningTrajectoryListenerManager.addListener(TAG,this) CallerAutopilotIdentifyListenerManager.addListener(TAG,this) + CallerPlanningActionsListenerManager.addListener(TAG, this) + UiThreadHandler.postDelayed(timeRunnable, 1000) } - fun release(){ + fun release() { CallerPlanningTrajectoryListenerManager.removeListener(TAG) + CallerAutopilotIdentifyListenerManager.removeListener(TAG) + CallerPlanningActionsListenerManager.removeListener(TAG) + } + + // 是否有车前引导线 + private var haveTrajectoryInfo: Boolean by Delegates.observable(false) { _, oldValue, newValue -> + if (oldValue != newValue) { + BridgeServiceManager.invokePlanningListener(newValue) + CallerLogger.d(TAG,"haveTrajectoryInfo 发生变化:${newValue}") + } + trajectoryTime = System.currentTimeMillis() + + } + + // 是否有预测数据 + private var havePredictionInfo: Boolean by Delegates.observable(false) { _, oldValue, newValue -> + if (oldValue != newValue) { + BridgeServiceManager.invokePredictionHaveData(newValue) + CallerLogger.d(TAG,"havePredictionInfo 发生变化:${newValue}") + } + predictionTime = System.currentTimeMillis() + } + + fun checkTimeout(){ + if(System.currentTimeMillis() - trajectoryTime>2_000){ + haveTrajectoryInfo = false + CallerLogger.d(TAG,"超时设置为false:haveTrajectoryInfo $haveTrajectoryInfo") + } + if(System.currentTimeMillis() - predictionTime>2_000){ + havePredictionInfo = false + CallerLogger.d(TAG,"超时设置为false:havePredictionInfo $havePredictionInfo") + } } /** @@ -29,19 +98,100 @@ object OchBridgeManager: CallerBase(), */ override fun onAutopilotTrajectory(trajectoryInfos: MutableList) { if(trajectoryInfos.isEmpty()){ - BridgeServiceManager.invokePlanningListener(false) + haveTrajectoryInfo = false }else{ - BridgeServiceManager.invokePlanningListener(true) + haveTrajectoryInfo = true } } + /** + * 预测信息 + */ override fun onPredictionObstacleTrajectory(predictionObjects: Prediction2025.mPredictionObjects) { if (predictionObjects.objsAppList==null) { - BridgeServiceManager.invokePredictionHaveData(false) + havePredictionInfo = false }else{ - BridgeServiceManager.invokePredictionHaveData(true) + havePredictionInfo = true } } + private val timeRunnable = Runnable { + timeCheck() + } + private fun timeCheck() { + if (lastUpdateTime > 0 && System.currentTimeMillis() - lastUpdateTime > 1000) { + ThreadUtils.getIoPool().execute { + CallerMapUIServiceManager.getOverlayManager()?.hidePoint("RenderParkingModel") + } + isHide = true + } + UiThreadHandler.postDelayed(timeRunnable, 1000) + } + + override fun pncActions(planningActionMsg: MessagePad.PlanningActionMsg) { + if (!FunctionBuildConfig.isParkingOpen) return + val timeStamp = System.currentTimeMillis() + lastUpdateTime = timeStamp + if (timeStamp - lastTime >= 1000) { + lastTime = System.currentTimeMillis() + // Saas乘客屏且是自驾中 + if (ProjectUtils.isSaas() && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) + ) { + Log.d(TAG, "pncActions-Sass乘客屏收到数据!") + if (CallerAutoPilotStatusListenerManager.getState() != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { + Log.d(TAG, "pncActions-非自驾中!") + CallerMapUIServiceManager.getOverlayManager()?.hidePoint("RenderParkingModel") + isHide = true + } else { + Log.d(TAG, "pncActions-UTM度带号:${planningActionMsg.utmZone},坐标为:(${planningActionMsg.updatedTerminal.x},${planningActionMsg.updatedTerminal.y}),角度为:${planningActionMsg.parkingLotHeading}") + val lonLatArr = map?.switchData( + planningActionMsg.updatedTerminal.x, + planningActionMsg.updatedTerminal.y, + false + ) + lonLatArr?.let { + if (it.size < 2) { + Log.d(TAG, "pncActions-UTM坐标转换失败!") + CallerMapUIServiceManager.getOverlayManager()?.hidePoint("RenderParkingModel") + isHide = true + return@let + } + val lon = getWgs84Lon() + val lat = getWgs84Lat() + val distance = LocationUtils.getDistance(it[0], it[1], lon, lat) + Log.d(TAG, "自车位置:(${lon},${lat}),进站点位置:(${it[0]},${it[1]}),pncActions-进站点距离自车${distance}米!") + // 只处理100m以内的 + if (distance >= 100) { + Log.d(TAG, "pncActions-进站点距离自车过远,不展示!") + CallerMapUIServiceManager.getOverlayManager()?.hidePoint("RenderParkingModel") + isHide = true + return@let + } + val angle = map!!.convertAngle(planningActionMsg.parkingLotHeading, it[0], it[1]).toFloat() + // owner、level、id作为key去从缓存中取 + val builder = + Point.Options.Builder("TYPE_MARKER_PNC", Level.MAP_MARKER) + .setId("RenderParkingModel") + .anchor(0.5f, 0.5f) + .set3DMode(true) + .isUseGps(true) + .controlAngle(true) + .rotate(angle) + .icon3DRes(R.raw.parking_model) + .longitude(it[0]) + .latitude(it[1]) + CallerMapUIServiceManager.getOverlayManager() + ?.showOrUpdatePoint(builder.build()) + Log.d(TAG, "pncActions-展示进站点(${it[0]},${it[1]}),角度为:${angle}!") + if (isHide) { + Log.d(TAG, "pncActions-显示被隐藏的进站点!") + CallerMapUIServiceManager.getOverlayManager()?.showPoint("RenderParkingModel") + isHide = false + } + } + } + } + } + } } \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/NDEViewModel.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/bridge/OchNdeManager.kt similarity index 81% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/NDEViewModel.kt rename to OCH/common/bridge/src/main/java/com/mogo/och/bridge/bridge/OchNdeManager.kt index 66c3fc90a0..674401607c 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/NDEViewModel.kt +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/bridge/OchNdeManager.kt @@ -1,24 +1,28 @@ -package com.mogo.och.unmanned.passenger.ui.aiview +package com.mogo.och.bridge.bridge -import androidx.lifecycle.ViewModel import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotIdentifyListener import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager -import com.mogo.och.unmanned.passenger.ui.aiview.bean.AIMessage +import com.mogo.eagle.core.function.call.autopilot.CallerVlmManager +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OCHCOMMON +import com.mogo.och.bridge.BridgeServiceManager +import com.mogo.och.common.module.biz.birdge.data.RoadMsg + import mogo.telematics.pad.MessagePad.TrackedObject -class NDEViewModel: ViewModel(), IMoGoAutopilotIdentifyListener { +object OchNdeManager : IMoGoAutopilotIdentifyListener { + private val TAG = "${M_OCHCOMMON}OchVlmManager" - companion object{ - private const val TAG = "NDEViewModel" + fun load(){ + CallerAutopilotIdentifyListenerManager.addListener(TAG, this) + } + + fun release(){ + CallerVlmManager.removeListener(TAG) } private var lastMap2 = HashMap() private var lastTime = 0L - fun init(){ - CallerAutopilotIdentifyListenerManager.addListener(TAG, this) - } - override fun onAutopilotIdentifyDataUpdate(trafficData: List?){ super.onAutopilotIdentifyDataUpdate(trafficData) handleCheLong(trafficData) @@ -27,7 +31,7 @@ class NDEViewModel: ViewModel(), IMoGoAutopilotIdentifyListener { private fun handleCheLong(trafficData: List?) { var hasCheLong = false var isNewData = false - val roadMsgList = ArrayList() + val roadMsgList = ArrayList() val curMap = HashMap() if (lastTime > 0 && System.currentTimeMillis() - lastTime > 60000) { lastMap2.clear()// 清除上次车龙事件的缓存 @@ -55,8 +59,7 @@ class NDEViewModel: ViewModel(), IMoGoAutopilotIdentifyListener { curMap[obj.laneNum] = "0" } // 保存所有车道信息 - roadMsgList.add( - AIMessage.RoadMsg( + roadMsgList.add(RoadMsg( obj.arrowType, laneNum = obj.laneNum, isRecommend = obj.suggestedLanes, @@ -74,10 +77,8 @@ class NDEViewModel: ViewModel(), IMoGoAutopilotIdentifyListener { lastTime = System.currentTimeMillis() val sortedList = roadMsgList.sortedWith(compareByDescending { it.laneNum }) - val ndeEvent = AIMessage.NDEData(System.currentTimeMillis().toString(),"路口车龙","前方路口有车龙",sortedList) - AIMessageManager.post(ndeEvent) + BridgeServiceManager.invokeNdeData("路口车龙","前方路口有车龙",sortedList) } } } - } \ No newline at end of file diff --git a/OCH/common/bridge/src/main/java/com/mogo/och/bridge/bridge/OchVlmManager.kt b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/bridge/OchVlmManager.kt new file mode 100644 index 0000000000..94c9c0b4a9 --- /dev/null +++ b/OCH/common/bridge/src/main/java/com/mogo/och/bridge/bridge/OchVlmManager.kt @@ -0,0 +1,68 @@ +package com.mogo.och.bridge.bridge + +import com.mogo.eagle.core.function.api.autopilot.IVlmListener +import com.mogo.eagle.core.function.call.autopilot.CallerVlmManager +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OCHCOMMON +import com.mogo.och.bridge.BridgeServiceManager +import com.mogo.och.common.module.biz.birdge.data.VlmData +import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager +import vllm.Vlm +import kotlin.properties.Delegates + +object OchVlmManager : IVlmListener { + private val TAG = "${M_OCHCOMMON}OchVlmManager" + + fun load(){ + CallerVlmManager.addListener(TAG,this) + } + + fun release(){ + CallerVlmManager.removeListener(TAG) + } + + // + private var vllmImageData: VlmImageData by Delegates.observable(VlmImageData(0.0,null)) { _, oldValue, newValue -> + if (oldValue != newValue) { + if(newValue.imageSourceTimestamp == vllmData.messageSourceTimestamp){ + CallerLogger.d(TAG," message先来 图片后来 发送message和图片 ${newValue.imageSourceTimestamp}---${vllmData.messageSourceTimestamp}") + val timemillis = System.currentTimeMillis() + BridgeServiceManager.invokeVlmData(VlmData(vllmData.id,vllmData.message,newValue.image, timemillis)) + OchChainLogManager.writeChainLogEyeVlm("收到VlmData"," message先来 图片后来 发送message和图片 ${newValue.imageSourceTimestamp}---${vllmData.messageSourceTimestamp}--$timemillis") + } + } + } + + private var vllmData: VlmMessageData by Delegates.observable(VlmMessageData(0.0,0,"")) { _, oldValue, newValue -> + if (oldValue != newValue) { + val currentTimeMillis = System.currentTimeMillis() + if(newValue.messageSourceTimestamp== vllmImageData.imageSourceTimestamp){ + // 图片先来 发送message和图片 + BridgeServiceManager.invokeVlmData(VlmData(newValue.id,newValue.message, + vllmImageData.image, currentTimeMillis + ) + ) + CallerLogger.d(TAG,"messsage后来 图片先来 发送message和图片 ${newValue.message}----${newValue.messageSourceTimestamp}---${newValue.id}") + OchChainLogManager.writeChainLogEyeVlm("收到VlmData","messsage后来 图片先来 发送message和图片 ${newValue.message}----${newValue.messageSourceTimestamp}---${newValue.id}--$currentTimeMillis") + }else{ + // message 先来 单独发送message 图片来了后 再次发送出去 + BridgeServiceManager.invokeVlmData(VlmData(newValue.id,newValue.message,null, + currentTimeMillis + )) + CallerLogger.d(TAG,"message先来 图片后来 发送message ${newValue.message}---${newValue.messageSourceTimestamp}---${newValue.id}---$currentTimeMillis") + OchChainLogManager.writeChainLogEyeVlm("收到VlmData","message先来 图片后来 发送message ${newValue.message}---${newValue.messageSourceTimestamp}---${newValue.id}---$currentTimeMillis") + } + } + } + + + override fun onVllm(sourceTimestamp: Double, vllm: Vlm.VLLMObject) { + if(this.vllmData.id!=vllm.workZone.id){ + this.vllmData = VlmMessageData(sourceTimestamp,vllm.workZone.id,vllm.workZone.sceneExplantion) + } + } + + override fun onVllmImage(sourceTimestamp: Double, image: ByteArray) { + this.vllmImageData = VlmImageData(sourceTimestamp,image) + } +} \ No newline at end of file diff --git a/OCH/common/bridge/src/main/res/raw/parking_model.nt3d b/OCH/common/bridge/src/main/res/raw/parking_model.nt3d new file mode 100644 index 0000000000..9989e16081 Binary files /dev/null and b/OCH/common/bridge/src/main/res/raw/parking_model.nt3d differ diff --git a/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt b/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt index 0d0219dd1d..054d5e574e 100644 --- a/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt +++ b/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt @@ -1,6 +1,8 @@ package com.mogo.och.common.module.debug import android.content.Intent +import android.graphics.Bitmap +import android.graphics.BitmapFactory import android.os.Environment import android.os.SystemClock import chassis.Chassis @@ -8,6 +10,7 @@ import chassis.Chassis.DoorNumber import chassis.VehicleStateOuterClass import com.amap.api.maps.model.LatLng import com.google.gson.reflect.TypeToken +import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.data.enums.DataSourceType import com.mogo.eagle.core.data.enums.EventTypeEnumNew import com.mogo.eagle.core.data.map.MogoLocation @@ -24,6 +27,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02Lis import com.mogo.eagle.core.function.call.autopilot.CallerChassisStatesListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerPlanningActionsListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager +import com.mogo.eagle.core.function.call.autopilot.CallerVlmManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.call.map.CallerMapRomaListener @@ -34,24 +38,25 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils +import com.mogo.och.common.module.R import com.mogo.och.common.module.biz.birdge.BridgeManager import com.mogo.och.common.module.biz.order.OrderManager import com.mogo.och.common.module.debug.location.MogoLocationExit import com.mogo.och.common.module.manager.loop.BizLoopManager -//import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager -//import com.mogo.och.bridge.utils.CoordinateCalculateRouteUtil -//import com.mogo.och.bridge.utils.CoordinateCalculateRouteUtil import com.mogo.och.common.module.view.DebugFloatWindow import com.mogo.och.common.module.wigets.media.MediaBeanManager import com.zhjt.mogo.adas.data.bean.AutopilotStatistics import mogo.telematics.pad.MessagePad import mogo_msg.MogoReportMsg +import vllm.Vlm import java.io.BufferedReader +import java.io.ByteArrayOutputStream import java.io.File import java.io.FileInputStream import java.io.IOException import java.io.InputStreamReader + object DebugDataDispatch { const val TAG = "DebugDataDispatch" @@ -73,6 +78,8 @@ object DebugDataDispatch { const val ota = "ota" const val video = "video" const val mediaMusic = "mediaAndMusic" + const val vlmMessage = "vlmMessage" + const val vlmImage = "vlmImage" // adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "location" --es path "1111/11111" // adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "globalPath" --es path "sy73.json" @@ -89,7 +96,10 @@ object DebugDataDispatch { // adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "showDebugView" // adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "scanner" --es qrInfo "" // adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "ota" --ei "ota" 1 -// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "video" --ei "video" 1 --es url "rtmp://video.zhidaozhixing.com/live/861130041693196C_2" +// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "vlmMessage" --es message "前方100米有道路施工,施工长度100米,影响第1、2车道通行。" --ei id 128 --ef time 1880.0 +// adb shell am broadcast -a com.mogo.launcher.debug -f 0x011000000 --es type "vlmImage" --ef time 1880.0 + +// adb shell am broadcast -a com.hmi.v2x.trafficlight -f 0x011000000 --ei trafficLightCheckType 1 --ei trafficLightCountDown 0 --ez trafficLightIsShow true // 红绿灯 val ROOT_PATH = @@ -102,6 +112,25 @@ object DebugDataDispatch { } when (type) { + vlmMessage -> { + val time = intent.getFloatExtra("time",0f) + val id = intent.getIntExtra("id",0) + val message = intent.getStringExtra("message") + val newBuilder = Vlm.VLLMObject.newBuilder() + val build = newBuilder.workZoneBuilder.setId(id).setSceneExplantion(message).build() + newBuilder.workZone = build + CallerVlmManager.invokeVllm(time.toDouble(),newBuilder.build()) + } + vlmImage -> { + val time = intent.getFloatExtra("time",0f) + BizLoopManager.runInIoThread{ + val bitmap = BitmapFactory.decodeResource(AbsMogoApplication.getApp().resources, R.drawable.common_debug) + val stream = ByteArrayOutputStream() + bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream) + val byteArray = stream.toByteArray() + CallerVlmManager.invokeVllmImage(time.toDouble(),byteArray) + } + } mediaMusic -> { val musicList = MediaBeanManager.getMusicList() val mediaList = MediaBeanManager.getMediaList() diff --git a/OCH/common/common/src/debug/res/drawable/common_debug.webp b/OCH/common/common/src/debug/res/drawable/common_debug.webp new file mode 100644 index 0000000000..9f79104dce Binary files /dev/null and b/OCH/common/common/src/debug/res/drawable/common_debug.webp differ diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/birdge/BridgeListener.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/birdge/BridgeListener.kt index 14b452a186..8d378f1ce0 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/birdge/BridgeListener.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/birdge/BridgeListener.kt @@ -1,6 +1,8 @@ package com.mogo.och.common.module.biz.birdge import com.mogo.eagle.core.data.map.MogoLocation +import com.mogo.och.common.module.biz.birdge.data.RoadMsg +import com.mogo.och.common.module.biz.birdge.data.VlmData interface BridgeListener { /** @@ -15,4 +17,9 @@ interface BridgeListener { fun onTrajectoryDistanceListener(distance: Double){} fun onTrajectoryPointsAndDistanceListener(trajectoryList: MutableList,distance: Double){} + + + fun onVlmDataListener(vlmData: VlmData){} + + fun onNdeDataListener(title: String, desc: String, sortedList: List) {} } \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/birdge/data/RoadMsg.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/birdge/data/RoadMsg.kt new file mode 100644 index 0000000000..5551bc498f --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/birdge/data/RoadMsg.kt @@ -0,0 +1,8 @@ +package com.mogo.och.common.module.biz.birdge.data + +data class RoadMsg( + var arrowType: Int, // 车道类型,如直行201(详情参考文件:message_pad.proto) + var laneNum: Int,// 车道号 + var isRecommend: Boolean,// 是否是推荐车道 + var isCheLong: Boolean// 是否有车龙,代表拥堵、行驶缓慢 +) \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/birdge/data/VlmData.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/birdge/data/VlmData.kt new file mode 100644 index 0000000000..0e9236d1ab --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/biz/birdge/data/VlmData.kt @@ -0,0 +1,33 @@ +package com.mogo.och.common.module.biz.birdge.data + +data class VlmData( + val id: Int?, + val message: String?, + var image: ByteArray?, + var timestamp: Long = System.currentTimeMillis() +) { + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (javaClass != other?.javaClass) return false + + other as VlmData + + if (id != other.id) return false + if (message != other.message) return false + if (image != null) { + if (other.image == null) return false + if (!image.contentEquals(other.image)) return false + } else if (other.image != null) return false + + return true + } + + override fun hashCode(): Int { + return id ?: 0 + } + + override fun toString(): String { + return "VlmData(id=$id, message=$message)" + } + +} diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt index bf288664fe..fa9ad787bf 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/constant/OchCommonConst.kt @@ -77,9 +77,6 @@ class OchCommonConst { // taxi 到达起始点围栏 const val ARRIVE_AT_START_STATION_DISTANCE = 15 //围栏由20m改为50m 再次改为15m - //总里程/平均车速。(bus的平均里程:25km/h,taxi的平均里程:38km/h),单位为:分钟,不足1分钟时,显示1分钟。 - const val TAXI_AVERAGE_SPEED = 38 - //算路终点UUID const val TAXI_ROUTING_VERIFY_END_SITE = "taxi_routing_verify_end_site" @@ -88,5 +85,14 @@ class OchCommonConst { const val TYPE_MARKER_ROUTING_VERIFY = "TYPE_MARKER_TAXI_ROUTING_VERIFY" + + + //b1 b2 平均速度 bus的平均里程:25km/h + const val BUS_AVERAGE_SPEED = 25 + + //M1的平均里程:15km/h + const val Charter_AVERAGE_SPEED = 15 + //T1T2的平均里程:38km/h + const val TAXI_AVERAGE_SPEED = 38 } } \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/EnvManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/EnvManager.kt new file mode 100644 index 0000000000..261ccbe987 --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/EnvManager.kt @@ -0,0 +1,45 @@ +package com.mogo.och.common.module.manager + +import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils + +object EnvManager { + fun isB1(): Boolean { + return AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode) + } + + fun isB1Driver(): Boolean { + return isB1() && AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode) + } + + fun isB1Passenger(): Boolean { + return isB1() && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) + } + + fun isB2(): Boolean { + return AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode) + } + + fun isB2Driver(): Boolean { + return isB2() && AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode) + } + + fun isB2Passenger(): Boolean { + return isB2() && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) + } + + fun isT1T2(): Boolean { + return AppIdentityModeUtils.isT1T2(FunctionBuildConfig.appIdentityMode) + } + + fun isT1T2Driver(): Boolean { + return isT1T2() && AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode) + } + + fun isT1T2Passenger(): Boolean { + return isT1T2() && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) + } + + + +} \ No newline at end of file diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audiofocus/AudioFocusManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audiofocus/AudioFocusManager.kt index d7c26644e9..a04cb103c2 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audiofocus/AudioFocusManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audiofocus/AudioFocusManager.kt @@ -4,6 +4,7 @@ import android.content.Context import android.media.AudioManager import com.mogo.commons.AbsMogoApplication import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.och.common.module.manager.EnvManager import com.mogo.och.common.module.manager.audition.AuditionManager import com.mogo.och.common.module.manager.audition.MusicData import com.mogo.och.common.module.manager.audition.PlayState @@ -64,7 +65,11 @@ object AudioFocusManager : AuditionManager.MusicDataChangeListener { if(isPlaying!= isPlayingVideo) { isPlayingVideo = isPlaying if(isPlaying){ - AuditionManager.stop() + if(EnvManager.isT1T2Passenger()){ + AuditionManager.pause() + }else { + AuditionManager.stop() + } } } } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audition/AuditionManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audition/AuditionManager.kt index 207561a4a7..c3feae4c51 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audition/AuditionManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/audition/AuditionManager.kt @@ -64,6 +64,15 @@ object AuditionManager: AuditionCacheManager.DataChangeListener, Audition.OnAudi return Audition.isPlaying } + fun pause(){ + val playing = isPlaying() + if(playing){ + musicDataPlaying?.let { + toggle(it) + } + } + } + fun stop(){ val playing = isPlaying() if(playing){ diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt index 67bc61de81..80cb4fa245 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt @@ -71,12 +71,16 @@ object OchChainLogManager { writeChainLog(title, info, upload, EVENT_KEY_INFO_ROUTING) } + const val EVENT_KEY_INFO_VLM = "analytics_event_och_vlm" fun writeChainLogEye(title: String, info: String) { writeChainLog(title, info, true, EVENT_KEY_INFO_CALL_EYE) } + fun writeChainLogEyeVlm(title: String, info: String) { + writeChainLog(title, info, false, EVENT_KEY_INFO_VLM) + } // 时间方面的日志 fun writeChainLogTime(title: String, info: String) { @@ -127,8 +131,8 @@ object OchChainLogManager { fun writeChainLogScanner(title: String, changeInfo: String) { writeChainLog(title, changeInfo, true, EVENT_KEY_INFO_SCANNER) } - fun writeChainLogAutopilot(title: String, changeInfo: String) { - writeChainLog(title, changeInfo, true, EVENT_KEY_INFO_AUTOPILOT) + fun writeChainLogAutopilot(title: String, changeInfo: String,upload:Boolean = true) { + writeChainLog(title, changeInfo, upload, EVENT_KEY_INFO_AUTOPILOT) } fun writeChainLogInit(title: String, info: String) { diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/OCHGradientTextView.java b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/OCHGradientTextView.java index 914736a270..9edc1391a5 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/OCHGradientTextView.java +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/OCHGradientTextView.java @@ -1,6 +1,7 @@ package com.mogo.och.common.module.wigets; import android.content.Context; +import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.LinearGradient; import android.graphics.Paint; @@ -10,6 +11,8 @@ import android.util.AttributeSet; import androidx.appcompat.widget.AppCompatTextView; +import com.mogo.och.common.module.R; + /** * 通用渐变文字 * @author: wangmingjun @@ -30,6 +33,8 @@ public class OCHGradientTextView extends AppCompatTextView { private float mdy; private int mColor; + private int ochgravity = 1; + public OCHGradientTextView(Context context) { this(context, null); } @@ -39,6 +44,11 @@ public class OCHGradientTextView extends AppCompatTextView { super(context, attrs); //设置默认的颜色 mColorList = new int[]{0xFFFFFFFF, 0xFFFFFFF}; + + TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.OCHGradientTextView); + + ochgravity = array.getInt(R.styleable.OCHGradientTextView_ochgravity, 1); + array.recycle(); } @@ -60,7 +70,11 @@ public class OCHGradientTextView extends AppCompatTextView { mPaint.setShadowLayer(mRadius, mdx, mdy, mColor); //画出文字 - canvas.drawText(mTipText, getMeasuredWidth() / 2.0f - mTextBound.width() / 2.0f, getMeasuredHeight() / 2.0f + mTextBound.height() / 2.0f, mPaint); + if(ochgravity==1) { + canvas.drawText(mTipText, getMeasuredWidth() / 2.0f - mTextBound.width() / 2.0f, getMeasuredHeight() / 2.0f + mTextBound.height() / 2.0f, mPaint); + }else if(ochgravity==0){ + canvas.drawText(mTipText, 0f, getMeasuredHeight() / 2.0f + mTextBound.height() / 2.0f-mTextBound.bottom, mPaint); + } } /** diff --git a/OCH/common/common/src/main/res/values/attrs.xml b/OCH/common/common/src/main/res/values/attrs.xml index 5b122d83ed..50c372ffe9 100644 --- a/OCH/common/common/src/main/res/values/attrs.xml +++ b/OCH/common/common/src/main/res/values/attrs.xml @@ -14,6 +14,10 @@ + + + + diff --git a/OCH/common/common/src/main/res/values/colors.xml b/OCH/common/common/src/main/res/values/colors.xml index d89d53bd4a..80f2ebb605 100644 --- a/OCH/common/common/src/main/res/values/colors.xml +++ b/OCH/common/common/src/main/res/values/colors.xml @@ -8,6 +8,7 @@ #111533 #878890 #EF262C + #00000000 #4D000000 #99000000 @@ -18,6 +19,7 @@ #80000000 #80FFFFFF + #FFFFFF #1466FB #E0EFFF #B8C2D7 @@ -42,10 +44,15 @@ #FF4E41 #B3FFFFFF #CCCCCC + #284F7E #F7151D41 #3B3D44 #2E323A #ffffffff + #1Affffff + #80000000 #2EACFF + #D4D4D4 + #FF852E \ No newline at end of file diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningAdapter.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningAdapter.kt index 09cd376e68..bc6ec819a7 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningAdapter.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningAdapter.kt @@ -39,6 +39,7 @@ class TaskRunningAdapter( private var totalHeight = 0f fun setDataList(dataList: List) { + CallerLogger.d(TAG,"设置view-----") this.mData.clear() this.mData.addAll(dataList) if (LineModel.startStationIndex == 0) { @@ -47,7 +48,7 @@ class TaskRunningAdapter( totalHeight = (halfHeight + (dataList.size - 1 - LineModel.startStationIndex) * heightItem).toFloat() } - notifyItemRangeChanged(0, dataList.size, true) + notifyDataSetChanged() } override fun onCreateViewHolder( diff --git a/OCH/shuttle/passenger_weaknet/build.gradle b/OCH/shuttle/passenger_weaknet/build.gradle index 6de3388d2b..7883d04966 100644 --- a/OCH/shuttle/passenger_weaknet/build.gradle +++ b/OCH/shuttle/passenger_weaknet/build.gradle @@ -48,13 +48,13 @@ android { main { res.srcDirs = [ 'src/main/res', - 'src/main/res/m2', - 'src/main/res/jinlv', + 'src/main/res/b2', + 'src/main/res/b1', ] java.srcDirs = [ 'src/main/java', - 'src/main/java/m2', - 'src/main/java/jinlv', + 'src/main/java/b2', + 'src/main/java/b1', ] } } diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/presenter/BaseBusPassengerPresenter.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/presenter/BaseBusPassengerPresenter.kt similarity index 95% rename from OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/presenter/BaseBusPassengerPresenter.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/presenter/BaseBusPassengerPresenter.kt index 827112c551..b8038726c7 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/presenter/BaseBusPassengerPresenter.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/presenter/BaseBusPassengerPresenter.kt @@ -37,11 +37,11 @@ class BaseBusPassengerPresenter(view: BusPassengerRouteFragment?) : } private fun initListeners() { - CommonModel.setRouteLineInfoCallback(this) + CommonModel.setRouteLineInfoCallback(TAG,this) } private fun releaseListeners() { - CommonModel.setRouteLineInfoCallback(null) + CommonModel.setRouteLineInfoCallback(TAG,null) } override fun updateSpeed(location: Int) { diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerBaseFragment.java b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerBaseFragment.java similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerBaseFragment.java rename to OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerBaseFragment.java diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java rename to OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/BusPassengerRouteFragment.java diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/adapter/BusPassengerLineStationsAdapter.java b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/adapter/BusPassengerLineStationsAdapter.java similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/adapter/BusPassengerLineStationsAdapter.java rename to OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/adapter/BusPassengerLineStationsAdapter.java diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/layoutmanager/CenterLayoutManager.java b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/layoutmanager/CenterLayoutManager.java similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/layoutmanager/CenterLayoutManager.java rename to OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/layoutmanager/CenterLayoutManager.java diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPBlueToothView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPBlueToothView.kt similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPBlueToothView.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPBlueToothView.kt diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPStatusBarView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPStatusBarView.kt similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPStatusBarView.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPStatusBarView.kt diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPTurnLightView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPTurnLightView.kt similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPTurnLightView.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPTurnLightView.kt diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPassengerTrafficLightView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPassengerTrafficLightView.kt similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/jinlv/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPassengerTrafficLightView.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b1/com/mogo/och/shuttle/weaknet/passenger/ui/widget/BusPassengerTrafficLightView.kt diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/constant/M2Const.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/constant/M2Const.kt similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/constant/M2Const.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/constant/M2Const.kt diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2ADASPresenter.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2ADASPresenter.kt new file mode 100644 index 0000000000..c830999cca --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2ADASPresenter.kt @@ -0,0 +1,242 @@ +package com.mogo.och.shuttle.weaknet.passenger.presenter + +import androidx.lifecycle.LifecycleOwner +import com.amap.api.maps.model.LatLng +import com.mogo.commons.mvp.Presenter +import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.util.ThreadUtils +import com.mogo.och.common.module.biz.birdge.BridgeListener +import com.mogo.och.common.module.biz.birdge.BridgeManager +import com.mogo.och.common.module.manager.loop.BizLoopManager +import com.mogo.och.common.module.utils.RxUtils +import com.mogo.och.data.bean.BusStationBean +import com.mogo.och.shuttle.weaknet.passenger.callback.ADASCallback +import com.mogo.och.shuttle.weaknet.passenger.callback.ICommonCallback +import com.mogo.och.shuttle.weaknet.passenger.constant.M2Const.Companion.M2_MAP_STATION_MAKER +import com.mogo.och.shuttle.weaknet.passenger.model.CommonModel +import com.mogo.och.shuttle.weaknet.passenger.model.PM2ADASModel +import com.mogo.och.shuttle.weaknet.passenger.ui.map.PM2HPMapFragment +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.AIMessageManager +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.bean.AIMessage +import io.reactivex.disposables.Disposable +import kotlin.properties.Delegates + +class PM2ADASPresenter(view: PM2HPMapFragment?) : + Presenter(view), ADASCallback, ICommonCallback, BridgeListener, + AIMessageManager.AIMessageListener { + + private val TAG = "PM2ADASPresenter" + + private var haveTrajectoryInfos:Boolean by Delegates.observable(false) { _, oldValue, newValue -> + if (oldValue != newValue) { + checkScreenChange() + } + } + private var havePredictionInfos:Boolean by Delegates.observable(false) { _, oldValue, newValue -> + if (oldValue != newValue) { + checkScreenChange() + } + } + // 是否有订单 + private var haveLine:Boolean by Delegates.observable(false) { _, oldValue, newValue -> + if (oldValue != newValue) { + checkScreenChange() + } + } + private var arrived:Boolean by Delegates.observable(false) { _, oldValue, newValue -> + if (oldValue != newValue) { + checkScreenChange() + } + } + + private var aiMessageShowmagic:Boolean by Delegates.observable(false) { _, oldValue, newValue -> + if (oldValue != newValue) { + checkScreenChange() + } + } + + private var lastAiMessageTime:Long by Delegates.observable(System.currentTimeMillis()) { _, oldValue, newValue -> + if (oldValue != newValue) { + aiMessageShowmagic = true + RxUtils.disposeSubscribe(lastAIMessageCountDown) + lastAIMessageCountDown = RxUtils.createSubscribe(5_000) { + aiMessageShowmagic = false + } + } + } + + + private var lastAIMessageCountDown: Disposable? = null + + override fun onCreate(owner: LifecycleOwner) { + super.onCreate(owner) + PM2ADASModel.INSTANCE.init(context) + initListener() + } + + private fun initListener() { + PM2ADASModel.INSTANCE.setAdasCallback(this) + CommonModel.setRouteLineInfoCallback(TAG, this) + BridgeManager.addBridgeListener(TAG,this) + AIMessageManager.registerListener(this) + } + + private fun removeListener() { + PM2ADASModel.INSTANCE.setAdasCallback(null) + CommonModel.setRouteLineInfoCallback(TAG,null) + CommonModel.releaseListeners() + BridgeManager.removeBridgeListener(TAG) + AIMessageManager.unregisterListener(this) + } + + override fun onDestroy(owner: LifecycleOwner) { + super.onDestroy(owner) + removeListener() + } + + override fun updateHDMapStations(stations: MutableList>) { + for (i in stations.indices) { + mView?.setMapMaker(M2_MAP_STATION_MAKER + i, stations[i]) + } + + } + + override fun clearCustomPolyline() { + ThreadUtils.runOnUiThread { + mView?.clearCustomPolyline() + } + } + + override fun updateLineStations(stations: MutableList) { + + val stationsList = mutableListOf() + val stationsListPass = mutableListOf() + var startStation: LatLng? = null + var endStation: LatLng? = null + + for (i in stations.indices) { + val station = stations[i] + val latLng = LatLng(station.gcjLat, station.gcjLon) + if (i == 0) { + startStation = latLng + continue + } + if (i == stations.size - 1) { + endStation = latLng + continue + } + if (station.drivingStatus == 1) {//行驶信息,0初始值;1已经过;2当前站;3未到站 + stationsListPass.add(latLng) + } else if (station.drivingStatus == 2) { + if (station.isLeaving) { + arrived = false + stationsListPass.add(latLng) + } else { + arrived = true + stationsList.add(latLng) + } + } else { + stationsList.add(latLng) + } + + } + + ThreadUtils.runOnUiThread { + mView?.updateLineStations(stationsList, stationsListPass, startStation, endStation) + } + PM2ADASModel.INSTANCE.updateHDMapStations(stations) + } + + override fun removeHDMapStations() { + mView?.removeMapMaker(M2_MAP_STATION_MAKER) + } + + override fun showNoTaskView(noLine: Boolean) { + haveLine = !noLine + ThreadUtils.runOnUiThread { + mView?.showNoTaskView(!noLine) + } + } + + + override fun onTrajectoryHaveData(haveTrajectoryInfos: Boolean) { + this.haveTrajectoryInfos = haveTrajectoryInfos +// checkScreenChange() + } + + override fun onPredictionHavaData(havePredictionInfos: Boolean) { + this.havePredictionInfos = havePredictionInfos +// checkScreenChange() + } + + override fun onReceive(msg: AIMessage) { + lastAiMessageTime = System.currentTimeMillis() + } + + override fun clear() { + } + + + fun checkScreenChange(){ + CallerLogger.d(TAG,"haveLine:$haveLine arrived:$arrived havePredictionInfos:$havePredictionInfos haveTrajectoryInfos:$haveTrajectoryInfos aiMessageShowmagic:$aiMessageShowmagic") + BizLoopManager.runInMainThread{ + // 是否有订单 + if(haveLine){// 有订单 + if(arrived){//展示高德地图 + if(aiMessageShowmagic){ + updateMapFlag(false) + // 展示高德地图+展示mogomind + mView?.showAmap_mind() + return@runInMainThread + }else{ + updateMapFlag(false) + // 展示高德地图 + mView?.showAmap() + return@runInMainThread + } + }else{// 展示高精地图 + if(aiMessageShowmagic){ + updateMapFlag(false) + // 展示高精地图 + mView?.showHDMap_mind() + return@runInMainThread + }else{ +// if(havePredictionInfos&&haveTrajectoryInfos){ +// updateMapFlag(true) +// // 展示高精地图+展示预测和决策 +// mView?.showHDMap_aip_prediction() +// return@runInMainThread +// }else{ + updateMapFlag(false) + // 展示高精地图 + mView?.showHDMap() + return@runInMainThread +// } + } + + } + }else{// 没有订单 + if(aiMessageShowmagic){// 有mogomind 消息 + updateMapFlag(false) + // 展示高精地图+mogoMind + mView?.showHDMap_mind() + }else{ + updateMapFlag(false) + // 展示高精地图 + mView?.showHDMap() + } + } + } + } + + private fun updateMapFlag(open: Boolean) { +// if (open) { +// FunctionBuildConfig.isDrawDecIdentifyData = true +// FunctionBuildConfig.isDrawPreIdentifyData = true +// } else { +// FunctionBuildConfig.isDrawDecIdentifyData = false +// FunctionBuildConfig.isDrawPreIdentifyData = false +// } + } +} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2DrivingPresenter.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2DrivingPresenter.kt new file mode 100644 index 0000000000..d6f758659f --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2DrivingPresenter.kt @@ -0,0 +1,67 @@ +package com.mogo.och.shuttle.weaknet.passenger.presenter + +import androidx.lifecycle.LifecycleOwner +import com.mogo.commons.mvp.Presenter +import com.mogo.eagle.core.utilcode.util.ThreadUtils +import com.mogo.och.common.module.manager.loop.BizLoopManager +import com.mogo.och.shuttle.weaknet.passenger.model.PM2ADASModel +import com.mogo.och.shuttle.weaknet.passenger.ui.line.PM2DrivingInfoFragment +import com.mogo.och.data.bean.BusStationBean +import com.mogo.och.shuttle.weaknet.passenger.callback.ICommonCallback +import com.mogo.och.shuttle.weaknet.passenger.model.CommonModel + +class PM2DrivingPresenter(view: PM2DrivingInfoFragment?) : + Presenter(view), + ICommonCallback { + + private val TAG = "PM2DrivingPresenter" + + init { + CommonModel.init(context) + PM2ADASModel.INSTANCE.init(context) + initListener() + } + + override fun onDestroy(owner: LifecycleOwner) { + super.onDestroy(owner) + destroyListener() + CommonModel.releaseListeners() + } + + private fun initListener(){ + CommonModel.setRouteLineInfoCallback(TAG,this) + } + + private fun destroyListener(){ + CommonModel.setRouteLineInfoCallback(TAG,null) + } + + override fun updateSpeed(speed: Int) { + + } + + override fun updateRemainMT(meters: Long, timeInSecond: Long) { + ThreadUtils.runOnUiThread { + mView?.updateRemainMT(meters, timeInSecond) //米,秒 + } + } + + override fun showNoTaskView(empty: Boolean) { + ThreadUtils.runOnUiThread { + mView?.showNoTaskView(empty) + } + if (empty){ + PM2ADASModel.INSTANCE.removeHDMapStations() + } + } + + + + override fun updateStationsInfo(stations: MutableList, i: Int, isArrived: Boolean) { + ThreadUtils.runOnUiThread { + mView?.updateStationsInfo(stations,i,isArrived) + } + } + + +} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2Presenter.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2Presenter.kt similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2Presenter.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2Presenter.kt diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2BaseFragment.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2BaseFragment.kt new file mode 100644 index 0000000000..039c33d7c3 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2BaseFragment.kt @@ -0,0 +1,168 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui + +import android.view.View +import android.view.ViewGroup +import android.widget.FrameLayout +import com.mogo.commons.mvp.MvpFragment +import com.mogo.eagle.core.data.enums.EventTypeEnumNew +import com.mogo.eagle.core.function.call.hmi.CallerRoadV2NEventWindowListenerManager +import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager +import com.mogo.eagle.core.utilcode.kotlin.onClick +import com.mogo.eagle.core.utilcode.util.AppUtils +import com.mogo.eagle.core.utilcode.util.UriUtils +import com.mogo.och.common.module.biz.birdge.data.RoadMsg +import com.mogo.och.common.module.biz.media.MediaManager +import com.mogo.och.common.module.manager.loop.BizLoopManager +import com.mogo.och.common.module.manager.transform.OchTransform +import com.mogo.och.common.module.manager.transform.OchTransformDispatch +import com.mogo.och.shuttle.weaknet.passenger.R +import com.mogo.och.shuttle.weaknet.passenger.presenter.PM2Presenter +import com.mogo.och.common.module.wigets.media.MediaPlayerFragment +import com.mogo.och.shuttle.weaknet.passenger.ui.line.PM2DrivingInfoFragment +import com.mogo.och.shuttle.weaknet.passenger.ui.map.PM2HPMapFragment +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.AIMessageManager +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.bean.AIMessage +import kotlinx.android.synthetic.main.shuttle_p_m2_fragment.test1 +import kotlinx.android.synthetic.main.shuttle_p_m2_fragment.test2 +import kotlinx.android.synthetic.main.shuttle_p_m2_fragment.test3 +import kotlinx.android.synthetic.main.shuttle_p_m2_fragment.tv_shuttle_b2_p_version +import kotlinx.android.synthetic.main.shuttle_p_m2_fragment.video_fragment + + +/** + * @author: wangmingjun + * @date: 2022/4/12 + */ +class PM2BaseFragment : + MvpFragment() { + + val TAG = PM2BaseFragment::class.java.simpleName + + private var drivingFragment: PM2DrivingInfoFragment? = null + private var hdMapFragment: PM2HPMapFragment? = null + private var mediaFragment: MediaPlayerFragment? = null + + // 视频直播流 + private val ochTransform = object : OchTransformDispatch { + override fun setVideoView(target: View?) { + super.setVideoView(target) + if (target != null) { + BizLoopManager.runInMainThread { + target.id = R.id.video_show + val params = FrameLayout.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT + ) + video_fragment.addView(target, params) + MediaManager.setMediaPause() + } + } else { + BizLoopManager.runInMainThread { + findViewById(R.id.video_show)?.let { + video_fragment.removeView(it) + MediaManager.setMediaResume() + } + } + } + } + } + + override fun getLayoutId(): Int { + return R.layout.shuttle_p_m2_fragment + } + + override fun getTagName(): String { + return TAG + } + + override fun initViews() { + tv_shuttle_b2_p_version.text = "版本:${AppUtils.getAppVersionName()}" + initFragment() + OchTransform.addListener(TAG, ochTransform) + } + + override fun onDestroy() { + OchTransform.removeListener(TAG) + super.onDestroy() + } + + /** + * 初始化行程信息,高静地图,宣传 三个fragment + */ + private fun initFragment() { + + if (drivingFragment == null) drivingFragment = PM2DrivingInfoFragment() + childFragmentManager.beginTransaction().add(R.id.driving_fragment, drivingFragment!!) + .show(drivingFragment!!).commitAllowingStateLoss() + + if (hdMapFragment == null) hdMapFragment = PM2HPMapFragment() + childFragmentManager.beginTransaction().add(R.id.hd_map_fragment, hdMapFragment!!) + .show(hdMapFragment!!).commitAllowingStateLoss() + + if (mediaFragment == null) mediaFragment = MediaPlayerFragment() + childFragmentManager.beginTransaction().add(R.id.video_fragment, mediaFragment!!) + .show(mediaFragment!!).commitAllowingStateLoss() + + + test1.onClick { + CallerRoadV2NEventWindowListenerManager.showImage( + System.currentTimeMillis().toString(), + System.currentTimeMillis(), + EventTypeEnumNew.getUpdateIconRes(EventTypeEnumNew.TYPE_USECASE_ROAD_BUS_STATION.poiType), + String.format( + EventTypeEnumNew.getAlarmContent(EventTypeEnumNew.TYPE_USECASE_ROAD_BUS_STATION.poiType), + 100 + ), + false, + EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ROAD_BUS_STATION.poiType), + UriUtils.res2Uri( + EventTypeEnumNew.getPoiTypeBg( + EventTypeEnumNew.TYPE_USECASE_ROAD_BUS_STATION.poiType, + false + ).toString() + ).toString() + ) + } + test2.onClick { + CallerMapRoadListenerManager.invokeCrossDevice(true) + } + test3.onClick { + val one = RoadMsg(201,1,true,false) + val two = RoadMsg(202,2,false,false) + val three = RoadMsg(203,3,false,true) + + val sortedList = ArrayList() + sortedList.add(one) + sortedList.add(two) + sortedList.add(three) + val ndeEvent = AIMessage.NDEData(System.currentTimeMillis().toString(),"路口车龙","前方路口有车龙",sortedList) + AIMessageManager.post(ndeEvent) + +// CallerRoadV2NEventWindowListenerManager.showImage( +// System.currentTimeMillis().toString(), +// System.currentTimeMillis(), +// EventTypeEnumNew.getUpdateIconRes(EventTypeEnumNew.TYPE_USECASE_ROAD_BUS_STATION.poiType), +// String.format( +// EventTypeEnumNew.getAlarmContent(EventTypeEnumNew.TYPE_USECASE_ROAD_BUS_STATION.poiType), +// 100 +// ), +// false, +// String.format( +// EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ROAD_BUS_STATION.poiType), +// 100 +// ), +// UriUtils.res2Uri( +// EventTypeEnumNew.getPoiTypeBg( +// EventTypeEnumNew.TYPE_USECASE_ROAD_BUS_STATION.poiType, +// false +// ).toString() +// ).toString() +// ) + } + } + + override fun createPresenter(): PM2Presenter { + return PM2Presenter(this) + } + +} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/PM2DrivingInfoFragment.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/PM2DrivingInfoFragment.kt new file mode 100644 index 0000000000..5d9b332c1f --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/PM2DrivingInfoFragment.kt @@ -0,0 +1,119 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.line + +import android.os.Bundle +import android.view.View +import com.mogo.commons.mvp.MvpFragment +import com.mogo.och.shuttle.weaknet.passenger.R +import com.mogo.och.shuttle.weaknet.passenger.presenter.PM2DrivingPresenter +import com.mogo.och.common.module.utils.NumberFormatUtil +import com.mogo.och.data.bean.BusStationBean +import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.arriveView +import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.emptyView +import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.lineView +import kotlin.math.ceil +import kotlin.math.roundToInt + +/** + * @author: wangmingjun + * @date: 2022/4/12 + */ +class PM2DrivingInfoFragment : + MvpFragment() { + + + + + override fun getLayoutId(): Int { + return R.layout.shuttle_p_m2_driving_info_fragment + } + + override fun getTagName(): String { + return TAG + } + + override fun initViews() { + + } + + override fun initViews(savedInstanceState: Bundle?) { + super.initViews(savedInstanceState) + + } + + override fun onResume() { + super.onResume() + } + + override fun onPause() { + super.onPause() + } + + override fun onDestroyView() { + mPresenter?.onDestroy(this) + super.onDestroyView() + } + + fun showNoTaskView(haveTask: Boolean) { + if(haveTask){ + emptyView.visibility = View.VISIBLE + arriveView.visibility = View.GONE + lineView.visibility = View.GONE + }else{ + emptyView.visibility = View.GONE + arriveView.visibility = View.GONE + lineView.visibility = View.VISIBLE + } + } + + override fun createPresenter(): PM2DrivingPresenter { + return PM2DrivingPresenter(this) + } + + fun updateStationsInfo(stations: MutableList, i: Int, isArrived: Boolean) { + if(stations.isEmpty()){ + emptyView.visibility = View.VISIBLE + arriveView.visibility = View.GONE + lineView.visibility = View.GONE + }else{ + if(isArrived&&i!=0){ + emptyView.visibility = View.GONE + arriveView.visibility = View.VISIBLE + lineView.visibility = View.GONE + arriveView.setArrivedStation(stations.get(i)) + }else{ + emptyView.visibility = View.GONE + arriveView.visibility = View.GONE + lineView.visibility = View.VISIBLE + } + } + + } + + /** + * 剩余里程和时间 + */ + fun updateRemainMT(meters: Long, timeInSecond: Long) { //米。秒 + var disUnit = "公里" + var remainDis: String? = "0" + + if (meters > 0) { + if (meters / 1000 < 1) { + disUnit = "米" + remainDis = meters.toFloat().roundToInt().toString() + } else { + disUnit = "公里" + remainDis = NumberFormatUtil.formatLong(meters.toDouble() / 1000) + } + } + + val time = ceil(timeInSecond / 60f).toInt() + +// "$remainDis$disUnit".also { tv_distance.text = it } +// "${time}分钟".also { tv_left_time.text = it } + } + + + companion object { + private val TAG = PM2DrivingInfoFragment::class.java.simpleName + } +} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/arrive/ArrivedView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/arrive/ArrivedView.kt new file mode 100644 index 0000000000..45af7ebd21 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/arrive/ArrivedView.kt @@ -0,0 +1,139 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.line.arrive + +import android.animation.Animator +import android.animation.AnimatorListenerAdapter +import android.animation.ValueAnimator +import android.content.Context +import android.graphics.drawable.AnimationDrawable +import android.util.AttributeSet +import android.view.LayoutInflater +import android.view.View +import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.commons.AbsMogoApplication +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.och.common.module.manager.loop.BizLoopManager +import com.mogo.och.common.module.utils.ResourcesUtils +import com.mogo.och.data.bean.BusStationBean +import com.mogo.och.shuttle.weaknet.passenger.R +import kotlinx.android.synthetic.main.m2_arrive_view.view.aciv_arrow_left +import kotlinx.android.synthetic.main.m2_arrive_view.view.aciv_arrow_right +import kotlinx.android.synthetic.main.m2_arrive_view.view.aciv_door_left +import kotlinx.android.synthetic.main.m2_arrive_view.view.aciv_door_right +import kotlinx.android.synthetic.main.m2_arrive_view.view.iv_animal_list +import kotlinx.android.synthetic.main.m2_arrive_view.view.ochtv_arrive_station_value +import me.jessyan.autosize.utils.AutoSizeUtils + +class ArrivedView : ConstraintLayout { + + private val TAG = "ArrivedView" + + constructor(context: Context) : super(context) + + constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet) + + constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super(context, attributeSet, defStyleAttr) + + constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes) + + val marginMax = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(),-137f) + val marginMin = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(),-55f) + + val animatorArrow = ValueAnimator.ofInt(0, 30).apply { + duration = 500 + repeatMode = ValueAnimator.REVERSE + repeatCount = -1 + addUpdateListener { animation -> + val index = animation.animatedValue as Int + val paramsLeft = aciv_arrow_left.layoutParams as LayoutParams + paramsLeft.marginEnd = index + aciv_arrow_left.layoutParams = paramsLeft + + val paramsRight = aciv_arrow_right.layoutParams as LayoutParams + paramsRight.marginStart = index + aciv_arrow_right.layoutParams = paramsRight + } + } + + val animator = ValueAnimator.ofInt(marginMax, marginMin).apply { + duration = 500 + addUpdateListener { animation -> + val index = animation.animatedValue as Int + val paramsLeft = aciv_door_left.layoutParams as LayoutParams + paramsLeft.marginEnd = index + aciv_door_left.layoutParams = paramsLeft + + val paramsRight = aciv_door_right.layoutParams as LayoutParams + paramsRight.marginStart = index + aciv_door_right.layoutParams = paramsRight + + if(index==-100){ + aciv_arrow_left.visibility = VISIBLE + aciv_arrow_right.visibility = VISIBLE + } + } + addListener(object : AnimatorListenerAdapter() { + override fun onAnimationEnd(animation: Animator) { + animatorArrow.start() + CallerLogger.d(TAG,"动画结束了") + } + }) + } + + private fun initView() { + LayoutInflater.from(context).inflate(R.layout.m2_arrive_view, this, true) + + ochtv_arrive_station_value.setVertrial(true) + val intArrayOf = intArrayOf( + ResourcesUtils.getColor(R.color.shuttle_p_m2_color_43cefe), + ResourcesUtils.getColor(R.color.shuttle_p_m2_color_1466fb), + ) + ochtv_arrive_station_value.setmColorList(intArrayOf) + + } + + override fun onVisibilityAggregated(isVisible: Boolean) { + super.onVisibilityAggregated(isVisible) + CallerLogger.d(TAG,"isVisible:${isVisible}") + if(isVisible) { + if(!animator.isRunning){ + animator.start() + } + iv_animal_list.visibility = View.VISIBLE + val animationDrawable = iv_animal_list.drawable as AnimationDrawable + animationDrawable.start() + }else{ + animator.cancel() + val paramsLeft = aciv_door_left.layoutParams as LayoutParams + paramsLeft.marginEnd =marginMax + aciv_door_left.layoutParams = paramsLeft + + val paramsRight = aciv_door_right.layoutParams as LayoutParams + paramsRight.marginStart = marginMax + aciv_door_right.layoutParams = paramsRight + + aciv_arrow_left.visibility = GONE + aciv_arrow_right.visibility = GONE + animatorArrow.cancel() + + iv_animal_list.visibility = View.VISIBLE + val animationDrawable = iv_animal_list.drawable as AnimationDrawable + animationDrawable.stop() + } + } + + fun setArrivedStation(busStationBean: BusStationBean) { + BizLoopManager.runInMainThread{ + ochtv_arrive_station_value.text = busStationBean.name + } + } + + init { + try { + initView() + } catch (e: Exception) { + e.printStackTrace() + } + } + + +} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/autopilot/AutopilotView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/autopilot/AutopilotView.kt new file mode 100644 index 0000000000..abbac7262d --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/autopilot/AutopilotView.kt @@ -0,0 +1,45 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.line.autopilot + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.data.map.MogoLocation +import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener +import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView +import com.mogo.och.bridge.autopilot.location.OchLocationManager +import com.mogo.och.common.module.manager.loop.BizLoopManager +import com.mogo.och.shuttle.weaknet.passenger.R +import kotlinx.android.synthetic.main.m2_speed.view.tv_speed +import kotlin.math.abs + +class AutopilotView : ConstraintLayout { + + private val TAG = "ItineraryView" + + constructor(context: Context) : super(context) + + constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet) + + constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super(context, attributeSet, defStyleAttr) + + constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes) + + private fun initView() { + LayoutInflater.from(context).inflate(R.layout.m2_autopilot, this, true) + } + + override fun onVisibilityAggregated(isVisible: Boolean) { + super.onVisibilityAggregated(isVisible) + } + + init { + try { + initView() + } catch (e: Exception) { + e.printStackTrace() + } + } + + +} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2TurnLightView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/autopilot/light/M2TurnLightView.kt similarity index 81% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2TurnLightView.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/autopilot/light/M2TurnLightView.kt index 2ded804a8c..fc708bf80b 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2TurnLightView.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/autopilot/light/M2TurnLightView.kt @@ -1,4 +1,4 @@ -package com.mogo.och.shuttle.weaknet.passenger.ui.widget +package com.mogo.och.shuttle.weaknet.passenger.ui.line.autopilot.light import android.animation.AnimatorSet import android.animation.ObjectAnimator @@ -16,11 +16,9 @@ import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.shuttle.weaknet.passenger.R import com.mogo.och.common.module.manager.light.TurnLightManager -import kotlinx.android.synthetic.main.shuttle_p_m2_turn_light_status.view.left_nor_image import kotlinx.android.synthetic.main.shuttle_p_m2_turn_light_status.view.left_select_image import kotlinx.android.synthetic.main.shuttle_p_m2_turn_light_status.view.right_nor_image import kotlinx.android.synthetic.main.shuttle_p_m2_turn_light_status.view.right_select_image -import kotlinx.android.synthetic.main.shuttle_p_m2_turn_light_status.view.turn_light_layout /** * @author: wangmingjun @@ -43,8 +41,7 @@ class M2TurnLightView @JvmOverloads constructor( private var isDisappear: Boolean = false init { - LayoutInflater.from(context) - .inflate(R.layout.shuttle_p_m2_turn_light_status, this, true) + LayoutInflater.from(context).inflate(R.layout.shuttle_p_m2_turn_light_status, this, true) } override fun onAttachedToWindow() { @@ -126,12 +123,12 @@ class M2TurnLightView @JvmOverloads constructor( appearAnimation.duration = 300 val appearAnimationImage = AlphaAnimation(0f, 1.0f) appearAnimation.duration = 500 - turn_light_layout.startAnimation(appearAnimation) - left_nor_image.startAnimation(appearAnimationImage) +// turn_light_layout.startAnimation(appearAnimation) +// left_nor_image.startAnimation(appearAnimationImage) right_nor_image.startAnimation(appearAnimationImage) - turn_light_layout.visibility = View.VISIBLE - left_nor_image.visibility = View.VISIBLE +// turn_light_layout.visibility = View.VISIBLE +// left_nor_image.visibility = View.VISIBLE right_nor_image.visibility = View.VISIBLE } @@ -142,19 +139,15 @@ class M2TurnLightView @JvmOverloads constructor( left_select_image.clearAnimation() right_select_image.clearAnimation() - left_nor_image.clearAnimation() + //left_nor_image.clearAnimation() right_nor_image.clearAnimation() - turn_light_layout.clearAnimation() val disappearAnimationLeft = AlphaAnimation(1.0f, 0f) disappearAnimationLeft.duration = 300 - val disappearAnimationBg = AlphaAnimation(1.0f, 0f) - disappearAnimationBg.duration = 500 - - left_nor_image.startAnimation(disappearAnimationLeft) + //left_nor_image.startAnimation(disappearAnimationLeft) right_nor_image.startAnimation(disappearAnimationLeft) - turn_light_layout.startAnimation(disappearAnimationBg) + disappearAnimationLeft.setAnimationListener(object : Animation.AnimationListener { override fun onAnimationRepeat(p0: Animation?) { @@ -164,20 +157,8 @@ class M2TurnLightView @JvmOverloads constructor( } override fun onAnimationEnd(p0: Animation?) { - left_nor_image.visibility = View.GONE - right_nor_image.visibility = View.GONE - } - }) - - disappearAnimationBg.setAnimationListener(object : Animation.AnimationListener { - override fun onAnimationRepeat(p0: Animation?) { - } - - override fun onAnimationStart(p0: Animation?) { - } - - override fun onAnimationEnd(p0: Animation?) { - turn_light_layout.visibility = View.GONE +// left_nor_image.visibility = View.GONE +// right_nor_image.visibility = View.GONE } }) } diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/autopilot/speed/SpeedView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/autopilot/speed/SpeedView.kt new file mode 100644 index 0000000000..9fa9402efb --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/autopilot/speed/SpeedView.kt @@ -0,0 +1,64 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.line.autopilot.speed + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.eagle.core.data.map.MogoLocation +import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener +import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView +import com.mogo.och.bridge.autopilot.location.OchLocationManager +import com.mogo.och.common.module.manager.loop.BizLoopManager +import com.mogo.och.shuttle.weaknet.passenger.R +import kotlinx.android.synthetic.main.m2_speed.view.tv_speed +import kotlin.math.abs + +class SpeedView : ConstraintLayout, IMoGoChassisLocationGCJ02Listener { + + private val TAG = "ItineraryView" + + constructor(context: Context) : super(context) + + constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet) + + constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super(context, attributeSet, defStyleAttr) + + constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes) + + private fun initView() { + LayoutInflater.from(context).inflate(R.layout.m2_speed, this, true) + + tv_speed.setOnLongClickListener { + context?.let { ToggleDebugView.toggleDebugView.toggle(it) } + true + } + } + + override fun onVisibilityAggregated(isVisible: Boolean) { + super.onVisibilityAggregated(isVisible) + if(isVisible){ + OchLocationManager.addGCJ02Listener(TAG, 3, this) + }else{ + OchLocationManager.removeGCJ02Listener(TAG) + } + } + + init { + try { + initView() + } catch (e: Exception) { + e.printStackTrace() + } + } + + override fun onChassisLocationGCJ02(mogoLocation: MogoLocation?) { + mogoLocation?.let { + BizLoopManager.runInMainThread { + val speedKM = (abs(it.gnssSpeed) * 3.6f).toInt() + tv_speed.text = speedKM.toString() + } + } + } + + +} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/autopilot/status/StatusView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/autopilot/status/StatusView.kt new file mode 100644 index 0000000000..d298340199 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/autopilot/status/StatusView.kt @@ -0,0 +1,58 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.line.autopilot.status + +import android.content.Context +import android.util.AttributeSet +import androidx.appcompat.widget.AppCompatTextView +import androidx.core.content.ContextCompat +import com.mogo.och.common.module.manager.loop.BizLoopManager +import com.mogo.och.shuttle.weaknet.passenger.R +import com.mogo.och.shuttle.weaknet.passenger.callback.ICommonCallback +import com.mogo.och.shuttle.weaknet.passenger.model.CommonModel + +class StatusView : AppCompatTextView, ICommonCallback { + + private val TAG = "ItineraryView" + + constructor(context: Context) : super(context) + + constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet) + + constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super(context, attributeSet, defStyleAttr) + + private fun initView() { + + } + + override fun onVisibilityAggregated(isVisible: Boolean) { + super.onVisibilityAggregated(isVisible) + if(isVisible){ + CommonModel.setRouteLineInfoCallback(TAG,this) + }else{ + CommonModel.setRouteLineInfoCallback(TAG,null) + } + } + + override fun updateAutoStatus(isAutoPilot: Boolean) { + BizLoopManager.runInMainThread { + context?.let { + if (isAutoPilot) { + setTextColor(ContextCompat.getColor(it, R.color.common_FFFFFF)) + background = ContextCompat.getDrawable(it, R.drawable.m2_autopilot_status_in) + } else { + setTextColor(ContextCompat.getColor(it, R.color.common_284F7E)) + background = ContextCompat.getDrawable(it, R.drawable.m2_autopilot_status_out) + } + } + } + } + + init { + try { + initView() + } catch (e: Exception) { + e.printStackTrace() + } + } + + +} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/empty/EmptyView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/empty/EmptyView.kt new file mode 100644 index 0000000000..216ca6611b --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/empty/EmptyView.kt @@ -0,0 +1,47 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.line.empty + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.och.common.module.utils.ResourcesUtils +import com.mogo.och.shuttle.weaknet.passenger.R +import kotlinx.android.synthetic.main.m2_empty_view.view.tv_title + +class EmptyView : ConstraintLayout { + + private val TAG = "EmptyView" + + constructor(context: Context) : super(context) + + constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet) + + constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super(context, attributeSet, defStyleAttr) + + constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes) + + private fun initView() { + LayoutInflater.from(context).inflate(R.layout.m2_empty_view, this, true) + + tv_title.setVertrial(true) + val intArrayOf = intArrayOf( + ResourcesUtils.getColor(R.color.shuttle_p_m2_color_43cefe), + ResourcesUtils.getColor(R.color.shuttle_p_m2_color_1466fb), + ) + tv_title.setmColorList(intArrayOf) + } + + override fun onVisibilityAggregated(isVisible: Boolean) { + super.onVisibilityAggregated(isVisible) + } + + init { + try { + initView() + } catch (e: Exception) { + e.printStackTrace() + } + } + + +} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/LineView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/LineView.kt new file mode 100644 index 0000000000..55272e3a7b --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/LineView.kt @@ -0,0 +1,92 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.line.lineinfo + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.findViewTreeViewModelStoreOwner +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import com.mogo.eagle.core.utilcode.kotlin.onClick +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.mogo.view.SpacesItemDecoration +import com.mogo.och.common.module.manager.loop.BizLoopManager +import com.mogo.och.common.module.wigets.WrapContentLinearLayoutManager +import com.mogo.och.data.bean.BusStationBean +import com.mogo.och.shuttle.weaknet.passenger.R +import com.mogo.och.shuttle.weaknet.passenger.ui.line.lineinfo.item.ItemDecoration +import com.mogo.och.shuttle.weaknet.passenger.ui.line.lineinfo.item.StationAdapter +import kotlinx.android.synthetic.main.m2_line_view.view.autoplit_info +import kotlinx.android.synthetic.main.m2_line_view.view.ll_station_container +import me.jessyan.autosize.utils.AutoSizeUtils + +class LineView : ConstraintLayout, LineViewModel.LineViewCallback { + + private val TAG = "EmptyView" + + constructor(context: Context) : super(context) + + constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet) + + constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super(context, attributeSet, defStyleAttr) + + constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes) + + private lateinit var mAdapter: StationAdapter + + private lateinit var linearLayoutManager: LinearLayoutManager + + private var viewModel:LineViewModel?=null + + + + private fun initView() { + LayoutInflater.from(context).inflate(R.layout.m2_line_view, this, true) + + linearLayoutManager = LinearLayoutManager(context) + ll_station_container.setLayoutManager(linearLayoutManager) + mAdapter = StationAdapter() + ll_station_container.addItemDecoration(ItemDecoration()) + + ll_station_container.setAdapter(mAdapter) + + ll_station_container.itemAnimator?.addDuration = 0; + ll_station_container.itemAnimator?.changeDuration = 0; + ll_station_container.itemAnimator?.moveDuration = 0; + ll_station_container.itemAnimator?.removeDuration = 0; + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + viewModel = findViewTreeViewModelStoreOwner()?.let { + ViewModelProvider(it).get(LineViewModel::class.java) + } + viewModel?.setLineCallback(this) + } + + override fun onVisibilityAggregated(isVisible: Boolean) { + super.onVisibilityAggregated(isVisible) + } + + init { + try { + initView() + } catch (e: Exception) { + e.printStackTrace() + } + } + + override fun updateLineStations(stations: MutableList?) { + CallerLogger.d(TAG,"展示站点:${stations}") + mAdapter.submitList(stations) + } + + override fun updateRemainMt(distance: String, time: String) { + BizLoopManager.runInMainThread{ + mAdapter.notifyDistanceAndTime(distance,time) + } + } + + +} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/LineViewModel.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/LineViewModel.kt new file mode 100644 index 0000000000..334d7d5ab4 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/LineViewModel.kt @@ -0,0 +1,74 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.line.lineinfo + +import androidx.lifecycle.ViewModel +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_BUS +import com.mogo.och.common.module.manager.loop.BizLoopManager +import com.mogo.och.common.module.utils.NumberFormatUtil +import com.mogo.och.data.bean.BusStationBean +import com.mogo.och.shuttle.weaknet.passenger.callback.ICommonCallback +import com.mogo.och.shuttle.weaknet.passenger.model.CommonModel +import io.reactivex.disposables.Disposable +import kotlin.math.ceil +import kotlin.math.roundToInt + +/** + * @author XuXinChao + * @description BadCase录包管理页面 + * @since: 2022/12/15 + */ +class LineViewModel : ViewModel(), ICommonCallback { + + private val TAG = M_BUS+LineViewModel::class.java.simpleName + + private var viewCallback:LineViewCallback?=null + + private var endTaskDisposable:Disposable?=null + + + override fun onCleared() { + d(TAG,"onCleared") + CommonModel.setRouteLineInfoCallback(TAG,null) + } + + fun setLineCallback(viewCallback:LineViewCallback){ + this.viewCallback = viewCallback + CommonModel.setRouteLineInfoCallback(TAG,this) + } + + override fun updateLineStations(stations: MutableList?) { + BizLoopManager.runInMainThread{ + this.viewCallback?.updateLineStations(stations) + } + } + + override fun updateRemainMT(meters: Long, timeInSecond: Long) { + super.updateRemainMT(meters, timeInSecond) + var disUnit = "公里" + var remainDis: String? = "0" + + if (meters > 0) { + if (meters / 1000 < 1) { + disUnit = "米" + remainDis = meters.toFloat().roundToInt().toString() + } else { + disUnit = "公里" + remainDis = NumberFormatUtil.formatLong(meters.toDouble() / 1000) + } + } + + val time = ceil(timeInSecond / 60f).toInt() + +// "$remainDis$disUnit".also { tv_distance.text = it } +// "${time}分钟".also { tv_left_time.text = it } + + this.viewCallback?.updateRemainMt("$remainDis$disUnit","${time}分钟") + } + + interface LineViewCallback{ + fun updateLineStations(stations: MutableList?) + fun updateRemainMt(distance: String, time: String) + } + +} + diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/item/ItemDecoration.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/item/ItemDecoration.kt new file mode 100644 index 0000000000..e33191337a --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/item/ItemDecoration.kt @@ -0,0 +1,40 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.line.lineinfo.item + +import android.graphics.Rect +import android.view.View +import androidx.recyclerview.widget.RecyclerView +import me.jessyan.autosize.utils.AutoSizeUtils + +/** + * 这是LinearLayoutManager设置Item间距的的一个辅助类 + * + * @author donghongyu + */ +class ItemDecoration() : RecyclerView.ItemDecoration() { + override fun getItemOffsets( + outRect: Rect, view: View, + parent: RecyclerView, state: RecyclerView.State + ) { + if((parent.adapter?.itemCount ?: 4) < 4) { + val height = AutoSizeUtils.dp2px(parent.context, 140f) + + val layoutParams = view.layoutParams as RecyclerView.LayoutParams + layoutParams.height = height + view.layoutParams = layoutParams + }else if((parent.adapter?.itemCount ?: 4) == 4){ + val height = AutoSizeUtils.dp2px(parent.context, 100f) + + val layoutParams = view.layoutParams as RecyclerView.LayoutParams + layoutParams.height = height + view.layoutParams = layoutParams + }else{ + val height = AutoSizeUtils.dp2px(parent.context,68f) + val layoutParams = view.layoutParams as RecyclerView.LayoutParams + layoutParams.height = height + view.layoutParams = layoutParams + } + + + super.getItemOffsets(outRect, view, parent, state) + } +} diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/item/StationAdapter.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/item/StationAdapter.kt new file mode 100644 index 0000000000..50a2d41441 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/item/StationAdapter.kt @@ -0,0 +1,178 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.line.lineinfo.item + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.ListAdapter +import com.mogo.och.data.bean.BusStationBean +import com.mogo.och.shuttle.weaknet.passenger.R + +class StationAdapter : ListAdapter(MessageDiffCallback()) { + + var currentIndex = 0 + var isLeaving = false + var showPassOmit = false + var showFuluterOmit = false + + var distanceAndTime = "" + + override fun submitList(list: MutableList?) { + val newDataList = mutableListOf() + list?.let { + it.forEachIndexed { index, busStationBean -> + if (busStationBean.drivingStatus == 2) { + currentIndex = index + isLeaving = busStationBean.isLeaving + return@forEachIndexed + } + } + if (isLeaving) { + currentIndex += 1 + } + if ((it.size) <= 7) { + showPassOmit = false + showFuluterOmit = false + newDataList.addAll(it.toList()) + } else { + if(currentIndex-1<3){ + showPassOmit = false // 全展示 + }else{ + showPassOmit = true // 展示省略 + } + + if(it.size-(currentIndex+1)-1<3) {// 全展示 + showFuluterOmit = false + }else{// 展示省略 + showFuluterOmit = true + } + + if(showPassOmit&&showFuluterOmit){// 都有 + newDataList.add(it.first()) + newDataList.add(StationBeanOmit(currentIndex-1-1)) + newDataList.addAll(list.slice(currentIndex-1 .. currentIndex+1)) + newDataList.add(StationBeanOmit(list.size-(currentIndex+3)))// 减去+1 省略 和最后一个 + newDataList.add(list.last()) + }else{ + if(showFuluterOmit||showPassOmit){ + if(showFuluterOmit){// 只展示下面的省略号 + newDataList.addAll(list.subList(0,5)) + newDataList.add(StationBeanOmit(list.size-5-1)) + newDataList.add(list.last()) + } + if(showPassOmit){// 只展示上面的手机号 + newDataList.add(list.first()) + newDataList.add(StationBeanOmit(list.size-5-1)) + newDataList.addAll(list.slice(list.size-5 until list.size)) + } else { + + } + }else{ + newDataList.addAll(it.toList()) + } + + } + } + } + + newDataList.forEachIndexed { index, busStationBean -> + if (busStationBean.drivingStatus == 2) { + currentIndex = index + isLeaving = busStationBean.isLeaving + if(isLeaving){ + currentIndex+=1 + } + } + } + distanceAndTime = "" + super.submitList(newDataList) + } + + override fun onBindViewHolder(holder: StationViewHolder, position: Int) { + getItem(position)?.let { + holder.bind(it,distanceAndTime) + } + } + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): StationViewHolder { + val inflater = LayoutInflater.from(parent.context) + return when (viewType) { + StationViewHolder.NormalStationStart -> NormalStationStartViewHolder( + inflater.inflate(R.layout.m2_station_normal_start_view, parent, false) + ) + StationViewHolder.NormalStationEnd -> NormalStationEndViewHolder( + inflater.inflate(R.layout.m2_station_normal_end_view, parent, false) + ) + StationViewHolder.NormalStationFuture -> NormalStationFutureViewHolder( + inflater.inflate(R.layout.m2_station_normal_future_view, parent, false) + ) + StationViewHolder.NormalStationPass -> NormalStationPassViewHolder( + inflater.inflate(R.layout.m2_station_normal_pass_view, parent, false) + ) + + StationViewHolder.CurrentStationStart -> CurrentStationStartViewHolder( + inflater.inflate(R.layout.m2_station_current_start_view, parent, false) + ) + StationViewHolder.CurrentStationEnd -> CurrentStationEndViewHolder( + inflater.inflate(R.layout.m2_station_current_end_view, parent, false) + ) + StationViewHolder.CurrentStation -> CurrentStationViewHolder( + inflater.inflate(R.layout.m2_station_current_view, parent, false) + ) + + StationViewHolder.OmitStationPass -> OmitPassViewHolder( + inflater.inflate(R.layout.m2_station_omit_view_pass, parent,false) + ) + StationViewHolder.OmitStationFuture -> OmitFutureViewHolder( + inflater.inflate(R.layout.m2_station_omit_view_future, parent,false) + ) + + else -> throw IllegalArgumentException("Invalid view type") + } + } + + override fun getItemViewType(position: Int): Int { + if (getItem(position) is StationBeanOmit) { + return if (position < currentIndex) { + StationViewHolder.OmitStationPass + } else { + StationViewHolder.OmitStationFuture + } + } + when (position) { + 0 -> { + return if (currentIndex == position) { + StationViewHolder.CurrentStationStart + } else { + StationViewHolder.NormalStationStart + } + } + + itemCount - 1 -> { + return if (currentIndex == position) { + StationViewHolder.CurrentStationEnd + } else { + StationViewHolder.NormalStationEnd + } + } + + else -> { + return if (currentIndex == position) { + StationViewHolder.CurrentStation + } else if (currentIndex < position) { + StationViewHolder.NormalStationFuture + } else { + StationViewHolder.NormalStationPass + } + } + } + } + + override fun onViewRecycled(holder: StationViewHolder) { + super.onViewRecycled(holder) + holder.viewRecycled(holder) + } + + fun notifyDistanceAndTime(distance: String, time: String) { + distanceAndTime = "${distance}·${time}" + notifyItemChanged(currentIndex) + } +} diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/item/StationDiffCallback.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/item/StationDiffCallback.kt new file mode 100644 index 0000000000..966c1f5a01 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/item/StationDiffCallback.kt @@ -0,0 +1,17 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.line.lineinfo.item + +import androidx.recyclerview.widget.DiffUtil +import com.mogo.och.data.bean.BusStationBean + +class MessageDiffCallback: DiffUtil.ItemCallback() { + + override fun areContentsTheSame(oldItem: BusStationBean, newItem: BusStationBean): Boolean { + return oldItem == newItem + } + + override fun areItemsTheSame(oldItem: BusStationBean, newItem: BusStationBean): Boolean { + return oldItem.siteId == newItem.siteId + } +} + +data class StationBeanOmit(var coutOmit:Int):BusStationBean() \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/item/StationViewHolder.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/item/StationViewHolder.kt new file mode 100644 index 0000000000..5c987951d6 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/item/StationViewHolder.kt @@ -0,0 +1,123 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.line.lineinfo.item + +import android.view.View +import androidx.appcompat.widget.AppCompatTextView +import androidx.recyclerview.widget.RecyclerView +import com.mogo.och.common.module.utils.ResourcesUtils +import com.mogo.och.common.module.wigets.OCHGradientTextView +import com.mogo.och.data.bean.BusStationBean +import com.mogo.och.shuttle.weaknet.passenger.R +import java.text.SimpleDateFormat +import java.util.Locale + + +abstract class StationViewHolder(view: View) : RecyclerView.ViewHolder(view) { + abstract fun bind(item: BusStationBean,distanceAndView:String) + open fun viewRecycled(holder: StationViewHolder){} + private val sampleDateFormat = SimpleDateFormat("HH:mm", Locale.CHINA) + protected val TAG = javaClass.simpleName + + companion object{ + val CurrentStationStart = 0 + val CurrentStationEnd = 1 + val CurrentStation = 2 + + val NormalStationStart = 3 + var NormalStationEnd = 4 + val NormalStationPass = 5 + val NormalStationFuture = 6 + + val OmitStationPass = 7 + val OmitStationFuture = 8 + } +} + +class NormalStationStartViewHolder(binding: View) : StationViewHolder(binding) { + private var startStaionName: AppCompatTextView = binding.findViewById(R.id.actv_normal_station_start) + override fun bind(item: BusStationBean,distanceAndView:String) { + startStaionName.text = item.name + } +} +class NormalStationEndViewHolder(binding: View) : StationViewHolder(binding) { + private var endStaionName: AppCompatTextView = binding.findViewById(R.id.actv_normal_station_end) + override fun bind(item: BusStationBean,distanceAndView:String) { + endStaionName.text = item.name + } +} +class NormalStationPassViewHolder(binding: View) : StationViewHolder(binding) { + private var passStaionName: AppCompatTextView = binding.findViewById(R.id.actv_normal_station_pass) + override fun bind(item: BusStationBean,distanceAndView:String) { + passStaionName.text = item.name + } +} +class NormalStationFutureViewHolder(binding: View) : StationViewHolder(binding) { + private var futureStaionName: AppCompatTextView = binding.findViewById(R.id.actv_normal_station_future) + override fun bind(item: BusStationBean,distanceAndView:String) { + futureStaionName.text = item.name + } +} + + +class CurrentStationViewHolder(binding: View) : StationViewHolder(binding) { + private var currentStaionName: OCHGradientTextView = binding.findViewById(R.id.och_current_station_name) + private var actv_distance: AppCompatTextView = binding.findViewById(R.id.actv_distance) + override fun bind(item: BusStationBean,distanceAndView:String) { + var text = item.name + if(text.length>12){ + text = text.slice(0..10)+"…" + } + currentStaionName.text = text + currentStaionName.setVertrial(true) + val intArrayOf = intArrayOf( + ResourcesUtils.getColor(R.color.shuttle_p_m2_color_43cefe), + ResourcesUtils.getColor(R.color.shuttle_p_m2_color_1466fb), + ) + currentStaionName.setmColorList(intArrayOf) + actv_distance.text = distanceAndView + } +} +class CurrentStationStartViewHolder(binding: View) : StationViewHolder(binding) { + private var currentStaionStartName: OCHGradientTextView = binding.findViewById(R.id.och_current_station_start_name) + override fun bind(item: BusStationBean,distanceAndView:String) { + currentStaionStartName.text = item.name + val intArrayOf = intArrayOf( + ResourcesUtils.getColor(R.color.shuttle_p_m2_color_43cefe), + ResourcesUtils.getColor(R.color.shuttle_p_m2_color_1466fb), + ) + currentStaionStartName.setmColorList(intArrayOf) + } +} +class CurrentStationEndViewHolder(binding: View) : StationViewHolder(binding) { + private var currentStaionEndName: OCHGradientTextView = binding.findViewById(R.id.och_current_station_end_name) + private var actv_distance_end: AppCompatTextView = binding.findViewById(R.id.actv_distance_end) + override fun bind(item: BusStationBean,distanceAndView:String) { + var text = item.name + if(text.length>12){ + text = text.slice(0..10)+"…" + } + currentStaionEndName.text = text + val intArrayOf = intArrayOf( + ResourcesUtils.getColor(R.color.shuttle_p_m2_color_43cefe), + ResourcesUtils.getColor(R.color.shuttle_p_m2_color_1466fb), + ) + currentStaionEndName.setmColorList(intArrayOf) + actv_distance_end.text = distanceAndView + } +} + +class OmitPassViewHolder(binding: View) : StationViewHolder(binding) { + private var omitCout: AppCompatTextView = binding.findViewById(R.id.actv_pass_omit_cout) + override fun bind(item: BusStationBean,distanceAndView:String) { + if(item is StationBeanOmit){ + omitCout.text = "${item.coutOmit}站" + } + } +} +class OmitFutureViewHolder(binding: View) : StationViewHolder(binding) { + private var omitCout: AppCompatTextView = binding.findViewById(R.id.actv_future_omit_count) + override fun bind(item: BusStationBean,distanceAndView:String) { + if(item is StationBeanOmit){ + omitCout.text = "${item.coutOmit}站" + } + } +} diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/map/PM2HPMapFragment.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/map/PM2HPMapFragment.kt new file mode 100644 index 0000000000..c893a45a11 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/map/PM2HPMapFragment.kt @@ -0,0 +1,297 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.map + +import android.graphics.BitmapFactory +import android.os.Bundle +import android.view.View +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.view.marginEnd +import com.amap.api.maps.model.LatLng +import com.mogo.commons.AbsMogoApplication +import com.mogo.commons.mvp.MvpFragment +import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager +import com.mogo.eagle.core.function.view.SiteMarkerBean +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d +import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider +import com.mogo.map.overlay.core.Level +import com.mogo.map.overlay.point.Point +import com.mogo.map.MapDataWrapper +import com.mogo.och.shuttle.weaknet.passenger.R +import com.mogo.och.shuttle.weaknet.passenger.constant.M2Const.Companion.TYPE_MARKER_M2_LINE +import com.mogo.och.shuttle.weaknet.passenger.presenter.PM2ADASPresenter +import com.mogo.och.common.module.utils.OCHThreadPoolManager +import kotlinx.android.synthetic.main.shuttle_p_m2_hpmap_fragment.aciv_top_shader +import kotlinx.android.synthetic.main.shuttle_p_m2_hpmap_fragment.mHomeView +import kotlinx.android.synthetic.main.shuttle_p_m2_hpmap_fragment.mindView +import kotlinx.android.synthetic.main.shuttle_p_m2_hpmap_fragment.overMapView +import me.jessyan.autosize.utils.AutoSizeUtils + +import java.util.* + +/** + * @author: wangmingjun + * @date: 2022/4/12 + */ +class PM2HPMapFragment : + MvpFragment() { + + private val stationIcon = BitmapFactory.decodeResource( + AbsMogoApplication.getApp().resources, + R.drawable.shuttle_p_m2_map_staton_icon + ) + private val stationPassIcon = BitmapFactory.decodeResource( + AbsMogoApplication.getApp().resources, + R.drawable.shuttle_p_m2_map_staton_arrived_icon + ) + private val startStationIcon = BitmapFactory.decodeResource( + AbsMogoApplication.getApp().resources, + R.drawable.shuttle_p_m2_map_start_icon + ) + private val endStationIcon = BitmapFactory.decodeResource( + AbsMogoApplication.getApp().resources, + R.drawable.shuttle_p_m2_map_end_icon + ) + + /** + * 改变自动驾驶状态 + * + * @param status 2 - running 1 - enable 2 - disable + */ + override fun getLayoutId(): Int { + return R.layout.shuttle_p_m2_hpmap_fragment + } + + override fun getTagName(): String { + return TAG + } + + override fun initViews() { + + } + + override fun initViews(savedInstanceState: Bundle?) { + super.initViews(savedInstanceState) + mHomeView.onCreate(savedInstanceState) + overMapView?.let { + it.onCreateView(savedInstanceState) + val radius = AutoSizeUtils.dp2px(requireContext(), 16f) + it.outlineProvider = TextureVideoViewOutlineProvider(radius.toFloat()) + it.clipToOutline = true + it.hideResetView() + } +// cl_prediction_contain.onCreate(savedInstanceState) + } + + override fun onResume() { + super.onResume() + mHomeView.onResume() + overMapView?.onResume() +// cl_prediction_contain.onResume() + } + + override fun onLowMemory() { + super.onLowMemory() + mHomeView.onLowMemory() +// cl_prediction_contain.onLowMemory() + } + + override fun onSaveInstanceState(outState: Bundle) { + super.onSaveInstanceState(outState) + mHomeView.onSaveInstanceState(outState) +// cl_prediction_contain.onSaveInstanceState(outState) + } + + override fun onPause() { + super.onPause() + mHomeView.onPause() + overMapView?.onPause() +// cl_prediction_contain.onPause() + } + + override fun onDestroyView() { + mHomeView.onDestroy() + overMapView?.onDestroy() +// cl_prediction_contain.onDestroy() + super.onDestroyView() + } + + override fun createPresenter(): PM2ADASPresenter { + return PM2ADASPresenter(this) + } + + companion object { + private val TAG = PM2HPMapFragment::class.java.simpleName + } + + fun updateLineStations( + stations: MutableList, + stationsPass: MutableList, + startStation: LatLng?, + endStation: LatLng? + ) { + overMapView?.let { + val stationsList: MutableList = mutableListOf() + startStation?.let { start -> + stationsList.add(SiteMarkerBean(start, startStationIcon, 0.5f, 0.5f)) + } + for (stationPass in stationsPass) { + stationsList.add(SiteMarkerBean(stationPass, stationPassIcon, 0.5f, 0.5f)) + } + for (stationPass in stations) { + stationsList.add(SiteMarkerBean(stationPass, stationIcon, 0.5f, 0.5f)) + } + endStation?.let { end -> + stationsList.add(SiteMarkerBean(end, endStationIcon, 0.5f, 0.5f)) + } + it.drawSiteMarkers(stationsList) + } + } + + fun setMapMaker( + uuid: String, + station: MutableList, + ) { + //开启线程执行起终点marker设置 + val setMapMarkerRunnable = Runnable { + d( + "setMapMaker= " + Thread.currentThread().name, + uuid + "=latitude=" + station[1] + ",longitude=" + station[0] + ) + + val builder = Point.Options.Builder( + TYPE_MARKER_M2_LINE, + Level.MAP_MARKER + ) + .setId(uuid) + .anchor(0.5f, 0.5f) + .set3DMode(true) + .isUseGps(true) + .controlAngle(true) + .icon3DRes(R.raw.star_marker) + .longitude(station[0]) + .latitude(station[1]) + MapDataWrapper.getCenterLineInfo( + station[0], station[1], -1f + ) { + // 有可能鹰眼map为空没有角度。判空使用后可能造成maker角度跟道路角度不一致 地图未初始化会返回空 + it?.let{ + builder.rotate(it.angle.toFloat()) + } + val overlayManager = CallerMapUIServiceManager.getOverlayManager() + overlayManager?.showOrUpdatePoint(builder.build()) + } + + } + OCHThreadPoolManager.getsInstance().execute(setMapMarkerRunnable) + } + + fun removeMapMaker( + uuid: String, + ) { + //开启线程移除起终点marker设置 + val removeMapMarkerRunnable = Runnable { + d("RemoveMapMaker=" + Thread.currentThread().name, uuid) + val overlayManager = CallerMapUIServiceManager.getOverlayManager() + overlayManager?.removeAllPointsInOwner(TYPE_MARKER_M2_LINE) + } + OCHThreadPoolManager.getsInstance().execute(removeMapMarkerRunnable) + } + + fun showNoTaskView(b: Boolean) { + if(!b) { + overMapView?.clearSiteMarkers() + clearCustomPolyline() + } + } + + fun clearCustomPolyline() { + overMapView?.clearCustomPolyline() + } + + // 展示高精地图 + // 展示高精地图+展示预测和决策 + // 展示高精地图+mogoMind + // 展示高德地图 + // 展示高德地图+展示mogomind + + val hdMapMarginEnd = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(),-170f) + + // 展示高精地图 + fun showHDMap(){ + mHomeView.visibility = View.VISIBLE + val layoutParams = mHomeView.layoutParams as ConstraintLayout.LayoutParams + layoutParams.marginStart = 0 + mHomeView.layoutParams = layoutParams + + aciv_top_shader.visibility = View.GONE + +// cl_aip_contain.visibility = View.GONE +// cl_prediction_contain.visibility = View.GONE + + mindView.visibility = View.GONE + overMapView.visibility = View.GONE + } + // 展示高德地图 + fun showAmap(){ + mHomeView.visibility = View.GONE + aciv_top_shader.visibility = View.GONE + +// cl_aip_contain.visibility = View.GONE +// cl_prediction_contain.visibility = View.GONE + + mindView.visibility = View.GONE + overMapView.visibility = View.VISIBLE + + val layoutParams = overMapView.layoutParams as ConstraintLayout.LayoutParams + layoutParams.marginStart = 0 + overMapView.layoutParams = layoutParams + } + // 展示高精地图+mogoMind + fun showHDMap_mind(){ + mHomeView.visibility = View.VISIBLE + val layoutParams = mHomeView.layoutParams as ConstraintLayout.LayoutParams + layoutParams.marginStart = hdMapMarginEnd + mHomeView.layoutParams = layoutParams + + aciv_top_shader.visibility = View.VISIBLE + +// cl_aip_contain.visibility = View.GONE +// cl_prediction_contain.visibility = View.GONE + + mindView.visibility = View.VISIBLE + overMapView.visibility = View.GONE + } + // 展示高精地图+展示预测和决策 + fun showHDMap_aip_prediction(){ + mHomeView.visibility = View.VISIBLE + val layoutParams = mHomeView.layoutParams as ConstraintLayout.LayoutParams + layoutParams.marginStart = hdMapMarginEnd + mHomeView.layoutParams = layoutParams + + aciv_top_shader.visibility = View.VISIBLE + +// cl_aip_contain.visibility = View.VISIBLE +// cl_prediction_contain.visibility = View.VISIBLE + + mindView.visibility = View.GONE + overMapView.visibility = View.GONE + } + + fun showAmap_mind(){ + mHomeView.visibility = View.GONE + + aciv_top_shader.visibility = View.VISIBLE + +// cl_aip_contain.visibility = View.GONE +// cl_prediction_contain.visibility = View.GONE + + mindView.visibility = View.VISIBLE + + overMapView.visibility = View.VISIBLE + + val layoutParams = overMapView.layoutParams as ConstraintLayout.LayoutParams + layoutParams.marginStart = hdMapMarginEnd + overMapView.layoutParams = layoutParams + + } + +} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/AIMessageManager.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/AIMessageManager.kt new file mode 100644 index 0000000000..c13baa5895 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/AIMessageManager.kt @@ -0,0 +1,64 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.mind + +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.bean.AIMessage +import java.util.concurrent.CopyOnWriteArrayList + + +object AIMessageManager { + + // 使用 CopyOnWriteArrayList 来存储消息回调列表,保证线程安全 + private val messageListeners: MutableList = CopyOnWriteArrayList() + + + /** + * 注册一个消息监听器。 + * + * @param listener 要注册的 AiMessageListener 实例。 + */ + fun registerListener(listener: AIMessageListener) { + messageListeners.add(listener) + } + + /** + * 取消注册一个消息监听器。 + * + * @param listener 要取消注册的 AiMessageListener 实例。 + */ + fun unregisterListener(listener: AIMessageListener) { + messageListeners.remove(listener) + } + + /** + * 发布一条消息。 + * + * 这条消息会被发送给所有已注册的监听器。 + * + * @param msg 要发布的消息。 + */ + fun post(msg: AIMessage) { + // 遍历所有已注册的监听器,并调用它们的 onReceive 方法 + messageListeners.forEach { callback -> + callback.onReceive(msg) + } + } + + fun clearData(){ + messageListeners.forEach { callback -> + callback.clear() + } + } + + /** + * 消息监听器接口。 + */ + interface AIMessageListener { + /** + * 当接收到消息时,会调用此方法。 + * + * @param msg 接收到的消息。 + */ + fun onReceive(msg: AIMessage) + + fun clear() + } +} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/MindView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/MindView.kt new file mode 100644 index 0000000000..81a274fec9 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/MindView.kt @@ -0,0 +1,152 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.mind + +import android.content.Context +import android.util.AttributeSet +import android.util.Log +import android.view.LayoutInflater +import android.view.View +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.findViewTreeLifecycleOwner +import androidx.lifecycle.findViewTreeViewModelStoreOwner +import androidx.lifecycle.lifecycleScope +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import com.mogo.eagle.core.data.enums.EventTypeEnumNew +import com.mogo.eagle.core.function.call.hmi.CallerRoadV2NEventWindowListenerManager +import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager +import com.mogo.eagle.core.utilcode.kotlin.onClick +import com.mogo.eagle.core.utilcode.util.UriUtils +import com.mogo.och.shuttle.weaknet.passenger.R +import com.mogo.och.shuttle.weaknet.passenger.ui.line.lineinfo.LineViewModel +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.adapter.AIMessageAdapter +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.adapter.OnItemClickListener +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.adapter.PaddingItemDecoration +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.bean.AIMessage +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.data.AutomaticExplorationViewModel +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.data.NDEViewModel +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.data.RoadCrossRoamViewModel +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.data.RoadV2NEventViewModel +import kotlinx.android.synthetic.main.m2_mind_view.view.rv_mind_list +import kotlinx.coroutines.launch + +class MindView : ConstraintLayout, MindViewModel.AiViewCallback { + + private val TAG = "MindView" + + constructor(context: Context) : super(context) + + constructor(context: Context, attributeSet: AttributeSet) : super(context, attributeSet) + + constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int) : super(context, attributeSet, defStyleAttr) + + constructor(context: Context, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes) + + private var roadV2NEventModel: RoadV2NEventViewModel?= null + private var roadCrossRoamModel: RoadCrossRoamViewModel?= null + private var automaticExplorationModel: AutomaticExplorationViewModel?= null + private var ndeViewModel: NDEViewModel?= null + + + private var viewModel:MindViewModel?=null + + private var isUserScrollingTime = 0L + + private val SCROLL_THRESHOLD = 2000L + + private val messageAdapter: AIMessageAdapter by lazy { AIMessageAdapter() } + private val messageLayoutManager: LinearLayoutManager by lazy { + LinearLayoutManager(context).apply { + stackFromEnd = true + } + } + + private fun initView() { + LayoutInflater.from(context).inflate(R.layout.m2_mind_view, this, true) + + rv_mind_list.layoutManager = messageLayoutManager + rv_mind_list.adapter = messageAdapter + rv_mind_list.addItemDecoration(PaddingItemDecoration(200, 300)) + messageAdapter.onItemClickListener = OnItemClickListener { item, position -> + if (item is AIMessage.Event) { + + } + } + rv_mind_list.addOnScrollListener(object : RecyclerView.OnScrollListener() { + override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) { + super.onScrollStateChanged(recyclerView, newState) + if (newState != RecyclerView.SCROLL_STATE_IDLE) { + isUserScrollingTime = System.currentTimeMillis() + } + } + }) + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + viewModel = findViewTreeViewModelStoreOwner()?.let { + ViewModelProvider(it).get(MindViewModel::class.java) + } + viewModel?.setViewCallback(this) + + roadV2NEventModel = findViewTreeViewModelStoreOwner()?.let{ + ViewModelProvider(it)[RoadV2NEventViewModel::class.java] + } + roadV2NEventModel?.init() + roadCrossRoamModel = findViewTreeViewModelStoreOwner()?.let{ + ViewModelProvider(it)[RoadCrossRoamViewModel::class.java] + } + roadCrossRoamModel?.init(context) + automaticExplorationModel = findViewTreeViewModelStoreOwner()?.let{ + ViewModelProvider(it)[AutomaticExplorationViewModel::class.java] + } + automaticExplorationModel?.init() + ndeViewModel = findViewTreeViewModelStoreOwner()?.let{ + ViewModelProvider(it)[NDEViewModel::class.java] + } + ndeViewModel?.init() + + findViewTreeLifecycleOwner()?.lifecycleScope?.launch { + viewModel?.messagesFlow?.collect { + Log.d(TAG, "${tName()} onMessages update: ${it}") + if(it.isNotEmpty()){ + rv_mind_list.visibility = View.VISIBLE + }else{ + rv_mind_list.visibility = View.VISIBLE + } + messageAdapter.submitList(it) { + Log.d(TAG, "${tName()} adapter submit: ") + scrollToBottom() + } + } + } + } + + // 滚动到RecyclerView底部 + private fun scrollToBottom() { + val delay = System.currentTimeMillis() - isUserScrollingTime + if (delay < SCROLL_THRESHOLD) { + return + } + val layoutManager = rv_mind_list.layoutManager as LinearLayoutManager + layoutManager.scrollToPositionWithOffset(messageAdapter.itemCount - 1, 0) + } + + fun tName(): String { + return "【${Thread.currentThread().name}】" + } + + override fun onVisibilityAggregated(isVisible: Boolean) { + super.onVisibilityAggregated(isVisible) + } + + init { + try { + initView() + } catch (e: Exception) { + e.printStackTrace() + } + } + + +} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/MindViewModel.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/MindViewModel.kt new file mode 100644 index 0000000000..f2b02dbe69 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/MindViewModel.kt @@ -0,0 +1,174 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.mind + +import android.util.Log +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.mogo.eagle.core.data.ai.V2XRepository +import com.mogo.eagle.core.data.map.MogoLocation +import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.bean.AIMessage +import com.mogo.och.bridge.autopilot.location.OchLocationManager +import com.mogo.och.common.module.biz.birdge.BridgeListener +import com.mogo.och.common.module.biz.birdge.BridgeManager +import com.mogo.och.common.module.voice.VoiceNotice +import com.mogo.och.shuttle.weaknet.passenger.callback.ICommonCallback +import com.mogo.och.shuttle.weaknet.passenger.model.CommonModel +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharedFlow +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.launch + +class MindViewModel : ViewModel(), AIMessageManager.AIMessageListener, + BridgeListener { + + private val msgList = mutableListOf() + private var lastTimestamp = System.currentTimeMillis() + + // 记录最后一次事件发生的时间,使用 private set 限制外部修改 + // private val TIMESTAMP_THRESHOLD = 1000 * 60 * 5 // 5分钟 + private val TIMESTAMP_THRESHOLD = 1000 * 30 + + private var llmResultJob: Job? = null + + private var isChecking = false + + private val _messagesFlow = MutableStateFlow>(emptyList()) + val messagesFlow: SharedFlow> get() = _messagesFlow + + private val commontCallback = object : ICommonCallback{ + override fun showNoTaskView(isTrue: Boolean) { + if(isTrue){ + clearMsg() + } + } + } + + private val locationCallback = object : IMoGoChassisLocationGCJ02Listener { + override fun onChassisLocationGCJ02(mogoLocation: MogoLocation?) { + mogoLocation?.let { + V2XRepository.provideLocation(it, 0) + } + + } + } + + init { + + } + + fun setViewCallback(aiView: AiViewCallback) { + CommonModel.setRouteLineInfoCallback(TAG,commontCallback) + OchLocationManager.addGCJ02Listener(TAG, 1, locationCallback) + AIMessageManager.registerListener(this) + + BridgeManager.addBridgeListener(TAG,this) + + } + + + override fun onCleared() { + AIMessageManager.unregisterListener(this) + llmResultJob?.cancel() + CommonModel.setRouteLineInfoCallback(TAG,null) + OchLocationManager.removeGCJ02Listener(TAG) + super.onCleared() + } + + override fun onReceive(msg: AIMessage) { + Log.d(TAG, "onReceive: $msg") + if (isChecking) { + if (msg is AIMessage.Event) { + msg.showScanFlag = true + } + } + + // 获更新消息 + updateMsg(msg) + } + + override fun clear() { + clearMsg() + } + + private fun handleMsg(newMessage: AIMessage) { + val existingIndex = findMessageIndex(newMessage.id) + if (existingIndex != -1) { + handleExistingMessage(existingIndex, newMessage) + } else { + handleNewMessage(newMessage) + } + } + + private fun findMessageIndex(messageId: String): Int { + return msgList.indexOfFirst { it.id == messageId } + } + + private fun handleExistingMessage(index: Int, newMessage: AIMessage) { + val oldMessage = msgList[index] + + newMessage.showTimestamp = oldMessage.showTimestamp + msgList[index] = newMessage + + speakMessageIfNeeded(newMessage, isLastMessage = msgList.last() == newMessage) + } + + private fun handleNewMessage(newMessage: AIMessage) { + updateTimestampIfNeeded(newMessage) + msgList.add(newMessage) + speakMessageIfNeeded(newMessage, isLastMessage = true) + } + + private fun updateTimestampIfNeeded(newMessage: AIMessage) { + val time = newMessage.timestamp - lastTimestamp + if (time >= TIMESTAMP_THRESHOLD) { + newMessage.showTimestamp = true + lastTimestamp = newMessage.timestamp + } + } + + private fun speakMessageIfNeeded(newMessage: AIMessage, isLastMessage: Boolean) { + if (isLastMessage && newMessage.tts.isNotEmpty()) { + VoiceNotice.showNotice(newMessage.tts) + } + } + + companion object { + private const val TAG = "AiViewModel" + } + + private fun updateMsg(msg: AIMessage) { + synchronized(msgList) { + handleMsg(msg) + _messagesFlow.value = msgList.toList() + } + } + + private fun deleteMsg(msgId: String) { + synchronized(msgList) { + val iterator = msgList.iterator() + while (iterator.hasNext()) { + if (iterator.next().id == msgId) { + iterator.remove() + } + } + _messagesFlow.value = msgList.toList() + } + } + + private fun clearMsg() { + synchronized(msgList) { + msgList.clear() + _messagesFlow.value = msgList.toList() + } + } + + + interface AiViewCallback { + + } +} + + + diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/AIMessageAdapter.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/AIMessageAdapter.kt new file mode 100644 index 0000000000..70757e8612 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/AIMessageAdapter.kt @@ -0,0 +1,51 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.mind.adapter + +import android.view.LayoutInflater +import android.view.ViewGroup +import androidx.recyclerview.widget.ListAdapter +import com.mogo.och.shuttle.weaknet.passenger.R +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.bean.AIMessage + +class AIMessageAdapter : ListAdapter(MessageDiffCallback()) { + + var onItemClickListener: OnItemClickListener? = null + + override fun onBindViewHolder(holder: MessageViewHolder, position: Int) { + getItem(position)?.let { + holder.bind(it, onItemClickListener) + } + } + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MessageViewHolder { + val inflater = LayoutInflater.from(parent.context) + return when (viewType) { + AIMessage.TYPE_PNC_ACTION -> PNCActionViewHolder(inflater.inflate(R.layout.b2_item_ai_pnc_action,parent,false)) + AIMessage.TYPE_ROAD_V2N -> RoadV2NEventViewHolder(inflater.inflate(R.layout.b2_item_ai_road_v2n_event,parent,false)) + AIMessage.TYPE_ROAD_CROSS -> RoadCrossRoamViewHolder(inflater.inflate(R.layout.b2_item_ai_road_cross_roam,parent,false))// 全息路口 + AIMessage.TYPE_AUTOMATIC_EXPLORATION -> AutomaticExplorationViewHolder(inflater.inflate(R.layout.b2_item_ai_automatic_exploration,parent,false))// 探查 + AIMessage.TYPE_NDE -> NDEViewHolder(inflater.inflate(R.layout.b2_item_ai_nde_event,parent,false))// 车龙 + else -> throw IllegalArgumentException("Invalid view type") + } + } + + override fun getItemViewType(position: Int): Int { + return when (getItem(position)) { + is AIMessage.Event -> AIMessage.TYPE_EVENT + is AIMessage.Scan -> AIMessage.TYPE_SCAN + is AIMessage.Light -> AIMessage.TYPE_LIGHT + is AIMessage.Speed -> AIMessage.TYPE_SPEED + is AIMessage.Warning -> AIMessage.TYPE_WARNING + is AIMessage.PNCAction -> AIMessage.TYPE_PNC_ACTION + is AIMessage.RoadV2NEvent -> AIMessage.TYPE_ROAD_V2N + is AIMessage.RoadCrossRoam -> AIMessage.TYPE_ROAD_CROSS + is AIMessage.AutomaticExploration -> AIMessage.TYPE_AUTOMATIC_EXPLORATION + is AIMessage.NDEData -> AIMessage.TYPE_NDE + else -> AIMessage.TYPE_EVENT + } + } + + override fun onViewRecycled(holder: MessageViewHolder) { + super.onViewRecycled(holder) + holder.viewRecycled(holder) + } +} diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/AIMessageViewHolder.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/AIMessageViewHolder.kt new file mode 100644 index 0000000000..11bd35ccf8 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/AIMessageViewHolder.kt @@ -0,0 +1,224 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.mind.adapter + +import android.animation.ObjectAnimator +import android.animation.ValueAnimator +import android.content.Context +import android.graphics.Rect +import android.util.Log +import android.view.View +import android.view.animation.LinearInterpolator +import android.widget.FrameLayout +import android.widget.ImageView +import android.widget.LinearLayout +import android.widget.TextView +import androidx.core.content.ContextCompat +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import com.bumptech.glide.Glide +import com.mogo.eagle.core.data.notice.AutoExplorationEntity +import com.mogo.eagle.core.data.v2x.RoadV2NEventType +import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager +import com.mogo.eagle.core.function.hmi.ui.notice.exploration.AutomaticExplorationAdapter +import com.mogo.eagle.core.function.hmi.ui.v2n.RoadV2NEventLivePlayView +import com.mogo.eagle.core.function.view.MapRoamView +import com.mogo.eagle.core.function.view.RoadCrossRoamListAdapter +import com.mogo.eagle.core.utilcode.mogo.glide.GlideImageLoader +import com.mogo.eagle.core.utilcode.mogo.imageloader.MogoImageView +import com.mogo.eagle.core.utilcode.util.DateTimeUtils +import com.mogo.och.shuttle.weaknet.passenger.R +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.bean.AIMessage +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale + + +abstract class MessageViewHolder(view: View) : RecyclerView.ViewHolder(view) { + abstract fun bind(item: AIMessage, onItemClickListener: OnItemClickListener? = null) + open fun viewRecycled(holder: MessageViewHolder){} + private val sampleDateFormat = SimpleDateFormat("HH:mm", Locale.CHINA) + protected val TAG = javaClass.simpleName + + fun handleTimestamp(item: AIMessage, tvTimestamp: TextView) { + if (item.showTimestamp) { + tvTimestamp.visibility = View.VISIBLE + tvTimestamp.text = sampleDateFormat.format(Date(item.timestamp)) + } else { + tvTimestamp.visibility = View.GONE + } + } + + fun View.setVisibilityBasedOn(condition: Boolean) { + visibility = if (condition) View.VISIBLE else View.GONE + } + + fun TextView.setTextAndVisibility(text: String) { + if (text.isEmpty()) { + visibility = View.GONE + this.text = "" + } else { + visibility = View.VISIBLE + this.text = text + } + } + + fun ImageView.showOrHideWithUrl(url: String) { + if (url.isEmpty()) { + visibility = View.GONE + + } else { + visibility = View.VISIBLE + Glide.with(this) + .load(url) + .placeholder(R.drawable.icon_pic_holder) + .error(R.drawable.icon_pic_error) +// .error(R.drawable.icon_marker_window_place_holder) +// .placeholder(R.drawable.icon_marker_window_place_holder) + .into(this) + + } + } +} + + +class PNCActionViewHolder(binding: View) : MessageViewHolder(binding){ + + private var tvPncActionDesc: TextView = binding.findViewById(R.id.tvPNCHintContent) + + override fun bind(item: AIMessage, onItemClickListener: OnItemClickListener?) { + if(item is AIMessage.PNCAction){ + tvPncActionDesc.text = item.actionDesc + } + } + +} + +class RoadV2NEventViewHolder(binding: View) : MessageViewHolder(binding){ + + private var tvV2XHintContent: TextView = binding.findViewById(R.id.tvV2XHintContent) + private var containerImageAndLiveVideo: FrameLayout = binding.findViewById(R.id.containerImageAndLiveVideo) + private var livePlayView: RoadV2NEventLivePlayView = binding.findViewById(R.id.livePlayView) + private var contentImageView: MogoImageView = binding.findViewById(R.id.contentImageView) + + override fun bind(item: AIMessage, onItemClickListener: OnItemClickListener?) { + if(item is AIMessage.RoadV2NEvent){ + tvV2XHintContent.text = item.title + when (item.eventType) { + RoadV2NEventType.TEXT -> { + containerImageAndLiveVideo.visibility = View.GONE + contentImageView.visibility = View.GONE + livePlayView.visibility = View.GONE + } + + RoadV2NEventType.IMAGE -> { + containerImageAndLiveVideo.visibility = View.VISIBLE + contentImageView.visibility = View.VISIBLE + livePlayView.visibility = View.GONE + GlideImageLoader.getInstance() + .displayImage(item.contentImageUrl, contentImageView) + } + + RoadV2NEventType.LIVE_VIDEO -> { + containerImageAndLiveVideo.visibility = View.VISIBLE + contentImageView.visibility = View.GONE + livePlayView.visibility = View.VISIBLE + val cityCode = + CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84().cityCode + livePlayView.startRoadCameraLive( + item.id, + item.cameraIp, item.lon, item.lat, cityCode + ) + } + } + } + + + } + +} + +class RoadCrossRoamViewHolder(binding: View) : MessageViewHolder(binding){ + + private var tvRoadRoamTitle: TextView = binding.findViewById(R.id.tvRoadRoamTitle) + private var lvRoadCrossRoamTip: RecyclerView = binding.findViewById(R.id.lvRoadCrossRoamTip) + + override fun bind(item: AIMessage, onItemClickListener: OnItemClickListener?) { + if(item is AIMessage.RoadCrossRoam){ + lvRoadCrossRoamTip.layoutManager = NoScrollLayoutManager(itemView.context) + lvRoadCrossRoamTip.adapter = RoadCrossRoamListB2Adapter(itemView.context) + tvRoadRoamTitle.setTextColor(itemView.context.getColor(R.color.color_131415)) + + } + } + +} + +class AutomaticExplorationViewHolder(binding: View) : MessageViewHolder(binding){ + + private var rvExplorationList: RecyclerView = binding.findViewById(R.id.rvExplorationList) + private lateinit var automaticExplorationAdapter: AutomaticExplorationB2Adapter + + override fun bind(item: AIMessage, onItemClickListener: OnItemClickListener?) { + val linearLayoutManager = LinearLayoutManager(itemView.context) + linearLayoutManager.orientation = LinearLayoutManager.VERTICAL + automaticExplorationAdapter = AutomaticExplorationB2Adapter(itemView.context) + rvExplorationList.adapter = automaticExplorationAdapter + rvExplorationList.layoutManager = linearLayoutManager + initData() + } + + private fun initData() { + val dataList = ArrayList(7) + dataList.add(AutoExplorationEntity("当前道路事件分析",2000L,false)) + dataList.add(AutoExplorationEntity("前方车辆",2000L,false)) + dataList.add(AutoExplorationEntity("两侧车辆",2600L,false)) + dataList.add(AutoExplorationEntity("后方车辆",3000L,false)) + dataList.add(AutoExplorationEntity("前方路口车辆流速分析",4000L,false)) + dataList.add(AutoExplorationEntity("前方路口行人/非机动车分析",4300L,false)) + dataList.add(AutoExplorationEntity("路侧视频分析",5000L,false)) + automaticExplorationAdapter.setListener(object: AutomaticExplorationB2Adapter.CompleteListener{ + override fun onComplete(entity: AutoExplorationEntity) { + dataList.forEach { + if(it.explorationContent == entity.explorationContent){ + it.explorationComplete = true + } + } + } + + }) + automaticExplorationAdapter.setData(dataList) + } + +} + +class NDEViewHolder(binding: View) : MessageViewHolder(binding){ + + private var tvNdeContent: TextView = binding.findViewById(R.id.tvNdeHintContent) + private var rvNdeList: RecyclerView = binding.findViewById(R.id.rvNdeList) + + override fun bind(item: AIMessage, onItemClickListener: OnItemClickListener?) { + if(item is AIMessage.NDEData){ + tvNdeContent.text = item.desc + val linearLayoutManager = LinearLayoutManager(itemView.context) + linearLayoutManager.orientation = LinearLayoutManager.HORIZONTAL + val ndeRoadAdapter = AINDERoadAdapter(itemView.context) + rvNdeList.adapter = ndeRoadAdapter + rvNdeList.layoutManager = linearLayoutManager + ndeRoadAdapter.setData(item.roadList) + } + } + +} + +private class NoScrollLayoutManager(context: Context?) : LinearLayoutManager(context) { + override fun canScrollVertically(): Boolean { + return false + } + + override fun canScrollHorizontally(): Boolean { + return false + } +} + +fun interface OnItemClickListener { + fun onItemClick(item: AIMessage, position: Int) +} diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/AINDERoadAdapter.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/AINDERoadAdapter.kt new file mode 100644 index 0000000000..9492b7f358 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/AINDERoadAdapter.kt @@ -0,0 +1,237 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.mind.adapter + +import android.content.Context +import android.util.TypedValue +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.content.ContextCompat +import androidx.recyclerview.widget.RecyclerView +import com.mogo.och.common.module.biz.birdge.data.RoadMsg +import com.mogo.och.shuttle.weaknet.passenger.R + +class AINDERoadAdapter(private val context: Context): RecyclerView.Adapter() { + + private var roadList: List?= null + + fun setData(list: List){ + roadList = list + notifyDataSetChanged() + } + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AIRoadHolder { + val view = LayoutInflater.from(parent.context) + .inflate(R.layout.b2_item_ai_nde_road, parent, false) + return AIRoadHolder(view) + } + + override fun onBindViewHolder(holder: AIRoadHolder, position: Int) { + roadList?.let{ + val roadMsg = it[position] + if(it.size < 3){ + //设置item宽度为最大宽度180dp + val params = ConstraintLayout.LayoutParams( + TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 90f, + context.resources.displayMetrics).toInt(), + ConstraintLayout.LayoutParams.WRAP_CONTENT) + holder.clRoadLayout.layoutParams = params + }else if(it.size == 3){ + //设置item宽度为最大宽度180dp + val params = ConstraintLayout.LayoutParams( + TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 60f, + context.resources.displayMetrics).toInt(), + ConstraintLayout.LayoutParams.WRAP_CONTENT) + holder.clRoadLayout.layoutParams = params + }else if(it.size == 4){ + //设置item宽度为最大宽度180dp + val params = ConstraintLayout.LayoutParams( + TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 50f, + context.resources.displayMetrics).toInt(), + ConstraintLayout.LayoutParams.WRAP_CONTENT) + holder.clRoadLayout.layoutParams = params + }else{ + val params = ConstraintLayout.LayoutParams( + TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 45f, + context.resources.displayMetrics).toInt(), + ConstraintLayout.LayoutParams.WRAP_CONTENT) + holder.clRoadLayout.layoutParams = params + } + when(roadMsg.arrowType){ + //直行 + 201->{ + holder.ivRoadType.setImageDrawable( + ContextCompat.getDrawable( + context, + R.drawable.icon_road_forward + )) + } + //直行或左转 + 202->{ + holder.ivRoadType.setImageDrawable( + ContextCompat.getDrawable( + context, + R.drawable.icon_road_forward_or_turn_left + )) + } + //直行或右转 + 203->{ + holder.ivRoadType.setImageDrawable( + ContextCompat.getDrawable( + context, + R.drawable.icon_road_forward_or_turn_right + )) + } + //直行或掉头 + 204->{ + holder.ivRoadType.setImageDrawable( + ContextCompat.getDrawable( + context, + R.drawable.icon_road_forward_or_reverse + )) + } + //左转 + 205->{ + holder.ivRoadType.setImageDrawable( + ContextCompat.getDrawable( + context, + R.drawable.icon_road_turn_left + )) + } + //左转或掉头 + 206->{ + holder.ivRoadType.setImageDrawable( + ContextCompat.getDrawable( + context, + R.drawable.icon_road_turn_left_or_reverse + )) + } + //左弯或向左合流 + 207->{ + holder.ivRoadType.setImageDrawable( + ContextCompat.getDrawable( + context, + R.drawable.icon_road_turn_or_merge_left + )) + } + //右转 + 208->{ + holder.ivRoadType.setImageDrawable( + ContextCompat.getDrawable( + context, + R.drawable.icon_road_turn_right + )) + } + //右转或向右合流 + 209->{ + holder.ivRoadType.setImageDrawable( + ContextCompat.getDrawable( + context, + R.drawable.icon_road_turn_or_merge_right + )) + } + //左右转弯 + 210->{ + holder.ivRoadType.setImageDrawable( + ContextCompat.getDrawable( + context, + R.drawable.icon_road_turn_left_or_right + )) + } + //掉头 + 211->{ + holder.ivRoadType.setImageDrawable( + ContextCompat.getDrawable( + context, + R.drawable.icon_road_reverse + )) + } + //禁止左转 + 212->{ + holder.ivRoadType.setImageDrawable( + ContextCompat.getDrawable( + context, + R.drawable.icon_road_prohibit_turn_left + )) + } + //禁止右转 + 213->{ + holder.ivRoadType.setImageDrawable( + ContextCompat.getDrawable( + context, + R.drawable.icon_road_prohibit_turn_right + )) + } + //禁止掉头 + 214->{ + holder.ivRoadType.setImageDrawable( + ContextCompat.getDrawable( + context, + R.drawable.icon_road_prohibit_reverse + )) + } + //直行或左转或右转 + 215->{ + holder.ivRoadType.setImageDrawable( + ContextCompat.getDrawable( + context, + R.drawable.icon_road_forward_turn_left_right + )) + } + //直行或掉头或左转 + 216->{ + holder.ivRoadType.setImageDrawable( + ContextCompat.getDrawable( + context, + R.drawable.icon_road_forward_turn_left_reverse + )) + } + //右转或掉头 + 217->{ + holder.ivRoadType.setImageDrawable( + ContextCompat.getDrawable( + context, + R.drawable.icon_road_turn_right_or_reverse + )) + } + //禁止右转或向右合流 + 218->{ + holder.ivRoadType.setImageDrawable( + ContextCompat.getDrawable( + context, + R.drawable.icon_road_prohibit_turn_or_merge_right + )) + } + } + //是否是推荐车道 + if(roadMsg.isRecommend){ + holder.tvRoadStatus.text = context.getString(R.string.nde_road_recommend) + holder.tvRoadStatus.setTextColor(context.getColor(R.color.msg_nde_road_recommend)) + holder.clRoadLayout.background = ContextCompat.getDrawable( + context, + R.drawable.bg_nde_road_recommend + ) + } + //是否有车龙,代表拥堵、行驶缓慢 + if(roadMsg.isCheLong){ + holder.tvRoadStatus.text = context.getString(R.string.nde_road_slow) + holder.tvRoadStatus.setTextColor(context.getColor(R.color.msg_nde_road_slow)) + } + if(position == it.lastIndex){ + holder.viewDivider.visibility = View.INVISIBLE + } + } + } + + override fun getItemCount() = roadList?.size ?: 0 + + class AIRoadHolder(itemView: View) : RecyclerView.ViewHolder(itemView){ + var clRoadLayout: ConstraintLayout = itemView.findViewById(R.id.clRoadLayout) + var ivRoadType: ImageView = itemView.findViewById(R.id.ivRoadType) + var tvRoadStatus: TextView = itemView.findViewById(R.id.tvRoadStatus) + var viewDivider: View = itemView.findViewById(R.id.viewDivider) + } + +} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/AutomaticExplorationB2Adapter.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/AutomaticExplorationB2Adapter.kt new file mode 100644 index 0000000000..6117a085ba --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/AutomaticExplorationB2Adapter.kt @@ -0,0 +1,83 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.mind.adapter + +import android.animation.Animator +import android.animation.AnimatorListenerAdapter +import android.animation.ObjectAnimator +import android.animation.ValueAnimator +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.view.animation.LinearInterpolator +import android.widget.ImageView +import android.widget.TextView +import androidx.core.content.ContextCompat +import androidx.recyclerview.widget.RecyclerView +import com.mogo.eagle.core.data.notice.AutoExplorationEntity +import com.mogo.och.shuttle.weaknet.passenger.R + +/** + * 自动探查适配器 + * 鹰眼650需求 + */ +class AutomaticExplorationB2Adapter(val context: Context): RecyclerView.Adapter() { + + private var data: List ?= null + private var completeListener: CompleteListener ?= null + + fun setData(data: List){ + this.data = data + notifyDataSetChanged() + } + + fun setListener(listener: CompleteListener){ + completeListener = listener + } + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ExplorationHolder { + val view = LayoutInflater.from(parent.context) + .inflate(R.layout.item_auto_exploration_b2, parent, false) + return ExplorationHolder(view) + } + + override fun getItemCount() = data?.size ?: 0 + + override fun onBindViewHolder(holder: ExplorationHolder, position: Int) { + data?.let { + val entity = it[position] + holder.tvExplorationContent.text = entity.explorationContent + holder.ivExplorationLoading.setImageDrawable( + ContextCompat.getDrawable( + context, + R.drawable.icon_exploration_loading_p + )) + val rotationAnim = ObjectAnimator.ofFloat(holder.ivExplorationLoading, "rotation", 0f, 360f) + rotationAnim.repeatCount = entity.explorationDuration.toInt()/1000 + rotationAnim.repeatMode = ValueAnimator.RESTART + rotationAnim.duration = 1000 + rotationAnim.interpolator = LinearInterpolator() + rotationAnim.addListener(object: AnimatorListenerAdapter(){ + override fun onAnimationEnd(animation: Animator) { + super.onAnimationEnd(animation) + completeListener?.onComplete(entity) + holder.ivExplorationLoading.setImageDrawable( + ContextCompat.getDrawable( + context, + R.drawable.icon_exploration_done_p + )) + } + }) + rotationAnim.start() + } + } + + class ExplorationHolder(itemView: View) : RecyclerView.ViewHolder(itemView){ + var ivExplorationLoading: ImageView = itemView.findViewById(R.id.ivExplorationLoading) + var tvExplorationContent: TextView = itemView.findViewById(R.id.tvExplorationContent) + } + + interface CompleteListener{ + fun onComplete(entity: AutoExplorationEntity) + } + +} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/MessageDiffCallback.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/MessageDiffCallback.kt new file mode 100644 index 0000000000..011e06ca1c --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/MessageDiffCallback.kt @@ -0,0 +1,15 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.mind.adapter + +import androidx.recyclerview.widget.DiffUtil +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.bean.AIMessage + +class MessageDiffCallback: DiffUtil.ItemCallback() { + + override fun areContentsTheSame(oldItem: AIMessage, newItem: AIMessage): Boolean { + return oldItem == newItem + } + + override fun areItemsTheSame(oldItem: AIMessage, newItem: AIMessage): Boolean { + return oldItem.id == newItem.id + } +} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/PaddingItemDecoration.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/PaddingItemDecoration.kt new file mode 100644 index 0000000000..058a0a11c9 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/PaddingItemDecoration.kt @@ -0,0 +1,94 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.mind.adapter + +import android.graphics.Canvas +import android.graphics.Rect +import android.graphics.drawable.Drawable +import android.graphics.drawable.GradientDrawable +import android.view.View +import androidx.recyclerview.widget.GridLayoutManager +import androidx.recyclerview.widget.RecyclerView +import androidx.recyclerview.widget.StaggeredGridLayoutManager +import com.mogo.commons.AbsMogoApplication +import com.mogo.och.common.module.utils.ResourcesUtils +import com.mogo.och.shuttle.weaknet.passenger.R +import me.jessyan.autosize.utils.AutoSizeUtils + +class PaddingItemDecoration(private val topPadding: Int, private val bottomPadding: Int) : RecyclerView.ItemDecoration() { + + private var divider: Drawable + + private var padding = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(),13f) + + init { + val shapeDrawable = GradientDrawable() + shapeDrawable.setColor(ResourcesUtils.getColor(R.color.b2_BBC9D4)) + shapeDrawable.shape = GradientDrawable.RECTANGLE + val width = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(),343f) + val height = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(),1f) + shapeDrawable.setSize(width, height) + divider = shapeDrawable + } + + override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) { + super.getItemOffsets(outRect, view, parent, state) + + + // 只有第一个 item 的顶部添加空白 + if (parent.getChildAdapterPosition(view) == 0) { + outRect.top = topPadding + } else{ + outRect.top = 0 + } + + // 最后一个 item 的底部添加空白 +// if (parent.getChildAdapterPosition(view) == state.itemCount - 1) { +// outRect.bottom = bottomPadding +// } else{ +// outRect.bottom = 0 +// } + } + + override fun onDraw(c: Canvas, parent: RecyclerView, state: RecyclerView.State) { + super.onDraw(c, parent, state) + val childCount = parent.childCount //获取可见item的数量 + val spanCount: Int = getSpanCount(parent) + for (i in 0 until childCount) { + val child = parent.getChildAt(i) + val params = child + .layoutParams as RecyclerView.LayoutParams + val left = child.left - params.leftMargin + padding + val right = child.right - padding //- params.rightMargin - divider.intrinsicWidth + val top = child.bottom + params.bottomMargin + val bottom = top + divider.intrinsicHeight + divider.setBounds(left, top, right, bottom) + divider.draw(c) + if (i < spanCount) { //画第一行顶部的分割线 + drawHorizontalForFirstRow(c, child) + } + } + } + + private fun drawHorizontalForFirstRow(c: Canvas, child: View) { + val params = child + .layoutParams as RecyclerView.LayoutParams + val left = child.left - params.leftMargin - divider.intrinsicWidth + val top = child.top - params.topMargin - divider.intrinsicHeight + val right = child.right + params.rightMargin + divider.intrinsicWidth + val bottom = top + divider.intrinsicHeight + divider.setBounds(left, top, right, bottom) + divider.draw(c) + } + + private fun getSpanCount(parent: RecyclerView): Int { + // 列数 + var spanCount = -1 + val layoutManager = parent.layoutManager + if (layoutManager is GridLayoutManager) { + spanCount = layoutManager.spanCount + } else if (layoutManager is StaggeredGridLayoutManager) { + spanCount = layoutManager + .spanCount + } + return spanCount + } +} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/RoadCrossRoamListB2Adapter.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/RoadCrossRoamListB2Adapter.kt new file mode 100644 index 0000000000..162b8516ea --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/adapter/RoadCrossRoamListB2Adapter.kt @@ -0,0 +1,65 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.mind.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.ProgressBar +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.mogo.och.shuttle.weaknet.passenger.R +import kotlin.random.Random + + +class RoadCrossRoamListB2Adapter(private val mContext: Context) : RecyclerView.Adapter() { + + private val items: MutableList = mutableListOf() + + init { + items.add("前方路况拥堵分析") + items.add("路口危险车辆分析") + items.add("路口交通事故分析") + items.add("路口行人碰撞分析") + items.add("路口非机动车分析") + items.add("路口灯态分析") + } + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { + val view: View = + LayoutInflater.from(mContext).inflate(R.layout.item_road_cross_ai_roam_tip_b2, parent, false) + return ViewHolder(view) + } + + override fun getItemCount(): Int { + return 6 + } + + override fun onBindViewHolder(holder: ViewHolder, position: Int) { + val item = items[position] + holder.textView.setTextColor(mContext.getColor(R.color.color_191A1C)) + holder.textView.text = item + // 随机决定是否显示ProgressBar +// if (Random.nextBoolean()) { // 50%的几率显示ProgressBar + holder.progressBar.visibility = View.VISIBLE + holder.checkIcon.visibility = View.INVISIBLE + + val r0 = Random.nextInt(0,3) + val r1 = Random.nextInt(1,9) + // 模拟加载完成 + holder.itemView.postDelayed({ + holder.progressBar.visibility = View.INVISIBLE + holder.checkIcon.visibility = View.VISIBLE + },r0 * 1000L + r1 * 100L) +// } else { +// holder.progressBar.visibility = View.GONE +// holder.checkIcon.visibility = View.VISIBLE +// } + } + + class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + var textView: TextView = itemView.findViewById(R.id.tvRoadItemTip) + var progressBar: ProgressBar = itemView.findViewById(R.id.pbRoadItemTip) + var checkIcon: ImageView = itemView.findViewById(R.id.ivRoadItemTip) + } +} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/bean/AssistantMessage.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/bean/AssistantMessage.kt new file mode 100644 index 0000000000..cd3abee857 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/bean/AssistantMessage.kt @@ -0,0 +1,180 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.mind.bean + +import android.os.CountDownTimer +import android.util.Log +import com.mogo.eagle.core.data.v2x.RoadV2NEventType +import com.mogo.och.common.module.biz.birdge.data.RoadMsg +import com.mogo.och.common.module.biz.birdge.data.VlmData +import kotlin.math.floor + + +sealed class AIMessage( + open val id: String, + open val title: String, + open val tts: String = "", + val timestamp: Long = System.currentTimeMillis(), + var showTimestamp: Boolean = false +) { + + companion object { + const val TYPE_SCAN = 0 + const val TYPE_EVENT = 1 + const val TYPE_LIGHT = 3 + const val TYPE_SPEED = 4 + const val TYPE_WARNING = 5 + const val TYPE_PNC_ACTION = 6 + const val TYPE_ROAD_V2N = 7 + const val TYPE_ROAD_CROSS = 8 + const val TYPE_AUTOMATIC_EXPLORATION = 9 + const val TYPE_NDE = 11 + } + + data class Scan( + override val id: String, + override val title: String, + val pictureUrl: String = "", + var showScanFlag: Boolean = false + ) : AIMessage(id, title) + + data class Event( + override val id: String, + override val title: String, + override val tts: String = "", + val position: String = "", + val distance: String = "", + val range: String = "", + val time: String = "", + val pictureUrl: String = "", + val videoUrl: String = "", + var showScanFlag: Boolean = false + ) : AIMessage(id, title, tts) + + data class QA( + override val id: String, + override val title: String, + override val tts: String = "", + val question: String, + val answer: String, + var state: QuestionState = QuestionState.UNDERSTAND, + val pictureUrl: String = "", + var pictureUrlList: List = listOf(), + val videoUrl: String = "", + ) : AIMessage(id, title, tts) { + + enum class QuestionState(val code: Int) { + UNDERSTAND(1), + ANALYZE(2), + ANSWER(3), + FINISH(4), + ERROR(-1), + } + } + + data class Light( + override val id: String, + override val title: String, + override val tts: String = "", + var seconds: Int, + val status: Int + ) : AIMessage(id, title, tts) { + private var countDownTimer: CountDownTimer? = null + private var listener: OnCountdownUpdateListener? = null + + fun startCountdown(millisInFuture: Long, countDownInternal: Long) { + countDownTimer?.cancel() + countDownTimer = object : CountDownTimer(millisInFuture, countDownInternal) { + override fun onTick(millisUntilFinished: Long) { + //倒计时开始 + Log.d( + "StartOrSlowDownTip", + "millisUntilFinished = $millisUntilFinished, countDownInternal = $countDownInternal" + ) + val cd = millisUntilFinished / 1000.0 +// val split = String.format("%.2f", cd).split(".") + seconds = floor(cd).toInt() + listener?.onCountdownUpdate() + } + + override fun onFinish() { + //倒计时完成 + seconds = 0 + listener?.onCountdownFinish() + } + } + countDownTimer?.start() + } + + fun stopCountdown() { + countDownTimer?.cancel() + } + + fun setOnCountdownUpdateListener(listener: OnCountdownUpdateListener) { + this.listener = listener + } + + interface OnCountdownUpdateListener { + fun onCountdownUpdate() + fun onCountdownFinish() + } + } + + + data class Speed( + override val id: String, + override val title: String, + override val tts: String = "", + val speedMax: Int, + val speedMin: Int, + ) : AIMessage(id, title, tts) + + data class Warning( + override val id: String, + override val title: String, + override val tts: String = "", + ) : AIMessage(id, title, tts) + + data class PNCAction( + override val id: String, + override val title: String, + var actionDesc: String, + var timeStamp: Long = 0, //事件发生事件戳 + ): AIMessage(id,title) + + data class RoadV2NEvent( + override val id: String, + override val title: String, + override val tts: String = "", //TTS的文案 + var eventType: RoadV2NEventType, //事件弹框类型 + var timeStamp: Long = 0, //事件发生事件戳 + var iconResId: Int, //事件icon res id + var isNeedTTS: Boolean = false, //事件文案是否需要同步tts + var contentImageUrl: String, // Image 类型时图片 url + var cameraIp: String, // 路侧camera ip,用于请求获取拉流地址 + var lon: Double, //事件坐标-经度 + var lat: Double, //事件坐标-纬度 + ): AIMessage(id,title,tts) + + data class RoadCrossRoam( + override val id: String, + override val title: String + ): AIMessage(id,title) + + data class AutomaticExploration( + override val id: String, + override val title: String + ): AIMessage(id,title) + + data class EvaluateData( + override val id: String, + override val title: String, + var isFirst:Boolean = true + ): AIMessage(id,title) + + data class NDEData( + override val id: String, + override val title: String, + var desc: String, + var roadList: List + ): AIMessage(id,title) + +} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/bean/ListenUIState.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/bean/ListenUIState.kt new file mode 100644 index 0000000000..1f98a8b5bf --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/bean/ListenUIState.kt @@ -0,0 +1,3 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.mind.bean + +data class ListenUIState(val show: Boolean, val text: String, val showTips: Boolean = false) \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/data/AutomaticExplorationViewModel.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/data/AutomaticExplorationViewModel.kt new file mode 100644 index 0000000000..e84aea400f --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/data/AutomaticExplorationViewModel.kt @@ -0,0 +1,118 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.mind.data + +import android.os.CountDownTimer +import androidx.lifecycle.ViewModel +import com.mogo.eagle.core.data.msgbox.MsgBoxBean +import com.mogo.eagle.core.data.msgbox.MsgBoxType +import com.mogo.eagle.core.data.msgbox.MsgCategory +import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxListener +import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxListenerManager +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.util.ThreadUtils +import com.mogo.och.shuttle.weaknet.passenger.callback.ICommonCallback +import com.mogo.och.shuttle.weaknet.passenger.model.CommonModel +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.AIMessageManager +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.bean.AIMessage + +/** + * 自动探查 + */ +class AutomaticExplorationViewModel: ViewModel(), IMsgBoxListener, ICommonCallback { + + companion object{ + private const val TAG = "AutomaticExplorationViewModel" + private const val EXPLORATION_SHOW_TIME = 300000L //距离用户在触发上一次事件播报的时间5分钟后,自动触发常规道路情况检测 + } + + private var showViewTimer: CountDownTimer?= null //展示自动探查倒计时 + private var isCountingDown: Boolean = false //是否处于倒计时中 + private var hasOrder: Boolean = false // 车当前是否有订单 + + fun init(){ + CommonModel.setRouteLineInfoCallback(TAG,this) + CallerMsgBoxListenerManager.addListener(TAG,this) + } + + override fun onCleared() { + super.onCleared() + CommonModel.setRouteLineInfoCallback(TAG,null) + CallerMsgBoxListenerManager.removeListener(TAG) + } + + override fun showNoTaskView(isTrue: Boolean) { + super.showNoTaskView(isTrue) + if(isTrue){ + cancelTimer() + currentOrderStatus(false) + }else{ + startShowTimer() + currentOrderStatus(true) + } + } + + + override fun onDataChanged(category: MsgCategory, msgBoxList: MsgBoxBean) { + if(category == MsgCategory.NOTICE){ + if(msgBoxList.type == MsgBoxType.V2X){ + //重置倒计时时长 + cancelTimer() + if(hasOrder){ + startShowTimer() + } + } + } + } + + /** + * 取消倒计时 + */ + private fun cancelTimer(){ + CallerLogger.d(TAG,"cancelTimer") + showViewTimer?.cancel() + showViewTimer = null + isCountingDown = false + } + + /** + * 开始倒计时 + */ + private fun startShowTimer(){ + CallerLogger.d(TAG,"startShowTimer") + if(!isCountingDown){ + ThreadUtils.runOnUiThread { + if(showViewTimer == null){ + showViewTimer = object: CountDownTimer(EXPLORATION_SHOW_TIME,EXPLORATION_SHOW_TIME){ + override fun onTick(millisUntilFinished: Long) { + CallerLogger.d(TAG,"倒计时+:${millisUntilFinished}") + } + + override fun onFinish() { + if(hasOrder){ + showAutoExploration() + } + isCountingDown = false + } + } + } + isCountingDown = true + showViewTimer?.start() + } + } + } + + /** + * 设置当前订单状态 + * @param orderStatus true有订单;false没有订单 + */ + private fun currentOrderStatus(orderStatus: Boolean){ + hasOrder = orderStatus + } + + + + private fun showAutoExploration(){ + val automaticExploration = AIMessage.AutomaticExploration(System.currentTimeMillis().toString(),"") + AIMessageManager.post(automaticExploration) + } + +} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/data/NDEViewModel.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/data/NDEViewModel.kt new file mode 100644 index 0000000000..bb77504f17 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/data/NDEViewModel.kt @@ -0,0 +1,35 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.mind.data + +import androidx.lifecycle.ViewModel +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotIdentifyListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager +import com.mogo.och.common.module.biz.birdge.BridgeListener +import com.mogo.och.common.module.biz.birdge.BridgeManager +import com.mogo.och.common.module.biz.birdge.data.RoadMsg +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.AIMessageManager +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.bean.AIMessage + +/** + * 车龙信息 + */ +class NDEViewModel: ViewModel(), BridgeListener { + + companion object{ + private const val TAG = "NDEViewModel" + } + + fun init(){ + BridgeManager.addBridgeListener(TAG,this) + } + + override fun onCleared() { + super.onCleared() + BridgeManager.removeBridgeListener(TAG) + } + + override fun onNdeDataListener(title: String, desc: String, sortedList: List) { + val ndeEvent = AIMessage.NDEData(System.currentTimeMillis().toString(),title,desc,sortedList) + AIMessageManager.post(ndeEvent) + } + +} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/data/PNCActionsViewModel.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/data/PNCActionsViewModel.kt new file mode 100644 index 0000000000..74964909d2 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/data/PNCActionsViewModel.kt @@ -0,0 +1,259 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.mind.data + +import androidx.lifecycle.ViewModel +import com.mogo.eagle.core.data.autopilot.pnc.PncActionsHelper +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningActionsListener +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager +import com.mogo.eagle.core.function.call.autopilot.CallerPlanningActionsListenerManager +import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager +import com.mogo.och.common.module.manager.loop.BizLoopManager +import com.mogo.och.data.bean.BusStationBean +import com.mogo.och.shuttle.weaknet.passenger.callback.ICommonCallback +import com.mogo.och.shuttle.weaknet.passenger.model.CommonModel +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.AIMessageManager +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.bean.AIMessage +import mogo.telematics.pad.MessagePad + +class PNCActionsViewModel: ViewModel(), IMoGoAutopilotPlanningActionsListener, ICommonCallback { + + companion object{ + private const val TAG = "PNCActionsViewModel" + } + + private var currentAction = "" + + private var currentStation:BusStationBean?=null + + fun init(){ + CallerPlanningActionsListenerManager.addListener(TAG, this) + CommonModel.setRouteLineInfoCallback(TAG,this) + } + + override fun onCleared() { + super.onCleared() + CallerPlanningActionsListenerManager.removeListener(TAG) + CommonModel.setRouteLineInfoCallback(TAG,null) + } + + override fun updateStationsInfo( + stations: MutableList?, + currentStationIndex: Int, + isArrived: Boolean + ) { + try { + currentStation = stations?.get(currentStationIndex) + }catch (e:Exception){ + OchChainLogManager.writeChainLogError("PNCActionsViewModel 设置错误","${e.message}") + } + } + + override fun showNoTaskView(isTrue: Boolean) { + super.showNoTaskView(isTrue) + if(isTrue){ + currentStation = null + } + } + + + override fun pncActions(planningActionMsg: MessagePad.PlanningActionMsg) { + try { + BizLoopManager.runInMainThread { + if (CallerAutoPilotStatusListenerManager.getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { + var actions: String? = null + planningActionMsg.actionMsg?.let { + try { + actions = PncActionsHelper.getAction( + it.drivingState.number, + it.drivingAction.number + ) + } catch (e: Exception) { + e.printStackTrace() + } + } + planningActionMsg.v2NActionMsgList?.forEach { v2nAction -> + actions = PncActionsHelper.getAction( + v2nAction.drivingState.number, + v2nAction.drivingAction.number + ) + } + // update view + actions?.let { + if(it.isNotEmpty() && it != currentAction){ + currentAction = it + val title = getActionTitle(it) + if(title.isNotEmpty()){ + val desc = getActionDesc(title) + val action = AIMessage.PNCAction(it+System.currentTimeMillis(),title,desc,System.currentTimeMillis()) + AIMessageManager.post(action) + } + } + } + + } + } + } catch (e: Exception) { + e.printStackTrace() + } + } + + private fun getActionTitle(pncAction: String): String{ + return when(pncAction){ + "正在进站"->{ + "车辆进站" + } + "等待进站"->{ + "车辆等待进站" + } + "正在出站"->{ + "车辆出站" + } + "等待出站"->{ + "车辆等待出站" + } + "正在向左变道"->{ + "车辆向左变道" + } + "正在向右变道"->{ + "车辆向右变道" + } + "正在完成变道"->{ + "车辆完成变道" + } + "正在绕过障碍物"->{ + "车辆正在绕过前方障碍物" + } + "正在向左绕行避让前方静止障碍物"->{ + "车辆正在绕过前方障碍物" + } + "正在向右绕行避让前方静止障碍物"->{ + "车辆正在绕过前方障碍物" + } + "正在避让障碍物"->{ + "车辆正在避让前方障碍物" + } + "正在向左变道避让前方静止障碍物"->{ + "车辆正在避让前方障碍物" + } + "正在向右变道避让前方静止障碍物"->{ + "车辆正在避让前方障碍物" + } + "正在等红灯"->{ + "路口等红灯" + } + "正在向左变道避让前方道路施工"->{ + "车辆正在变道避让前方道路施工" + } + "正在向右变道避让前方道路施工"->{ + "车辆正在变道避让前方道路施工" + } + "正在向左绕行避让前方道路施工"->{ + "车辆正在绕行避让前方道路施工" + } + "正在向右绕行避让前方道路施工"->{ + "车辆正在绕行避让前方道路施工" + } + + "正在向左变道避让前方道路事故"->{ + "车辆正在变道避让前方道路事故" + } + "正在向右变道避让前方道路事故"->{ + "车辆正在变道避让前方道路事故" + } + "正在向左绕行避让前方道路事故"->{ + "车辆正在绕行避让前方道路事故" + } + "正在向右绕行避让前方道路事故"->{ + "车辆正在绕行避让前方道路事故" + } + "正在跟随车辆行驶"->{ + "车辆正在跟车通行" + } + "正在跟车行驶"->{ + "车辆正在跟车通行" + } + "正在向左变道避让前方车龙"->{ + "车辆正在绕行前方车龙" + } + "正在向右变道避让前方车龙"->{ + "车辆正在绕行前方车龙" + } + "正在使用云端规划通过路口"->{ + "车辆正在使用云端轨迹通行" + } + "正在避让后方来车"->{ + "车辆正在避让后方来车" + } + else->{ + "" + } + } + } + + private fun getActionDesc(action: String): String{ + return when(action){ + "车辆进站"->{ + "前方即将到达${CommonModel.routesResult}," + + "车辆正在规划减速并进站停靠,请安心等待车辆停稳再下车哦~" + } + "车辆等待进站"->{ + "车辆待环境安全后进站,耐心等几秒,安全比赶路更重要~" + } + "车辆出站"->{ + "欢迎乘坐MOGO RoboTaxi~车辆正在规划出站,坐稳扶好哦,我们出发啦!小智持续守护您的行程。" + } + "车辆等待出站"->{ + "车辆待环境安全后出站,耐心等几秒,安全比赶路更重要~" + } + "车辆向左变道"->{ + "确认环境安全,车辆正在规划平稳向左变道,同时持续监测周边交通参与者动向,放心交给我们吧!" + } + "车辆向右变道"->{ + "确认环境安全,车辆正在规划平稳向右变道,同时持续监测周边交通参与者动向,放心交给我们吧!" + } + "车辆完成变道"->{ + "变道完成啦,继续前进!小智持续守护您的行程。" + } + "车辆正在绕过前方障碍物"->{ + "发现前方障碍物,车辆正在规划平稳变道,即将画出一条完美弧线~" + } + "车辆正在避让前方障碍物"->{ + "发现前方障碍物,车辆正在规划平稳避让,诠释优雅与丝滑~" + } + "车辆完成绕障"->{ + "绕障完成啦,继续前进!小智持续守护您的行程。" + } + "路口等红灯"->{ + "车辆正在路口等红灯,可以安心放空望望窗外~小智一直在您身边哦!" + } + "车辆正在变道避让前方道路施工"->{ + "车辆正在提前规划变道避让前方道路施工,稳稳的很安心~您已体验到车路云一体化协同应用场景,是当之无愧的先锋体验官!" + } + "车辆正在绕行避让前方道路施工"->{ + "车辆正在提前规划绕行避让前方道路施工,稳稳的很安心~您已体验到车路云一体化协同应用场景,是当之无愧的先锋体验官!" + } + "车辆正在变道避让前方道路事故"->{ + "车辆正在提前规划变道避让前方道路事故,放心看我表现吧!您已体验到车路云一体化协同应用场景,小智为您欢呼!" + } + "车辆正在绕行避让前方道路事故"->{ + "车辆正在提前规划绕行避让前方道路事故,放心看我表现吧!您已体验到车路云一体化协同应用场景,小智为您欢呼!" + } + "车辆正在跟车通行"->{ + "车辆正在跟随前车通行,舒适度MAX~您已体验到车路云一体化协同应用场景,超越全国99%的乘客!" + } + "车辆正在绕行前方车龙"->{ + "车辆正在提前规划变道避让路口车龙,舒适度MAX~。您已体验到车路云一体化协同应用场景,超越全国99%的乘客!" + } + "车辆正在使用云端轨迹通行"->{ + "前方智慧路口内有障碍物,车辆正在使用云端规划轨迹通行。您已体验到车路云一体化协同应用场景,超越全国99%的乘客!" + } + "车辆正在避让后方来车"->{ + "车辆正在避让后方来车,耐心等几秒,安全比赶路更重要~" + } + else->{ + "" + } + } + } + +} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/data/RoadCrossRoamViewModel.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/data/RoadCrossRoamViewModel.kt new file mode 100644 index 0000000000..28e8a50d24 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/data/RoadCrossRoamViewModel.kt @@ -0,0 +1,65 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.mind.data + +import android.content.Context +import androidx.lifecycle.ViewModel +import com.mogo.commons.voice.AIAssist +import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.function.api.map.road.IMoGoMapRoadListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager +import com.mogo.eagle.core.function.call.autopilot.CallerServicesEventManager +import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager +import com.mogo.eagle.core.function.call.map.CallerMapIdentifyManager +import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.AIMessageManager +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.bean.AIMessage + +class RoadCrossRoamViewModel: ViewModel(), IMoGoMapRoadListener { + + companion object{ + const val TAG = "RoadCrossRoamViewModel" + } + + private lateinit var mContext: Context + + fun init(context: Context){ + CallerMapRoadListenerManager.addListener(TAG, this) + mContext = context + } + + override fun onCrossDevice(trigger: Boolean) { + super.onCrossDevice(trigger) + if(trigger){ + show() + } + } + + private fun show(){ + // 没有路线不做提示 + if (CallerAutoPilotStatusListenerManager.getLineId() == 0L) { + CallerLogger.d(TAG, "没有路线不做提示") + return + } + // 首页被遮挡不做提示 + if (!CallerHmiViewControlListenerManager.getMainPageVisible()) { + CallerLogger.d(TAG, "attachView return , mainPageVisible is false") + return + } + // 没有路侧设备,不做处理 + CallerLogger.d(TAG, "命中,attachView") + val cross = CallerMapRoadListenerManager.getCrossEndInfo() + if (cross.isNullOrEmpty()) { + CallerLogger.d(TAG, "未触发,路口ID:$cross") + return + } + if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){ + val disStr = "为您提供路口全息影像,助力出行" + AIAssist.getInstance(mContext).speakTTSVoiceWithLevel(disStr, AIAssist.NEW_LEVEL_2) + } + CallerServicesEventManager.updateServicesNum(CallerServicesEventManager.ServiceType.ROAD) + AIMessageManager.post(AIMessage.RoadCrossRoam(System.currentTimeMillis().toString(),"")) + } + +} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/data/RoadV2NEventViewModel.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/data/RoadV2NEventViewModel.kt new file mode 100644 index 0000000000..e12074b35b --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/mind/data/RoadV2NEventViewModel.kt @@ -0,0 +1,74 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.mind.data + +import androidx.lifecycle.ProcessLifecycleOwner +import androidx.lifecycle.ViewModel +import androidx.lifecycle.lifecycleScope +import com.mogo.commons.utils.MogoAnalyticUtils +import com.mogo.eagle.core.data.v2x.RoadV2NEventWindowBean +import com.mogo.eagle.core.function.api.hmi.v2n.IRoadV2NEventWindowListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager +import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager +import com.mogo.eagle.core.function.call.hmi.CallerRoadV2NEventWindowListenerManager +import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.AIMessageManager +import com.mogo.och.shuttle.weaknet.passenger.ui.mind.bean.AIMessage +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch + +class RoadV2NEventViewModel: ViewModel(), IRoadV2NEventWindowListener { + + companion object{ + const val TAG = "RoadV2NEventViewModel" + const val ANALYTICS_KEY = "hmi_road_event_window_view" + + fun trackEvent(msg: String) { + ProcessLifecycleOwner.get().lifecycleScope.launch(Dispatchers.IO) { + val map: MutableMap = HashMap() + map["msg"] = msg + MogoAnalyticUtils.track( + ANALYTICS_KEY, + map + ) + HmiActionLog.hmiAction(TAG, msg) + } + CallerLogger.i(TAG, msg) + } + } + + fun init(){ + CallerRoadV2NEventWindowListenerManager.addListener(TAG, this) + } + + override fun show(dataBean: RoadV2NEventWindowBean) { + trackEvent("show --> $dataBean") + val canShowV2NEventWindowView = CallerHmiViewControlListenerManager.getMainPageVisible() + if (!canShowV2NEventWindowView) { + trackEvent("show --> 当前不在高精地图页面,跳过") + return + } + val lineId = CallerAutoPilotStatusListenerManager.getLineId() + if (lineId <= 0) { + trackEvent("show --> 当前无订单,跳过") + return + } + val event = AIMessage.RoadV2NEvent( + dataBean.eventId, + dataBean.hintStr, + "", + dataBean.eventType, + dataBean.timestamp, + dataBean.iconResId, + false, + dataBean.contentImageUrl, + dataBean.cameraIp, + dataBean.lon, + dataBean.lat + ) + AIMessageManager.post(event) + } + + override fun dismiss(eventId: String) { + + } +} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/statusbar/M2StatusBarView.kt similarity index 63% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/statusbar/M2StatusBarView.kt index f46d22882d..2cb5390f56 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2StatusBarView.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/statusbar/M2StatusBarView.kt @@ -1,30 +1,29 @@ -package com.mogo.och.shuttle.weaknet.passenger.ui.widget +package com.mogo.och.shuttle.weaknet.passenger.ui.statusbar import android.annotation.* import android.content.Context -import android.graphics.Color import android.util.AttributeSet import android.view.LayoutInflater import android.view.ViewGroup import androidx.constraintlayout.widget.ConstraintLayout import chassis.ChassisStatesOuterClass import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisStatesListener -import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener -import com.mogo.eagle.core.function.api.setting.IMoGoSkinModeChangeListener import com.mogo.eagle.core.function.call.autopilot.CallerChassisStatesListenerManager -import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager -import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager -import com.mogo.eagle.core.function.call.setting.CallerSkinModeListenerManager +import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView import com.mogo.eagle.core.utilcode.kotlin.* +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.ClickUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils +import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.common.module.manager.bluetooth.BleManager import com.mogo.och.common.module.manager.loop.BizLoopManager +import com.mogo.och.common.module.utils.ResourcesUtils import com.mogo.och.shuttle.weaknet.passenger.R -import kotlinx.android.synthetic.main.shuttle_p_m2_view_status_bar.view.aciv_wait_ele +import com.mogo.och.shuttle.weaknet.passenger.callback.ICommonCallback +import com.mogo.och.shuttle.weaknet.passenger.model.CommonModel import kotlinx.android.synthetic.main.shuttle_p_m2_view_status_bar.view.iv_logon -import kotlinx.android.synthetic.main.shuttle_p_m2_view_status_bar.view.progress import kotlinx.android.synthetic.main.shuttle_p_m2_view_status_bar.view.tv_power_cos +import kotlinx.android.synthetic.main.shuttle_p_m2_view_status_bar.view.tv_status_line_name import kotlinx.coroutines.* import me.jessyan.autosize.utils.AutoSizeUtils @@ -34,8 +33,8 @@ import me.jessyan.autosize.utils.AutoSizeUtils */ class M2StatusBarView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null -) : ConstraintLayout(context, attrs), IViewControlListener, IMoGoSkinModeChangeListener, - IMoGoChassisStatesListener { +) : ConstraintLayout(context, attrs), + IMoGoChassisStatesListener, ICommonCallback { companion object { const val TAG = "M2StatusBarView" @@ -46,59 +45,70 @@ class M2StatusBarView @JvmOverloads constructor( init { LayoutInflater.from(context).inflate(R.layout.shuttle_p_m2_view_status_bar, this, true) - setBackgroundColor(Color.parseColor("#80FFFFFF")) + setBackgroundColor(ResourcesUtils.getColor(R.color.white)) isClickable = true isFocusable = true + iv_logon.setOnLongClickListener { + context?.let { + ToggleDebugView.toggleDebugView.toggle(it) + } + true + } } @SuppressLint("ClickableViewAccessibility") override fun onAttachedToWindow() { super.onAttachedToWindow() + + CallerLogger.d(TAG,"onAttachedToWindow-------${this}") + post { val params: ViewGroup.LayoutParams = getLayoutParams() - params.height = AutoSizeUtils.dp2px(context,60f) + params.height = AutoSizeUtils.dp2px(context,100f) layoutParams = params } - //添加view控制 - CallerHmiViewControlListenerManager.addListener(TAG,this) - // 添加换肤监听 - CallerSkinModeListenerManager.addListener(TAG, this) + //电量 CallerChassisStatesListenerManager.addListener(TAG,this) + CommonModel.setRouteLineInfoCallback(TAG,this) - progress?.also { - it.progress = 0 - aciv_wait_ele.visibility = VISIBLE - } tv_power_cos?.also { - it.text = "检测中" - } - iv_logon.onClick { - BizLoopManager.runInMainThread{ - BleManager.scanLeDevice() - } + it.text = "?" } + tv_power_cos.onClick { BizLoopManager.runInIoThread { BleManager.sendData2Wx("1889480", "00,${System.currentTimeMillis()}") } } + } - override fun onSkinModeChange(skinMode: Int) { - when (skinMode) { - 0 -> setStatusBarDarkOrLight(false) - 1 -> setStatusBarDarkOrLight(true) + override fun updateLineInfo(lineName: String?) { + post { + CallerLogger.d(TAG,"updateLineInfo2-------${lineName}----${this}") + if(lineName==null){ + tv_status_line_name.setText(R.string.m2_line_name_detaile) + }else{ + tv_status_line_name.text = lineName + } + } + } + + override fun showNoTaskView(isTrue: Boolean) { + BizLoopManager.runInMainThread { + CallerLogger.d(TAG,"updateLineInfo1-------${isTrue}----${this}") + if(isTrue) { + tv_status_line_name.setText(R.string.m2_line_name_detaile) + } } } override fun onDetachedFromWindow() { super.onDetachedFromWindow() - CallerHmiViewControlListenerManager.removeListener(TAG) - CallerSkinModeListenerManager.removeListener(TAG) CallerChassisStatesListenerManager.removeListener(TAG) - CallerDevaToolsManager.hideStatusBar() + CommonModel.setRouteLineInfoCallback(TAG,null) } @SuppressLint("SetTextI18n") @@ -112,14 +122,11 @@ class M2StatusBarView @JvmOverloads constructor( if (oldBmsSoc != bmsSoc ) { scope.launch { if(bmsSoc >1){ - progress?.also { it.progress = bmsSoc.toInt() } tv_power_cos?.also { it.text = "${bmsSoc.toInt()}%" } }else{ val power = (bmsSoc * 100).toInt() - progress?.also { it.progress = power } tv_power_cos?.also {it.text = "$power%" } } - aciv_wait_ele.visibility = GONE } } } finally { diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2PTrafficLightView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2PTrafficLightView.kt similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2PTrafficLightView.kt rename to OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2PTrafficLightView.kt diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/OchMapBizPView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/OchMapBizPView.kt new file mode 100644 index 0000000000..5cf9c44760 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/OchMapBizPView.kt @@ -0,0 +1,19 @@ +package com.mogo.och.shuttle.weaknet.passenger.ui.widget + +import android.content.Context +import android.util.AttributeSet +import com.mogo.eagle.core.function.view.MapBizView +import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider +import me.jessyan.autosize.utils.AutoSizeUtils + +class OchMapBizPView(context: Context?, attrs: AttributeSet?) : MapBizView(context, attrs) { + + + override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { + super.onSizeChanged(w, h, oldw, oldh) + this.outlineProvider = + TextureVideoViewOutlineProvider(AutoSizeUtils.dp2px(context, 36f).toFloat()) + this.clipToOutline = true + } + +} diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/ShuttlePassengerProvider.kt b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/ShuttlePassengerProvider.kt index f3bc73e05e..b4ed489ec3 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/ShuttlePassengerProvider.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/ShuttlePassengerProvider.kt @@ -9,17 +9,15 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.eagle.core.utilcode.util.DeviceUtils import com.mogo.eagle.core.utilcode.util.MultiDisplayUtils -import com.mogo.och.bridge.ui.autopilot.AutopilotState import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.biz.provider.CommonServiceImpl -import com.mogo.och.common.module.biz.scanner.ScannerManager import com.mogo.och.common.module.voice.OutOffVoice import com.mogo.och.common.module.wigets.media.MediaPlayerActivity import com.mogo.och.shuttle.weaknet.passenger.model.TicketModel import com.mogo.och.shuttle.weaknet.passenger.ui.widget.BusPStatusBarView import com.mogo.och.shuttle.weaknet.passenger.ui.BusPassengerRouteFragment import com.mogo.och.shuttle.weaknet.passenger.ui.PM2BaseFragment -import com.mogo.och.shuttle.weaknet.passenger.ui.widget.M2StatusBarView +import com.mogo.och.shuttle.weaknet.passenger.ui.statusbar.M2StatusBarView /** * 网约车-Bus-乘客端 diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/callback/ICommonCallback.java b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/callback/ICommonCallback.java index 4a39fa1348..e0b6371ea9 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/callback/ICommonCallback.java +++ b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/callback/ICommonCallback.java @@ -9,16 +9,16 @@ import java.util.List; * @date: 2022/4/6 */ public interface ICommonCallback { - void updateLineInfo(String lineName); - void updateStationsInfo(List stations, int currentStationIndex, boolean isArrived); - void updateSpeed(int location); - void updateRemainMT(long meters, long timeInSecond); - void showNoTaskView(boolean isTrue); + default void updateLineInfo(String lineName){} + default void updateStationsInfo(List stations, int currentStationIndex, boolean isArrived){} + default void updateSpeed(int location){} + default void updateRemainMT(long meters, long timeInSecond){} + default void showNoTaskView(boolean isTrue){} /** * false: 未开启自驾, true : 开启自驾 */ - void updateAutoStatus(boolean isOpen); + default void updateAutoStatus(boolean isOpen){} default void updateLineStations(List stations){} diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/CommonModel.kt b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/CommonModel.kt index b030798c80..d8f10eab4d 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/CommonModel.kt +++ b/OCH/shuttle/passenger_weaknet/src/main/java/com/mogo/och/shuttle/weaknet/passenger/model/CommonModel.kt @@ -25,6 +25,7 @@ import com.mogo.och.bridge.autopilot.location.OchLocationManager import com.mogo.och.bridge.distance.IDistanceListener import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager import com.mogo.och.common.module.biz.birdge.BridgeManager +import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.manager.download.DownloadManager import com.mogo.och.common.module.manager.socket.cloud.OCHSocketMessageManager import com.mogo.och.common.module.manager.socket.lan.ILanMessageListener @@ -55,7 +56,7 @@ object CommonModel { var mContext: Context? = null - private var mCommonCallback: ICommonCallback? = null // bus路线信息更新 + private var mCommonCallbackList = mutableMapOf() var mStations = mutableListOf() var mNextStationIndex = 0 // A-B要到达站的index @@ -99,11 +100,16 @@ object CommonModel { LanSocketManager.unRegisterSocketMessageListener(DPMsgType.TYPE_TASK_DETAILS.type, typeTaskDetails) LoginLanPassengerSocket.removeListener(TAG) cleanStation("release") + this.mCommonCallbackList.clear() } - fun setRouteLineInfoCallback(callback: ICommonCallback?) { - this.mCommonCallback = callback + fun setRouteLineInfoCallback(tag:String,callback: ICommonCallback?) { + if(callback==null){ + this.mCommonCallbackList.remove(tag) + return + } + this.mCommonCallbackList[tag] = callback } @@ -141,19 +147,25 @@ object CommonModel { mNextStationIndex >= 0 && mNextStationIndex <= mStations.size - 1 && isGoingToNextStation ){ - mCommonCallback?.updateAutoStatus(true) + mCommonCallbackList.forEach { + it.value.updateAutoStatus(true) + } }else{//非美化模式下 - mCommonCallback?.updateAutoStatus(false) + mCommonCallbackList.forEach { + it.value.updateAutoStatus(false) + } } }else{//自驾状态 2 - mCommonCallback?.updateAutoStatus(true) + mCommonCallbackList.forEach { + it.value.updateAutoStatus(true) + } } } } private val trajectoryListener: IDistanceListener = object : IDistanceListener { override fun distanceCallback(distance: Float) { - val lastTime = distance / BusPassengerConst.BUS_AVERAGE_SPEED * 3.6 //秒 + val lastTime = distance / OchCommonConst.BUS_AVERAGE_SPEED * 3.6 //秒 d(TAG, "轨迹排查==lastSumLength = $distance") if (routesResult != null) { for (site in routesResult!!.sites) { @@ -172,10 +184,12 @@ object CommonModel { } } } - mCommonCallback?.updateRemainMT( - distance.toLong(), - lastTime.toLong() - ) + mCommonCallbackList.forEach { + it.value.updateRemainMT( + distance.toLong(), + lastTime.toLong() + ) + } } } @@ -226,7 +240,9 @@ object CommonModel { mNextStationIndex = 0 cleanStation("queryDriverSiteByCoordinate") isGoingToNextStation = false - mCommonCallback?.showNoTaskView(true) + mCommonCallbackList.forEach { + it.value.showNoTaskView(true) + } } @@ -238,20 +254,26 @@ object CommonModel { if (routesResult != null && routesResult!!.lineId != result.lineId) { d(TAG, "lineId change= clearCustomPolyline") - mCommonCallback?.clearCustomPolyline() + mCommonCallbackList.forEach { + it.value.clearCustomPolyline() + } } - d(TAG, "queryDriverSiteByCoordinate = update") + d(TAG, "queryDriverSiteByCoordinate = update ${result}") routesResult = result if (result.sites != null) { - mCommonCallback?.updateLineInfo(result.name) - mCommonCallback?.showNoTaskView(false) + mCommonCallbackList.forEach { + it.value.updateLineInfo(result.name) + it.value.showNoTaskView(false) + } if (result.sites != null) { val stations = result.sites mStations.clear() mStations.addAll(stations) - mCommonCallback?.updateLineStations(mStations) + mCommonCallbackList.forEach { + it.value.updateLineStations(mStations) + } for (i in stations.indices) { val station = stations[i] if(station.drivingStatus == BusPassengerConst.STATION_STATUS_STOPPED){ @@ -259,7 +281,9 @@ object CommonModel { if (station.isLeaving && i + 1 < stations.size ) { isGoingToNextStation = true - mCommonCallback?.updateStationsInfo(stations, i + 1, false) + mCommonCallbackList.forEach { + it.value.updateStationsInfo(stations, i + 1, false) + } mNextStationIndex = i + 1 val startStation = mStations[i] val endStation = mStations[i + 1] @@ -272,7 +296,9 @@ object CommonModel { } isGoingToNextStation = false Logger.d(TAG, "order = station= arrive") - mCommonCallback?.updateStationsInfo(stations, i, true) + mCommonCallbackList.forEach { + it.value.updateStationsInfo(stations, i, true) + } return } } @@ -411,6 +437,8 @@ object CommonModel { // km/h val speedKM = (abs(mogoLocation.gnssSpeed) * 3.6f).toInt() - mCommonCallback?.updateSpeed(speedKM) + mCommonCallbackList.forEach { + it.value.updateSpeed(speedKM) + } } } \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2ADASPresenter.kt b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2ADASPresenter.kt deleted file mode 100644 index 19f68964c6..0000000000 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2ADASPresenter.kt +++ /dev/null @@ -1,41 +0,0 @@ -package com.mogo.och.shuttle.weaknet.passenger.presenter - -import androidx.lifecycle.LifecycleOwner -import com.mogo.commons.mvp.Presenter -import com.mogo.och.shuttle.weaknet.passenger.callback.ADASCallback -import com.mogo.och.shuttle.weaknet.passenger.constant.M2Const.Companion.M2_MAP_STATION_MAKER -import com.mogo.och.shuttle.weaknet.passenger.model.PM2ADASModel -import com.mogo.och.shuttle.weaknet.passenger.ui.PM2HPMapFragment - -class PM2ADASPresenter(view: PM2HPMapFragment?) : - Presenter(view), ADASCallback { - - init { - PM2ADASModel.INSTANCE.init(context) - initListener() - } - - private fun initListener() { - PM2ADASModel.INSTANCE.setAdasCallback(this) - } - - private fun removeListener() { - PM2ADASModel.INSTANCE.setAdasCallback(null) - } - - override fun onDestroy(owner: LifecycleOwner) { - super.onDestroy(owner) - removeListener() - } - - override fun updateHDMapStations(stations: MutableList>) { - for (i in stations.indices){ - mView?.setMapMaker(M2_MAP_STATION_MAKER+i,stations[i]) - } - - } - - override fun removeHDMapStations() { - mView?.removeMapMaker(M2_MAP_STATION_MAKER) - } -} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2DrivingPresenter.kt b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2DrivingPresenter.kt deleted file mode 100644 index b82b61eef0..0000000000 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/presenter/PM2DrivingPresenter.kt +++ /dev/null @@ -1,124 +0,0 @@ -package com.mogo.och.shuttle.weaknet.passenger.presenter - -import androidx.lifecycle.LifecycleOwner -import com.amap.api.maps.model.LatLng -import com.mogo.commons.mvp.Presenter -import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.shuttle.weaknet.passenger.model.PM2ADASModel -import com.mogo.och.shuttle.weaknet.passenger.ui.PM2DrivingInfoFragment -import com.mogo.och.data.bean.BusStationBean -import com.mogo.och.shuttle.weaknet.passenger.callback.ICommonCallback -import com.mogo.och.shuttle.weaknet.passenger.model.CommonModel - -class PM2DrivingPresenter(view: PM2DrivingInfoFragment?) : - Presenter(view), - ICommonCallback { - - init { - CommonModel.init(context) - PM2ADASModel.INSTANCE.init(context) - initListener() - } - - override fun onDestroy(owner: LifecycleOwner) { - super.onDestroy(owner) - destroyListener() - CommonModel.releaseListeners() - } - - private fun initListener(){ - CommonModel.setRouteLineInfoCallback(this) - } - - private fun destroyListener(){ - CommonModel.setRouteLineInfoCallback(null) - } - - override fun updateSpeed(speed: Int) { -// CallerLogger.d( -// SceneConstant.M_BUS_P + "speed = ",speed.toString() -// ) - ThreadUtils.runOnUiThread { - mView?.updateSpeed(speed) - } - } - - override fun updateLineInfo(lineName: String) { - ThreadUtils.runOnUiThread { - mView?.updateTaskName(lineName) - } - } - - override fun updateRemainMT(meters: Long, timeInSecond: Long) { - ThreadUtils.runOnUiThread { - mView?.updateRemainMT(meters, timeInSecond) //米,秒 - } - } - - override fun showNoTaskView(isTrue: Boolean) { - ThreadUtils.runOnUiThread { - mView?.showNoTaskView(!isTrue) - } - if (isTrue){ - PM2ADASModel.INSTANCE.removeHDMapStations() - } - } - - override fun updateLineStations(stations: MutableList) { - - val stationsList = mutableListOf() - val stationsListPass = mutableListOf() - var startStation: LatLng? = null - var endStation: LatLng? = null - - for (i in stations.indices){ - val station = stations[i] - val latLng = LatLng(station.gcjLat,station.gcjLon) - if(i==0){ - startStation = latLng - continue - } - if(i==stations.size-1){ - endStation = latLng - continue - } - if(station.drivingStatus==1){//行驶信息,0初始值;1已经过;2当前站;3未到站 - stationsListPass.add(latLng) - }else if(station.drivingStatus==2){ - if(station.isLeaving){ - stationsListPass.add(latLng) - }else{ - stationsList.add(latLng) - } - }else{ - stationsList.add(latLng) - } - - } - - ThreadUtils.runOnUiThread { - mView?.updateLineStations(stationsList,stationsListPass,startStation,endStation) - } - PM2ADASModel.INSTANCE.updateHDMapStations(stations) - } - - override fun updateStationsInfo(stations: MutableList, i: Int, isArrived: Boolean) { - ThreadUtils.runOnUiThread { - mView?.updateStationsInfo(stations,i,isArrived) - } - } - - override fun clearCustomPolyline() { - ThreadUtils.runOnUiThread { - mView?.clearCustomPolyline() - } - } - - override fun updateAutoStatus(isOpen: Boolean) { - ThreadUtils.runOnUiThread { - mView?.updateAutoStatus(isOpen) - } - } - - -} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2BaseFragment.kt b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2BaseFragment.kt deleted file mode 100644 index 40dcabd118..0000000000 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2BaseFragment.kt +++ /dev/null @@ -1,96 +0,0 @@ -package com.mogo.och.shuttle.weaknet.passenger.ui - -import android.view.View -import android.view.ViewGroup -import android.widget.FrameLayout -import com.mogo.commons.mvp.MvpFragment -import com.mogo.eagle.core.utilcode.util.AppUtils -import com.mogo.och.common.module.biz.media.MediaManager -import com.mogo.och.common.module.manager.loop.BizLoopManager -import com.mogo.och.common.module.manager.transform.OchTransform -import com.mogo.och.common.module.manager.transform.OchTransformDispatch -import com.mogo.och.shuttle.weaknet.passenger.R -import com.mogo.och.shuttle.weaknet.passenger.presenter.PM2Presenter -import com.mogo.och.common.module.wigets.media.MediaPlayerFragment -import kotlinx.android.synthetic.main.shuttle_p_m2_fragment.tv_shuttle_b2_p_version -import kotlinx.android.synthetic.main.shuttle_p_m2_fragment.video_fragment - - -/** - * @author: wangmingjun - * @date: 2022/4/12 - */ -class PM2BaseFragment : - MvpFragment() { - - private var drivingFragment : PM2DrivingInfoFragment? = null - private var hdMapFragment : PM2HPMapFragment? = null - private var mediaFragment : MediaPlayerFragment? = null - - private val ochTransform = object : OchTransformDispatch{ - override fun setVideoView(target: View?) { - super.setVideoView(target) - if(target!=null){ - BizLoopManager.runInMainThread{ - target.id = R.id.video_show - val params = FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,ViewGroup.LayoutParams.MATCH_PARENT) - video_fragment.addView(target,params) - MediaManager.setMediaPause() - } - }else{ - BizLoopManager.runInMainThread{ - findViewById(R.id.video_show)?.let { - video_fragment.removeView(it) - MediaManager.setMediaResume() - } - } - } - } - } - - override fun getLayoutId(): Int { - return R.layout.shuttle_p_m2_fragment - } - - override fun getTagName(): String { - return TAG - } - - override fun initViews() { - tv_shuttle_b2_p_version.text = "版本:${AppUtils.getAppVersionName()}" - //隐藏小地图 - initFragment() - OchTransform.addListener(TAG,ochTransform) - } - - override fun onDestroy() { - OchTransform.removeListener(TAG) - super.onDestroy() - } - - /** - * 初始化行程信息,高静地图,宣传 三个fragment - */ - private fun initFragment() { - - if (drivingFragment == null) drivingFragment = PM2DrivingInfoFragment() - childFragmentManager.beginTransaction().add(R.id.driving_fragment, drivingFragment!!) - .show(drivingFragment!!).commitAllowingStateLoss() - - if (hdMapFragment == null) hdMapFragment = PM2HPMapFragment() - childFragmentManager.beginTransaction().add(R.id.hd_map_fragment, hdMapFragment!!) - .show(hdMapFragment!!).commitAllowingStateLoss() - - if (mediaFragment == null) mediaFragment = MediaPlayerFragment() - childFragmentManager.beginTransaction().add(R.id.video_fragment, mediaFragment!!) - .show(mediaFragment!!).commitAllowingStateLoss() - } - - override fun createPresenter(): PM2Presenter { - return PM2Presenter(this) - } - - companion object { - public val TAG = PM2BaseFragment::class.java.simpleName - } -} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2DrivingInfoFragment.kt b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2DrivingInfoFragment.kt deleted file mode 100644 index fd866061b2..0000000000 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2DrivingInfoFragment.kt +++ /dev/null @@ -1,285 +0,0 @@ -package com.mogo.och.shuttle.weaknet.passenger.ui - -import android.graphics.BitmapFactory -import android.graphics.drawable.AnimationDrawable -import android.os.Bundle -import android.view.View -import androidx.core.content.ContextCompat -import com.amap.api.maps.model.LatLng -import com.mogo.commons.AbsMogoApplication -import com.mogo.commons.mvp.MvpFragment -import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView -import com.mogo.eagle.core.function.view.SiteMarkerBean -import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider -import com.mogo.och.shuttle.weaknet.passenger.R -import com.mogo.och.shuttle.weaknet.passenger.presenter.PM2DrivingPresenter -import com.mogo.och.common.module.utils.NumberFormatUtil -import com.mogo.och.common.module.utils.ResourcesUtils -import com.mogo.och.data.bean.BusStationBean -import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.auto_tv -import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.clg_distance_left_time -import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.group_not_select_line -import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.group_stationinfo -import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.iv_animal_list -import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.line_name_tv -import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.overMapView -import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.speed_tv -import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.station_name_tv -import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.tv_arrived_notice -import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.tv_distance -import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.tv_left_time -import kotlinx.android.synthetic.main.shuttle_p_m2_driving_info_fragment.tv_next_station_title - -import me.jessyan.autosize.utils.AutoSizeUtils -import kotlin.math.ceil -import kotlin.math.roundToInt - -/** - * @author: wangmingjun - * @date: 2022/4/12 - */ -class PM2DrivingInfoFragment : - MvpFragment() { - - private val stationIcon = BitmapFactory.decodeResource( - AbsMogoApplication.getApp().resources, - R.drawable.shuttle_p_m2_map_staton_icon - ) - private val stationPassIcon = BitmapFactory.decodeResource( - AbsMogoApplication.getApp().resources, - R.drawable.shuttle_p_m2_map_staton_arrived_icon - ) - private val startStationIcon = BitmapFactory.decodeResource( - AbsMogoApplication.getApp().resources, - R.drawable.shuttle_p_m2_map_start_icon - ) - private val endStationIcon = BitmapFactory.decodeResource( - AbsMogoApplication.getApp().resources, - R.drawable.shuttle_p_m2_map_end_icon - ) - - - override fun getLayoutId(): Int { - return R.layout.shuttle_p_m2_driving_info_fragment - } - - override fun getTagName(): String { - return TAG - } - - override fun initViews() { - speed_tv.setOnLongClickListener { - context?.let { ToggleDebugView.toggleDebugView.toggle(it) } - true - } - - line_name_tv.setTextColor(ResourcesUtils.getColor(R.color.shuttle_p_m2_line_name_tv_color)) - station_name_tv.setTextColor(ResourcesUtils.getColor(R.color.shuttle_p_m2_line_name_tv_color)) - speed_tv.setVertrial(true) - val intArrayOf = intArrayOf( - ResourcesUtils.getColor(R.color.shuttle_p_m2_color_43cefe), - ResourcesUtils.getColor(R.color.shuttle_p_m2_color_1466fb), - ) - speed_tv.setmColorList(intArrayOf) - } - - override fun initViews(savedInstanceState: Bundle?) { - super.initViews(savedInstanceState) - overMapView?.let { - it.onCreateView(savedInstanceState) - val radius = AutoSizeUtils.dp2px(requireContext(), 16f) - it.outlineProvider = TextureVideoViewOutlineProvider(radius.toFloat()) - it.clipToOutline = true - } - } - - override fun onResume() { - super.onResume() - overMapView?.onResume() - } - - override fun onPause() { - super.onPause() - overMapView?.onPause() - } - - override fun onDestroyView() { - overMapView?.onDestroy() - mPresenter?.onDestroy(this) - super.onDestroyView() - } - - fun updateSpeed(speed: Int) { - speed_tv.text = speed.toString() - } - - fun updateTaskName(name: String) { - line_name_tv.text = name - } - - fun showNoTaskView(haveTask: Boolean) { - setLineInfoView(haveTask) - } - - private fun setLineInfoView(isShow: Boolean) { - if (!isShow) { - updateNoOrderUI() - } - } - - private fun updateNoOrderUI() { - line_name_tv.text = resources.getString(R.string.shuttle_p_m2_not_select_line_content) - updateNoStationView() - overMapView?.clearSiteMarkers() - clearCustomPolyline() - } - - fun clearCustomPolyline() { - overMapView?.clearCustomPolyline() - } - - private fun updateNoStationView() { - station_name_tv.setTextColor(ResourcesUtils.getColor(R.color.shuttle_p_m2_next_tv_color)) - station_name_tv.text = resources.getString(R.string.shuttle_p_m2_empty_tv) - tv_distance.text = resources.getString(R.string.shuttle_p_m2_empty_remain_km) - tv_left_time.text = resources.getString(R.string.shuttle_p_m2_empty_remain_minute) - noLineShow() - } - - override fun createPresenter(): PM2DrivingPresenter { - return PM2DrivingPresenter(this) - } - - fun updateAutoStatus(isAutoPilot: Boolean) { - if (isAutoPilot) { - context?.let { - auto_tv.setTextColor( - ContextCompat.getColor( - it, - R.color.shuttle_p_m2_white_color - ) - ) - } - context?.let { - auto_tv.background = - ContextCompat.getDrawable(it, R.drawable.shuttle_p_m2_auto_button_bg) - } - } else { - context?.let { - auto_tv.setTextColor( - ContextCompat.getColor( - it, - R.color.shuttle_p_m2_color_7094ad - ) - ) - } - context?.let { - auto_tv.background = - ContextCompat.getDrawable(it, R.drawable.shuttle_p_m2_bg_p_m2_auto) - } - } - } - - fun updateLineStations( - stations: MutableList, - stationsPass: MutableList, - startStation: LatLng?, - endStation: LatLng? - ) { - overMapView?.let { - val stationsList: MutableList = mutableListOf() - startStation?.let { start -> - stationsList.add(SiteMarkerBean(start, startStationIcon, 0.5f, 0.5f)) - } - for (stationPass in stationsPass) { - stationsList.add(SiteMarkerBean(stationPass, stationPassIcon, 0.5f, 0.5f)) - } - for (stationPass in stations) { - stationsList.add(SiteMarkerBean(stationPass, stationIcon, 0.5f, 0.5f)) - } - endStation?.let { end -> - stationsList.add(SiteMarkerBean(end, endStationIcon, 0.5f, 0.5f)) - } - it.drawSiteMarkers(stationsList) - } - } - - fun updateStationsInfo(stations: MutableList, i: Int, isArrived: Boolean) { - if (stations.size == 0) return - if (0 <= i && i < stations.size) { - station_name_tv.setTextColor(ResourcesUtils.getColor(R.color.shuttle_p_m2_next_tv_color)) - station_name_tv.text = stations[i].name - } - if (isArrived) {//到站 - tv_distance.text = resources.getString(R.string.shuttle_p_m2_empty_remain_km) - tv_left_time.text = resources.getString(R.string.shuttle_p_m2_empty_remain_minute) - tv_next_station_title.text = - resources.getString(R.string.shuttle_p_m2_station_title_arrived_tv) - haveLineAndArrivedStation() - } else { //前往目的地中 - tv_next_station_title.text = - resources.getString(R.string.shuttle_p_m2_next_station_title) - haveLineAndArriveingStation() - } - } - - /** - * 剩余里程和时间 - */ - fun updateRemainMT(meters: Long, timeInSecond: Long) { //米。秒 - var disUnit = "公里" - var remainDis: String? = "0" - - if (meters > 0) { - if (meters / 1000 < 1) { - disUnit = "米" - remainDis = meters.toFloat().roundToInt().toString() - } else { - disUnit = "公里" - remainDis = NumberFormatUtil.formatLong(meters.toDouble() / 1000) - } - } - - val time = ceil(timeInSecond / 60f).toInt() - - "$remainDis$disUnit".also { tv_distance.text = it } - "${time}分钟".also { tv_left_time.text = it } - } - - fun noLineShow() { - // 没有线路展示 - group_not_select_line.visibility = View.VISIBLE - // 下一个站点 - group_stationinfo.visibility = View.GONE - // 距离和剩余大概时间 - clg_distance_left_time.visibility = View.GONE - // 到达站点 - tv_arrived_notice.visibility = View.GONE - - iv_animal_list.visibility = View.GONE - } - - // 有线路正在到站点 - fun haveLineAndArriveingStation() { - group_not_select_line.visibility = View.GONE - group_stationinfo.visibility = View.VISIBLE - clg_distance_left_time.visibility = View.VISIBLE - tv_arrived_notice.visibility = View.GONE - iv_animal_list.visibility = View.GONE - } - - // 有线路到达站点 - private fun haveLineAndArrivedStation() { - group_not_select_line.visibility = View.GONE - group_stationinfo.visibility = View.VISIBLE - clg_distance_left_time.visibility = View.GONE - tv_arrived_notice.visibility = View.VISIBLE - iv_animal_list.visibility = View.VISIBLE - val animationDrawable = iv_animal_list.drawable as AnimationDrawable - animationDrawable.start() - } - - companion object { - private val TAG = PM2DrivingInfoFragment::class.java.simpleName - } -} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2HPMapFragment.kt b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2HPMapFragment.kt deleted file mode 100644 index 320a50e208..0000000000 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/PM2HPMapFragment.kt +++ /dev/null @@ -1,128 +0,0 @@ -package com.mogo.och.shuttle.weaknet.passenger.ui - -import android.os.Bundle -import com.mogo.commons.mvp.MvpFragment -import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d -import com.mogo.map.overlay.core.Level -import com.mogo.map.overlay.point.Point -import com.mogo.map.MapDataWrapper -import com.mogo.och.shuttle.weaknet.passenger.R -import com.mogo.och.shuttle.weaknet.passenger.constant.M2Const.Companion.TYPE_MARKER_M2_LINE -import com.mogo.och.shuttle.weaknet.passenger.presenter.PM2ADASPresenter -import com.mogo.och.common.module.utils.OCHThreadPoolManager -import kotlinx.android.synthetic.main.shuttle_p_m2_hpmap_fragment.mHomeView - -import java.util.* - -/** - * @author: wangmingjun - * @date: 2022/4/12 - */ -class PM2HPMapFragment : - MvpFragment() { - /** - * 改变自动驾驶状态 - * - * @param status 2 - running 1 - enable 2 - disable - */ - override fun getLayoutId(): Int { - return R.layout.shuttle_p_m2_hpmap_fragment - } - - override fun getTagName(): String { - return TAG - } - - override fun initViews() { - } - - override fun initViews(savedInstanceState: Bundle?) { - super.initViews(savedInstanceState) - mHomeView.onCreate(savedInstanceState) - } - - override fun onResume() { - super.onResume() - mHomeView.onResume() - } - - override fun onLowMemory() { - super.onLowMemory() - mHomeView.onLowMemory() - } - - override fun onSaveInstanceState(outState: Bundle) { - super.onSaveInstanceState(outState) - mHomeView.onSaveInstanceState(outState) - } - - override fun onPause() { - super.onPause() - mHomeView.onPause() - } - - override fun onDestroyView() { - mHomeView.onDestroy() - super.onDestroyView() - } - - override fun createPresenter(): PM2ADASPresenter { - return PM2ADASPresenter(this) - } - - companion object { - private val TAG = PM2HPMapFragment::class.java.simpleName - } - - fun setMapMaker( - uuid: String, - station: MutableList, - ) { - //开启线程执行起终点marker设置 - val setMapMarkerRunnable = Runnable { - d( - "setMapMaker= " + Thread.currentThread().name, - uuid + "=latitude=" + station[1] + ",longitude=" + station[0] - ) - - val builder = Point.Options.Builder( - TYPE_MARKER_M2_LINE, - Level.MAP_MARKER - ) - .setId(uuid) - .anchor(0.5f, 0.5f) - .set3DMode(true) - .isUseGps(true) - .controlAngle(true) - .icon3DRes(R.raw.star_marker) - .longitude(station[0]) - .latitude(station[1]) - MapDataWrapper.getCenterLineInfo( - station[0], station[1], -1f - ) { - // 有可能鹰眼map为空没有角度。判空使用后可能造成maker角度跟道路角度不一致 地图未初始化会返回空 - it?.let{ - builder.rotate(it.angle.toFloat()) - } - val overlayManager = CallerMapUIServiceManager.getOverlayManager() - overlayManager?.showOrUpdatePoint(builder.build()) - } - - } - OCHThreadPoolManager.getsInstance().execute(setMapMarkerRunnable) - } - - fun removeMapMaker( - uuid: String, - ) { - //开启线程移除起终点marker设置 - val removeMapMarkerRunnable = Runnable { - d("RemoveMapMaker=" + Thread.currentThread().name, uuid) - val overlayManager = CallerMapUIServiceManager.getOverlayManager() - overlayManager?.removeAllPointsInOwner(TYPE_MARKER_M2_LINE) - } - OCHThreadPoolManager.getsInstance().execute(removeMapMarkerRunnable) - } - -} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2BlueToothView.kt b/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2BlueToothView.kt deleted file mode 100644 index ac7550b0d4..0000000000 --- a/OCH/shuttle/passenger_weaknet/src/main/java/m2/com/mogo/och/shuttle/weaknet/passenger/ui/widget/M2BlueToothView.kt +++ /dev/null @@ -1,36 +0,0 @@ -package com.mogo.och.shuttle.weaknet.passenger.ui.widget - -import android.content.Context -import android.util.AttributeSet -import android.view.LayoutInflater -import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener -import com.mogo.eagle.core.function.hmi.ui.widget.BlueToothView -import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.och.shuttle.weaknet.passenger.R -import kotlinx.android.synthetic.main.shuttle_p_m2_view_blue_tooth.view.blueView - -/** - * 魔戒蓝牙控件 - * 放置于StatusBar右侧位置 - */ -class M2BlueToothView @JvmOverloads constructor( - context: Context, - attrs: AttributeSet? = null, - defStyleAttr: Int = 0 -) : BlueToothView(context, attrs, defStyleAttr),IMoGoDevaToolsListener { - - init { - LayoutInflater.from(context).inflate(R.layout.shuttle_p_m2_view_blue_tooth, this, true) - } - - override fun mofangStatus(status: Boolean) { - ThreadUtils.runOnUiThread { - if (status) { - blueView.setImageResource(R.drawable.shuttle_p_m2_blue_tooth_close) - } else { - blueView.setImageResource(R.drawable.shuttle_p_m2_blue_tooth_open) - } - } - } - -} \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_arrive_line_blue.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_arrive_line_blue.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_arrive_line_blue.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_arrive_line_blue.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_arrive_line_green.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_arrive_line_green.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_arrive_line_green.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_arrive_line_green.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_auto_close.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_auto_close.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_auto_close.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_auto_close.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_auto_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_auto_open.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_auto_open.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_auto_open.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bg_arrived_station.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_bg_arrived_station.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bg_arrived_station.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_bg_arrived_station.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bg_end_tag_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_bg_end_tag_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bg_end_tag_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_bg_end_tag_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bg_start_tag_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_bg_start_tag_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bg_start_tag_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_bg_start_tag_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_blue_tooth_close.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_blue_tooth_close.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_blue_tooth_close.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_blue_tooth_close.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_blue_tooth_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_blue_tooth_open.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_blue_tooth_open.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_blue_tooth_open.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bus_line_logo.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_bus_line_logo.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_bus_line_logo.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_bus_line_logo.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_cur_station_arrived_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_cur_station_arrived_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_cur_station_arrived_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_cur_station_arrived_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_cur_station_un_arrived_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_cur_station_un_arrived_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_cur_station_un_arrived_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_cur_station_un_arrived_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_light_green_nor.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_light_green_nor.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_light_green_nor.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_light_green_nor.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_light_red_nor.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_light_red_nor.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_light_red_nor.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_light_red_nor.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_light_yellow_nor.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_light_yellow_nor.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_light_yellow_nor.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_light_yellow_nor.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_line_blue.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_line_blue.png old mode 100755 new mode 100644 similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_line_blue.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_line_blue.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_line_green.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_line_green.png old mode 100755 new mode 100644 similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_line_green.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_line_green.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_arrived_point.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_arrived_point.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_arrived_point.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_arrived_point.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_arrow_arrived.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_arrow_arrived.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_arrow_arrived.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_arrow_arrived.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_arrow_un_arrive.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_arrow_un_arrive.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_arrow_un_arrive.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_arrow_un_arrive.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_car.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_car.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_car.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_car.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_end_point.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_end_point.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_end_point.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_end_point.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_start_point.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_start_point.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_start_point.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_start_point.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_unarrived_point.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_unarrived_point.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_map_unarrived_point.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_map_unarrived_point.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_no_order_data.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_no_order_data.png old mode 100755 new mode 100644 similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_no_order_data.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_no_order_data.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_point_blue.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_point_blue.png old mode 100755 new mode 100644 similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_point_blue.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_point_blue.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_point_gray.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_point_gray.png old mode 100755 new mode 100644 similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_point_gray.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_point_gray.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_right_route_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_right_route_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_right_route_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_right_route_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_route_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_route_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_route_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_route_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_0.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_0.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_0.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_0.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_1.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_1.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_1.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_1.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_2.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_2.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_2.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_speak_arrived_icon_2.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_split_line_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_split_line_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_split_line_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_split_line_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_status_bar_logo.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_status_bar_logo.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_status_bar_logo.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_status_bar_logo.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_youzhuan_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_youzhuan_open.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_youzhuan_open.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_youzhuan_open.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_youzhuan_un_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_youzhuan_un_open.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_youzhuan_un_open.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_youzhuan_un_open.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_zuozhuan_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_zuozhuan_open.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_zuozhuan_open.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_zuozhuan_open.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_zuozhuan_un_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_zuozhuan_un_open.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable-nodpi/shuttle_p_jl_zuozhuan_un_open.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable-nodpi/shuttle_p_jl_zuozhuan_un_open.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_end_station_circle.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_end_station_circle.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_end_station_circle.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_end_station_circle.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_middle_station_circle.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_middle_station_circle.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_middle_station_circle.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_middle_station_circle.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_progress_bar.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_progress_bar.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_progress_bar.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_progress_bar.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_speak_icon_arrived.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_speak_icon_arrived.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_speak_icon_arrived.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_speak_icon_arrived.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_start_station_circle.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_start_station_circle.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_start_station_circle.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_start_station_circle.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_status_bar.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_status_bar.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_status_bar.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_status_bar.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_traffic_light_background.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_traffic_light_background.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_bg_traffic_light_background.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_bg_traffic_light_background.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_brakelight_background_daytime.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_brakelight_background_daytime.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_brakelight_background_daytime.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_brakelight_background_daytime.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_dividing_line_bg.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_dividing_line_bg.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_dividing_line_bg.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_dividing_line_bg.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_panel_cur_station_panel.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_panel_cur_station_panel.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_panel_cur_station_panel.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_panel_cur_station_panel.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_progress_item_round.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_progress_item_round.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/drawable/shuttle_p_jl_progress_item_round.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/drawable/shuttle_p_jl_progress_item_round.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_base_fragment.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_base_fragment.xml similarity index 77% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_base_fragment.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_base_fragment.xml index abe9fe169d..671fd2ff69 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_base_fragment.xml +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_base_fragment.xml @@ -24,15 +24,18 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> - + + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintRight_toLeftOf="@+id/bus_p_route_panel" + android:layout_marginTop="@dimen/dp_98" + android:visibility="gone" + app:lightUser="passenger" + /> + + diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_map_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_map_view.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_map_view.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_map_view.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_no_data_common_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_no_data_common_view.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_no_data_common_view.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_no_data_common_view.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_route_fragment.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_route_fragment.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_route_fragment.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_route_fragment.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_stations_common_item.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_stations_common_item.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_stations_common_item.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_stations_common_item.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_traffic_light_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_traffic_light_view.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_traffic_light_view.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_traffic_light_view.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_turn_light_status.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_turn_light_status.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_turn_light_status.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_turn_light_status.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_view_blue_tooth.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_view_blue_tooth.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_view_blue_tooth.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_view_blue_tooth.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_view_status_bar.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_view_status_bar.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/layout/shuttle_p_weak_jl_view_status_bar.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/layout/shuttle_p_weak_jl_view_status_bar.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/values/colors.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/values/colors.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/values/colors.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/values/colors.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/values/dimens.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/values/dimens.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/values/dimens.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/values/dimens.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/jinlv/values/strings.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b1/values/strings.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/jinlv/values/strings.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b1/values/strings.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_aip_bg.9.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_aip_bg.9.png new file mode 100644 index 0000000000..32f10e1ca5 Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_aip_bg.9.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_arrive_door.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_arrive_door.png new file mode 100644 index 0000000000..0b6482c231 Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_arrive_door.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_arrive_door_left.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_arrive_door_left.png new file mode 100644 index 0000000000..358373e79c Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_arrive_door_left.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_arrive_door_left_arrow.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_arrive_door_left_arrow.png new file mode 100644 index 0000000000..9a53541b6d Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_arrive_door_left_arrow.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_arrive_door_right.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_arrive_door_right.png new file mode 100644 index 0000000000..faf04e9245 Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_arrive_door_right.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_arrive_door_right_arrow.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_arrive_door_right_arrow.png new file mode 100644 index 0000000000..9e3bb7c71c Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_arrive_door_right_arrow.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_current_stattion_point.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_current_stattion_point.png new file mode 100644 index 0000000000..8ff9c17e45 Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_current_stattion_point.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_end_omit.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_end_omit.png new file mode 100644 index 0000000000..10dd0aac94 Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_end_omit.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_end_point.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_end_point.png new file mode 100644 index 0000000000..9170c1b11c Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_end_point.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_mind_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_mind_bg.png new file mode 100644 index 0000000000..e62e3f8dfd Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_mind_bg.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_mind_top_shader.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_mind_top_shader.png new file mode 100644 index 0000000000..63634bd8f3 Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_mind_top_shader.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_prediction_bg.9.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_prediction_bg.9.png new file mode 100644 index 0000000000..6e00fe6f11 Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_prediction_bg.9.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_start_omit.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_start_omit.png new file mode 100644 index 0000000000..b60281977c Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_start_omit.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_start_point.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_start_point.png new file mode 100644 index 0000000000..62a02b464a Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_start_point.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_station_end_omit_count_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_station_end_omit_count_bg.png new file mode 100644 index 0000000000..7db954ab81 Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_station_end_omit_count_bg.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_station_future_point.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_station_future_point.png new file mode 100644 index 0000000000..fcc7fd65e5 Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_station_future_point.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_station_omit_count_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_station_omit_count_bg.png new file mode 100644 index 0000000000..7db954ab81 Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_station_omit_count_bg.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_station_pass_point.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_station_pass_point.png new file mode 100644 index 0000000000..132aac7c9b Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/b2_station_pass_point.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/icon_cover_line.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/icon_cover_line.png new file mode 100644 index 0000000000..206f9c8d9e Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/icon_cover_line.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/icon_image_error.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/icon_image_error.png new file mode 100644 index 0000000000..4cadae7774 Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/icon_image_error.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/icon_image_holder.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/icon_image_holder.png new file mode 100644 index 0000000000..3febfc5587 Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/icon_image_holder.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_autopilot_status_in.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_autopilot_status_in.png new file mode 100644 index 0000000000..15717e08b4 Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_autopilot_status_in.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_autopilot_status_out.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_autopilot_status_out.png new file mode 100644 index 0000000000..da717d8909 Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_autopilot_status_out.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_big_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_big_bg.png new file mode 100644 index 0000000000..a52b9f35ca Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_big_bg.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_bottom_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_bottom_bg.png new file mode 100644 index 0000000000..63185cf110 Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_bottom_bg.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_empty_go_statart.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_empty_go_statart.png new file mode 100644 index 0000000000..405de1bb25 Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_empty_go_statart.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_map_right_top.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_map_right_top.png new file mode 100644 index 0000000000..a889bf8503 Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_map_right_top.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_map_video_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_map_video_bg.png new file mode 100644 index 0000000000..b2ca76b4a0 Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_map_video_bg.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_mind_item_icon.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_mind_item_icon.png new file mode 100644 index 0000000000..94b54e567d Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_mind_item_icon.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_p_battery.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_p_battery.png new file mode 100644 index 0000000000..023d42d647 Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_p_battery.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_p_driver_info_right.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_p_driver_info_right.png new file mode 100644 index 0000000000..ce192601d5 Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_p_driver_info_right.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_top_arrive_station_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_top_arrive_station_bg.png new file mode 100644 index 0000000000..2ce4f6b84e Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_top_arrive_station_bg.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_top_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_top_bg.png new file mode 100644 index 0000000000..c2bac2662b Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_top_bg.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_top_empty_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_top_empty_bg.png new file mode 100644 index 0000000000..fbd884a360 Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/m2_top_empty_bg.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_amap_arrived_road.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_amap_arrived_road.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_amap_arrived_road.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_amap_arrived_road.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_amap_arriving_road.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_amap_arriving_road.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_amap_arriving_road.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_amap_arriving_road.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_amap_custom_corner.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_amap_custom_corner.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_amap_custom_corner.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_amap_custom_corner.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_arrived_an_0.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_arrived_an_0.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_arrived_an_0.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_arrived_an_0.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_arrived_an_1.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_arrived_an_1.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_arrived_an_1.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_arrived_an_1.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_arrived_an_2.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_arrived_an_2.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_arrived_an_2.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_arrived_an_2.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_auto_button_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_auto_button_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_auto_button_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_auto_button_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_bg_driving_info_image.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_bg_driving_info_image.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_bg_driving_info_image.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_bg_driving_info_image.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_bottom_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_bottom_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_bottom_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_bottom_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_card_split.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_card_split.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_card_split.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_card_split.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_clock_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_clock_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_clock_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_clock_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_electricity.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_electricity.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_electricity.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_electricity.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_img_drive_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_img_drive_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_img_drive_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_img_drive_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_img_line_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_img_line_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_img_line_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_img_line_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_img_time_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_img_time_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_img_time_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_img_time_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_light_green_nor.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_light_green_nor.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_light_green_nor.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_light_green_nor.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_light_red_nor.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_light_red_nor.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_light_red_nor.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_light_red_nor.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_light_yellow_nor.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_light_yellow_nor.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_light_yellow_nor.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_light_yellow_nor.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_lightyellow_nor.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_lightyellow_nor.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_lightyellow_nor.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_lightyellow_nor.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_line_name.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_line_name.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_line_name.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_line_name.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_line_noselect.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_line_noselect.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_line_noselect.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_line_noselect.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_line_tile.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_line_tile.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_line_tile.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_line_tile.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_car_icon.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_map_car_icon.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_car_icon.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_map_car_icon.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_end_icon.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_map_end_icon.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_end_icon.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_map_end_icon.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_start_icon.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_map_start_icon.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_start_icon.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_map_start_icon.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_staton_arrived_icon.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_map_staton_arrived_icon.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_staton_arrived_icon.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_map_staton_arrived_icon.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_staton_icon.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_map_staton_icon.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_map_staton_icon.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_map_staton_icon.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_p_video_holder.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_p_video_holder.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_p_video_holder.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_p_video_holder.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_sky_bg.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_sky_bg.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_sky_bg.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_sky_bg.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_status_bar_logo.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_status_bar_logo.png new file mode 100644 index 0000000000..f9606416ca Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_status_bar_logo.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_bottom_left.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_video_bottom_left.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_bottom_left.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_video_bottom_left.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_bottom_right.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_video_bottom_right.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_bottom_right.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_video_bottom_right.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_top_left.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_video_top_left.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_top_left.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_video_top_left.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_top_right.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_video_top_right.png similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_video_top_right.png rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_video_top_right.png diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_youzhuan_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_youzhuan_open.png new file mode 100644 index 0000000000..2ac9526450 Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_youzhuan_open.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_youzhuan_un_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_youzhuan_un_open.png new file mode 100644 index 0000000000..7f585ef4b6 Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_youzhuan_un_open.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_zuozhuan_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_zuozhuan_open.png new file mode 100644 index 0000000000..2c1f8c62f4 Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_zuozhuan_open.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_zuozhuan_un_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_zuozhuan_un_open.png new file mode 100644 index 0000000000..71643afcce Binary files /dev/null and b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable-nodpi/shuttle_p_m2_zuozhuan_un_open.png differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/b2_arrive_title_bg.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/b2_arrive_title_bg.xml new file mode 100644 index 0000000000..bfd05b17a1 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/b2_arrive_title_bg.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/b2_map_top_shader.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/b2_map_top_shader.xml new file mode 100644 index 0000000000..2ef485a4c8 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/b2_map_top_shader.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/b2_station_current_bg.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/b2_station_current_bg.xml new file mode 100644 index 0000000000..3b67c9ce6d --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/b2_station_current_bg.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/b2_station_line_rounded_future_bottom.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/b2_station_line_rounded_future_bottom.xml new file mode 100644 index 0000000000..1e7f02eab5 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/b2_station_line_rounded_future_bottom.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/b2_station_line_rounded_future_top.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/b2_station_line_rounded_future_top.xml new file mode 100644 index 0000000000..1964c79163 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/b2_station_line_rounded_future_top.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/b2_station_line_rounded_pass_bottom.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/b2_station_line_rounded_pass_bottom.xml new file mode 100644 index 0000000000..f4cb474011 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/b2_station_line_rounded_pass_bottom.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/b2_station_line_rounded_pass_top.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/b2_station_line_rounded_pass_top.xml new file mode 100644 index 0000000000..ebb90d0dea --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/b2_station_line_rounded_pass_top.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/icon_pic_error.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/icon_pic_error.xml new file mode 100644 index 0000000000..5de9d5afff --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/icon_pic_error.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/icon_pic_holder.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/icon_pic_holder.xml new file mode 100644 index 0000000000..67373cd139 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/icon_pic_holder.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_dashed_line.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_dashed_line.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_dashed_line.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_dashed_line.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_arrived_notice.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_driving_arrived_notice.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_arrived_notice.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_driving_arrived_notice.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_distance_lefttime.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_driving_distance_lefttime.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_distance_lefttime.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_driving_distance_lefttime.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_info.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_driving_info.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_info.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_driving_info.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_selector.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_driving_selector.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_driving_selector.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_driving_selector.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_p_m2_arrived_station.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_p_m2_arrived_station.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_p_m2_arrived_station.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_p_m2_arrived_station.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_p_m2_auto.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_p_m2_auto.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_p_m2_auto.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_p_m2_auto.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_p_m2_traffic_light.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_p_m2_traffic_light.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_p_m2_traffic_light.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_p_m2_traffic_light.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_pnc.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_pnc.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_bg_pnc.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_bg_pnc.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_brakelight_background_daytime.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_brakelight_background_daytime.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_brakelight_background_daytime.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_brakelight_background_daytime.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_power_seekbar_style.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_power_seekbar_style.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable/shuttle_p_m2_power_seekbar_style.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/drawable/shuttle_p_m2_power_seekbar_style.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_automatic_exploration.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_automatic_exploration.xml new file mode 100644 index 0000000000..624972121a --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_automatic_exploration.xml @@ -0,0 +1,44 @@ + + + + + + + + + + diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_nde_event.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_nde_event.xml new file mode 100644 index 0000000000..b8a78e6c8e --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_nde_event.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_nde_road.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_nde_road.xml new file mode 100644 index 0000000000..f7b6542170 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_nde_road.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_pnc_action.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_pnc_action.xml new file mode 100644 index 0000000000..564fd242b5 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_pnc_action.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_road_cross_roam.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_road_cross_roam.xml new file mode 100644 index 0000000000..82d7902ee2 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_road_cross_roam.xml @@ -0,0 +1,48 @@ + + + + + + + + + diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_road_v2n_event.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_road_v2n_event.xml new file mode 100644 index 0000000000..2e284542e6 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/b2_item_ai_road_v2n_event.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/item_auto_exploration_b2.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/item_auto_exploration_b2.xml new file mode 100644 index 0000000000..9f665788b7 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/item_auto_exploration_b2.xml @@ -0,0 +1,30 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/item_road_cross_ai_roam_tip_b2.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/item_road_cross_ai_roam_tip_b2.xml new file mode 100644 index 0000000000..24398afc97 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/item_road_cross_ai_roam_tip_b2.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_arrive_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_arrive_view.xml new file mode 100644 index 0000000000..797d834fbd --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_arrive_view.xml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_autopilot.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_autopilot.xml new file mode 100644 index 0000000000..ac7fa74f8f --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_autopilot.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_empty_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_empty_view.xml new file mode 100644 index 0000000000..0e5eaec687 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_empty_view.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_line_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_line_view.xml new file mode 100644 index 0000000000..625ec87e4b --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_line_view.xml @@ -0,0 +1,32 @@ + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_mind_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_mind_view.xml new file mode 100644 index 0000000000..c750d56f27 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_mind_view.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_speed.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_speed.xml new file mode 100644 index 0000000000..faf36bf7be --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_speed.xml @@ -0,0 +1,33 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_current_end_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_current_end_view.xml new file mode 100644 index 0000000000..de8ab340f4 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_current_end_view.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_current_start_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_current_start_view.xml new file mode 100644 index 0000000000..1b826a1323 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_current_start_view.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_current_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_current_view.xml new file mode 100644 index 0000000000..5c8a186419 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_current_view.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_end_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_end_view.xml new file mode 100644 index 0000000000..d69aa2f054 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_end_view.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_future_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_future_view.xml new file mode 100644 index 0000000000..0f16607660 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_future_view.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_pass_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_pass_view.xml new file mode 100644 index 0000000000..dd7561b91e --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_pass_view.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_start_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_start_view.xml new file mode 100644 index 0000000000..f8879dfd6a --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_start_view.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_omit_view_future.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_omit_view_future.xml new file mode 100644 index 0000000000..08f159c8e1 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_omit_view_future.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_omit_view_pass.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_omit_view_pass.xml new file mode 100644 index 0000000000..62c21c870a --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_omit_view_pass.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_driving_info_fragment.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_driving_info_fragment.xml new file mode 100644 index 0000000000..b9e1bf48a7 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_driving_info_fragment.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_fragment.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_fragment.xml new file mode 100644 index 0000000000..8acea1fed8 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_fragment.xml @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_hpmap_fragment.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_hpmap_fragment.xml new file mode 100644 index 0000000000..37d0d6e0b0 --- /dev/null +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_hpmap_fragment.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_traffic_light_view.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_traffic_light_view.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_traffic_light_view.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_traffic_light_view.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_turn_light_status.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_turn_light_status.xml similarity index 73% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_turn_light_status.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_turn_light_status.xml index a1699ac360..ca710e82b1 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_turn_light_status.xml +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/shuttle_p_m2_turn_light_status.xml @@ -1,16 +1,17 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/raw/star_marker.nt3d b/OCH/shuttle/passenger_weaknet/src/main/res/b2/raw/star_marker.nt3d similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/raw/star_marker.nt3d rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/raw/star_marker.nt3d diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/raw/station_marker.nt3d b/OCH/shuttle/passenger_weaknet/src/main/res/b2/raw/station_marker.nt3d similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/raw/station_marker.nt3d rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/raw/station_marker.nt3d diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/values/colors.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/values/colors.xml similarity index 81% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/values/colors.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/values/colors.xml index b0196c0ce9..41d7008540 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/res/m2/values/colors.xml +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/values/colors.xml @@ -21,7 +21,14 @@ #1466FB #7094AD #80FFFFFF + #A5B6C7 #99AFC9E7 #6617417B + #516582 + #95B1D6 + #1F82FB + #D7F1FF + #394047 + #BBC9D4 \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/values/dimens.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/values/dimens.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/values/dimens.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/values/dimens.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/values/ids.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/values/ids.xml similarity index 100% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/values/ids.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/values/ids.xml diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/values/strings.xml b/OCH/shuttle/passenger_weaknet/src/main/res/b2/values/strings.xml similarity index 73% rename from OCH/shuttle/passenger_weaknet/src/main/res/m2/values/strings.xml rename to OCH/shuttle/passenger_weaknet/src/main/res/b2/values/strings.xml index d2faf78c18..7d6e6f57cc 100644 --- a/OCH/shuttle/passenger_weaknet/src/main/res/m2/values/strings.xml +++ b/OCH/shuttle/passenger_weaknet/src/main/res/b2/values/strings.xml @@ -11,4 +11,10 @@ —分钟 请按秩序下车 暂无路线 + + MOGO BUS + AUTO + MOGO自动驾驶小巴 + 即将启程 + 当前到站 \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_blue_tooth_close.png b/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_blue_tooth_close.png deleted file mode 100644 index 0c292d2cf3..0000000000 Binary files a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_blue_tooth_close.png and /dev/null differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_blue_tooth_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_blue_tooth_open.png deleted file mode 100644 index cccf9e10fa..0000000000 Binary files a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_blue_tooth_open.png and /dev/null differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_status_bar_logo.png b/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_status_bar_logo.png deleted file mode 100644 index 71d8a4bdaa..0000000000 Binary files a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_status_bar_logo.png and /dev/null differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_youzhuan_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_youzhuan_open.png deleted file mode 100644 index bbd2c12d90..0000000000 Binary files a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_youzhuan_open.png and /dev/null differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_youzhuan_un_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_youzhuan_un_open.png deleted file mode 100644 index 7c0dcaabe1..0000000000 Binary files a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_youzhuan_un_open.png and /dev/null differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_zuozhuan_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_zuozhuan_open.png deleted file mode 100644 index 9bbda22cb7..0000000000 Binary files a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_zuozhuan_open.png and /dev/null differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_zuozhuan_un_open.png b/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_zuozhuan_un_open.png deleted file mode 100644 index 7c33fddbd9..0000000000 Binary files a/OCH/shuttle/passenger_weaknet/src/main/res/m2/drawable-nodpi/shuttle_p_m2_zuozhuan_un_open.png and /dev/null differ diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_driving_info_fragment.xml b/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_driving_info_fragment.xml deleted file mode 100644 index deb56a33b6..0000000000 --- a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_driving_info_fragment.xml +++ /dev/null @@ -1,368 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_fragment.xml b/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_fragment.xml deleted file mode 100644 index 8978979677..0000000000 --- a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_fragment.xml +++ /dev/null @@ -1,211 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_hpmap_fragment.xml b/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_hpmap_fragment.xml deleted file mode 100644 index 82e9de5533..0000000000 --- a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_hpmap_fragment.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_view_blue_tooth.xml b/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_view_blue_tooth.xml deleted file mode 100644 index 61448bf16d..0000000000 --- a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_view_blue_tooth.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml b/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml deleted file mode 100644 index d6e8823a45..0000000000 --- a/OCH/shuttle/passenger_weaknet/src/main/res/m2/layout/shuttle_p_m2_view_status_bar.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/OperationalDataItemView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/OperationalDataItemView.kt index 0c981f1eba..33f7fcc754 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/OperationalDataItemView.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/OperationalDataItemView.kt @@ -6,12 +6,12 @@ import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.och.unmanned.taxi.R +import kotlinx.android.synthetic.main.unmanned_taxi_operational_data_item_view.view.aciv_open_details import kotlinx.android.synthetic.main.unmanned_taxi_operational_data_item_view.view.operationDataContent1Tv import kotlinx.android.synthetic.main.unmanned_taxi_operational_data_item_view.view.operationDataContentTv import kotlinx.android.synthetic.main.unmanned_taxi_operational_data_item_view.view.operationDataUnit1Tv import kotlinx.android.synthetic.main.unmanned_taxi_operational_data_item_view.view.operationDataUnitTv import kotlinx.android.synthetic.main.unmanned_taxi_operational_data_item_view.view.operationalDataTagTv -import kotlinx.android.synthetic.main.unmanned_taxi_operational_data_item_view.view.operationalDataView /** * @author: wangmingjun @@ -30,7 +30,7 @@ class OperationalDataItemView @JvmOverloads constructor( } private fun initViewClick() { - operationalDataView.onClick { + aciv_open_details.onClick { mClickListener?.onClick() } } @@ -52,7 +52,7 @@ class OperationalDataItemView @JvmOverloads constructor( } fun setOperationalDataViewClick(isVisible: Int,clickListener: DataViewClickListener?){ - operationalDataView.visibility = isVisible + aciv_open_details.visibility = isVisible mClickListener = clickListener } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/TaskOrOrderAdapter.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/TaskOrOrderAdapter.kt index 81864cf942..ef1c8e52b6 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/TaskOrOrderAdapter.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/operational/TaskOrOrderAdapter.kt @@ -45,8 +45,7 @@ class TaskListAdapter(val context: Context, override fun onBindViewHolder(holder: TaskItemViewHolder, position: Int) { dataList?.also { val taskInfo = dataList[holder.bindingAdapterPosition] - holder.taskTimeTv.text = "下单时间 " + DateTimeUtil.formatLongToString(taskInfo.startTime, - DateTimeUtil.HH_mm) + holder.taskTimeTv.text = "下单时间 " + DateTimeUtil.formatLongToString(taskInfo.startTime, DateTimeUtil.HH_mm) holder.taskTypeBt.text = "演练单" holder.taskStartSiteTv.text = taskInfo.startSiteName holder.taskEndSiteTv.text = taskInfo.endSiteName @@ -111,10 +110,8 @@ class OrderListAdapter(val context: Context, private fun initViewDetailBtn(holder: OrderItemViewHolder) { dataList?.also { val orderInfo = it[holder.bindingAdapterPosition] - holder.orderViewDetailBt.text = "详情" + holder.orderViewDetailBt.text = "展开" holder.orderViewDetailBt.tag = true - holder.orderViewDetailBt.setCompoundDrawablesWithIntrinsicBounds(null,null, - context.getDrawable(R.drawable.view_detail_arrow),null) when(orderInfo.status){ OperationalOrderStatusEnum.Refunded.code,OperationalOrderStatusEnum.Unpaid.code, OperationalOrderStatusEnum.JourneyCompleted.code, @@ -135,14 +132,10 @@ class OrderListAdapter(val context: Context, if (holder.orderViewDetailBt.tag as Boolean){ holder.orderViewDetailBt.text = "收起" holder.orderViewDetailBt.tag = false - holder.orderViewDetailBt.setCompoundDrawablesWithIntrinsicBounds(null,null, - ContextCompat.getDrawable(context,R.drawable.close_detail_arrow),null) clickViewDetailListener?.clickViewOrderDetail(dataList[holder.bindingAdapterPosition].orderNo) }else{ - holder.orderViewDetailBt.text = "详情" + holder.orderViewDetailBt.text = "展开" holder.orderViewDetailBt.tag = true - holder.orderViewDetailBt.setCompoundDrawablesWithIntrinsicBounds(null,null, - ContextCompat.getDrawable(context,R.drawable.view_detail_arrow),null) holder.orderTaskStationView.visibility = View.GONE taskDetailListAdapter = null mOrderTaskStationList = null @@ -265,15 +258,15 @@ class OrderTaskDetailListAdapter(val context: Context, when (taskDetail.stationType){ StationTypeEnum.PathwayStation.code -> { holder.taskStationTagTv.text = "途经:" - holder.stationCircleIv.setImageResource(R.drawable.waypoint_circle) + holder.stationCircleIv.setImageResource(R.drawable.circle_blue_waypoint) } StationTypeEnum.OrderStartStation.code -> { holder.taskStationTagTv.text = "上车:" - holder.stationCircleIv.setImageResource(R.drawable.taxi_driver_circle_green_big) + holder.stationCircleIv.setImageResource(R.drawable.circle_green_start_station) } StationTypeEnum.OrderEndStation.code -> { holder.taskStationTagTv.text = "下车:" - holder.stationCircleIv.setImageResource(R.drawable.taxi_driver_circle_blue_big) + holder.stationCircleIv.setImageResource(R.drawable.circle_blue_end_station) } } holder.taskStationNameTv.text = taskDetail.stationName diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt index da5cbb8c85..bfdcd9880e 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt @@ -57,6 +57,7 @@ import com.mogo.och.bridge.utils.CoordinateCalculateRouteUtil.coordinateConverte import com.mogo.och.common.module.biz.birdge.BridgeManager import com.mogo.och.common.module.biz.order.IOrderListener import com.mogo.och.common.module.biz.order.OrderManager +import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.utils.OCHThreadPoolManager import com.mogo.och.common.module.utils.ResourcesUtils @@ -470,7 +471,7 @@ object TaxiTaskModel { private val localCalculateDistanceListener: IDistanceListener = object : IDistanceListener { override fun distanceCallback(distance: Float) { - val lastTime = distance / TaxiUnmannedConst.TAXI_AVERAGE_SPEED * 3.6 //秒 + val lastTime = distance / OchCommonConst.TAXI_AVERAGE_SPEED * 3.6 //秒 d( TAG, "dynamicCalculateRouteInfo: lastSumLength=$distance, lastTime=$lastTime, threadName=Thread.currentThread().name" diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/circle_blue_end_station.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/circle_blue_end_station.png new file mode 100644 index 0000000000..ce2b50bafe Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/circle_blue_end_station.png differ diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/circle_blue_waypoint.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/circle_blue_waypoint.png new file mode 100644 index 0000000000..4340fdf097 Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/circle_blue_waypoint.png differ diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/circle_green_start_station.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/circle_green_start_station.png new file mode 100644 index 0000000000..d04a119837 Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/circle_green_start_station.png differ diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/line_start_to_end.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/line_start_to_end.png new file mode 100644 index 0000000000..29d0e145a6 Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/line_start_to_end.png differ diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/operation_bg.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/operation_bg.png new file mode 100644 index 0000000000..184c6a0775 Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/operation_bg.png differ diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/order_detail.png b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/order_detail.png new file mode 100644 index 0000000000..59f7f52fd5 Binary files /dev/null and b/OCH/taxi/unmanned-driver/src/main/res/drawable-nodpi/order_detail.png differ diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable/baseline_close_44.xml b/OCH/taxi/unmanned-driver/src/main/res/drawable/baseline_close_44.xml new file mode 100644 index 0000000000..a6dd61b2f1 --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/res/drawable/baseline_close_44.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable/baseline_keyboard_arrow_right_24.xml b/OCH/taxi/unmanned-driver/src/main/res/drawable/baseline_keyboard_arrow_right_24.xml new file mode 100644 index 0000000000..1b410feb4f --- /dev/null +++ b/OCH/taxi/unmanned-driver/src/main/res/drawable/baseline_keyboard_arrow_right_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable/order_task_list_bg.xml b/OCH/taxi/unmanned-driver/src/main/res/drawable/order_task_list_bg.xml index f53d9c9a1d..5ffa9e4ea7 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/drawable/order_task_list_bg.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/drawable/order_task_list_bg.xml @@ -3,5 +3,5 @@ android:shape="rectangle"> - + \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/drawable/taxi_operation_data_item_bg.xml b/OCH/taxi/unmanned-driver/src/main/res/drawable/taxi_operation_data_item_bg.xml index d81e0cd834..9600d6d355 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/drawable/taxi_operation_data_item_bg.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/drawable/taxi_operation_data_item_bg.xml @@ -2,9 +2,5 @@ - + \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_order_task_detail_list_item.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_order_task_detail_list_item.xml index 87533758a3..be1928c233 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_order_task_detail_list_item.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_order_task_detail_list_item.xml @@ -9,7 +9,7 @@ android:id="@+id/taskStationTagTv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/dp_76" + android:layout_marginLeft="@dimen/dp_73" app:layout_constraintTop_toTopOf="parent" app:layout_constraintLeft_toLeftOf="parent" android:textSize="@dimen/dp_28" @@ -48,10 +48,10 @@ @@ -26,6 +28,7 @@ android:layout_marginTop="@dimen/dp_20" android:layout_marginLeft="@dimen/dp_8" android:textSize="@dimen/dp_76" + tools:text="0" app:layout_constraintLeft_toRightOf="@+id/operationDataUnitTv" app:layout_constraintTop_toTopOf="parent" android:textStyle="bold" @@ -34,8 +37,9 @@ android:id="@+id/operationDataUnitTv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/dp_12" android:layout_marginLeft="@dimen/dp_8" + tools:text="时" + app:layout_constraintBaseline_toBaselineOf="@+id/operationDataContent1Tv" android:textSize="@dimen/dp_36" app:layout_constraintLeft_toRightOf="@+id/operationDataContentTv" app:layout_constraintBottom_toBottomOf="@+id/operationDataContentTv" @@ -46,8 +50,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp_8" - android:layout_marginBottom="@dimen/dp_12" + app:layout_constraintBaseline_toBaselineOf="@+id/operationDataContent1Tv" android:textSize="@dimen/dp_36" + tools:text="分" app:layout_constraintLeft_toRightOf="@+id/operationDataContent1Tv" app:layout_constraintBottom_toBottomOf="@+id/operationDataContent1Tv" android:textColor="#FFFFFF"/> @@ -55,25 +60,20 @@ android:id="@+id/operationalDataTagTv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="#A7B6F0" + android:textColor="@color/common_cccccc" android:layout_marginTop="@dimen/dp_10" android:textSize="@dimen/dp_30" app:layout_constraintLeft_toLeftOf="@+id/operationDataContentTv" app:layout_constraintTop_toBottomOf="@+id/operationDataContentTv" - android:text="今日量"/> + android:text="今日服务总时长"/> - + app:layout_constraintEnd_toEndOf="parent" + android:padding="@dimen/dp_30" + android:layout_width="@dimen/dp_75" + android:layout_height="@dimen/dp_87"/> \ No newline at end of file diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_operational_data_view.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_operational_data_view.xml index 1ad75457e7..a685c69c75 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_operational_data_view.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_operational_data_view.xml @@ -3,20 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#F0151D41"> - - + android:background="@drawable/operation_bg"> + app:layout_constraintStart_toStartOf="parent" + android:layout_marginStart="@dimen/dp_61" + android:layout_marginTop="@dimen/dp_131" + app:layout_constraintTop_toTopOf="parent" /> + + + android:src="@drawable/baseline_close_44" + android:layout_marginEnd="@dimen/dp_106" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="@+id/line" + app:layout_constraintTop_toTopOf="@+id/line" /> + android:layout_marginTop="@dimen/dp_77" + app:layout_constraintTop_toBottomOf="@+id/line" + app:layout_constraintStart_toStartOf="@+id/line"> + app:layout_constraintTop_toBottomOf="@+id/line" /> + tools:background="@color/common_cccccc" + android:paddingTop="@dimen/dp_50"> @@ -20,9 +21,9 @@ android:id="@+id/orderNumTv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="#8E9DD4" - android:textSize="@dimen/dp_38" - android:layout_marginTop="@dimen/dp_54" + android:textColor="@color/common_d4d4d4" + android:textSize="@dimen/dp_30" + android:layout_marginTop="@dimen/dp_44" app:layout_constraintTop_toBottomOf="@+id/orderTimeTv" app:layout_constraintLeft_toLeftOf="@+id/orderTimeTv" tools:text="订单编号111111" /> @@ -32,7 +33,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="@dimen/dp_4" - android:textColor="#FFFFFF" + android:textColor="@color/common_ff852e" android:textSize="@dimen/dp_38" app:layout_constraintRight_toLeftOf="@+id/orderPriceUnitTv" app:layout_constraintBottom_toBottomOf="@+id/orderTimeTv" @@ -45,20 +46,19 @@ android:textColor="#FFFFFF" android:textSize="@dimen/dp_22" android:layout_marginBottom="@dimen/dp_8" + app:layout_constraintBaseline_toBaselineOf="@+id/orderPriceTv" app:layout_constraintBottom_toBottomOf="@+id/orderTimeTv" app:layout_constraintRight_toRightOf="parent" android:text="元"/> diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_task_list_item.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_task_list_item.xml index a43559bc91..497e86035d 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_task_list_item.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_task_list_item.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + tools:background="@color/common_cccccc" android:paddingTop="@dimen/dp_64" android:paddingRight="@dimen/dp_54"> @@ -12,7 +13,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="下单时间 9:01" - android:textColor="#8E9DD4" + android:textColor="@color/common_ffffffff" android:textSize="@dimen/dp_38" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent"/> @@ -57,29 +58,31 @@ diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt index a76facd3ae..75284c0202 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/model/TaxiPassengerModel.kt @@ -23,6 +23,7 @@ import com.mogo.och.common.module.manager.socket.cloud.AbnormalFactorsLoopManage import com.mogo.och.bridge.distance.IDistanceListener import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager import com.mogo.och.common.module.biz.birdge.BridgeManager +import com.mogo.och.common.module.constant.OchCommonConst import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.manager.loop.LoopInfo import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager @@ -314,7 +315,7 @@ object TaxiPassengerModel { override fun distanceCallback(distance: Float) { - val lastTime: Double = distance / TaxiPassengerConst.TAXI_AVERAGE_SPEED * 3.6 //秒 + val lastTime: Double = distance / OchCommonConst.TAXI_AVERAGE_SPEED * 3.6 //秒 for (callback in mOrderStatusCallbackMap.values) { callback.onCurrentOrderDistToEndChanged( diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/AiView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/AiView.kt index 50d8d9a1a6..5b1e8c33da 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/AiView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/AiView.kt @@ -26,6 +26,10 @@ import com.mogo.och.unmanned.passenger.ui.aiview.adapter.AIMessageAdapter import com.mogo.och.unmanned.passenger.ui.aiview.adapter.OnItemClickListener import com.mogo.och.unmanned.passenger.ui.aiview.adapter.PaddingItemDecoration import com.mogo.och.unmanned.passenger.ui.aiview.bean.AIMessage +import com.mogo.och.unmanned.passenger.ui.aiview.data.AutomaticExplorationViewModel +import com.mogo.och.unmanned.passenger.ui.aiview.data.NDEViewModel +import com.mogo.och.unmanned.passenger.ui.aiview.data.RoadCrossRoamViewModel +import com.mogo.och.unmanned.passenger.ui.aiview.data.RoadV2NEventViewModel import com.mogo.och.unmanned.taxi.passenger.R import kotlinx.android.synthetic.main.taxt_p_ai.view.aiMotionLayout import kotlinx.android.synthetic.main.taxt_p_ai.view.ivIcon @@ -47,11 +51,10 @@ class AiView @JvmOverloads constructor( private var viewModel:AIViewModel?=null -// private var pncActionsModel:PNCActionsViewModel ?= null - private var roadV2NEventModel:RoadV2NEventViewModel ?= null - private var roadCrossRoamModel:RoadCrossRoamViewModel ?= null - private var automaticExplorationModel:AutomaticExplorationViewModel ?= null - private var ndeViewModel: NDEViewModel ?= null + private var roadV2NEventModel: RoadV2NEventViewModel?= null + private var roadCrossRoamModel: RoadCrossRoamViewModel?= null + private var automaticExplorationModel: AutomaticExplorationViewModel?= null + private var ndeViewModel: NDEViewModel?= null private var aiAnimator: BigFrameAnimatorContainer?=null private var aiAnimatorBg: BigFrameAnimatorContainer?=null @@ -105,7 +108,6 @@ class AiView @JvmOverloads constructor( if(aiAnimator==null) { aiAnimator = BigFrameAnimatorContainer(R.array.ai_animator, 31, ivIcon) } -// aiAnimator?.start() ivIcon.onClick { viewModel?.onWakeUp() diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/adapter/AIMessageAdapter.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/adapter/AIMessageAdapter.kt index 665e2f7b04..1e833e1987 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/adapter/AIMessageAdapter.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/adapter/AIMessageAdapter.kt @@ -26,6 +26,7 @@ class AIMessageAdapter : ListAdapter(MessageDiffCa AIMessage.TYPE_AUTOMATIC_EXPLORATION -> AutomaticExplorationViewHolder(inflater.inflate(R.layout.item_ai_automatic_exploration,parent,false)) AIMessage.TYPE_EVALUATE -> EvaluateViewViewHolder(inflater.inflate(R.layout.taxi_p_evaluate,parent,false)) AIMessage.TYPE_NDE -> NDEViewHolder(inflater.inflate(R.layout.item_ai_nde_event,parent,false)) + AIMessage.TYPE_VLM -> VlmViewHolder(inflater.inflate(R.layout.item_ai_vlm_action,parent,false)) else -> throw IllegalArgumentException("Invalid view type") } } @@ -44,6 +45,7 @@ class AIMessageAdapter : ListAdapter(MessageDiffCa is AIMessage.AutomaticExploration -> AIMessage.TYPE_AUTOMATIC_EXPLORATION is AIMessage.EvaluateData -> AIMessage.TYPE_EVALUATE is AIMessage.NDEData -> AIMessage.TYPE_NDE + is AIMessage.AiVlmData -> AIMessage.TYPE_VLM else -> AIMessage.TYPE_EVENT } } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/adapter/AIMessageViewHolder.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/adapter/AIMessageViewHolder.kt index ee03645972..6b3f0b21bd 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/adapter/AIMessageViewHolder.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/adapter/AIMessageViewHolder.kt @@ -6,7 +6,6 @@ import android.animation.ObjectAnimator import android.animation.ValueAnimator import android.content.Context import android.graphics.Rect -import android.text.TextUtils import android.util.Log import android.view.View import android.view.animation.LinearInterpolator @@ -14,6 +13,7 @@ import android.widget.FrameLayout import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView +import androidx.appcompat.widget.AppCompatImageView import androidx.core.content.ContextCompat import androidx.core.graphics.toColorInt import androidx.recyclerview.widget.LinearLayoutManager @@ -29,6 +29,7 @@ import com.mogo.eagle.core.function.view.MapRoamView import com.mogo.eagle.core.function.view.RoadCrossRoamListAdapter import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.glide.GlideImageLoader +import com.mogo.eagle.core.utilcode.mogo.glide.transform.GlideRoundedCornersTransform import com.mogo.eagle.core.utilcode.mogo.imageloader.MogoImageView import com.mogo.eagle.core.utilcode.util.DateTimeUtils import com.mogo.och.common.module.utils.FrameAnimatorContainer @@ -38,8 +39,6 @@ import com.mogo.och.unmanned.taxi.passenger.R import com.youth.banner.Banner import com.youth.banner.indicator.CircleIndicator import com.youth.banner.transformer.ScaleInTransformer -import kotlinx.android.synthetic.main.taxi_p_evaluate.view.iv_evaluate_great -import kotlinx.android.synthetic.main.taxi_p_evaluate.view.iv_evaluate_low import java.text.SimpleDateFormat import java.util.Date import java.util.Locale @@ -85,6 +84,23 @@ abstract class MessageViewHolder(view: View) : RecyclerView.ViewHolder(view) { .placeholder(R.drawable.icon_pic_holder) .error(R.drawable.icon_pic_error) // .error(R.drawable.icon_marker_window_place_holder) +// .placeholder(R.drawable.icon_marker_window_place_holder) + .into(this) + + } + } + fun ImageView.showOrHideWithByteArray(image: ByteArray?) { + if (image==null) { + visibility = View.GONE + } else { + visibility = View.VISIBLE + //optionalTransform(new GlideRoundedCornersTransform(30f, GlideRoundedCornersTransform.CornerType.LEFT)) + Glide.with(this) + .load(image) + .optionalTransform(GlideRoundedCornersTransform(18f, GlideRoundedCornersTransform.CornerType.ALL)) + .placeholder(R.drawable.icon_pic_holder) + .error(R.drawable.icon_pic_error) +// .error(R.drawable.icon_marker_window_place_holder) // .placeholder(R.drawable.icon_marker_window_place_holder) .into(this) @@ -269,7 +285,6 @@ class RoadCrossRoamViewHolder(binding: View) : MessageViewHolder(binding){ outRect.bottom = 24 } }) - mapRoamView.openRoam() lvRoadCrossRoamTip.adapter = RoadCrossRoamListAdapter(itemView.context, true) // 创建横向移动的动画 val animator = @@ -435,6 +450,23 @@ class NDEViewHolder(binding: View) : MessageViewHolder(binding){ } +class VlmViewHolder(binding: View) : MessageViewHolder(binding){ + + private var tvNdeTitle: TextView = binding.findViewById(R.id.tvVlmMessage) + private var tvVlmTime: TextView = binding.findViewById(R.id.tvVlmTimeStr) + private var acivVlmImage: AppCompatImageView = binding.findViewById(R.id.acivVlmImage) + + + override fun bind(item: AIMessage, onItemClickListener: OnItemClickListener?) { + if(item is AIMessage.AiVlmData){ + tvNdeTitle.text = item.vlmData.message + acivVlmImage.showOrHideWithByteArray(item.vlmData.image) + tvVlmTime.text = "更新时间:${DateTimeUtils.getTimeText(item.vlmData.timestamp,DateTimeUtils.HH_mm_ss)}" + } + } + +} + private class NoScrollLayoutManager(context: Context?) : LinearLayoutManager(context) { override fun canScrollVertically(): Boolean { return false diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/adapter/AINDERoadAdapter.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/adapter/AINDERoadAdapter.kt index 0d2ec97ca1..dbb8050c2d 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/adapter/AINDERoadAdapter.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/adapter/AINDERoadAdapter.kt @@ -10,14 +10,14 @@ import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.mogo.och.unmanned.passenger.ui.aiview.bean.AIMessage +import com.mogo.och.common.module.biz.birdge.data.RoadMsg import com.mogo.och.unmanned.taxi.passenger.R class AINDERoadAdapter(private val context: Context): RecyclerView.Adapter() { - private var roadList: List?= null + private var roadList: List?= null - fun setData(list: List){ + fun setData(list: List){ roadList = list notifyDataSetChanged() } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/bean/AssistantMessage.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/bean/AssistantMessage.kt index 2b7ca9a3e4..b6038b0efe 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/bean/AssistantMessage.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/bean/AssistantMessage.kt @@ -3,6 +3,8 @@ package com.mogo.och.unmanned.passenger.ui.aiview.bean import android.os.CountDownTimer import android.util.Log import com.mogo.eagle.core.data.v2x.RoadV2NEventType +import com.mogo.och.common.module.biz.birdge.data.RoadMsg +import com.mogo.och.common.module.biz.birdge.data.VlmData import kotlin.math.floor @@ -27,6 +29,7 @@ sealed class AIMessage( const val TYPE_AUTOMATIC_EXPLORATION = 9 const val TYPE_EVALUATE = 10 const val TYPE_NDE = 11 + const val TYPE_VLM = 12 } data class Scan( @@ -177,11 +180,11 @@ sealed class AIMessage( var roadList: List ):AIMessage(id,title) - data class RoadMsg( - var arrowType: Int, // 车道类型,如直行201(详情参考文件:message_pad.proto) - var laneNum: Int,// 车道号 - var isRecommend: Boolean,// 是否是推荐车道 - var isCheLong: Boolean// 是否有车龙,代表拥堵、行驶缓慢 - ) + data class AiVlmData( + override val id: String, + override val title: String, + var desc: String, + var vlmData: VlmData + ):AIMessage(id,title) } \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/AutomaticExplorationViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/data/AutomaticExplorationViewModel.kt similarity index 97% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/AutomaticExplorationViewModel.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/data/AutomaticExplorationViewModel.kt index 153b91e0d2..89b41098df 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/AutomaticExplorationViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/data/AutomaticExplorationViewModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.unmanned.passenger.ui.aiview +package com.mogo.och.unmanned.passenger.ui.aiview.data import android.os.CountDownTimer import androidx.lifecycle.ViewModel @@ -10,11 +10,11 @@ import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxListener import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxListenerManager import com.mogo.eagle.core.utilcode.util.StringUtils import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.bridge.distance.IDistanceListener import com.mogo.och.bridge.distance.TrajectoryAndDistanceManager import com.mogo.och.data.taxi.BaseOrderBean import com.mogo.och.data.taxi.TaxiOrderStatusEnum +import com.mogo.och.unmanned.passenger.ui.aiview.AIMessageManager import com.mogo.och.unmanned.passenger.ui.aiview.bean.AIMessage import com.mogo.och.unmanned.taxi.utils.order.OrderListener import com.mogo.och.unmanned.taxi.utils.order.OrderModel diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/data/NDEViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/data/NDEViewModel.kt new file mode 100644 index 0000000000..ee6bf64d4d --- /dev/null +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/data/NDEViewModel.kt @@ -0,0 +1,39 @@ +package com.mogo.och.unmanned.passenger.ui.aiview.data + +import androidx.lifecycle.ViewModel +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotIdentifyListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager +import com.mogo.och.common.module.biz.birdge.BridgeListener +import com.mogo.och.common.module.biz.birdge.BridgeManager +import com.mogo.och.common.module.biz.birdge.data.RoadMsg +import com.mogo.och.common.module.biz.birdge.data.VlmData +import com.mogo.och.unmanned.passenger.ui.aiview.AIMessageManager +import com.mogo.och.unmanned.passenger.ui.aiview.bean.AIMessage + +class NDEViewModel: ViewModel(), BridgeListener { + + companion object{ + private const val TAG = "NDEViewModel" + } + + fun init(){ + BridgeManager.addBridgeListener(TAG,this) + } + + override fun onCleared() { + super.onCleared() + BridgeManager.removeBridgeListener(TAG) + } + + + override fun onVlmDataListener(vlmData: VlmData){ + val ndeEvent = AIMessage.AiVlmData(vlmData.id.toString(),"","",vlmData) + AIMessageManager.post(ndeEvent) + } + + override fun onNdeDataListener(title: String, desc: String, sortedList: List) { + val ndeEvent = AIMessage.NDEData(System.currentTimeMillis().toString(),title,desc,sortedList) + AIMessageManager.post(ndeEvent) + } + +} \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/PNCActionsViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/data/PNCActionsViewModel.kt similarity index 98% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/PNCActionsViewModel.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/data/PNCActionsViewModel.kt index c3875ae4f7..33fc356fed 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/PNCActionsViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/data/PNCActionsViewModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.unmanned.passenger.ui.aiview +package com.mogo.och.unmanned.passenger.ui.aiview.data import androidx.lifecycle.ViewModel import com.mogo.eagle.core.data.autopilot.pnc.PncActionsHelper @@ -6,10 +6,9 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningActionsL import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerPlanningActionsListenerManager -import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger -import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.unmanned.passenger.model.TaxiPassengerModel +import com.mogo.och.unmanned.passenger.ui.aiview.AIMessageManager import com.mogo.och.unmanned.passenger.ui.aiview.bean.AIMessage import mogo.telematics.pad.MessagePad diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/RoadCrossRoamViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/data/RoadCrossRoamViewModel.kt similarity index 94% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/RoadCrossRoamViewModel.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/data/RoadCrossRoamViewModel.kt index c7f836ed4d..fd6eb8a2f4 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/RoadCrossRoamViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/data/RoadCrossRoamViewModel.kt @@ -1,7 +1,6 @@ -package com.mogo.och.unmanned.passenger.ui.aiview +package com.mogo.och.unmanned.passenger.ui.aiview.data import android.content.Context -import android.view.View import androidx.lifecycle.ViewModel import com.mogo.commons.voice.AIAssist import com.mogo.eagle.core.data.config.FunctionBuildConfig @@ -14,6 +13,7 @@ import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.och.unmanned.passenger.ui.aiview.AIMessageManager import com.mogo.och.unmanned.passenger.ui.aiview.bean.AIMessage class RoadCrossRoamViewModel: ViewModel(), IMoGoMapRoadListener { @@ -67,7 +67,7 @@ class RoadCrossRoamViewModel: ViewModel(), IMoGoMapRoadListener { AIAssist.getInstance(mContext).speakTTSVoiceWithLevel(disStr, AIAssist.NEW_LEVEL_2) } CallerServicesEventManager.updateServicesNum(CallerServicesEventManager.ServiceType.ROAD) - AIMessageManager.post(AIMessage.RoadCrossRoam(System.currentTimeMillis().toString(),"")) + AIMessageManager.post(AIMessage.RoadCrossRoam(System.currentTimeMillis().toString(), "")) } } \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/RoadV2NEventViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/data/RoadV2NEventViewModel.kt similarity index 95% rename from OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/RoadV2NEventViewModel.kt rename to OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/data/RoadV2NEventViewModel.kt index b850341ea7..bc7fc909fd 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/RoadV2NEventViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/aiview/data/RoadV2NEventViewModel.kt @@ -1,4 +1,4 @@ -package com.mogo.och.unmanned.passenger.ui.aiview +package com.mogo.och.unmanned.passenger.ui.aiview.data import androidx.lifecycle.ProcessLifecycleOwner import androidx.lifecycle.ViewModel @@ -11,6 +11,7 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager import com.mogo.eagle.core.function.call.hmi.CallerRoadV2NEventWindowListenerManager import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.och.unmanned.passenger.ui.aiview.AIMessageManager import com.mogo.och.unmanned.passenger.ui.aiview.bean.AIMessage import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/HomeViewModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/HomeViewModel.kt index 57a84256d6..ecadbb6a40 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/HomeViewModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/HomeViewModel.kt @@ -41,22 +41,22 @@ class HomeViewModel : ViewModel(), BridgeListener, OrderListener { override fun onTrajectoryHaveData(haveTrajectoryInfos: Boolean) { this.haveTrajectoryInfos = haveTrajectoryInfos -// checkScreenChange() + checkScreenChange() } override fun onPredictionHavaData(havePredictionInfos: Boolean) { this.havePredictionInfos = havePredictionInfos -// checkScreenChange() + checkScreenChange() } override fun onCurrentOrderStatusChanged(order: BaseOrderBean?) { this.order = order -// checkScreenChange() + checkScreenChange() } - fun checkScreenChange(){ + private fun checkScreenChange(){ // CallerLogger.d(TAG,"havePredictionInfos:${havePredictionInfos}--haveTrajectoryInfos:${haveTrajectoryInfos}--order:${order}") -// if(order!=null&&havePredictionInfos&&havePredictionInfos){ +// if(havePredictionInfos&&havePredictionInfos){//order!=null&& // FunctionBuildConfig.isDrawDecIdentifyData = true // FunctionBuildConfig.isDrawPreIdentifyData = true // // 展示三联屏 diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/MapBizPView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/MapBizPView.kt new file mode 100644 index 0000000000..0a7bc5aec8 --- /dev/null +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/homepage/MapBizPView.kt @@ -0,0 +1,19 @@ +package com.mogo.och.unmanned.passenger.ui.homepage + +import android.content.Context +import android.util.AttributeSet +import com.mogo.eagle.core.function.view.MapBizView +import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider +import me.jessyan.autosize.utils.AutoSizeUtils + +class MapBizPView(context: Context?, attrs: AttributeSet?) : MapBizView(context, attrs) { + + + override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) { + super.onSizeChanged(w, h, oldw, oldh) + this.outlineProvider = + TextureVideoViewOutlineProvider(AutoSizeUtils.dp2px(context, 36f).toFloat()) + this.clipToOutline = true + } + +} diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_ai_title_bg.png b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_ai_title_bg.png new file mode 100644 index 0000000000..a4706fb634 Binary files /dev/null and b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/taxi_p_ai_title_bg.png differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/item_ai_vlm_action.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/item_ai_vlm_action.xml new file mode 100644 index 0000000000..adac7de786 --- /dev/null +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/item_ai_vlm_action.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_home.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_home.xml index 1616971d6f..37838ee628 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_home.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxi_p_home.xml @@ -26,33 +26,31 @@ android:id="@+id/midContainer" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_marginBottom="@dimen/dp_10" - android:visibility="gone" - app:layout_constraintTop_toTopOf="parent" android:layout_marginStart="-6.5dp" android:layout_marginEnd="-6.5dp" + android:layout_marginBottom="@dimen/dp_10" + android:visibility="gone" + app:layout_constraintEnd_toStartOf="@id/rightStartGuideline" app:layout_constraintStart_toEndOf="@+id/midStartGuideline" - app:layout_constraintEnd_toStartOf="@id/rightStartGuideline"> + app:layout_constraintTop_toTopOf="parent"> - - - - - + + + + + - - - - - - + + + + @@ -68,7 +66,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> - - - - - - + + - - - - - - - - - - - - -1 } + /** + * NDE下行感知进PNC开关 + * @param enable 0: 不发给PnC 1:发给Pnc + */ + override fun sendNdeDownPerceptionToPnc(enable: Int): Boolean { + return AdasManager.getInstance().sendNdeDownPerceptionToPnc(enable) > -1 + } + + /** + * NDE下行事件进PNC开关 + * @param enable 0: 不发给PnC 1:发给Pnc + */ + override fun sendNdeDownEventToPnc(enable: Int): Boolean { + return AdasManager.getInstance().sendNdeDownEventToPnc(enable) > -1 + } + + /** + * V2I下行感知进PNC开关 + * @param enable 0: 不发给PnC 1:发给Pnc + */ + override fun sendV2iDownPerceptionToPnc(enable: Int): Boolean { + return AdasManager.getInstance().sendV2iDownPerceptionToPnc(enable) > -1 + } + + /** + * 云端配置控制 + * @param type 0:蘑菇云 1:NDE云 2:基础平台云 + * @param direction 0:上行和下行 1:上行 2:下行 当 type == 0 或 1 时 此值只能是 0(蘑菇云和NDE云只能上下行同时控制;当 type == 2 时 此值不能是 0(基础平台云只能上下行分开控制); + * @param enable 连接使能开关, true:开 false:关闭 + */ + override fun sendForceStopOrStartCloudReq(type: Int, direction: Int, enable: Boolean): Boolean { + return AdasManager.getInstance().sendForceStopOrStartCloudReq(type, direction, enable) > -1 + } + + /** + * 域控上报OBU开关控制 + * @param enable 0:关 1:开 + */ + override fun sendSetObuUploadReq(enable: Int): Boolean { + return AdasManager.getInstance().sendSetObuUploadReq(enable) > -1 + } + + /** + * 域控上报OBU开关状态查询 + */ + override fun sendObuUploadStatusQuery(): Boolean { + return AdasManager.getInstance().sendObuUploadStatusQuery() > -1 + } + } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt index 1c66b56dd4..0b0315c04a 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -86,9 +86,11 @@ import com.mogo.eagle.core.function.call.autopilot.CallerSweeperFutianCloudTaskL import com.mogo.eagle.core.function.call.autopilot.CallerTakeoverListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerV2XListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerV2nNioEventListenerManager +import com.mogo.eagle.core.function.call.autopilot.CallerVlmManager import com.mogo.eagle.core.function.call.devatools.CallerCaptureImgManager import com.mogo.eagle.core.function.call.devatools.CallerDiskCopyManager -import com.mogo.eagle.core.function.call.devatools.CallerImgUploadCloudManager +import com.mogo.eagle.core.function.call.devatools.CallerNDECloudManager +import com.mogo.eagle.core.function.call.devatools.CallerV2XManager import com.mogo.eagle.core.function.call.devatools.CallerOTAManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager import com.mogo.eagle.core.function.call.obu.CallerObuMapMathListenerManager @@ -114,6 +116,14 @@ import com.zhjt.mogo.adas.data.bean.LaunchConditionData import com.zhjt.mogo.adas.data.bean.NodeStateInfo import com.zhjt.mogo.adas.data.bean.ReceivedAck import com.zhjt.mogo.adas.data.bean.UnableLaunchReason +import com.zhjt.mogo.adas.data.bean.cloud.info.AdviceAvwInfo +import com.zhjt.mogo.adas.data.bean.cloud.info.AdviceComRsiInfo +import com.zhjt.mogo.adas.data.bean.cloud.info.AdviceEvwInfo +import com.zhjt.mogo.adas.data.bean.cloud.info.AdviceGlosaInfo +import com.zhjt.mogo.adas.data.bean.cloud.info.AdviceLaneSpdLmtInfo +import com.zhjt.mogo.adas.data.bean.cloud.info.AstFuncTlmInfo +import com.zhjt.mogo.adas.data.bean.cloud.pojo.AdvicePojo +import com.zhjt.mogo.adas.data.bean.cloud.pojo.AstFuncPojo import com.zhjt.mogo.adas.data.bean.power.PowerData import com.zhjt.mogo.adas.data.sweeper.bootable.SweeperBootable import com.zhjt.mogo.adas.data.sweeper.task.SweeperTask @@ -143,6 +153,7 @@ import prediction2025.Prediction2025 import record_cache.RecordPanelOuterClass import system_master.SsmInfo import system_master.SystemStatusInfo +import vllm.Vlm import java.io.PrintWriter import java.io.StringWriter import kotlin.math.roundToInt @@ -597,6 +608,22 @@ class MoGoAdasListenerImpl : OnAdasListener { } } + /** + * OTA 2.0 新接口 + * + * @param header 头 + * @param token PadSsmMsg唯一消息ID + * @param timestamp 消息发送时间 单位:毫秒 + * @param status OTA 2.0 数据 + */ + override fun onOtaPureStr( + header: MessagePad.Header?, + token: Long, + timestamp: Long, + status: SsmInfo.PureStr? + ) { + } + /** * 冷启动状态变更上报以及查询状态 * @@ -1300,6 +1327,7 @@ class MoGoAdasListenerImpl : OnAdasListener { ) { FunctionBuildConfig.fusionMode = adasParam.fusionMode CallerAutopilotGetParamResponseDispatcher.dispatchResponse(header, getParamResp, adasParam) + CallerV2XManager.invokeGetParamResp(getParamResp, adasParam) } /** @@ -1428,29 +1456,29 @@ class MoGoAdasListenerImpl : OnAdasListener { */ override fun onNodeStateInfo(stateInfo: NodeStateInfo) { CallerNodeStateListenerManager.invokeNodeState(stateInfo) - if (stateInfo.existState != null) { - if (stateInfo.nodeName == AdasConstants.NodeName.SSM) { - //域控SSM接口接收是否超时 - if (stateInfo.existState == NodeExistState.NODE_EXIST_TIMEOUT) { - CallerMsgBoxManager.saveMsgBox( - MsgBoxBean( - MsgBoxType.SSMINFO, - SSMMsg(0, "连接超时", "SSM超时无响应", System.currentTimeMillis()) - ) - ) - } else { - CallerMsgBoxManager.saveMsgBox( - MsgBoxBean( - MsgBoxType.SSMINFO, - SSMMsg(0, "连接恢复", "SSM连接恢复", System.currentTimeMillis()) - ) - ) - } - } else if (stateInfo.nodeName == AdasConstants.NodeName.FSM2024) { - //域控FSM接口接收是否超时 -// (stateInfo.existState == NodeExistState.NODE_EXIST_TIMEOUT) - } - } +// if (stateInfo.existState != null) { +// if (stateInfo.nodeName == AdasConstants.NodeName.SSM) { +// //域控SSM接口接收是否超时 +// if (stateInfo.existState == NodeExistState.NODE_EXIST_TIMEOUT) { +// CallerMsgBoxManager.saveMsgBox( +// MsgBoxBean( +// MsgBoxType.SSMINFO, +// SSMMsg(0, "连接超时", "SSM超时无响应", System.currentTimeMillis()) +// ) +// ) +// } else { +// CallerMsgBoxManager.saveMsgBox( +// MsgBoxBean( +// MsgBoxType.SSMINFO, +// SSMMsg(0, "连接恢复", "SSM连接恢复", System.currentTimeMillis()) +// ) +// ) +// } +// } else if (stateInfo.nodeName == AdasConstants.NodeName.FSM2024) { +// //域控FSM接口接收是否超时 +//// (stateInfo.existState == NodeExistState.NODE_EXIST_TIMEOUT) +// } +// } } /** @@ -1477,13 +1505,143 @@ class MoGoAdasListenerImpl : OnAdasListener { override fun onCloudConfig(header: MessagePad.Header, config: MessagePad.CloudConfig) { CallerCloudConfigListenerManager.invokeCloudConfig(config) + CallerV2XManager.invokeCloudConfig(config) } override fun onImgUploadCloudStatusResp( header: MessagePad.Header, resp: MessagePad.ImgUploadCloudStatusResp ) { - CallerImgUploadCloudManager.invokeImgUploadCloudStatusResp(resp) + CallerV2XManager.invokeImgUploadCloudStatusResp(resp) + } + + /** + * NDE下发 信号灯信息 + * + * @param header 头 + * @param astFuncPojo 云端辅助功能信息 + * @param astFuncTlmInfo 云端下发信号灯信息 + */ + override fun onNdeCloudAstFuncTlm( + header: MessagePad.Header, + astFuncPojo: AstFuncPojo, + astFuncTlmInfo: AstFuncTlmInfo + ) { + CallerNDECloudManager.onNdeCloudAstFuncTlm(astFuncPojo,astFuncTlmInfo) + } + + /** + * NDE下发 信号灯路口车速引导功能指令 + * + * @param header 头 + * @param advicePojo 实时决策建议 + * @param adviceGlosaInfo 信号灯路口车速引导功能指令 + */ + override fun onNdeCloudAdviceGlosa( + header: MessagePad.Header, + advicePojo: AdvicePojo, + adviceGlosaInfo: AdviceGlosaInfo + ) { + CallerNDECloudManager.onNdeCloudAdviceGlosa(advicePojo,adviceGlosaInfo) + } + + /** + * NDE下发 通用 RSI 预警指令 + * 包含: + * 闯红灯预警 + * 行驶车道建议 + * 交通拥堵提醒 + * 道路危险状况提示 + * 超视距弱势交通参与者提醒 + * 路口其他车辆闯红灯预警 + * 障碍物(路面遗撒)预警 + * 能见度预警 + * + * @param header 头 + * @param advicePojo 实时决策建议 + * @param adviceComRsiInfo 通用RSI预警指令 + */ + override fun onNdeCloudAdviceComRsi( + header: MessagePad.Header, + advicePojo: AdvicePojo, + adviceComRsiInfo: AdviceComRsiInfo + ) { + CallerNDECloudManager.onNdeCloudAdviceComRsi(advicePojo,adviceComRsiInfo) + } + + /** + * NDE下发 紧急车辆预警指令 + * + * @param header 头 + * @param advicePojo 实时决策建议 + * @param adviceEvwInfo 紧急车辆预警指令 + */ + override fun onNdeCloudAdviceEvw( + header: MessagePad.Header, + advicePojo: AdvicePojo, + adviceEvwInfo: AdviceEvwInfo + ) { + CallerNDECloudManager.onNdeCloudAdviceEvw(advicePojo,adviceEvwInfo) + } + + /** + * NDE下发 动态车道级限速指令 + * + * @param header 头 + * @param advicePojo 实时决策建议 + * @param adviceLaneSpdLmtInfo 动态车道级限速指令 + */ + override fun onNdeCloudAdviceLaneSpdLmt( + header: MessagePad.Header, + advicePojo: AdvicePojo, + adviceLaneSpdLmtInfo: AdviceLaneSpdLmtInfo + ) { + CallerNDECloudManager.onNdeCloudAdviceLaneSpdLmt(advicePojo,adviceLaneSpdLmtInfo) + } + + /** + * NDE下发 异常车辆预警指令 + * + * @param header 头 + * @param advicePojo 实时决策建议 + * @param adviceAvwInfo 异常车辆预警指令 + */ + override fun onNdeCloudAdviceAvw( + header: MessagePad.Header, + advicePojo: AdvicePojo, + adviceAvwInfo: AdviceAvwInfo + ) { + CallerNDECloudManager.onNdeCloudAdviceAvw(advicePojo,adviceAvwInfo) + } + + /** + * 视觉语言模型 + * + * @param header 头 + * @param vllm 数据 + */ + override fun onVllm(header: MessagePad.Header, vllm: Vlm.VLLMObject) { + CallerVlmManager.invokeVllm(header.sourceTimestamp, vllm) + } + + /** + * 视觉语言模型图像 + * + * @param header 头 + * @param image 数据 + */ + override fun onVllmImage(header: MessagePad.Header, image: ByteArray) { + CallerVlmManager.invokeVllmImage(header.sourceTimestamp, image) + } + + /** + * 域控上报OBU开关状态响应 + * + * @param header 头 + * @param enable 数据 + */ + override fun onObuUploadStatus(header: MessagePad.Header, enable: MessagePad.SetEnableReq) { + CallerV2XManager.invokeObuUploadStatus(enable) } /** diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt index c0ff93bfab..5e9ddb8186 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt @@ -142,8 +142,28 @@ class MoGoAdasMsgConnectStatusListenerImpl : CallerAutoPilotControlManager.setRainMode(FunctionBuildConfig.isRainMode) // 6.6.2 版本默认开启,与海江确认过,默认发盲区模式 CallerAutoPilotControlManager.sendFusionMode(2) - CallerAutoPilotControlManager.sendV2iToPncCmd(FunctionBuildConfig.v2iToPNC) + CallerAutoPilotControlManager.sendV2nToPncCmd(FunctionBuildConfig.v2nTotalSwitch) + + //事件数据进PNC应用 + if(FunctionBuildConfig.ndeEventDataToPnc){ + CallerAutoPilotControlManager.sendNdeDownEventToPnc(1) + }else{ + CallerAutoPilotControlManager.sendNdeDownEventToPnc(0) + } + //感知数据进PNC应用 + if(FunctionBuildConfig.ndePerceptionDataToPnc){ + CallerAutoPilotControlManager.sendNdeDownPerceptionToPnc(1) + }else{ + CallerAutoPilotControlManager.sendNdeDownPerceptionToPnc(0) + } + //V2I下行感知进PNC开关 + if(FunctionBuildConfig.v2iPerceptionDataToPnc){ + CallerAutoPilotControlManager.sendV2iDownPerceptionToPnc(1) + }else{ + CallerAutoPilotControlManager.sendV2iDownPerceptionToPnc(0) + } + } AdasConstants.IpcConnectionStatus.CONNECTING -> { diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt index 439d5e5ccb..b172f96feb 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuDcCombineManager.kt @@ -1,7 +1,6 @@ package com.mogo.eagle.core.function.datacenter.obu import android.content.Context -import com.mogo.eagle.core.data.R import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.config.HmiBuildConfig import com.mogo.eagle.core.data.enums.CommunicationType @@ -27,7 +26,6 @@ import com.mogo.eagle.core.function.datacenter.obu.utils.TrafficDataConvertUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU import com.mogo.eagle.core.utilcode.util.ConvertUtils -import com.mogo.skin.utils.SkinResources import com.mogo.support.obu.ObuScene import com.zhidao.support.obu.constants.MogoObuShowConstants import kotlin.math.roundToInt @@ -341,7 +339,7 @@ class MogoObuDcCombineManager private constructor() : IMoGoObuWarningRsiListener * RSM预警信息 CvxPtcThreatIndInfo CvxPtcInfoIndInfo(主车与弱势交通参与者之间的预警(如:弱势交通参与者碰撞预警)) */ fun onMogoObuDcRsmWarning(rsmWarningData: ObuScene.RsmWarningData?) { - if (HmiBuildConfig.v2iWeaknessTraffic) { + if (FunctionBuildConfig.v2iWeakTrafficParticipant) { CallerLogger.d( "${M_OBU}${TAG}", "MogoObuDcCombineManager onMogoObuRsmWarning ------> ${rsmWarningData.toString()}" diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt index bda0b7989c..1291e731b1 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt @@ -1,7 +1,6 @@ package com.mogo.eagle.core.function.datacenter.obu import android.content.Context -import com.mogo.eagle.core.data.R import com.mogo.eagle.core.data.app.AppConfigInfo import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.config.HmiBuildConfig @@ -26,7 +25,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ import com.mogo.eagle.core.utilcode.util.ConvertUtils import com.mogo.eagle.core.utilcode.util.FileUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import com.mogo.skin.utils.SkinResources import com.mogo.support.obu.ObuBase import com.mogo.support.obu.ObuScene import com.mogo.support.obu.constants.* @@ -298,7 +296,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { * v2v预警信息 CvxRvInfoIndInfo CvxV2vThreatIndInfo 他车 */ override fun onObuRvWarning(data: ObuScene.RvWarningData) { - if (FunctionBuildConfig.v2xTotalSwitch && HmiBuildConfig.v2vTotalSwitch) { + if (FunctionBuildConfig.v2xTotalSwitch && FunctionBuildConfig.v2vDownwardSwitch) { if (data.warningMsg != null) { // 更新数据,远车数据,之前要匹配uuid data.vehBasicsMsg?.let { @@ -646,7 +644,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { "onMogoObuRsmWarning ------> ${data?.toString()}" ) if (FunctionBuildConfig.v2xTotalSwitch && HmiBuildConfig.v2iTotalSwitch) { - if (HmiBuildConfig.v2iWeaknessTraffic) { + if (FunctionBuildConfig.v2iWeakTrafficParticipant) { // 交通参与者类型 0x0:未知 UNKNOWN | 1机动车 2:非机动车 NON_MOTOR | 3:行人 PEDESTRIAN 4:obu if (data != null && data.participant != null) { val v2xType = when (data.participant.ptcType) { diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt index 8e9cd40442..df48ff67a7 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt @@ -24,8 +24,10 @@ import com.mogo.eagle.core.data.multidisplay.TelematicConstant import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotIdentifyListener import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener +import com.mogo.eagle.core.function.api.devatools.INDECloudListener import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager +import com.mogo.eagle.core.function.call.devatools.CallerNDECloudManager import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager @@ -36,6 +38,9 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.GsonUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.skin.utils.SkinResources +import com.zhjt.mogo.adas.common.cloud.AstFuncTlmPhaseStateLightState +import com.zhjt.mogo.adas.data.bean.cloud.info.AstFuncTlmInfo +import com.zhjt.mogo.adas.data.bean.cloud.pojo.AstFuncPojo import com.zhjt.service.chain.ChainLog import perception.FusionTrafficLightOuterClass import kotlin.math.abs @@ -66,7 +71,7 @@ fun convert(state: FusionTrafficLightOuterClass.FusionLightState): TrafficLightE * @since: 2022/4/28 */ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLightListener, - IMoGoChassisLocationGCJ02Listener { + IMoGoChassisLocationGCJ02Listener, INDECloudListener { companion object { const val TAG = "TrafficLightDispatcher" @@ -93,10 +98,16 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight @Volatile private var hasFusionLightStatus: Boolean = false + //是否有云控基础平台红绿灯数据 + @Volatile + private var hasCloudControlLight: Boolean = false + + //红绿灯定时器,超时未更新隐藏红绿灯 @Volatile private var lightCountDownTimer: CountDownTimer? = null private var lastLightTime: Long = System.currentTimeMillis() + private var cloudControlLightTime: Long = System.currentTimeMillis() //云控基础平台红绿灯超时倒计时 private var currentSpeed: Float = 0f private var isPrompted: Boolean = false //是否提示过起步提醒/提前减速,每个路口仅提示一次 @@ -110,6 +121,8 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight CallerAutopilotIdentifyListenerManager.addListener(TAG, this) //注册获取当前车速 CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 1, this) + //注册监听云控基础平台数据 + CallerNDECloudManager.addListener(TAG,this) } /** @@ -362,7 +375,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight "${SceneConstant.M_D_C}${TAG}", "resetTrafficLight ------> isReset = $isReset ---hasObuLightStatus = $hasObuLightStatus" ) - if (!hasObuLightStatus && !hasAutopilotPerception && !hasFusionLightStatus) { + if (!hasObuLightStatus && !hasAutopilotPerception && !hasFusionLightStatus && !hasCloudControlLight) { if (isReset) { hide("云端重置红绿灯数据", DataSourceType.AICLOUD) } @@ -425,6 +438,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight hasObuLightStatus = false hasAutopilotPerception = false hasAiLightStatus = false + hasCloudControlLight = false hasFusionLightStatus = true CallerTrafficLightListenerManager.showFusionTrafficLight(currentState, currentDuration, nextState, nextDuration, nextTwoState, nextTwoDuration, lightSource) @@ -542,6 +556,8 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight CallerAutopilotIdentifyListenerManager.removeListener(TAG) //取消注册获取当前车速 CallerChassisLocationGCJ02ListenerManager.removeListener(TAG) + //取消注册云控基础平台数据 + CallerNDECloudManager.removeListener(TAG) } /** @@ -551,4 +567,103 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight currentSpeed = abs(mogoLocation?.gnssSpeed ?: 0f) } + /** + * NDE下发 信号灯信息 + * @param astFuncPojo 云端辅助功能信息 + * @param astFuncTlmInfo 云端下发信号灯信息 + */ + override fun onNdeCloudAstFuncTlm(astFuncPojo: AstFuncPojo, astFuncTlmInfo: AstFuncTlmInfo) { + super.onNdeCloudAstFuncTlm(astFuncPojo, astFuncTlmInfo) + if(astFuncTlmInfo.phaseState.isNotEmpty()){ + if(hasFusionLightStatus){ + return + }else{ + val currentState = getLightStatus(astFuncTlmInfo.phaseState[0].lightState) + val nextState = getLightStatus(astFuncTlmInfo.phaseState[0].nextLightState) + val currentDuration = astFuncTlmInfo.phaseState[0].timeLeft + val nextDuration = astFuncTlmInfo.phaseState[0].nextLightTime + if(currentState!=TrafficLightEnum.BLACK && nextState != TrafficLightEnum.BLACK + && currentDuration != 0 && nextDuration != 0){ + hasCloudControlLight = true + //展示云控基础平台信号灯信息 + CallerTrafficLightListenerManager.showCloudTrafficLight(currentState, currentDuration, nextState, nextDuration) + //倒计时,超时还未更新数据则隐藏红绿灯 + cloudControlLightTime = System.currentTimeMillis() + if (lightCountDownTimer == null){ + UiThreadHandler.post { + lightCountDownTimer = object : CountDownTimer(300000, 500) { + override fun onTick(millisUntilFinished: Long) { + if ((System.currentTimeMillis() - cloudControlLightTime) > 1000) { + //隐藏红绿灯显示 + hide("倒计时结束隐藏", DataSourceType.TELEMATIC_UNION_V2N) + CallerTrafficLightListenerManager.disableTrafficLight() + lightCountDownTimer?.cancel() + lightCountDownTimer = null + hasFusionLightStatus = false + isPrompted = false + isTurnGreen = false + } + } + + override fun onFinish() { + //隐藏红绿灯显示 + hide("倒计时结束隐藏", DataSourceType.TELEMATIC_UNION_V2N) + CallerTrafficLightListenerManager.disableTrafficLight() + lightCountDownTimer?.cancel() + lightCountDownTimer = null + hasFusionLightStatus = false + isPrompted = false + isTurnGreen = false + } + + } + lightCountDownTimer?.start() + } + } + }else{ + //隐藏云控基础信号红绿灯 + CallerTrafficLightListenerManager.disableTrafficLight() + hasCloudControlLight = false + } + } + }else{ + hasCloudControlLight = false + //隐藏云控基础信号红绿灯 + CallerTrafficLightListenerManager.disableTrafficLight() + } + } + + /** + * 获取云控基础平台灯态 + * @param lightState 当前灯态 + */ + private fun getLightStatus(lightState: AstFuncTlmPhaseStateLightState): TrafficLightEnum { + return when (lightState) { + //红闪、红灯 + AstFuncTlmPhaseStateLightState.RED_FLASH, + AstFuncTlmPhaseStateLightState.RED -> { + TrafficLightEnum.RED + } + //绿灯待行状态、绿灯状态、受保护相位绿灯(箭头灯) + AstFuncTlmPhaseStateLightState.GREEN_WAIT, + AstFuncTlmPhaseStateLightState.GREEN, + AstFuncTlmPhaseStateLightState.GREEN_PROTECTED -> { + TrafficLightEnum.GREEN + } + //黄灯状态、黄闪 + AstFuncTlmPhaseStateLightState.YELLOW, + AstFuncTlmPhaseStateLightState.YELLOW_FLASH -> { + TrafficLightEnum.YELLOW + } + //异常、预留、未知状态、信号灯未工作、故障 + AstFuncTlmPhaseStateLightState.ERROR, + AstFuncTlmPhaseStateLightState.RESERVED, + AstFuncTlmPhaseStateLightState.UNKNOWN, + AstFuncTlmPhaseStateLightState.OFF, + AstFuncTlmPhaseStateLightState.FAULT -> { + TrafficLightEnum.BLACK + } + } + } + } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt index cf92928ab4..16c19b6505 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/DataManager.kt @@ -167,7 +167,7 @@ object DataManager { CallerMsgBoxListenerManager.invokeListener(MsgCategory.SYS_INFO, msg) } - MsgBoxType.OBU, MsgBoxType.NOTICE, MsgBoxType.OPERATION,MsgBoxType.OTA, MsgBoxType.NDE -> { + MsgBoxType.OBU, MsgBoxType.NOTICE, MsgBoxType.OPERATION,MsgBoxType.OTA, MsgBoxType.NDE,MsgBoxType.CLOUD -> { synchronized(this) { notifyList.add(msg) } @@ -381,6 +381,17 @@ object DataManager { } } } + MsgBoxType.CLOUD.ordinal -> { + return@map MsgBoxBean( + MsgBoxType.CLOUD, + GsonUtils.fromJson(json,CloudControlMsg::class.java) + ).apply { + this.timestamp = msgInfo.timeStamp + withContext(Dispatchers.Main) { + cacheNotifyList.add(this@apply) + } + } + } else -> { return@map null diff --git a/core/function-impl/mogo-core-function-devatools-rviz/.gitignore b/core/function-impl/mogo-core-function-devatools-rviz/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/build.gradle b/core/function-impl/mogo-core-function-devatools-rviz/build.gradle new file mode 100644 index 0000000000..19d058e590 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/build.gradle @@ -0,0 +1,94 @@ +plugins { + id 'com.android.library' + id 'kotlin-android' + id 'kotlin-android-extensions' + id 'kotlin-kapt' +} + +android { + compileSdkVersion rootProject.ext.android.compileSdkVersion + defaultConfig { + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion + versionCode Integer.valueOf(VERSION_CODE) + versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION") + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles 'consumer-rules.pro' + + + javaCompileOptions { + annotationProcessorOptions { + arguments = ["room.schemaLocation": "$projectDir/schemas".toString()] + } + } + } + + //排除包中的proto文件 + packagingOptions { + exclude '**/*.proto' + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + lintOptions { + abortOnError false + } + + kotlinOptions { + jvmTarget = "1.8" + freeCompilerArgs += [ + "-Xopt-in=kotlin.RequiresOptIn" + ] + } + +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation rootProject.ext.dependencies.kotlinstdlib + implementation rootProject.ext.dependencies.mogologlib + + implementation rootProject.ext.dependencies.androidx_datastore + implementation rootProject.ext.dependencies.androidxroomruntime + kapt rootProject.ext.dependencies.androidxroomcompiler + implementation rootProject.ext.dependencies.rxandroid + implementation rootProject.ext.dependencies.androidxcardview + implementation rootProject.ext.dependencies.androidxroomktx + implementation rootProject.ext.dependencies.androidxappcompat + implementation rootProject.ext.dependencies.androidxconstraintlayout + implementation rootProject.ext.dependencies.androidxrecyclerview + + implementation rootProject.ext.dependencies.life_cycle_scope + + implementation project(':core:mogo-core-function-call') + implementation project(':core:mogo-core-function-api') + implementation project(':core:mogo-core-res') + implementation project(':foudations:mogo-commons') +// implementation 'io.github.h07000223:flycoTabLayout:3.0.0' 直接应用源码 + implementation project(':core:mogo-core-utils') + implementation project(':libraries:mogo-adas') + implementation project(':libraries:mogo-adas-data') + + //----------------SSH start--------------------- + //implementation('org.connectbot:sshlib:2.2.21') + //正常引用 org.connectbot:sshlib:2.2.21库由于存在冲突 故将原始代码拷贝到项目中并引用库中的第三方库 + implementation("com.jcraft:jzlib:1.1.3") + implementation("org.connectbot:simplesocks:1.0.1") + implementation("com.google.crypto.tink:tink:1.7.0") + implementation("org.connectbot:jbcrypt:1.0.2") + //----------------SSH end--------------------- + implementation 'org.conscrypt:conscrypt-android:2.5.2' + + implementation 'com.belerweb:pinyin4j:2.5.1' +} + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/gradle.properties b/core/function-impl/mogo-core-function-devatools-rviz/gradle.properties new file mode 100644 index 0000000000..768f0ce1ac --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/gradle.properties @@ -0,0 +1,3 @@ +GROUP=com.mogo.eagle.core.function.impl +POM_ARTIFACT_ID=devatools_rviz +VERSION_CODE=1 diff --git a/core/function-impl/mogo-core-function-devatools-rviz/proguard-rules.pro b/core/function-impl/mogo-core-function-devatools-rviz/proguard-rules.pro new file mode 100644 index 0000000000..3dbb226707 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/proguard-rules.pro @@ -0,0 +1,23 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile + +-dontwarn android.arch.persistence.** \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..d8a81d16c5 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/AndroidManifest.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/assets/AutoPilotVisualDB.db b/core/function-impl/mogo-core-function-devatools-rviz/src/main/assets/AutoPilotVisualDB.db new file mode 100644 index 0000000000..b3cc78585e Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/assets/AutoPilotVisualDB.db differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/assets/AutoPilotVisualDB.db-shm b/core/function-impl/mogo-core-function-devatools-rviz/src/main/assets/AutoPilotVisualDB.db-shm new file mode 100644 index 0000000000..60c4f90f28 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/assets/AutoPilotVisualDB.db-shm differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/assets/AutoPilotVisualDB.db-wal b/core/function-impl/mogo-core-function-devatools-rviz/src/main/assets/AutoPilotVisualDB.db-wal new file mode 100644 index 0000000000..813a6f51a5 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/assets/AutoPilotVisualDB.db-wal differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/assets/courbd.ttf b/core/function-impl/mogo-core-function-devatools-rviz/src/main/assets/courbd.ttf new file mode 100644 index 0000000000..145b73651f Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/assets/courbd.ttf differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/flyco/tablayout/CommonTabLayout.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/flyco/tablayout/CommonTabLayout.java new file mode 100644 index 0000000000..c65ba8fbf0 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/flyco/tablayout/CommonTabLayout.java @@ -0,0 +1,959 @@ +package com.flyco.tablayout; + +import android.animation.TypeEvaluator; +import android.animation.ValueAnimator; +import android.content.Context; +import android.content.res.TypedArray; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; +import android.graphics.Path; +import android.graphics.Rect; +import android.graphics.drawable.GradientDrawable; +import android.os.Bundle; +import android.os.Parcelable; +import android.util.AttributeSet; +import android.util.SparseArray; +import android.util.TypedValue; +import android.view.Gravity; +import android.view.View; +import android.view.ViewGroup; +import android.view.animation.OvershootInterpolator; +import android.widget.FrameLayout; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.TextView; +import com.zhjt.mogo_core_function_devatools.rviz.R; + +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; + +import com.flyco.tablayout.listener.CustomTabEntity; +import com.flyco.tablayout.listener.OnTabSelectListener; +import com.flyco.tablayout.utils.FragmentChangeManager; +import com.flyco.tablayout.utils.UnreadMsgUtils; +import com.flyco.tablayout.widget.MsgView; + +import java.util.ArrayList; + +/** 没有继承HorizontalScrollView不能滑动,对于ViewPager无依赖 */ +public class CommonTabLayout extends FrameLayout implements ValueAnimator.AnimatorUpdateListener { + private Context mContext; + private ArrayList mTabEntitys = new ArrayList<>(); + private LinearLayout mTabsContainer; + private int mCurrentTab; + private int mLastTab; + private int mTabCount; + /** 用于绘制显示器 */ + private Rect mIndicatorRect = new Rect(); + private GradientDrawable mIndicatorDrawable = new GradientDrawable(); + + private Paint mRectPaint = new Paint(Paint.ANTI_ALIAS_FLAG); + private Paint mDividerPaint = new Paint(Paint.ANTI_ALIAS_FLAG); + private Paint mTrianglePaint = new Paint(Paint.ANTI_ALIAS_FLAG); + private Path mTrianglePath = new Path(); + private static final int STYLE_NORMAL = 0; + private static final int STYLE_TRIANGLE = 1; + private static final int STYLE_BLOCK = 2; + private int mIndicatorStyle = STYLE_NORMAL; + + private float mTabPadding; + private boolean mTabSpaceEqual; + private float mTabWidth; + + /** indicator */ + private int mIndicatorColor; + private float mIndicatorHeight; + private float mIndicatorWidth; + private float mIndicatorCornerRadius; + private float mIndicatorMarginLeft; + private float mIndicatorMarginTop; + private float mIndicatorMarginRight; + private float mIndicatorMarginBottom; + private long mIndicatorAnimDuration; + private boolean mIndicatorAnimEnable; + private boolean mIndicatorBounceEnable; + private int mIndicatorGravity; + + /** underline */ + private int mUnderlineColor; + private float mUnderlineHeight; + private int mUnderlineGravity; + + /** divider */ + private int mDividerColor; + private float mDividerWidth; + private float mDividerPadding; + + /** title */ + private static final int TEXT_BOLD_NONE = 0; + private static final int TEXT_BOLD_WHEN_SELECT = 1; + private static final int TEXT_BOLD_BOTH = 2; + private float mTextsize; + private int mTextSelectColor; + private int mTextUnselectColor; + private int mTextBold; + private boolean mTextAllCaps; + + /** icon */ + private boolean mIconVisible; + private int mIconGravity; + private float mIconWidth; + private float mIconHeight; + private float mIconMargin; + + private int mHeight; + + /** anim */ + private ValueAnimator mValueAnimator; + private OvershootInterpolator mInterpolator = new OvershootInterpolator(1.5f); + + private FragmentChangeManager mFragmentChangeManager; + + public CommonTabLayout(Context context) { + this(context, null, 0); + } + + public CommonTabLayout(Context context, AttributeSet attrs) { + this(context, attrs, 0); + } + + public CommonTabLayout(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + setWillNotDraw(false);//重写onDraw方法,需要调用这个方法来清除flag + setClipChildren(false); + setClipToPadding(false); + + this.mContext = context; + mTabsContainer = new LinearLayout(context); + addView(mTabsContainer); + + obtainAttributes(context, attrs); + + //get layout_height + String height = attrs.getAttributeValue("http://schemas.android.com/apk/res/android", "layout_height"); + + //create ViewPager + if (height.equals(ViewGroup.LayoutParams.MATCH_PARENT + "")) { + } else if (height.equals(ViewGroup.LayoutParams.WRAP_CONTENT + "")) { + } else { + int[] systemAttrs = {android.R.attr.layout_height}; + TypedArray a = context.obtainStyledAttributes(attrs, systemAttrs); + mHeight = a.getDimensionPixelSize(0, ViewGroup.LayoutParams.WRAP_CONTENT); + a.recycle(); + } + + mValueAnimator = ValueAnimator.ofObject(new PointEvaluator(), mLastP, mCurrentP); + mValueAnimator.addUpdateListener(this); + } + + private void obtainAttributes(Context context, AttributeSet attrs) { + TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.CommonTabLayout); + + mIndicatorStyle = ta.getInt(R.styleable.CommonTabLayout_tl_indicator_style, 0); + mIndicatorColor = ta.getColor(R.styleable.CommonTabLayout_tl_indicator_color, Color.parseColor(mIndicatorStyle == STYLE_BLOCK ? "#4B6A87" : "#ffffff")); + mIndicatorHeight = ta.getDimension(R.styleable.CommonTabLayout_tl_indicator_height, + dp2px(mIndicatorStyle == STYLE_TRIANGLE ? 4 : (mIndicatorStyle == STYLE_BLOCK ? -1 : 2))); + mIndicatorWidth = ta.getDimension(R.styleable.CommonTabLayout_tl_indicator_width, dp2px(mIndicatorStyle == STYLE_TRIANGLE ? 10 : -1)); + mIndicatorCornerRadius = ta.getDimension(R.styleable.CommonTabLayout_tl_indicator_corner_radius, dp2px(mIndicatorStyle == STYLE_BLOCK ? -1 : 0)); + mIndicatorMarginLeft = ta.getDimension(R.styleable.CommonTabLayout_tl_indicator_margin_left, dp2px(0)); + mIndicatorMarginTop = ta.getDimension(R.styleable.CommonTabLayout_tl_indicator_margin_top, dp2px(mIndicatorStyle == STYLE_BLOCK ? 7 : 0)); + mIndicatorMarginRight = ta.getDimension(R.styleable.CommonTabLayout_tl_indicator_margin_right, dp2px(0)); + mIndicatorMarginBottom = ta.getDimension(R.styleable.CommonTabLayout_tl_indicator_margin_bottom, dp2px(mIndicatorStyle == STYLE_BLOCK ? 7 : 0)); + mIndicatorAnimEnable = ta.getBoolean(R.styleable.CommonTabLayout_tl_indicator_anim_enable, true); + mIndicatorBounceEnable = ta.getBoolean(R.styleable.CommonTabLayout_tl_indicator_bounce_enable, true); + mIndicatorAnimDuration = ta.getInt(R.styleable.CommonTabLayout_tl_indicator_anim_duration, -1); + mIndicatorGravity = ta.getInt(R.styleable.CommonTabLayout_tl_indicator_gravity, Gravity.BOTTOM); + + mUnderlineColor = ta.getColor(R.styleable.CommonTabLayout_tl_underline_color, Color.parseColor("#ffffff")); + mUnderlineHeight = ta.getDimension(R.styleable.CommonTabLayout_tl_underline_height, dp2px(0)); + mUnderlineGravity = ta.getInt(R.styleable.CommonTabLayout_tl_underline_gravity, Gravity.BOTTOM); + + mDividerColor = ta.getColor(R.styleable.CommonTabLayout_tl_divider_color, Color.parseColor("#ffffff")); + mDividerWidth = ta.getDimension(R.styleable.CommonTabLayout_tl_divider_width, dp2px(0)); + mDividerPadding = ta.getDimension(R.styleable.CommonTabLayout_tl_divider_padding, dp2px(12)); + + mTextsize = ta.getDimension(R.styleable.CommonTabLayout_tl_textsize, sp2px(13f)); + mTextSelectColor = ta.getColor(R.styleable.CommonTabLayout_tl_textSelectColor, Color.parseColor("#ffffff")); + mTextUnselectColor = ta.getColor(R.styleable.CommonTabLayout_tl_textUnselectColor, Color.parseColor("#AAffffff")); + mTextBold = ta.getInt(R.styleable.CommonTabLayout_tl_textBold, TEXT_BOLD_NONE); + mTextAllCaps = ta.getBoolean(R.styleable.CommonTabLayout_tl_textAllCaps, false); + + mIconVisible = ta.getBoolean(R.styleable.CommonTabLayout_tl_iconVisible, true); + mIconGravity = ta.getInt(R.styleable.CommonTabLayout_tl_iconGravity, Gravity.TOP); + mIconWidth = ta.getDimension(R.styleable.CommonTabLayout_tl_iconWidth, dp2px(0)); + mIconHeight = ta.getDimension(R.styleable.CommonTabLayout_tl_iconHeight, dp2px(0)); + mIconMargin = ta.getDimension(R.styleable.CommonTabLayout_tl_iconMargin, dp2px(2.5f)); + + mTabSpaceEqual = ta.getBoolean(R.styleable.CommonTabLayout_tl_tab_space_equal, true); + mTabWidth = ta.getDimension(R.styleable.CommonTabLayout_tl_tab_width, dp2px(-1)); + mTabPadding = ta.getDimension(R.styleable.CommonTabLayout_tl_tab_padding, mTabSpaceEqual || mTabWidth > 0 ? dp2px(0) : dp2px(10)); + + ta.recycle(); + } + + public void setTabData(ArrayList tabEntitys) { + if (tabEntitys == null || tabEntitys.size() == 0) { + throw new IllegalStateException("TabEntitys can not be NULL or EMPTY !"); + } + + this.mTabEntitys.clear(); + this.mTabEntitys.addAll(tabEntitys); + + notifyDataSetChanged(); + } + + /** 关联数据支持同时切换fragments */ + public void setTabData(ArrayList tabEntitys, FragmentActivity fa, int containerViewId, ArrayList fragments) { + mFragmentChangeManager = new FragmentChangeManager(fa.getSupportFragmentManager(), containerViewId, fragments); + setTabData(tabEntitys); + } + + /** 更新数据 */ + public void notifyDataSetChanged() { + mTabsContainer.removeAllViews(); + this.mTabCount = mTabEntitys.size(); + View tabView; + for (int i = 0; i < mTabCount; i++) { + if (mIconGravity == Gravity.LEFT) { + tabView = View.inflate(mContext, R.layout.layout_tab_left, null); + } else if (mIconGravity == Gravity.RIGHT) { + tabView = View.inflate(mContext, R.layout.layout_tab_right, null); + } else if (mIconGravity == Gravity.BOTTOM) { + tabView = View.inflate(mContext, R.layout.layout_tab_bottom, null); + } else { + tabView = View.inflate(mContext, R.layout.layout_tab_top, null); + } + + tabView.setTag(i); + addTab(i, tabView); + } + + updateTabStyles(); + } + + /** 创建并添加tab */ + private void addTab(final int position, View tabView) { + TextView tv_tab_title = (TextView) tabView.findViewById(R.id.tv_tab_title); + tv_tab_title.setText(mTabEntitys.get(position).getTabTitle()); + ImageView iv_tab_icon = (ImageView) tabView.findViewById(R.id.iv_tab_icon); + iv_tab_icon.setImageResource(mTabEntitys.get(position).getTabUnselectedIcon()); + + tabView.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + int position = (Integer) v.getTag(); + if (mCurrentTab != position) { + setCurrentTab(position); + if (mListener != null) { + mListener.onTabSelect(position); + } + } else { + if (mListener != null) { + mListener.onTabReselect(position); + } + } + } + }); + + /** 每一个Tab的布局参数 */ + LinearLayout.LayoutParams lp_tab = mTabSpaceEqual ? + new LinearLayout.LayoutParams(0, LayoutParams.MATCH_PARENT, 1.0f) : + new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT); + if (mTabWidth > 0) { + lp_tab = new LinearLayout.LayoutParams((int) mTabWidth, LayoutParams.MATCH_PARENT); + } + mTabsContainer.addView(tabView, position, lp_tab); + } + + private void updateTabStyles() { + for (int i = 0; i < mTabCount; i++) { + View tabView = mTabsContainer.getChildAt(i); + tabView.setPadding((int) mTabPadding, 0, (int) mTabPadding, 0); + TextView tv_tab_title = (TextView) tabView.findViewById(R.id.tv_tab_title); + tv_tab_title.setTextColor(i == mCurrentTab ? mTextSelectColor : mTextUnselectColor); + tv_tab_title.setTextSize(TypedValue.COMPLEX_UNIT_PX, mTextsize); +// tv_tab_title.setPadding((int) mTabPadding, 0, (int) mTabPadding, 0); + if (mTextAllCaps) { + tv_tab_title.setText(tv_tab_title.getText().toString().toUpperCase()); + } + + if (mTextBold == TEXT_BOLD_BOTH) { + tv_tab_title.getPaint().setFakeBoldText(true); + } else if (mTextBold == TEXT_BOLD_NONE) { + tv_tab_title.getPaint().setFakeBoldText(false); + } + + ImageView iv_tab_icon = (ImageView) tabView.findViewById(R.id.iv_tab_icon); + if (mIconVisible) { + iv_tab_icon.setVisibility(View.VISIBLE); + CustomTabEntity tabEntity = mTabEntitys.get(i); + iv_tab_icon.setImageResource(i == mCurrentTab ? tabEntity.getTabSelectedIcon() : tabEntity.getTabUnselectedIcon()); + LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams( + mIconWidth <= 0 ? LinearLayout.LayoutParams.WRAP_CONTENT : (int) mIconWidth, + mIconHeight <= 0 ? LinearLayout.LayoutParams.WRAP_CONTENT : (int) mIconHeight); + if (mIconGravity == Gravity.LEFT) { + lp.rightMargin = (int) mIconMargin; + } else if (mIconGravity == Gravity.RIGHT) { + lp.leftMargin = (int) mIconMargin; + } else if (mIconGravity == Gravity.BOTTOM) { + lp.topMargin = (int) mIconMargin; + } else { + lp.bottomMargin = (int) mIconMargin; + } + + iv_tab_icon.setLayoutParams(lp); + } else { + iv_tab_icon.setVisibility(View.GONE); + } + } + } + + private void updateTabSelection(int position) { + for (int i = 0; i < mTabCount; ++i) { + View tabView = mTabsContainer.getChildAt(i); + final boolean isSelect = i == position; + TextView tab_title = (TextView) tabView.findViewById(R.id.tv_tab_title); + tab_title.setTextColor(isSelect ? mTextSelectColor : mTextUnselectColor); + ImageView iv_tab_icon = (ImageView) tabView.findViewById(R.id.iv_tab_icon); + CustomTabEntity tabEntity = mTabEntitys.get(i); + iv_tab_icon.setImageResource(isSelect ? tabEntity.getTabSelectedIcon() : tabEntity.getTabUnselectedIcon()); + if (mTextBold == TEXT_BOLD_WHEN_SELECT) { + tab_title.getPaint().setFakeBoldText(isSelect); + } + } + } + + private void calcOffset() { + final View currentTabView = mTabsContainer.getChildAt(this.mCurrentTab); + mCurrentP.left = currentTabView.getLeft(); + mCurrentP.right = currentTabView.getRight(); + + final View lastTabView = mTabsContainer.getChildAt(this.mLastTab); + mLastP.left = lastTabView.getLeft(); + mLastP.right = lastTabView.getRight(); + +// Log.d("AAA", "mLastP--->" + mLastP.left + "&" + mLastP.right); +// Log.d("AAA", "mCurrentP--->" + mCurrentP.left + "&" + mCurrentP.right); + if (mLastP.left == mCurrentP.left && mLastP.right == mCurrentP.right) { + invalidate(); + } else { + mValueAnimator.setObjectValues(mLastP, mCurrentP); + if (mIndicatorBounceEnable) { + mValueAnimator.setInterpolator(mInterpolator); + } + + if (mIndicatorAnimDuration < 0) { + mIndicatorAnimDuration = mIndicatorBounceEnable ? 500 : 250; + } + mValueAnimator.setDuration(mIndicatorAnimDuration); + mValueAnimator.start(); + } + } + + private void calcIndicatorRect() { + View currentTabView = mTabsContainer.getChildAt(this.mCurrentTab); + float left = currentTabView.getLeft(); + float right = currentTabView.getRight(); + + mIndicatorRect.left = (int) left; + mIndicatorRect.right = (int) right; + + if (mIndicatorWidth < 0) { //indicatorWidth小于0时,原jpardogo's PagerSlidingTabStrip + + } else {//indicatorWidth大于0时,圆角矩形以及三角形 + float indicatorLeft = currentTabView.getLeft() + (currentTabView.getWidth() - mIndicatorWidth) / 2; + + mIndicatorRect.left = (int) indicatorLeft; + mIndicatorRect.right = (int) (mIndicatorRect.left + mIndicatorWidth); + } + } + + @Override + public void onAnimationUpdate(ValueAnimator animation) { + View currentTabView = mTabsContainer.getChildAt(this.mCurrentTab); + IndicatorPoint p = (IndicatorPoint) animation.getAnimatedValue(); + mIndicatorRect.left = (int) p.left; + mIndicatorRect.right = (int) p.right; + + if (mIndicatorWidth < 0) { //indicatorWidth小于0时,原jpardogo's PagerSlidingTabStrip + + } else {//indicatorWidth大于0时,圆角矩形以及三角形 + float indicatorLeft = p.left + (currentTabView.getWidth() - mIndicatorWidth) / 2; + + mIndicatorRect.left = (int) indicatorLeft; + mIndicatorRect.right = (int) (mIndicatorRect.left + mIndicatorWidth); + } + invalidate(); + } + + private boolean mIsFirstDraw = true; + + @Override + protected void onDraw(Canvas canvas) { + super.onDraw(canvas); + + if (isInEditMode() || mTabCount <= 0) { + return; + } + + int height = getHeight(); + int paddingLeft = getPaddingLeft(); + // draw divider + if (mDividerWidth > 0) { + mDividerPaint.setStrokeWidth(mDividerWidth); + mDividerPaint.setColor(mDividerColor); + for (int i = 0; i < mTabCount - 1; i++) { + View tab = mTabsContainer.getChildAt(i); + canvas.drawLine(paddingLeft + tab.getRight(), mDividerPadding, paddingLeft + tab.getRight(), height - mDividerPadding, mDividerPaint); + } + } + + // draw underline + if (mUnderlineHeight > 0) { + mRectPaint.setColor(mUnderlineColor); + if (mUnderlineGravity == Gravity.BOTTOM) { + canvas.drawRect(paddingLeft, height - mUnderlineHeight, mTabsContainer.getWidth() + paddingLeft, height, mRectPaint); + } else { + canvas.drawRect(paddingLeft, 0, mTabsContainer.getWidth() + paddingLeft, mUnderlineHeight, mRectPaint); + } + } + + //draw indicator line + if (mIndicatorAnimEnable) { + if (mIsFirstDraw) { + mIsFirstDraw = false; + calcIndicatorRect(); + } + } else { + calcIndicatorRect(); + } + + + if (mIndicatorStyle == STYLE_TRIANGLE) { + if (mIndicatorHeight > 0) { + mTrianglePaint.setColor(mIndicatorColor); + mTrianglePath.reset(); + mTrianglePath.moveTo(paddingLeft + mIndicatorRect.left, height); + mTrianglePath.lineTo(paddingLeft + mIndicatorRect.left / 2 + mIndicatorRect.right / 2, height - mIndicatorHeight); + mTrianglePath.lineTo(paddingLeft + mIndicatorRect.right, height); + mTrianglePath.close(); + canvas.drawPath(mTrianglePath, mTrianglePaint); + } + } else if (mIndicatorStyle == STYLE_BLOCK) { + if (mIndicatorHeight < 0) { + mIndicatorHeight = height - mIndicatorMarginTop - mIndicatorMarginBottom; + } else { + + } + + if (mIndicatorHeight > 0) { + if (mIndicatorCornerRadius < 0 || mIndicatorCornerRadius > mIndicatorHeight / 2) { + mIndicatorCornerRadius = mIndicatorHeight / 2; + } + + mIndicatorDrawable.setColor(mIndicatorColor); + mIndicatorDrawable.setBounds(paddingLeft + (int) mIndicatorMarginLeft + mIndicatorRect.left, + (int) mIndicatorMarginTop, (int) (paddingLeft + mIndicatorRect.right - mIndicatorMarginRight), + (int) (mIndicatorMarginTop + mIndicatorHeight)); + mIndicatorDrawable.setCornerRadius(mIndicatorCornerRadius); + mIndicatorDrawable.draw(canvas); + } + } else { + /* mRectPaint.setColor(mIndicatorColor); + calcIndicatorRect(); + canvas.drawRect(getPaddingLeft() + mIndicatorRect.left, getHeight() - mIndicatorHeight, + mIndicatorRect.right + getPaddingLeft(), getHeight(), mRectPaint);*/ + + if (mIndicatorHeight > 0) { + mIndicatorDrawable.setColor(mIndicatorColor); + if (mIndicatorGravity == Gravity.BOTTOM) { + mIndicatorDrawable.setBounds(paddingLeft + (int) mIndicatorMarginLeft + mIndicatorRect.left, + height - (int) mIndicatorHeight - (int) mIndicatorMarginBottom, + paddingLeft + mIndicatorRect.right - (int) mIndicatorMarginRight, + height - (int) mIndicatorMarginBottom); + } else { + mIndicatorDrawable.setBounds(paddingLeft + (int) mIndicatorMarginLeft + mIndicatorRect.left, + (int) mIndicatorMarginTop, + paddingLeft + mIndicatorRect.right - (int) mIndicatorMarginRight, + (int) mIndicatorHeight + (int) mIndicatorMarginTop); + } + mIndicatorDrawable.setCornerRadius(mIndicatorCornerRadius); + mIndicatorDrawable.draw(canvas); + } + } + } + + //setter and getter + public void setCurrentTab(int currentTab) { + mLastTab = this.mCurrentTab; + this.mCurrentTab = currentTab; + updateTabSelection(currentTab); + if (mFragmentChangeManager != null) { + mFragmentChangeManager.setFragments(currentTab); + } + if (mIndicatorAnimEnable) { + calcOffset(); + } else { + invalidate(); + } + } + + public void setIndicatorStyle(int indicatorStyle) { + this.mIndicatorStyle = indicatorStyle; + invalidate(); + } + + public void setTabPadding(float tabPadding) { + this.mTabPadding = dp2px(tabPadding); + updateTabStyles(); + } + + public void setTabSpaceEqual(boolean tabSpaceEqual) { + this.mTabSpaceEqual = tabSpaceEqual; + updateTabStyles(); + } + + public void setTabWidth(float tabWidth) { + this.mTabWidth = dp2px(tabWidth); + updateTabStyles(); + } + + public void setIndicatorColor(int indicatorColor) { + this.mIndicatorColor = indicatorColor; + invalidate(); + } + + public void setIndicatorHeight(float indicatorHeight) { + this.mIndicatorHeight = dp2px(indicatorHeight); + invalidate(); + } + + public void setIndicatorWidth(float indicatorWidth) { + this.mIndicatorWidth = dp2px(indicatorWidth); + invalidate(); + } + + public void setIndicatorCornerRadius(float indicatorCornerRadius) { + this.mIndicatorCornerRadius = dp2px(indicatorCornerRadius); + invalidate(); + } + + public void setIndicatorGravity(int indicatorGravity) { + this.mIndicatorGravity = indicatorGravity; + invalidate(); + } + + public void setIndicatorMargin(float indicatorMarginLeft, float indicatorMarginTop, + float indicatorMarginRight, float indicatorMarginBottom) { + this.mIndicatorMarginLeft = dp2px(indicatorMarginLeft); + this.mIndicatorMarginTop = dp2px(indicatorMarginTop); + this.mIndicatorMarginRight = dp2px(indicatorMarginRight); + this.mIndicatorMarginBottom = dp2px(indicatorMarginBottom); + invalidate(); + } + + public void setIndicatorAnimDuration(long indicatorAnimDuration) { + this.mIndicatorAnimDuration = indicatorAnimDuration; + } + + public void setIndicatorAnimEnable(boolean indicatorAnimEnable) { + this.mIndicatorAnimEnable = indicatorAnimEnable; + } + + public void setIndicatorBounceEnable(boolean indicatorBounceEnable) { + this.mIndicatorBounceEnable = indicatorBounceEnable; + } + + public void setUnderlineColor(int underlineColor) { + this.mUnderlineColor = underlineColor; + invalidate(); + } + + public void setUnderlineHeight(float underlineHeight) { + this.mUnderlineHeight = dp2px(underlineHeight); + invalidate(); + } + + public void setUnderlineGravity(int underlineGravity) { + this.mUnderlineGravity = underlineGravity; + invalidate(); + } + + public void setDividerColor(int dividerColor) { + this.mDividerColor = dividerColor; + invalidate(); + } + + public void setDividerWidth(float dividerWidth) { + this.mDividerWidth = dp2px(dividerWidth); + invalidate(); + } + + public void setDividerPadding(float dividerPadding) { + this.mDividerPadding = dp2px(dividerPadding); + invalidate(); + } + + public void setTextsize(float textsize) { + this.mTextsize = sp2px(textsize); + updateTabStyles(); + } + + public void setTextSelectColor(int textSelectColor) { + this.mTextSelectColor = textSelectColor; + updateTabStyles(); + } + + public void setTextUnselectColor(int textUnselectColor) { + this.mTextUnselectColor = textUnselectColor; + updateTabStyles(); + } + + public void setTextBold(int textBold) { + this.mTextBold = textBold; + updateTabStyles(); + } + + public void setIconVisible(boolean iconVisible) { + this.mIconVisible = iconVisible; + updateTabStyles(); + } + + public void setIconGravity(int iconGravity) { + this.mIconGravity = iconGravity; + notifyDataSetChanged(); + } + + public void setIconWidth(float iconWidth) { + this.mIconWidth = dp2px(iconWidth); + updateTabStyles(); + } + + public void setIconHeight(float iconHeight) { + this.mIconHeight = dp2px(iconHeight); + updateTabStyles(); + } + + public void setIconMargin(float iconMargin) { + this.mIconMargin = dp2px(iconMargin); + updateTabStyles(); + } + + public void setTextAllCaps(boolean textAllCaps) { + this.mTextAllCaps = textAllCaps; + updateTabStyles(); + } + + + public int getTabCount() { + return mTabCount; + } + + public int getCurrentTab() { + return mCurrentTab; + } + + public int getIndicatorStyle() { + return mIndicatorStyle; + } + + public float getTabPadding() { + return mTabPadding; + } + + public boolean isTabSpaceEqual() { + return mTabSpaceEqual; + } + + public float getTabWidth() { + return mTabWidth; + } + + public int getIndicatorColor() { + return mIndicatorColor; + } + + public float getIndicatorHeight() { + return mIndicatorHeight; + } + + public float getIndicatorWidth() { + return mIndicatorWidth; + } + + public float getIndicatorCornerRadius() { + return mIndicatorCornerRadius; + } + + public float getIndicatorMarginLeft() { + return mIndicatorMarginLeft; + } + + public float getIndicatorMarginTop() { + return mIndicatorMarginTop; + } + + public float getIndicatorMarginRight() { + return mIndicatorMarginRight; + } + + public float getIndicatorMarginBottom() { + return mIndicatorMarginBottom; + } + + public long getIndicatorAnimDuration() { + return mIndicatorAnimDuration; + } + + public boolean isIndicatorAnimEnable() { + return mIndicatorAnimEnable; + } + + public boolean isIndicatorBounceEnable() { + return mIndicatorBounceEnable; + } + + public int getUnderlineColor() { + return mUnderlineColor; + } + + public float getUnderlineHeight() { + return mUnderlineHeight; + } + + public int getDividerColor() { + return mDividerColor; + } + + public float getDividerWidth() { + return mDividerWidth; + } + + public float getDividerPadding() { + return mDividerPadding; + } + + public float getTextsize() { + return mTextsize; + } + + public int getTextSelectColor() { + return mTextSelectColor; + } + + public int getTextUnselectColor() { + return mTextUnselectColor; + } + + public int getTextBold() { + return mTextBold; + } + + public boolean isTextAllCaps() { + return mTextAllCaps; + } + + public int getIconGravity() { + return mIconGravity; + } + + public float getIconWidth() { + return mIconWidth; + } + + public float getIconHeight() { + return mIconHeight; + } + + public float getIconMargin() { + return mIconMargin; + } + + public boolean isIconVisible() { + return mIconVisible; + } + + + public ImageView getIconView(int tab) { + View tabView = mTabsContainer.getChildAt(tab); + ImageView iv_tab_icon = (ImageView) tabView.findViewById(R.id.iv_tab_icon); + return iv_tab_icon; + } + + public TextView getTitleView(int tab) { + View tabView = mTabsContainer.getChildAt(tab); + TextView tv_tab_title = (TextView) tabView.findViewById(R.id.tv_tab_title); + return tv_tab_title; + } + + //setter and getter + + // show MsgTipView + private Paint mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG); + private SparseArray mInitSetMap = new SparseArray<>(); + + /** + * 显示未读消息 + * + * @param position 显示tab位置 + * @param num num小于等于0显示红点,num大于0显示数字 + */ + public void showMsg(int position, int num) { + if (position >= mTabCount) { + position = mTabCount - 1; + } + + View tabView = mTabsContainer.getChildAt(position); + MsgView tipView = (MsgView) tabView.findViewById(R.id.rtv_msg_tip); + if (tipView != null) { + UnreadMsgUtils.show(tipView, num); + + if (mInitSetMap.get(position) != null && mInitSetMap.get(position)) { + return; + } + + if (!mIconVisible) { + setMsgMargin(position, 2, 2); + } else { + setMsgMargin(position, 0, + mIconGravity == Gravity.LEFT || mIconGravity == Gravity.RIGHT ? 4 : 0); + } + + mInitSetMap.put(position, true); + } + } + + /** + * 显示未读红点 + * + * @param position 显示tab位置 + */ + public void showDot(int position) { + if (position >= mTabCount) { + position = mTabCount - 1; + } + showMsg(position, 0); + } + + public void hideMsg(int position) { + if (position >= mTabCount) { + position = mTabCount - 1; + } + + View tabView = mTabsContainer.getChildAt(position); + MsgView tipView = (MsgView) tabView.findViewById(R.id.rtv_msg_tip); + if (tipView != null) { + tipView.setVisibility(View.GONE); + } + } + + /** + * 设置提示红点偏移,注意 + * 1.控件为固定高度:参照点为tab内容的右上角 + * 2.控件高度不固定(WRAP_CONTENT):参照点为tab内容的右上角,此时高度已是红点的最高显示范围,所以这时bottomPadding其实就是topPadding + */ + public void setMsgMargin(int position, float leftPadding, float bottomPadding) { + if (position >= mTabCount) { + position = mTabCount - 1; + } + View tabView = mTabsContainer.getChildAt(position); + MsgView tipView = (MsgView) tabView.findViewById(R.id.rtv_msg_tip); + if (tipView != null) { + TextView tv_tab_title = (TextView) tabView.findViewById(R.id.tv_tab_title); + mTextPaint.setTextSize(mTextsize); + float textWidth = mTextPaint.measureText(tv_tab_title.getText().toString()); + float textHeight = mTextPaint.descent() - mTextPaint.ascent(); + MarginLayoutParams lp = (MarginLayoutParams) tipView.getLayoutParams(); + + float iconH = mIconHeight; + float margin = 0; + if (mIconVisible) { + if (iconH <= 0) { + iconH = mContext.getResources().getDrawable(mTabEntitys.get(position).getTabSelectedIcon()).getIntrinsicHeight(); + } + margin = mIconMargin; + } + + if (mIconGravity == Gravity.TOP || mIconGravity == Gravity.BOTTOM) { + lp.leftMargin = dp2px(leftPadding); + lp.topMargin = mHeight > 0 ? (int) (mHeight - textHeight - iconH - margin) / 2 - dp2px(bottomPadding) : dp2px(bottomPadding); + } else { + lp.leftMargin = dp2px(leftPadding); + lp.topMargin = mHeight > 0 ? (int) (mHeight - Math.max(textHeight, iconH)) / 2 - dp2px(bottomPadding) : dp2px(bottomPadding); + } + + tipView.setLayoutParams(lp); + } + } + + /** 当前类只提供了少许设置未读消息属性的方法,可以通过该方法获取MsgView对象从而各种设置 */ + public MsgView getMsgView(int position) { + if (position >= mTabCount) { + position = mTabCount - 1; + } + View tabView = mTabsContainer.getChildAt(position); + MsgView tipView = (MsgView) tabView.findViewById(R.id.rtv_msg_tip); + return tipView; + } + + private OnTabSelectListener mListener; + + public void setOnTabSelectListener(OnTabSelectListener listener) { + this.mListener = listener; + } + + + @Override + protected Parcelable onSaveInstanceState() { + Bundle bundle = new Bundle(); + bundle.putParcelable("instanceState", super.onSaveInstanceState()); + bundle.putInt("mCurrentTab", mCurrentTab); + return bundle; + } + + @Override + protected void onRestoreInstanceState(Parcelable state) { + if (state instanceof Bundle) { + Bundle bundle = (Bundle) state; + mCurrentTab = bundle.getInt("mCurrentTab"); + state = bundle.getParcelable("instanceState"); + if (mCurrentTab != 0 && mTabsContainer.getChildCount() > 0) { + updateTabSelection(mCurrentTab); + } + } + super.onRestoreInstanceState(state); + } + + class IndicatorPoint { + public float left; + public float right; + } + + private IndicatorPoint mCurrentP = new IndicatorPoint(); + private IndicatorPoint mLastP = new IndicatorPoint(); + + class PointEvaluator implements TypeEvaluator { + @Override + public IndicatorPoint evaluate(float fraction, IndicatorPoint startValue, IndicatorPoint endValue) { + float left = startValue.left + fraction * (endValue.left - startValue.left); + float right = startValue.right + fraction * (endValue.right - startValue.right); + IndicatorPoint point = new IndicatorPoint(); + point.left = left; + point.right = right; + return point; + } + } + + + protected int dp2px(float dp) { + final float scale = mContext.getResources().getDisplayMetrics().density; + return (int) (dp * scale + 0.5f); + } + + protected int sp2px(float sp) { + final float scale = this.mContext.getResources().getDisplayMetrics().scaledDensity; + return (int) (sp * scale + 0.5f); + } + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/flyco/tablayout/listener/CustomTabEntity.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/flyco/tablayout/listener/CustomTabEntity.java new file mode 100644 index 0000000000..ee39fe7ac0 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/flyco/tablayout/listener/CustomTabEntity.java @@ -0,0 +1,13 @@ +package com.flyco.tablayout.listener; + +import androidx.annotation.DrawableRes; + +public interface CustomTabEntity { + String getTabTitle(); + + @DrawableRes + int getTabSelectedIcon(); + + @DrawableRes + int getTabUnselectedIcon(); +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/flyco/tablayout/listener/OnTabSelectListener.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/flyco/tablayout/listener/OnTabSelectListener.java new file mode 100644 index 0000000000..edf6cdb8ee --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/flyco/tablayout/listener/OnTabSelectListener.java @@ -0,0 +1,6 @@ +package com.flyco.tablayout.listener; + +public interface OnTabSelectListener { + void onTabSelect(int position); + void onTabReselect(int position); +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/flyco/tablayout/utils/FragmentChangeManager.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/flyco/tablayout/utils/FragmentChangeManager.java new file mode 100644 index 0000000000..f47b3153d6 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/flyco/tablayout/utils/FragmentChangeManager.java @@ -0,0 +1,55 @@ +package com.flyco.tablayout.utils; + +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; + +import java.util.ArrayList; + +public class FragmentChangeManager { + private FragmentManager mFragmentManager; + private int mContainerViewId; + /** Fragment切换数组 */ + private ArrayList mFragments; + /** 当前选中的Tab */ + private int mCurrentTab; + + public FragmentChangeManager(FragmentManager fm, int containerViewId, ArrayList fragments) { + this.mFragmentManager = fm; + this.mContainerViewId = containerViewId; + this.mFragments = fragments; + initFragments(); + } + + /** 初始化fragments */ + private void initFragments() { + for (Fragment fragment : mFragments) { + mFragmentManager.beginTransaction().add(mContainerViewId, fragment).hide(fragment).commit(); + } + + setFragments(0); + } + + /** 界面切换控制 */ + public void setFragments(int index) { + for (int i = 0; i < mFragments.size(); i++) { + FragmentTransaction ft = mFragmentManager.beginTransaction(); + Fragment fragment = mFragments.get(i); + if (i == index) { + ft.show(fragment); + } else { + ft.hide(fragment); + } + ft.commit(); + } + mCurrentTab = index; + } + + public int getCurrentTab() { + return mCurrentTab; + } + + public Fragment getCurrentFragment() { + return mFragments.get(mCurrentTab); + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/flyco/tablayout/utils/UnreadMsgUtils.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/flyco/tablayout/utils/UnreadMsgUtils.java new file mode 100644 index 0000000000..2a4358b013 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/flyco/tablayout/utils/UnreadMsgUtils.java @@ -0,0 +1,58 @@ +package com.flyco.tablayout.utils; + + +import android.util.DisplayMetrics; +import android.view.View; +import android.widget.RelativeLayout; + +import com.flyco.tablayout.widget.MsgView; + +/** + * 未读消息提示View,显示小红点或者带有数字的红点: + * 数字一位,圆 + * 数字两位,圆角矩形,圆角是高度的一半 + * 数字超过两位,显示99+ + */ +public class UnreadMsgUtils { + public static void show(MsgView msgView, int num) { + if (msgView == null) { + return; + } + RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) msgView.getLayoutParams(); + DisplayMetrics dm = msgView.getResources().getDisplayMetrics(); + msgView.setVisibility(View.VISIBLE); + if (num <= 0) {//圆点,设置默认宽高 + msgView.setStrokeWidth(0); + msgView.setText(""); + + lp.width = (int) (10 * dm.density); + lp.height = (int) (10 * dm.density); + msgView.setLayoutParams(lp); + } else { + lp.height = (int) (36 * dm.density); + if (num < 10) {//圆 + lp.width = (int) (36 * dm.density); + msgView.setText(num + ""); + } else if (num < 100) {//圆角矩形,圆角是高度的一半,设置默认padding + lp.width = RelativeLayout.LayoutParams.WRAP_CONTENT; + msgView.setPadding((int) (12 * dm.density), 0, (int) (12 * dm.density), 0); + msgView.setText(num + ""); + } else {//数字超过两位,显示99+ + lp.width = RelativeLayout.LayoutParams.WRAP_CONTENT; + msgView.setPadding((int) (12 * dm.density), 0, (int) (12 * dm.density), 0); + msgView.setText("99+"); + } + msgView.setLayoutParams(lp); + } + } + + public static void setSize(MsgView rtv, int size) { + if (rtv == null) { + return; + } + RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) rtv.getLayoutParams(); + lp.width = size; + lp.height = size; + rtv.setLayoutParams(lp); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/flyco/tablayout/widget/MsgView.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/flyco/tablayout/widget/MsgView.java new file mode 100644 index 0000000000..913f2387f1 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/flyco/tablayout/widget/MsgView.java @@ -0,0 +1,160 @@ +package com.flyco.tablayout.widget; + +import android.content.Context; +import android.content.res.TypedArray; +import android.graphics.Color; +import android.graphics.drawable.GradientDrawable; +import android.graphics.drawable.StateListDrawable; +import android.os.Build; +import android.util.AttributeSet; + +import androidx.appcompat.widget.AppCompatTextView; + +import com.zhjt.mogo_core_function_devatools.rviz.R; + +/** + * 用于需要圆角矩形框背景的TextView的情况,减少直接使用TextView时引入的shape资源文件 + */ +public class MsgView extends AppCompatTextView { + private Context context; + private GradientDrawable gd_background = new GradientDrawable(); + private int backgroundColor; + private int cornerRadius; + private int strokeWidth; + private int strokeColor; + private boolean isRadiusHalfHeight; + private boolean isWidthHeightEqual; + + public MsgView(Context context) { + this(context, null); + } + + public MsgView(Context context, AttributeSet attrs) { + this(context, attrs, 0); + } + + public MsgView(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + this.context = context; + obtainAttributes(context, attrs); + } + + private void obtainAttributes(Context context, AttributeSet attrs) { + TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.MsgView); + backgroundColor = ta.getColor(R.styleable.MsgView_mv_backgroundColor, Color.TRANSPARENT); + cornerRadius = ta.getDimensionPixelSize(R.styleable.MsgView_mv_cornerRadius, 0); + strokeWidth = ta.getDimensionPixelSize(R.styleable.MsgView_mv_strokeWidth, 0); + strokeColor = ta.getColor(R.styleable.MsgView_mv_strokeColor, Color.TRANSPARENT); + isRadiusHalfHeight = ta.getBoolean(R.styleable.MsgView_mv_isRadiusHalfHeight, false); + isWidthHeightEqual = ta.getBoolean(R.styleable.MsgView_mv_isWidthHeightEqual, false); + + ta.recycle(); + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + if (isWidthHeightEqual() && getWidth() > 0 && getHeight() > 0) { + int max = Math.max(getWidth(), getHeight()); + int measureSpec = MeasureSpec.makeMeasureSpec(max, MeasureSpec.EXACTLY); + super.onMeasure(measureSpec, measureSpec); + return; + } + + super.onMeasure(widthMeasureSpec, heightMeasureSpec); + } + + @Override + protected void onLayout(boolean changed, int left, int top, int right, int bottom) { + super.onLayout(changed, left, top, right, bottom); + if (isRadiusHalfHeight()) { + setCornerRadius(getHeight() / 2); + } else { + setBgSelector(); + } + } + + + public void setBackgroundColor(int backgroundColor) { + this.backgroundColor = backgroundColor; + setBgSelector(); + } + + public void setCornerRadius(int cornerRadius) { + this.cornerRadius = dp2px(cornerRadius); + setBgSelector(); + } + + public void setStrokeWidth(int strokeWidth) { + this.strokeWidth = dp2px(strokeWidth); + setBgSelector(); + } + + public void setStrokeColor(int strokeColor) { + this.strokeColor = strokeColor; + setBgSelector(); + } + + public void setIsRadiusHalfHeight(boolean isRadiusHalfHeight) { + this.isRadiusHalfHeight = isRadiusHalfHeight; + setBgSelector(); + } + + public void setIsWidthHeightEqual(boolean isWidthHeightEqual) { + this.isWidthHeightEqual = isWidthHeightEqual; + setBgSelector(); + } + + public int getBackgroundColor() { + return backgroundColor; + } + + public int getCornerRadius() { + return cornerRadius; + } + + public int getStrokeWidth() { + return strokeWidth; + } + + public int getStrokeColor() { + return strokeColor; + } + + public boolean isRadiusHalfHeight() { + return isRadiusHalfHeight; + } + + public boolean isWidthHeightEqual() { + return isWidthHeightEqual; + } + + protected int dp2px(float dp) { + final float scale = context.getResources().getDisplayMetrics().density; + return (int) (dp * scale + 0.5f); + } + + protected int sp2px(float sp) { + final float scale = this.context.getResources().getDisplayMetrics().scaledDensity; + return (int) (sp * scale + 0.5f); + } + + private void setDrawable(GradientDrawable gd, int color, int strokeColor) { + gd.setColor(color); + gd.setCornerRadius(cornerRadius); + gd.setStroke(strokeWidth, strokeColor); + } + + public void setBgSelector() { + StateListDrawable bg = new StateListDrawable(); + + setDrawable(gd_background, backgroundColor, strokeColor); + bg.addState(new int[]{-android.R.attr.state_pressed}, gd_background); + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {//16 + setBackground(bg); + } else { + //noinspection deprecation + setBackgroundDrawable(bg); + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/AuthAgentCallback.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/AuthAgentCallback.java new file mode 100644 index 0000000000..5373db4043 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/AuthAgentCallback.java @@ -0,0 +1,64 @@ +package com.trilead.ssh2; + +import java.security.KeyPair; +import java.util.Map; + +/** + * AuthAgentCallback. + * + * @author Kenny Root + * @version $Id$ + */ +public interface AuthAgentCallback { + + /** + * @return array of blobs containing the OpenSSH-format encoded public keys + */ + Map retrieveIdentities(); + + /** + * @param pair A RSAPrivateKey, ECPrivateKey, or + * DSAPrivateKey containing a DSA, EC, or RSA private + * and corresponding PublicKey. + * @param comment comment associated with this key + * @param confirmUse whether to prompt before using this key + * @param lifetime lifetime in seconds for key to be remembered + * @return success or failure + */ + boolean addIdentity(KeyPair pair, String comment, boolean confirmUse, int lifetime); + + /** + * @param publicKey byte blob containing the OpenSSH-format encoded public key + * @return success or failure + */ + boolean removeIdentity(byte[] publicKey); + + /** + * @return success or failure + */ + boolean removeAllIdentities(); + + /** + * @param publicKey byte blob containing the OpenSSH-format encoded public key + * @return A RSAPrivateKey or DSAPrivateKey + * containing a DSA or RSA private key of + * the user in Trilead object format. + */ + KeyPair getKeyPair(byte[] publicKey); + + /** + * @return + */ + boolean isAgentLocked(); + + /** + * @param lockPassphrase + */ + boolean setAgentLock(String lockPassphrase); + + /** + * @param unlockPassphrase + * @return + */ + boolean requestAgentUnlock(String unlockPassphrase); +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/ChannelCondition.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/ChannelCondition.java new file mode 100644 index 0000000000..ef8a5aa3e8 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/ChannelCondition.java @@ -0,0 +1,61 @@ + +package com.trilead.ssh2; + +/** + * Contains constants that can be used to specify what conditions to wait for on + * a SSH-2 channel (e.g., represented by a {@link Session}). + * + * @see Session#waitForCondition(int, long) + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: ChannelCondition.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ + +public interface ChannelCondition +{ + /** + * A timeout has occurred, none of your requested conditions is fulfilled. + * However, other conditions may be true - therefore, NEVER use the "==" + * operator to test for this (or any other) condition. Always use + * something like ((cond & ChannelCondition.CLOSED) != 0). + */ + int TIMEOUT = 1; + + /** + * The underlying SSH-2 channel, however not necessarily the whole connection, + * has been closed. This implies EOF. Note that there may still + * be unread stdout or stderr data in the local window, i.e, STDOUT_DATA + * or/and STDERR_DATA may be set at the same time. + */ + int CLOSED = 2; + + /** + * There is stdout data available that is ready to be consumed. + */ + int STDOUT_DATA = 4; + + /** + * There is stderr data available that is ready to be consumed. + */ + int STDERR_DATA = 8; + + /** + * EOF on has been reached, no more _new_ stdout or stderr data will arrive + * from the remote server. However, there may be unread stdout or stderr + * data, i.e, STDOUT_DATA or/and STDERR_DATA + * may be set at the same time. + */ + int EOF = 16; + + /** + * The exit status of the remote process is available. + * Some servers never send the exist status, or occasionally "forget" to do so. + */ + int EXIT_STATUS = 32; + + /** + * The exit signal of the remote process is available. + */ + int EXIT_SIGNAL = 64; + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/Connection.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/Connection.java new file mode 100644 index 0000000000..64e3fe0d45 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/Connection.java @@ -0,0 +1,1564 @@ + +package com.trilead.ssh2; + +import java.io.CharArrayWriter; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.net.InetSocketAddress; +import java.net.SocketTimeoutException; +import java.security.KeyPair; +import java.security.SecureRandom; +import java.util.Vector; + +import com.trilead.ssh2.auth.AuthenticationManager; +import com.trilead.ssh2.auth.SignatureProxy; +import com.trilead.ssh2.channel.ChannelManager; +import com.trilead.ssh2.crypto.CryptoWishList; +import com.trilead.ssh2.crypto.cipher.BlockCipherFactory; +import com.trilead.ssh2.crypto.digest.MACs; +import com.trilead.ssh2.log.Logger; +import com.trilead.ssh2.packets.PacketIgnore; +import com.trilead.ssh2.transport.KexManager; +import com.trilead.ssh2.transport.TransportManager; +import com.trilead.ssh2.util.TimeoutService; +import com.trilead.ssh2.util.TimeoutService.TimeoutToken; + +/** + * A Connection is used to establish an encrypted TCP/IP + * connection to a SSH-2 server. + *

+ * Typically, one + *

    + *
  1. creates a {@link #Connection(String) Connection} object.
  2. + *
  3. calls the {@link #connect() connect()} method.
  4. + *
  5. calls some of the authentication methods (e.g., + * {@link #authenticateWithPublicKey(String, File, String) authenticateWithPublicKey()}).
  6. + *
  7. calls one or several times the {@link #openSession() openSession()} + * method.
  8. + *
  9. finally, one must close the connection and release resources with the + * {@link #close() close()} method.
  10. + *
+ * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: Connection.java,v 1.3 2008/04/01 12:38:09 cplattne Exp $ + */ + +public class Connection implements AutoCloseable +{ + /** + * The identifier presented to the SSH-2 server. + */ + public final static String identification = "TrileadSSH2Java_213"; + + /** + * Will be used to generate all random data needed for the current + * connection. Note: SecureRandom.nextBytes() is thread safe. + */ + private SecureRandom generator; + + /** + * Unless you know what you are doing, you will never need this. + * + * @return The list of supported cipher algorithms by this implementation. + */ + public static synchronized String[] getAvailableCiphers() + { + return BlockCipherFactory.getDefaultCipherList(); + } + + /** + * Unless you know what you are doing, you will never need this. + * + * @return The list of supported MAC algorthims by this implementation. + */ + public static synchronized String[] getAvailableMACs() + { + return MACs.getMacList(); + } + + /** + * Unless you know what you are doing, you will never need this. + * + * @return The list of supported server host key algorthims by this + * implementation. + */ + public static synchronized String[] getAvailableServerHostKeyAlgorithms() + { + return KexManager.getDefaultServerHostkeyAlgorithmList(); + } + + private AuthenticationManager am; + + private boolean authenticated = false; + private boolean compression = false; + private ChannelManager cm; + + private CryptoWishList cryptoWishList = new CryptoWishList(); + + private DHGexParameters dhgexpara = new DHGexParameters(); + + private final String hostname; + + private final int port; + + private TransportManager tm; + + private ProxyData proxyData = null; + + private Vector connectionMonitors = new Vector(); + + /** + * Prepares a fresh Connection object which can then be used + * to establish a connection to the specified SSH-2 server. + *

+ * Same as {@link #Connection(String, int) Connection(hostname, 22)}. + * + * @param hostname + * the hostname of the SSH-2 server. + */ + public Connection(String hostname) + { + this(hostname, 22); + } + + /** + * Prepares a fresh Connection object which can then be used + * to establish a connection to the specified SSH-2 server. + * + * @param hostname + * the host where we later want to connect to. + * @param port + * port on the server, normally 22. + */ + public Connection(String hostname, int port) + { + this.hostname = hostname; + this.port = port; + } + + /** + * A wrapper that calls + * {@link #authenticateWithKeyboardInteractive(String, String[], InteractiveCallback) + * authenticateWithKeyboardInteractivewith} a null submethod + * list. + * + * @param user + * A String holding the username. + * @param cb + * An InteractiveCallback which will be used to + * determine the responses to the questions asked by the server. + * @return whether the connection is now authenticated. + * @throws IOException + */ + public synchronized boolean authenticateWithKeyboardInteractive(String user, InteractiveCallback cb) + throws IOException + { + return authenticateWithKeyboardInteractive(user, null, cb); + } + + /** + * After a successful connect, one has to authenticate oneself. This method + * is based on "keyboard-interactive", specified in + * draft-ietf-secsh-auth-kbdinteract-XX. Basically, you have to define a + * callback object which will be feeded with challenges generated by the + * server. Answers are then sent back to the server. It is possible that the + * callback will be called several times during the invocation of this + * method (e.g., if the server replies to the callback's answer(s) with + * another challenge...) + *

+ * If the authentication phase is complete, true will be + * returned. If the server does not accept the request (or if further + * authentication steps are needed), false is returned and + * one can retry either by using this or any other authentication method + * (use the getRemainingAuthMethods method to get a list of + * the remaining possible methods). + *

+ * Note: some SSH servers advertise "keyboard-interactive", however, any + * interactive request will be denied (without having sent any challenge to + * the client). + * + * @param user + * A String holding the username. + * @param submethods + * An array of submethod names, see + * draft-ietf-secsh-auth-kbdinteract-XX. May be null + * to indicate an empty list. + * @param cb + * An InteractiveCallback which will be used to + * determine the responses to the questions asked by the server. + * + * @return whether the connection is now authenticated. + * @throws IOException + */ + public synchronized boolean authenticateWithKeyboardInteractive(String user, String[] submethods, + InteractiveCallback cb) throws IOException + { + if (cb == null) + throw new IllegalArgumentException("Callback may not ne NULL!"); + + checkRequirements(user); + + authenticated = am.authenticateInteractive(user, submethods, cb); + + return authenticated; + } + + /** + * After a successful connect, one has to authenticate oneself. This method + * sends username and password to the server. + *

+ * If the authentication phase is complete, true will be + * returned. If the server does not accept the request (or if further + * authentication steps are needed), false is returned and + * one can retry either by using this or any other authentication method + * (use the getRemainingAuthMethods method to get a list of + * the remaining possible methods). + *

+ * Note: if this method fails, then please double-check that it is actually + * offered by the server (use + * {@link #getRemainingAuthMethods(String) getRemainingAuthMethods()}. + *

+ * Often, password authentication is disabled, but users are not aware of + * it. Many servers only offer "publickey" and "keyboard-interactive". + * However, even though "keyboard-interactive" *feels* like password + * authentication (e.g., when using the putty or openssh clients) it is + * *not* the same mechanism. + * + * @param user + * @param password + * @return if the connection is now authenticated. + * @throws IOException + */ + public synchronized boolean authenticateWithPassword(String user, String password) throws IOException + { + if (password == null) + throw new IllegalArgumentException("password argument is null"); + + checkRequirements(user); + + authenticated = am.authenticatePassword(user, password); + + return authenticated; + } + + /** + * After a successful connect, one has to authenticate oneself. This method + * can be used to explicitly use the special "none" authentication method + * (where only a username has to be specified). + *

+ * Note 1: The "none" method may always be tried by clients, however as by + * the specs, the server will not explicitly announce it. In other words, + * the "none" token will never show up in the list returned by + * {@link #getRemainingAuthMethods(String)}. + *

+ * Note 2: no matter which one of the authenticateWithXXX() methods you + * call, the library will always issue exactly one initial "none" + * authentication request to retrieve the initially allowed list of + * authentication methods by the server. Please read RFC 4252 for the + * details. + *

+ * If the authentication phase is complete, true will be + * returned. If further authentication steps are needed, false + * is returned and one can retry by any other authentication method (use the + * getRemainingAuthMethods method to get a list of the + * remaining possible methods). + * + * @param user the username to attempt to log in as + * @return if the connection is now authenticated. + * @throws IOException + */ + public synchronized boolean authenticateWithNone(String user) throws IOException + { + checkRequirements(user); + + /* Trigger the sending of the PacketUserauthRequestNone packet */ + /* (if not already done) */ + + authenticated = am.authenticateNone(user); + + return authenticated; + } + + /** + * After a successful connect, one has to authenticate oneself. The + * authentication method "publickey" works by signing a challenge sent by + * the server. The signature is either DSA, EC, or RSA based - it just depends + * on the type of private key you specify, either a DSA or RSA private key in + * PEM format. And yes, this is may seem to be a little confusing, the + * method is called "publickey" in the SSH-2 protocol specification, however + * since we need to generate a signature, you actually have to supply a + * private key =). + *

+ * The private key contained in the PEM file may also be encrypted + * ("Proc-Type: 4,ENCRYPTED"). The library supports DES-CBC and DES-EDE3-CBC + * encryption, as well as the more exotic PEM encryption AES-128-CBC, + * AES-192-CBC and AES-256-CBC. + *

+ * If the authentication phase is complete, true will be + * returned. If the server does not accept the request (or if further + * authentication steps are needed), false is returned and + * one can retry either by using this or any other authentication method + * (use the getRemainingAuthMethods method to get a list of + * the remaining possible methods). + *

+ * NOTE PUTTY USERS: Event though your key file may start with + * "-----BEGIN..." it is not in the expected format. You have to convert it + * to the OpenSSH key format by using the "puttygen" tool (can be downloaded + * from the Putty website). Simply load your key and then use the + * "Conversions/Export OpenSSH key" functionality to get a proper PEM file. + * + * @param user + * A String holding the username. + * @param pemPrivateKey + * A char[] containing a DSA or RSA private key of + * the user in OpenSSH key format (PEM, you can't miss the + * "-----BEGIN DSA PRIVATE KEY-----" or "-----BEGIN RSA PRIVATE + * KEY-----" tag). The char array may contain + * linebreaks/linefeeds. + * @param password + * If the PEM structure is encrypted ("Proc-Type: 4,ENCRYPTED") + * then you must specify a password. Otherwise, this argument + * will be ignored and can be set to null. + * + * @return whether the connection is now authenticated. + * @throws IOException + */ + public synchronized boolean authenticateWithPublicKey(String user, char[] pemPrivateKey, String password) + throws IOException + { + if (pemPrivateKey == null) + throw new IllegalArgumentException("pemPrivateKey argument is null"); + + checkRequirements(user); + + authenticated = am.authenticatePublicKey(user, pemPrivateKey, password, getOrCreateSecureRND()); + + return authenticated; + } + + /** + * After a successful connect, one has to authenticate oneself. The + * authentication method "publickey" works by signing a challenge sent by + * the server. The signature is either DSA, EC, or RSA based - it just depends + * on the type of private key you specify, either a DSA, EC, or RSA private key + * in PEM format. And yes, this is may seem to be a little confusing, the + * method is called "publickey" in the SSH-2 protocol specification, however + * since we need to generate a signature, you actually have to supply a + * private key =). + *

+ * If the authentication phase is complete, true will be + * returned. If the server does not accept the request (or if further + * authentication steps are needed), false is returned and + * one can retry either by using this or any other authentication method + * (use the getRemainingAuthMethods method to get a list of + * the remaining possible methods). + * + * @param user + * A String holding the username. + * @param pair + * A KeyPair containing a RSAPrivateKey, + * DSAPrivateKey, or ECPrivateKey and + * corresponding PublicKey. + * + * @return whether the connection is now authenticated. + * @throws IOException + */ + public synchronized boolean authenticateWithPublicKey(String user, KeyPair pair) + throws IOException + { + if (pair == null) + throw new IllegalArgumentException("Key pair argument is null"); + + checkRequirements(user); + + authenticated = am.authenticatePublicKey(user, pair, getOrCreateSecureRND()); + + return authenticated; + } + /** + * A convenience wrapper function which reads in a private key (PEM format, + * either DSA, EC, or RSA) and then calls + * authenticateWithPublicKey(String, char[], String). + *

+ * NOTE PUTTY USERS: Event though your key file may start with + * "-----BEGIN..." it is not in the expected format. You have to convert it + * to the OpenSSH key format by using the "puttygen" tool (can be downloaded + * from the Putty website). Simply load your key and then use the + * "Conversions/Export OpenSSH key" functionality to get a proper PEM file. + * + * @param user + * A String holding the username. + * @param pemFile + * A File object pointing to a file containing a + * DSA, EC, or RSA private key of the user in OpenSSH key format + * (PEM, you can't miss the "-----BEGIN DSA PRIVATE KEY-----", + * "-----BEGIN EC PRIVATE KEY-----", or + * "-----BEGIN RSA PRIVATE KEY-----" tag). + * @param password + * If the PEM file is encrypted then you must specify the + * password. Otherwise, this argument will be ignored and can be + * set to null. + * + * @return whether the connection is now authenticated. + * @throws IOException + */ + public synchronized boolean authenticateWithPublicKey(String user, File pemFile, String password) + throws IOException + { + if (pemFile == null) + throw new IllegalArgumentException("pemFile argument is null"); + + char[] buff = new char[256]; + + CharArrayWriter cw = new CharArrayWriter(); + + FileReader fr = new FileReader(pemFile); + + while (true) + { + int len = fr.read(buff); + if (len < 0) + break; + cw.write(buff, 0, len); + } + + fr.close(); + + return authenticateWithPublicKey(user, cw.toCharArray(), password); + } + + /** + * After a successful connect, one has to authenticate oneself. The + * authentication method "publickey" works by signing a challenge sent by + * the server. The signature is either DSA, EC, EdDSA or RSA based depending + * on the SignatureProxy specified. The SignatureProxy should sign the + * server's challenge in order to authenticate the user. The user of this library + * is no longer forced to pass the private key. + *

+ * If the authentication phase is complete, true will be + * returned. If the server does not accept the request (or if further + * authentication steps are needed), false is returned and + * one can retry either by using this or any other authentication method + * (use the getRemainingAuthMethods method to get a list of + * the remaining possible methods). + * + * @param user + * A String holding the username. + * @param signatureProxy + * A SignatureProxy containing a public key and implementing + * a sign method. + * + * @return Whether the connection is now authenticated. + * @throws IOException Might be thrown if the authentication process threw an error. + */ + public synchronized boolean authenticateWithPublicKey(String user, SignatureProxy signatureProxy) + throws IOException + { + checkRequirements(user); + + if (signatureProxy.getPublicKey() == null) + { + throw new IllegalArgumentException("Signature manager does not contain a public key."); + } + + authenticated = am.authenticatePublicKey(user, signatureProxy); + + return authenticated; + } + + private void checkRequirements(String user) + { + if (tm == null) + { + throw new IllegalStateException("Connection is not established!"); + } + + if (authenticated) + { + throw new IllegalStateException("Connection is already authenticated!"); + } + + if (am == null) + { + am = new AuthenticationManager(tm); + } + + if (cm == null) + { + cm = new ChannelManager(tm); + } + + if (user == null) + { + throw new IllegalArgumentException("user argument is null"); + } + } + + /** + * Add a {@link ConnectionMonitor} to this connection. Can be invoked at any + * time, but it is best to add connection monitors before invoking + * connect() to avoid glitches (e.g., you add a connection + * monitor after a successful connect(), but the connection has died in the + * mean time. Then, your connection monitor won't be notified.) + *

+ * You can add as many monitors as you like. + * + * @see ConnectionMonitor + * + * @param cmon + * An object implementing the ConnectionMonitor + * interface. + */ + public synchronized void addConnectionMonitor(ConnectionMonitor cmon) + { + if (cmon == null) + throw new IllegalArgumentException("cmon argument is null"); + + connectionMonitors.addElement(cmon); + + if (tm != null) + tm.setConnectionMonitors(connectionMonitors); + } + + /** + * Controls whether compression is used on the link or not. + *

+ * Note: This can only be called before connect() + * @param enabled whether to enable compression + * @throws IOException + */ + public synchronized void setCompression(boolean enabled) throws IOException { + if (tm != null) + throw new IOException("Connection to " + hostname + " is already in connected state!"); + + compression = enabled; + } + + /** + * Close the connection to the SSH-2 server. All assigned sessions will be + * closed, too. Can be called at any time. Don't forget to call this once + * you don't need a connection anymore - otherwise the receiver thread may + * run forever. + */ + public synchronized void close() + { + Throwable t = new Throwable("Closed due to user request."); + close(t, false); + } + + private void close(Throwable t, boolean hard) + { + if (cm != null) + cm.closeAllChannels(); + + if (tm != null) + { + tm.close(t, !hard); + tm = null; + } + am = null; + cm = null; + authenticated = false; + } + + /** + * Same as + * {@link #connect(ServerHostKeyVerifier, int, int) connect(null, 0, 0)}. + * + * @return see comments for the + * {@link #connect(ServerHostKeyVerifier, int, int) connect(ServerHostKeyVerifier, int, int)} + * method. + * @throws IOException + */ + public synchronized ConnectionInfo connect() throws IOException + { + return connect(null, 0, 0); + } + + /** + * Same as + * {@link #connect(ServerHostKeyVerifier, int, int) connect(verifier, 0, 0)}. + * + * @return see comments for the + * {@link #connect(ServerHostKeyVerifier, int, int) connect(ServerHostKeyVerifier, int, int)} + * method. + * @throws IOException + */ + public synchronized ConnectionInfo connect(ServerHostKeyVerifier verifier) throws IOException + { + return connect(verifier, 0, 0); + } + + /** + * Connect to the SSH-2 server and, as soon as the server has presented its + * host key, use the + * {@link ServerHostKeyVerifier#verifyServerHostKey(String, int, String, + * byte[]) ServerHostKeyVerifier.verifyServerHostKey()} method of the + * verifier to ask for permission to proceed. If + * verifier is null, then any host key will + * be accepted - this is NOT recommended, since it makes man-in-the-middle + * attackes VERY easy (somebody could put a proxy SSH server between you and + * the real server). + *

+ * Note: The verifier will be called before doing any crypto calculations + * (i.e., diffie-hellman). Therefore, if you don't like the presented host + * key then no CPU cycles are wasted (and the evil server has less + * information about us). + *

+ * However, it is still possible that the server presented a fake host key: + * the server cheated (typically a sign for a man-in-the-middle attack) and + * is not able to generate a signature that matches its host key. Don't + * worry, the library will detect such a scenario later when checking the + * signature (the signature cannot be checked before having completed the + * diffie-hellman exchange). + *

+ * Note 2: The {@link ServerHostKeyVerifier#verifyServerHostKey(String, int, + * String, byte[]) ServerHostKeyVerifier.verifyServerHostKey()} method will + * *NOT* be called from the current thread, the call is being made from a + * background thread (there is a background dispatcher thread for every + * established connection). + *

+ * Note 3: This method will block as long as the key exchange of the + * underlying connection has not been completed (and you have not specified + * any timeouts). + *

+ * Note 4: If you want to re-use a connection object that was successfully + * connected, then you must call the {@link #close()} method before invoking + * connect() again. + * + * @param verifier + * An object that implements the {@link ServerHostKeyVerifier} + * interface. Pass null to accept any server host + * key - NOT recommended. + * + * @param connectTimeout + * Connect the underlying TCP socket to the server with the given + * timeout value (non-negative, in milliseconds). Zero means no + * timeout. If a proxy is being used (see + * {@link #setProxyData(ProxyData)}), then this timeout is used + * for the connection establishment to the proxy. + * + * @param kexTimeout + * Timeout for complete connection establishment (non-negative, + * in milliseconds). Zero means no timeout. The timeout counts + * from the moment you invoke the connect() method and is + * cancelled as soon as the first key-exchange round has + * finished. It is possible that the timeout event will be fired + * during the invocation of the verifier callback, + * but it will only have an effect after the + * verifier returns. + * + * @return A {@link ConnectionInfo} object containing the details of the + * established connection. + * + * @throws IOException + * If any problem occurs, e.g., the server's host key is not + * accepted by the verifier or there is problem + * during the initial crypto setup (e.g., the signature sent by + * the server is wrong). + *

+ * In case of a timeout (either connectTimeout or kexTimeout) a + * SocketTimeoutException is thrown. + *

+ * An exception may also be thrown if the connection was already + * successfully connected (no matter if the connection broke in + * the mean time) and you invoke connect() again + * without having called {@link #close()} first. + *

+ * If a HTTP proxy is being used and the proxy refuses the + * connection, then a {@link HTTPProxyException} may be thrown, + * which contains the details returned by the proxy. If the + * proxy is buggy and does not return a proper HTTP response, + * then a normal IOException is thrown instead. + */ + public synchronized ConnectionInfo connect(ServerHostKeyVerifier verifier, int connectTimeout, int kexTimeout) + throws IOException + { + final class TimeoutState + { + boolean isCancelled = false; + boolean timeoutSocketClosed = false; + } + + if (tm != null) + throw new IOException("Connection to " + hostname + " is already in connected state!"); + + if (connectTimeout < 0) + throw new IllegalArgumentException("connectTimeout must be non-negative!"); + + if (kexTimeout < 0) + throw new IllegalArgumentException("kexTimeout must be non-negative!"); + + final TimeoutState state = new TimeoutState(); + + tm = new TransportManager(hostname, port); + + tm.setConnectionMonitors(connectionMonitors); + + // Don't offer compression if not requested + if (!compression) { + cryptoWishList.c2s_comp_algos = new String[] { "none" }; + cryptoWishList.s2c_comp_algos = new String[] { "none" }; + } + + /* + * Make sure that the runnable below will observe the new value of "tm" + * and "state" (the runnable will be executed in a different thread, + * which may be already running, that is why we need a memory barrier + * here). See also the comment in Channel.java if you are interested in + * the details. + * + * OKOK, this is paranoid since adding the runnable to the todo list of + * the TimeoutService will ensure that all writes have been flushed + * before the Runnable reads anything (there is a synchronized block in + * TimeoutService.addTimeoutHandler). + */ + + synchronized (tm) + { + /* We could actually synchronize on anything. */ + } + + try + { + TimeoutToken token = null; + + if (kexTimeout > 0) + { + final Runnable timeoutHandler = new Runnable() + { + public void run() + { + synchronized (state) + { + if (state.isCancelled) + return; + state.timeoutSocketClosed = true; + tm.close(new SocketTimeoutException("The connect timeout expired"), false); + } + } + }; + + long timeoutHorizont = System.currentTimeMillis() + kexTimeout; + + token = TimeoutService.addTimeoutHandler(timeoutHorizont, timeoutHandler); + } + + try + { + tm.initialize(cryptoWishList, verifier, dhgexpara, connectTimeout, getOrCreateSecureRND(), proxyData); + } + catch (SocketTimeoutException se) + { + throw (SocketTimeoutException) new SocketTimeoutException( + "The connect() operation on the socket timed out.").initCause(se); + } + + /* Wait until first KEX has finished */ + + ConnectionInfo ci = tm.getConnectionInfo(1); + + /* Now try to cancel the timeout, if needed */ + + if (token != null) + { + TimeoutService.cancelTimeoutHandler(token); + + /* Were we too late? */ + + synchronized (state) + { + if (state.timeoutSocketClosed) + throw new IOException("This exception will be replaced by the one below =)"); + /* + * Just in case the "cancelTimeoutHandler" invocation came + * just a little bit too late but the handler did not enter + * the semaphore yet - we can still stop it. + */ + state.isCancelled = true; + } + } + + return ci; + } + catch (SocketTimeoutException ste) + { + throw ste; + } + catch (IOException e1) + { + /* This will also invoke any registered connection monitors */ + close(new Throwable("There was a problem during connect."), false); + + synchronized (state) + { + /* + * Show a clean exception, not something like "the socket is + * closed!?!" + */ + if (state.timeoutSocketClosed) + throw new SocketTimeoutException("The kexTimeout (" + kexTimeout + " ms) expired."); + } + + /* Do not wrap a HTTPProxyException */ + if (e1 instanceof HTTPProxyException) + throw e1; + + throw new IOException("There was a problem while connecting to " + hostname + ":" + port, e1); + } + } + + /** + * Creates a new {@link LocalPortForwarder}. A + * LocalPortForwarder forwards TCP/IP connections that arrive + * at a local port via the secure tunnel to another host (which may or may + * not be identical to the remote SSH-2 server). + *

+ * This method must only be called after one has passed successfully the + * authentication step. There is no limit on the number of concurrent + * forwardings. + * + * @param local_port + * the local port the LocalPortForwarder shall bind to. + * @param host_to_connect + * target address (IP or hostname) + * @param port_to_connect + * target port + * @return A {@link LocalPortForwarder} object. + * @throws IOException + */ + public synchronized LocalPortForwarder createLocalPortForwarder(int local_port, String host_to_connect, + int port_to_connect) throws IOException + { + if (tm == null) + throw new IllegalStateException("Cannot forward ports, you need to establish a connection first."); + + if (!authenticated) + throw new IllegalStateException("Cannot forward ports, connection is not authenticated."); + + return new LocalPortForwarder(cm, local_port, host_to_connect, port_to_connect); + } + + /** + * Creates a new {@link LocalPortForwarder}. A + * LocalPortForwarder forwards TCP/IP connections that arrive + * at a local port via the secure tunnel to another host (which may or may + * not be identical to the remote SSH-2 server). + *

+ * This method must only be called after one has passed successfully the + * authentication step. There is no limit on the number of concurrent + * forwardings. + * + * @param addr + * specifies the InetSocketAddress where the local socket shall + * be bound to. + * @param host_to_connect + * target address (IP or hostname) + * @param port_to_connect + * target port + * @return A {@link LocalPortForwarder} object. + * @throws IOException + */ + public synchronized LocalPortForwarder createLocalPortForwarder(InetSocketAddress addr, String host_to_connect, + int port_to_connect) throws IOException + { + if (tm == null) + throw new IllegalStateException("Cannot forward ports, you need to establish a connection first."); + + if (!authenticated) + throw new IllegalStateException("Cannot forward ports, connection is not authenticated."); + + return new LocalPortForwarder(cm, addr, host_to_connect, port_to_connect); + } + + /** + * Creates a new {@link LocalStreamForwarder}. A + * LocalStreamForwarder manages an Input/Outputstream pair + * that is being forwarded via the secure tunnel into a TCP/IP connection to + * another host (which may or may not be identical to the remote SSH-2 + * server). + * + * @param host_to_connect + * @param port_to_connect + * @return A {@link LocalStreamForwarder} object. + * @throws IOException + */ + public synchronized LocalStreamForwarder createLocalStreamForwarder(String host_to_connect, int port_to_connect) + throws IOException + { + if (tm == null) + throw new IllegalStateException("Cannot forward, you need to establish a connection first."); + + if (!authenticated) + throw new IllegalStateException("Cannot forward, connection is not authenticated."); + + return new LocalStreamForwarder(cm, host_to_connect, port_to_connect); + } + + /** + * Creates a new {@link DynamicPortForwarder}. A + * DynamicPortForwarder forwards TCP/IP connections that arrive + * at a local port via the secure tunnel to another host that is chosen via + * the SOCKS protocol. + *

+ * This method must only be called after one has passed successfully the + * authentication step. There is no limit on the number of concurrent + * forwardings. + * + * @param local_port + * @return A {@link DynamicPortForwarder} object. + * @throws IOException + */ + public synchronized DynamicPortForwarder createDynamicPortForwarder(int local_port) throws IOException + { + if (tm == null) + throw new IllegalStateException("Cannot forward ports, you need to establish a connection first."); + + if (!authenticated) + throw new IllegalStateException("Cannot forward ports, connection is not authenticated."); + + return new DynamicPortForwarder(cm, local_port); + } + + /** + * Creates a new {@link DynamicPortForwarder}. A + * DynamicPortForwarder forwards TCP/IP connections that arrive + * at a local port via the secure tunnel to another host that is chosen via + * the SOCKS protocol. + *

+ * This method must only be called after one has passed successfully the + * authentication step. There is no limit on the number of concurrent + * forwardings. + * + * @param addr + * specifies the InetSocketAddress where the local socket shall + * be bound to. + * @return A {@link DynamicPortForwarder} object. + * @throws IOException + */ + public synchronized DynamicPortForwarder createDynamicPortForwarder(InetSocketAddress addr) throws IOException + { + if (tm == null) + throw new IllegalStateException("Cannot forward ports, you need to establish a connection first."); + + if (!authenticated) + throw new IllegalStateException("Cannot forward ports, connection is not authenticated."); + + return new DynamicPortForwarder(cm, addr); + } + + /** + * Create a very basic {@link SCPClient} that can be used to copy files + * from/to the SSH-2 server. + *

+ * Works only after one has passed successfully the authentication step. + * There is no limit on the number of concurrent SCP clients. + *

+ * Note: This factory method will probably disappear in the future. + * + * @return A {@link SCPClient} object. + */ + public synchronized SCPClient createSCPClient() { + if (tm == null) + throw new IllegalStateException("Cannot create SCP client, you need to establish a connection first."); + + if (!authenticated) + throw new IllegalStateException("Cannot create SCP client, connection is not authenticated."); + + return new SCPClient(this); + } + + /** + * Force an asynchronous key re-exchange (the call does not block). The + * latest values set for MAC, Cipher and DH group exchange parameters will + * be used. If a key exchange is currently in progress, then this method has + * the only effect that the so far specified parameters will be used for the + * next (server driven) key exchange. + *

+ * Note: This implementation will never start a key exchange (other than the + * initial one) unless you or the SSH-2 server ask for it. + * + * @throws IOException + * In case of any failure behind the scenes. + */ + public synchronized void forceKeyExchange() throws IOException + { + if (tm == null) + throw new IllegalStateException("You need to establish a connection first."); + + tm.forceKeyExchange(cryptoWishList, dhgexpara); + } + + /** + * Returns the hostname that was passed to the constructor. + * + * @return the hostname + */ + public synchronized String getHostname() + { + return hostname; + } + + /** + * Returns the port that was passed to the constructor. + * + * @return the TCP port + */ + public synchronized int getPort() + { + return port; + } + + /** + * Returns a {@link ConnectionInfo} object containing the details of the + * connection. Can be called as soon as the connection has been established + * (successfully connected). + * + * @return A {@link ConnectionInfo} object. + * @throws IOException + * In case of any failure behind the scenes. + */ + public synchronized ConnectionInfo getConnectionInfo() throws IOException + { + if (tm == null) + throw new IllegalStateException( + "Cannot get details of connection, you need to establish a connection first."); + return tm.getConnectionInfo(1); + } + + /** + * After a successful connect, one has to authenticate oneself. This method + * can be used to tell which authentication methods are supported by the + * server at a certain stage of the authentication process (for the given + * username). + *

+ * Note 1: the username will only be used if no authentication step was done + * so far (it will be used to ask the server for a list of possible + * authentication methods by sending the initial "none" request). Otherwise, + * this method ignores the user name and returns a cached method list (which + * is based on the information contained in the last negative server + * response). + *

+ * Note 2: the server may return method names that are not supported by this + * implementation. + *

+ * After a successful authentication, this method must not be called + * anymore. + * + * @param user + * A String holding the username. + * + * @return a (possibly emtpy) array holding authentication method names. + * @throws IOException + */ + public synchronized String[] getRemainingAuthMethods(String user) throws IOException + { + if (user == null) + throw new IllegalArgumentException("user argument may not be NULL!"); + + if (tm == null) + throw new IllegalStateException("Connection is not established!"); + + if (authenticated) + throw new IllegalStateException("Connection is already authenticated!"); + + if (am == null) + am = new AuthenticationManager(tm); + + if (cm == null) + cm = new ChannelManager(tm); + + return am.getRemainingMethods(user); + } + + /** + * Determines if the authentication phase is complete. Can be called at any + * time. + * + * @return true if no further authentication steps are + * needed. + */ + public synchronized boolean isAuthenticationComplete() + { + return authenticated; + } + + /** + * Returns true if there was at least one failed authentication request and + * the last failed authentication request was marked with "partial success" + * by the server. This is only needed in the rare case of SSH-2 server + * setups that cannot be satisfied with a single successful authentication + * request (i.e., multiple authentication steps are needed.) + *

+ * If you are interested in the details, then have a look at RFC4252. + * + * @return if the there was a failed authentication step and the last one + * was marked as a "partial success". + */ + public synchronized boolean isAuthenticationPartialSuccess() + { + if (am == null) + return false; + + return am.getPartialSuccess(); + } + + /** + * Checks if a specified authentication method is available. This method is + * actually just a wrapper for {@link #getRemainingAuthMethods(String) + * getRemainingAuthMethods()}. + * + * @param user + * A String holding the username. + * @param method + * An authentication method name (e.g., "publickey", "password", + * "keyboard-interactive") as specified by the SSH-2 standard. + * @return if the specified authentication method is currently available. + * @throws IOException + */ + public synchronized boolean isAuthMethodAvailable(String user, String method) throws IOException + { + if (method == null) + throw new IllegalArgumentException("method argument may not be NULL!"); + + String methods[] = getRemainingAuthMethods(user); + + for (int i = 0; i < methods.length; i++) + { + if (methods[i].compareTo(method) == 0) + return true; + } + + return false; + } + + private final SecureRandom getOrCreateSecureRND() + { + if (generator == null) + generator = new SecureRandom(); + + return generator; + } + + /** + * Open a new {@link Session} on this connection. Works only after one has + * passed successfully the authentication step. There is no limit on the + * number of concurrent sessions. + * + * @return A {@link Session} object. + * @throws IOException + */ + public synchronized Session openSession() throws IOException + { + if (tm == null) + throw new IllegalStateException("Cannot open session, you need to establish a connection first."); + + if (!authenticated) + throw new IllegalStateException("Cannot open session, connection is not authenticated."); + + return new Session(cm, getOrCreateSecureRND()); + } + + /** + * Send an SSH_MSG_IGNORE packet. This method will generate a random data + * attribute (length between 0 (invlusive) and 16 (exclusive) bytes, + * contents are random bytes). + *

+ * This method must only be called once the connection is established. + * + * @throws IOException + */ + public synchronized void sendIgnorePacket() throws IOException + { + SecureRandom rnd = getOrCreateSecureRND(); + + byte[] data = new byte[rnd.nextInt(16)]; + rnd.nextBytes(data); + + sendIgnorePacket(data); + } + + /** + * Send an SSH_MSG_IGNORE packet with the given data attribute. + *

+ * This method must only be called once the connection is established. + * + * @throws IOException + */ + public synchronized void sendIgnorePacket(byte[] data) throws IOException + { + if (data == null) + throw new IllegalArgumentException("data argument must not be null."); + + if (tm == null) + throw new IllegalStateException( + "Cannot send SSH_MSG_IGNORE packet, you need to establish a connection first."); + + PacketIgnore pi = new PacketIgnore(); + pi.setData(data); + + tm.sendMessage(pi.getPayload()); + } + + /** + * Removes duplicates from a String array, keeps only first occurence of + * each element. Does not destroy order of elements; can handle nulls. Uses + * a very efficient O(N^2) algorithm =) + * + * @param list + * a String array. + * @return a cleaned String array. + */ + private String[] removeDuplicates(String[] list) + { + if ((list == null) || (list.length < 2)) + return list; + + String[] list2 = new String[list.length]; + + int count = 0; + + for (int i = 0; i < list.length; i++) + { + boolean duplicate = false; + + String element = list[i]; + + for (int j = 0; j < count; j++) + { + if (element == null ? list2[j] == null : element.equals(list2[j])) + { + duplicate = true; + break; + } + } + + if (duplicate) + continue; + + list2[count++] = list[i]; + } + + if (count == list2.length) + return list2; + + String[] tmp = new String[count]; + System.arraycopy(list2, 0, tmp, 0, count); + + return tmp; + } + + /** + * Unless you know what you are doing, you will never need this. + * + * @param ciphers + */ + public synchronized void setClient2ServerCiphers(String[] ciphers) + { + if ((ciphers == null) || (ciphers.length == 0)) + throw new IllegalArgumentException(); + ciphers = removeDuplicates(ciphers); + BlockCipherFactory.checkCipherList(ciphers); + cryptoWishList.c2s_enc_algos = ciphers; + } + + /** + * Unless you know what you are doing, you will never need this. + * + * @param macs + */ + public synchronized void setClient2ServerMACs(String[] macs) + { + if ((macs == null) || (macs.length == 0)) + throw new IllegalArgumentException(); + macs = removeDuplicates(macs); + MACs.checkMacList(macs); + cryptoWishList.c2s_mac_algos = macs; + } + + /** + * Sets the parameters for the diffie-hellman group exchange. Unless you + * know what you are doing, you will never need this. Default values are + * defined in the {@link DHGexParameters} class. + * + * @param dgp + * {@link DHGexParameters}, non null. + * + */ + public synchronized void setDHGexParameters(DHGexParameters dgp) + { + if (dgp == null) + throw new IllegalArgumentException(); + + dhgexpara = dgp; + } + + /** + * Unless you know what you are doing, you will never need this. + * + * @param ciphers + */ + public synchronized void setServer2ClientCiphers(String[] ciphers) + { + if ((ciphers == null) || (ciphers.length == 0)) + throw new IllegalArgumentException(); + ciphers = removeDuplicates(ciphers); + BlockCipherFactory.checkCipherList(ciphers); + cryptoWishList.s2c_enc_algos = ciphers; + } + + /** + * Unless you know what you are doing, you will never need this. + * + * @param macs + */ + public synchronized void setServer2ClientMACs(String[] macs) + { + if ((macs == null) || (macs.length == 0)) + throw new IllegalArgumentException(); + + macs = removeDuplicates(macs); + MACs.checkMacList(macs); + cryptoWishList.s2c_mac_algos = macs; + } + + /** + * Define the set of allowed server host key algorithms to be used for the + * following key exchange operations. + *

+ * Unless you know what you are doing, you will never need this. + * + * @param algos + * An array of allowed server host key algorithms. SSH-2 defines + * ssh-dss and ssh-rsa. The + * entries of the array must be ordered after preference, i.e., + * the entry at index 0 is the most preferred one. You must + * specify at least one entry. + */ + public synchronized void setServerHostKeyAlgorithms(String[] algos) + { + if ((algos == null) || (algos.length == 0)) + throw new IllegalArgumentException(); + + algos = removeDuplicates(algos); + KexManager.checkServerHostkeyAlgorithmsList(algos); + cryptoWishList.serverHostKeyAlgorithms = algos; + } + + /** + * Define the set of allowed Key Exchange algorithms to be used for the + * following key exchange operations. + *

+ * Unless you know what you are doing, you will never need this. + * + * @param algos + * An array of allowed key exchange algorithms. + */ + public synchronized void setKeyExchangeAlgorithms(String[] algos) + { + if (algos == null || algos.length == 0) + throw new IllegalArgumentException(); + + algos = removeDuplicates(algos); + KexManager.checkKexAlgorithmList(algos); + cryptoWishList.kexAlgorithms = algos; + } + + /** + * Used to tell the library that the connection shall be established through + * a proxy server. It only makes sense to call this method before calling + * the {@link #connect() connect()} method. + *

+ * At the moment, only HTTP proxies are supported. + *

+ * Note: This method can be called any number of times. The + * {@link #connect() connect()} method will use the value set in the last + * preceding invocation of this method. + * + * @see HTTPProxyData + * + * @param proxyData + * Connection information about the proxy. If null, + * then no proxy will be used (non surprisingly, this is also the + * default). + */ + public synchronized void setProxyData(ProxyData proxyData) + { + this.proxyData = proxyData; + } + + /** + * Request a remote port forwarding. If successful, then forwarded + * connections will be redirected to the given target address. You can + * cancle a requested remote port forwarding by calling + * {@link #cancelRemotePortForwarding(int) cancelRemotePortForwarding()}. + *

+ * A call of this method will block until the peer either agreed or + * disagreed to your request- + *

+ * Note 1: this method typically fails if you + *

    + *
  • pass a port number for which the used remote user has not enough + * permissions (i.e., port < 1024)
  • + *
  • or pass a port number that is already in use on the remote server
  • + *
  • or if remote port forwarding is disabled on the server.
  • + *
+ *

+ * Note 2: (from the openssh man page): By default, the listening socket on + * the server will be bound to the loopback interface only. This may be + * overriden by specifying a bind address. Specifying a remote bind address + * will only succeed if the server's GatewayPorts option is enabled + * (see sshd_config(5)). + * + * @param bindAddress + * address to bind to on the server: + *

    + *
  • "" means that connections are to be accepted on all + * protocol families supported by the SSH implementation
  • + *
  • "0.0.0.0" means to listen on all IPv4 addresses
  • + *
  • "::" means to listen on all IPv6 addresses
  • + *
  • "localhost" means to listen on all protocol families + * supported by the SSH implementation on loopback addresses + * only, [RFC3330] and RFC3513]
  • + *
  • "127.0.0.1" and "::1" indicate listening on the loopback + * interfaces for IPv4 and IPv6 respectively
  • + *
+ * @param bindPort + * port number to bind on the server (must be > 0) + * @param targetAddress + * the target address (IP or hostname) + * @param targetPort + * the target port + * @throws IOException + */ + public synchronized void requestRemotePortForwarding(String bindAddress, int bindPort, String targetAddress, + int targetPort) throws IOException + { + if (tm == null) + throw new IllegalStateException("You need to establish a connection first."); + + if (!authenticated) + throw new IllegalStateException("The connection is not authenticated."); + + if ((bindAddress == null) || (targetAddress == null) || (bindPort <= 0) || (targetPort <= 0)) + throw new IllegalArgumentException(); + + cm.requestGlobalForward(bindAddress, bindPort, targetAddress, targetPort); + } + + /** + * Cancel an earlier requested remote port forwarding. Currently active + * forwardings will not be affected (e.g., disrupted). Note that further + * connection forwarding requests may be received until this method has + * returned. + * + * @param bindPort + * the allocated port number on the server + * @throws IOException + * if the remote side refuses the cancel request or another low + * level error occurs (e.g., the underlying connection is + * closed) + */ + public synchronized void cancelRemotePortForwarding(int bindPort) throws IOException + { + if (tm == null) + throw new IllegalStateException("You need to establish a connection first."); + + if (!authenticated) + throw new IllegalStateException("The connection is not authenticated."); + + cm.requestCancelGlobalForward(bindPort); + } + + /** + * Provide your own instance of SecureRandom. Can be used, e.g., if you want + * to seed the used SecureRandom generator manually. + *

+ * The SecureRandom instance is used during key exchanges, public key + * authentication, x11 cookie generation and the like. + * + * @param rnd + * a SecureRandom instance + */ + public synchronized void setSecureRandom(SecureRandom rnd) + { + if (rnd == null) + throw new IllegalArgumentException(); + + this.generator = rnd; + } + + /** + * Enable/disable debug logging. Only do this when requested by Trilead + * support. + *

+ * For speed reasons, some static variables used to check whether debugging + * is enabled are not protected with locks. In other words, if you + * dynamicaly enable/disable debug logging, then some threads may still use + * the old setting. To be on the safe side, enable debugging before doing + * the connect() call. + * + * @param enable + * on/off + * @param logger + * a {@link DebugLogger DebugLogger} instance, null + * means logging using the simple logger which logs all messages + * to to stderr. Ignored if enabled is false + */ + public synchronized void enableDebugging(boolean enable, DebugLogger logger) + { + Logger.enabled = enable; + + if (!enable) + { + Logger.logger = null; + } + else + { + if (logger == null) + { + logger = new DebugLogger() + { + + public void log(int level, String className, String message) + { + long now = System.currentTimeMillis(); + System.err.println(now + " : " + className + ": " + message); + } + }; + } + + Logger.logger = logger; + } + } + + /** + * This method can be used to perform end-to-end connection testing. It + * sends a 'ping' message to the server and waits for the 'pong' from the + * server. + *

+ * When this method throws an exception, then you can assume that the + * connection should be abandoned. + *

+ * Note: Works only after one has passed successfully the authentication + * step. + *

+ * Implementation details: this method sends a SSH_MSG_GLOBAL_REQUEST + * request ('trilead-ping') to the server and waits for the + * SSH_MSG_REQUEST_FAILURE reply packet from the server. + * + * @throws IOException + * in case of any problem + */ + public synchronized void ping() throws IOException + { + if (tm == null) + throw new IllegalStateException("You need to establish a connection first."); + + if (!authenticated) + throw new IllegalStateException("The connection is not authenticated."); + + cm.requestGlobalTrileadPing(); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/ConnectionInfo.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/ConnectionInfo.java new file mode 100644 index 0000000000..d508acf514 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/ConnectionInfo.java @@ -0,0 +1,65 @@ + +package com.trilead.ssh2; + +/** + * In most cases you probably do not need the information contained in here. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: ConnectionInfo.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ +public class ConnectionInfo +{ + /** + * The used key exchange (KEX) algorithm in the latest key exchange. + */ + public String keyExchangeAlgorithm; + + /** + * The currently used crypto algorithm for packets from to the client to the + * server. + */ + public String clientToServerCryptoAlgorithm; + /** + * The currently used crypto algorithm for packets from to the server to the + * client. + */ + public String serverToClientCryptoAlgorithm; + + /** + * The currently used MAC algorithm for packets from to the client to the + * server. + */ + public String clientToServerMACAlgorithm; + /** + * The currently used MAC algorithm for packets from to the server to the + * client. + */ + public String serverToClientMACAlgorithm; + + /** + * The type of the server host key (currently either "ssh-dss" or + * "ssh-rsa"). + */ + public String serverHostKeyAlgorithm; + /** + * The server host key that was sent during the latest key exchange. + */ + public byte[] serverHostKey; + + /** + * Number of kex exchanges performed on this connection so far. + */ + public int keyExchangeCounter = 0; + + /** + * The currently used compression algorithm for packets from the client to + * the server. + */ + public String clientToServerCompressionAlgorithm; + + /** + * The currently used compression algorithm for packets from the server to + * the client. + */ + public String serverToClientCompressionAlgorithm; +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/ConnectionMonitor.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/ConnectionMonitor.java new file mode 100644 index 0000000000..59a9766d25 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/ConnectionMonitor.java @@ -0,0 +1,34 @@ + +package com.trilead.ssh2; + +/** + * A ConnectionMonitor is used to get notified when the + * underlying socket of a connection is closed. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: ConnectionMonitor.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ + +public interface ConnectionMonitor +{ + /** + * This method is called after the connection's underlying + * socket has been closed. E.g., due to the {@link Connection#close()} request of the + * user, if the peer closed the connection, due to a fatal error during connect() + * (also if the socket cannot be established) or if a fatal error occured on + * an established connection. + *

+ * This is an experimental feature. + *

+ * You MUST NOT make any assumption about the thread that invokes this method. + *

+ * Please note: if the connection is not connected (e.g., there was no successful + * connect() call), then the invocation of {@link Connection#close()} will NOT trigger + * this method. + * + * @see Connection#addConnectionMonitor(ConnectionMonitor) + * + * @param reason Includes an indication why the socket was closed. + */ + void connectionLost(Throwable reason); +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/DHGexParameters.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/DHGexParameters.java new file mode 100644 index 0000000000..e779600e20 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/DHGexParameters.java @@ -0,0 +1,121 @@ + +package com.trilead.ssh2; + +/** + * A DHGexParameters object can be used to specify parameters for + * the diffie-hellman group exchange. + *

+ * Depending on which constructor is used, either the use of a + * SSH_MSG_KEX_DH_GEX_REQUEST or SSH_MSG_KEX_DH_GEX_REQUEST_OLD + * can be forced. + * + * @see Connection#setDHGexParameters(DHGexParameters) + * @author Christian Plattner, plattner@trilead.com + * @version $Id: DHGexParameters.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ + +public class DHGexParameters +{ + private final int min_group_len; + private final int pref_group_len; + private final int max_group_len; + + private static final int MIN_ALLOWED = 1024; + private static final int MAX_ALLOWED = 8192; + + /** + * Same as calling {@link #DHGexParameters(int, int, int) DHGexParameters(1024, 1024, 4096)}. + * This is also the default used by the Connection class. + * + */ + public DHGexParameters() + { + this(1024, 1024, 4096); + } + + /** + * This constructor can be used to force the sending of a + * SSH_MSG_KEX_DH_GEX_REQUEST_OLD request. + * Internally, the minimum and maximum group lengths will + * be set to zero. + * + * @param pref_group_len has to be >= 1024 and <= 8192 + */ + public DHGexParameters(int pref_group_len) + { + if ((pref_group_len < MIN_ALLOWED) || (pref_group_len > MAX_ALLOWED)) + throw new IllegalArgumentException("pref_group_len out of range!"); + + this.pref_group_len = pref_group_len; + this.min_group_len = 0; + this.max_group_len = 0; + } + + /** + * This constructor can be used to force the sending of a + * SSH_MSG_KEX_DH_GEX_REQUEST request. + *

+ * Note: older OpenSSH servers don't understand this request, in which + * case you should use the {@link #DHGexParameters(int)} constructor. + *

+ * All values have to be >= 1024 and <= 8192. Furthermore, + * min_group_len <= pref_group_len <= max_group_len. + * + * @param min_group_len + * @param pref_group_len + * @param max_group_len + */ + public DHGexParameters(int min_group_len, int pref_group_len, int max_group_len) + { + if ((min_group_len < MIN_ALLOWED) || (min_group_len > MAX_ALLOWED)) + throw new IllegalArgumentException("min_group_len out of range!"); + + if ((pref_group_len < MIN_ALLOWED) || (pref_group_len > MAX_ALLOWED)) + throw new IllegalArgumentException("pref_group_len out of range!"); + + if ((max_group_len < MIN_ALLOWED) || (max_group_len > MAX_ALLOWED)) + throw new IllegalArgumentException("max_group_len out of range!"); + + if ((pref_group_len < min_group_len) || (pref_group_len > max_group_len)) + throw new IllegalArgumentException("pref_group_len is incompatible with min and max!"); + + if (max_group_len < min_group_len) + throw new IllegalArgumentException("max_group_len must not be smaller than min_group_len!"); + + this.min_group_len = min_group_len; + this.pref_group_len = pref_group_len; + this.max_group_len = max_group_len; + } + + /** + * Get the maximum group length. + * + * @return the maximum group length, may be zero if + * SSH_MSG_KEX_DH_GEX_REQUEST_OLD should be requested + */ + public int getMax_group_len() + { + return max_group_len; + } + + /** + * Get the minimum group length. + * + * @return minimum group length, may be zero if + * SSH_MSG_KEX_DH_GEX_REQUEST_OLD should be requested + */ + public int getMin_group_len() + { + return min_group_len; + } + + /** + * Get the preferred group length. + * + * @return the preferred group length + */ + public int getPref_group_len() + { + return pref_group_len; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/DebugLogger.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/DebugLogger.java new file mode 100644 index 0000000000..f1ede720d0 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/DebugLogger.java @@ -0,0 +1,23 @@ +package com.trilead.ssh2; + +/** + * An interface which needs to be implemented if you + * want to capture debugging messages. + * + * @see Connection#enableDebugging(boolean, DebugLogger) + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: DebugLogger.java,v 1.1 2008/03/03 07:01:36 cplattne Exp $ + */ +public interface DebugLogger +{ + +/** + * Log a debug message. + * + * @param level 0-99, 99 is a the most verbose level + * @param className the class that generated the message + * @param message the debug message + */ +void log(int level, String className, String message); +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/DynamicPortForwarder.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/DynamicPortForwarder.java new file mode 100644 index 0000000000..db3a0682c9 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/DynamicPortForwarder.java @@ -0,0 +1,77 @@ +/* + * Copyright 2007 Kenny Root, Jeffrey Sharkey + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * a.) Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * b.) Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * c.) Neither the name of Trilead nor the names of its contributors may + * be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +package com.trilead.ssh2; + +import java.io.IOException; +import java.net.InetSocketAddress; + +import com.trilead.ssh2.channel.ChannelManager; +import com.trilead.ssh2.channel.DynamicAcceptThread; + +/** + * A DynamicPortForwarder forwards TCP/IP connections to a local + * port via the secure tunnel to another host which is selected via the + * SOCKS protocol. Checkout {@link Connection#createDynamicPortForwarder(int)} + * on how to create one. + * + * @author Kenny Root + * @version $Id: $ + */ +public class DynamicPortForwarder { + ChannelManager cm; + + DynamicAcceptThread dat; + + DynamicPortForwarder(ChannelManager cm, int local_port) + throws IOException + { + this.cm = cm; + + dat = new DynamicAcceptThread(cm, local_port); + dat.setDaemon(true); + dat.start(); + } + + DynamicPortForwarder(ChannelManager cm, InetSocketAddress addr) throws IOException { + this.cm = cm; + + dat = new DynamicAcceptThread(cm, addr); + dat.setDaemon(true); + dat.start(); + } + + /** + * Stop TCP/IP forwarding of newly arriving connections. + * + */ + public void close() { + dat.stopWorking(); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/ExtendedServerHostKeyVerifier.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/ExtendedServerHostKeyVerifier.java new file mode 100644 index 0000000000..f757aa6b97 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/ExtendedServerHostKeyVerifier.java @@ -0,0 +1,47 @@ +package com.trilead.ssh2; + +import java.util.List; + +/** + * This extends the {@link ServerHostKeyVerifier} interface by allowing the remote server to indicate it has multiple + * server key algorithms available. After authentication, the {@link #getKnownKeyAlgorithmsForHost(String, int)} method + * may be called and compared against the list of server-controller keys. If a key algorithm has been added then + * {@link #addServerHostKey(String, int, String, byte[])} will be called. If a key algorithm has been removed, then + * {@link #removeServerHostKey(String, int, String, byte[])} will be called. + * + * @author Kenny Root + */ +public abstract class ExtendedServerHostKeyVerifier implements ServerHostKeyVerifier { + /** + * Called during connection to determine which keys are known for this host. + * + * @param hostname the hostname used to create the {@link Connection} object + * @param port the server's remote TCP port + * @return list of hostkey algorithms for the given hostname and port combination + * or {@code null} if none are known. + */ + public abstract List getKnownKeyAlgorithmsForHost(String hostname, int port); + + /** + * After authentication, if the server indicates it no longer uses this key, this method will be called + * for the app to remove its record of it. + * + * @param hostname the hostname used to create the {@link Connection} object + * @param port the server's remote TCP port + * @param serverHostKeyAlgorithm key algorithm of removed key + * @param serverHostKey key data of removed key + */ + public abstract void removeServerHostKey(String hostname, int port, String serverHostKeyAlgorithm, + byte[] serverHostKey); + + /** + * After authentication, if the server indicates it has another keyAlgorithm, this method will be + * called for the app to add it to its record of known keys for this hostname. + * + * @param hostname the hostname used to create the {@link Connection} object + * @param port the server's remote TCP port + * @param keyAlgorithm SSH standard name for the key to be added + * @param serverHostKey SSH encoding of the key data for the key to be added + */ + public abstract void addServerHostKey(String hostname, int port, String keyAlgorithm, byte[] serverHostKey); +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/ExtensionInfo.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/ExtensionInfo.java new file mode 100644 index 0000000000..58e602765d --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/ExtensionInfo.java @@ -0,0 +1,47 @@ +package com.trilead.ssh2; + +import com.trilead.ssh2.packets.PacketExtInfo; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +/** + * SSH extensions reported by the server + * + * https://tools.ietf.org/html/draft-ietf-curdle-ssh-ext-info-15 + */ +public class ExtensionInfo +{ + private final Set signatureAlgorithmsAccepted; + + /** + * @return Signature algorithms that server will accept. If empty, this extension was absent. + */ + public Set getSignatureAlgorithmsAccepted() + { + return signatureAlgorithmsAccepted; + } + + public static ExtensionInfo fromPacketExtInfo(PacketExtInfo packetExtInfo) + { + String rawAlgs = packetExtInfo.getExtNameToValue().get("server-sig-algs"); + if (rawAlgs == null) + { + return new ExtensionInfo(Collections.emptySet()); + } + + Set algsSet = new HashSet<>(); + Collections.addAll(algsSet, rawAlgs.split(",")); + return new ExtensionInfo(algsSet); + } + + public static ExtensionInfo noExtInfoSeen() + { + return new ExtensionInfo(Collections.emptySet()); + } + + private ExtensionInfo(Set signatureAlgorithmsAccepted) + { + this.signatureAlgorithmsAccepted = Collections.unmodifiableSet(signatureAlgorithmsAccepted); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/HTTPProxyData.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/HTTPProxyData.java new file mode 100644 index 0000000000..3be55a4160 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/HTTPProxyData.java @@ -0,0 +1,202 @@ + +package com.trilead.ssh2; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.Socket; + +import com.trilead.ssh2.crypto.Base64; +import com.trilead.ssh2.transport.ClientServerHello; + +/** + * A HTTPProxyData object is used to specify the needed connection data + * to connect through a HTTP proxy. + * + * @see Connection#setProxyData(ProxyData) + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: HTTPProxyData.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ + +public class HTTPProxyData implements ProxyData +{ + private final String proxyHost; + private final int proxyPort; + private final String proxyUser; + private final String proxyPass; + private final String[] requestHeaderLines; + + /** + * Same as calling {@link #HTTPProxyData(String, int, String, String) HTTPProxyData(proxyHost, proxyPort, null, null)} + * + * @param proxyHost Proxy hostname. + * @param proxyPort Proxy port. + */ + public HTTPProxyData(String proxyHost, int proxyPort) + { + this(proxyHost, proxyPort, null, null); + } + + /** + * Same as calling {@link #HTTPProxyData(String, int, String, String, String[]) HTTPProxyData(proxyHost, proxyPort, null, null, null)} + * + * @param proxyHost Proxy hostname. + * @param proxyPort Proxy port. + * @param proxyUser Username for basic authentication (null if no authentication is needed). + * @param proxyPass Password for basic authentication (null if no authentication is needed). + */ + public HTTPProxyData(String proxyHost, int proxyPort, String proxyUser, String proxyPass) + { + this(proxyHost, proxyPort, proxyUser, proxyPass, null); + } + + /** + * Connection data for a HTTP proxy. It is possible to specify a username and password + * if the proxy requires basic authentication. Also, additional request header lines can + * be specified (e.g., "User-Agent: CERN-LineMode/2.15 libwww/2.17b3"). + *

+ * Please note: if you want to use basic authentication, then both proxyUser + * and proxyPass must be non-null. + *

+ * Here is an example: + *

+ * + * new HTTPProxyData("192.168.1.1", "3128", "proxyuser", "secret", new String[] {"User-Agent: TrileadBasedClient/1.0", "X-My-Proxy-Option: something"}); + * + * + * @param proxyHost Proxy hostname. + * @param proxyPort Proxy port. + * @param proxyUser Username for basic authentication (null if no authentication is needed). + * @param proxyPass Password for basic authentication (null if no authentication is needed). + * @param requestHeaderLines An array with additional request header lines (without end-of-line markers) + * that have to be sent to the server. May be null. + */ + + public HTTPProxyData(String proxyHost, int proxyPort, String proxyUser, String proxyPass, + String[] requestHeaderLines) + { + if (proxyHost == null) + throw new IllegalArgumentException("proxyHost must be non-null"); + + if (proxyPort < 0) + throw new IllegalArgumentException("proxyPort must be non-negative"); + + this.proxyHost = proxyHost; + this.proxyPort = proxyPort; + this.proxyUser = proxyUser; + this.proxyPass = proxyPass; + this.requestHeaderLines = requestHeaderLines; + } + + @Override + public Socket openConnection(String hostname, int port, int connectTimeout) throws IOException { + Socket sock = new Socket(); + + InetAddress addr = InetAddress.getByName(proxyHost); + sock.connect(new InetSocketAddress(addr, proxyPort), connectTimeout); + sock.setSoTimeout(0); + + /* OK, now tell the proxy where we actually want to connect to */ + + StringBuffer sb = new StringBuffer(); + + sb.append("CONNECT "); + sb.append(hostname); + sb.append(':'); + sb.append(port); + sb.append(" HTTP/1.0\r\n"); + + if ((proxyUser != null) && (proxyPass != null)) + { + String credentials = proxyUser + ":" + proxyPass; + char[] encoded; + try { + encoded = Base64.encode(credentials.getBytes("ISO-8859-1")); + } catch (UnsupportedEncodingException e) { + encoded = Base64.encode(credentials.getBytes()); + } + sb.append("Proxy-Authorization: Basic "); + sb.append(encoded); + sb.append("\r\n"); + } + + if (requestHeaderLines != null) + { + for (int i = 0; i < requestHeaderLines.length; i++) + { + if (requestHeaderLines[i] != null) + { + sb.append(requestHeaderLines[i]); + sb.append("\r\n"); + } + } + } + + sb.append("\r\n"); + + OutputStream out = sock.getOutputStream(); + + try { + out.write(sb.toString().getBytes("ISO-8859-1")); + } catch (UnsupportedEncodingException e) { + out.write(sb.toString().getBytes()); + } + out.flush(); + + /* Now parse the HTTP response */ + + byte[] buffer = new byte[1024]; + InputStream in = sock.getInputStream(); + + int len = ClientServerHello.readLineRN(in, buffer); + + String httpReponse; + try { + httpReponse = new String(buffer, 0, len, "ISO-8859-1"); + } catch (UnsupportedEncodingException e) { + httpReponse = new String(buffer, 0, len); + } + + if (!httpReponse.startsWith("HTTP/")) + throw new IOException("The proxy did not send back a valid HTTP response."); + + /* "HTTP/1.X XYZ X" => 14 characters minimum */ + + if ((httpReponse.length() < 14) || (httpReponse.charAt(8) != ' ') || (httpReponse.charAt(12) != ' ')) + throw new IOException("The proxy did not send back a valid HTTP response."); + + int errorCode = 0; + + try + { + errorCode = Integer.parseInt(httpReponse.substring(9, 12)); + } + catch (NumberFormatException ignore) + { + throw new IOException("The proxy did not send back a valid HTTP response."); + } + + if ((errorCode < 0) || (errorCode > 999)) + throw new IOException("The proxy did not send back a valid HTTP response."); + + if (errorCode != 200) + { + throw new HTTPProxyException(httpReponse.substring(13), errorCode); + } + + /* OK, read until empty line */ + + while (true) + { + len = ClientServerHello.readLineRN(in, buffer); + if (len == 0) + break; + } + + return sock; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/HTTPProxyException.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/HTTPProxyException.java new file mode 100644 index 0000000000..2d2d019b52 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/HTTPProxyException.java @@ -0,0 +1,29 @@ + +package com.trilead.ssh2; + +import java.io.IOException; + +/** + * May be thrown upon connect() if a HTTP proxy is being used. + * + * @see Connection#connect() + * @see Connection#setProxyData(ProxyData) + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: HTTPProxyException.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ + +public class HTTPProxyException extends IOException +{ + private static final long serialVersionUID = 2241537397104426186L; + + public final String httpResponse; + public final int httpErrorCode; + + public HTTPProxyException(String httpResponse, int httpErrorCode) + { + super("HTTP Proxy Error (" + httpErrorCode + " " + httpResponse + ")"); + this.httpResponse = httpResponse; + this.httpErrorCode = httpErrorCode; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/InteractiveCallback.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/InteractiveCallback.java new file mode 100644 index 0000000000..06186efc7b --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/InteractiveCallback.java @@ -0,0 +1,55 @@ + +package com.trilead.ssh2; + +/** + * An InteractiveCallback is used to respond to challenges sent + * by the server if authentication mode "keyboard-interactive" is selected. + * + * @see Connection#authenticateWithKeyboardInteractive(String, + * String[], InteractiveCallback) + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: InteractiveCallback.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ + +public interface InteractiveCallback +{ + /** + * This callback interface is used during a "keyboard-interactive" + * authentication. Every time the server sends a set of challenges (however, + * most often just one challenge at a time), this callback function will be + * called to give your application a chance to talk to the user and to + * determine the response(s). + *

+ * Some copy-paste information from the standard: a command line interface + * (CLI) client SHOULD print the name and instruction (if non-empty), adding + * newlines. Then for each prompt in turn, the client SHOULD display the + * prompt and read the user input. The name and instruction fields MAY be + * empty strings, the client MUST be prepared to handle this correctly. The + * prompt field(s) MUST NOT be empty strings. + *

+ * Please refer to draft-ietf-secsh-auth-kbdinteract-XX.txt for the details. + *

+ * Note: clients SHOULD use control character filtering as discussed in + * RFC4251 to avoid attacks by including + * terminal control characters in the fields to be displayed. + * + * @param name + * the name String sent by the server. + * @param instruction + * the instruction String sent by the server. + * @param numPrompts + * number of prompts - may be zero (in this case, you should just + * return a String array of length zero). + * @param prompt + * an array (length numPrompts) of Strings + * @param echo + * an array (length numPrompts) of booleans. For + * each prompt, the corresponding echo field indicates whether or + * not the user input should be echoed as characters are typed. + * @return an array of reponses - the array size must match the parameter + * numPrompts. + */ + String[] replyToChallenge(String name, String instruction, int numPrompts, String[] prompt, boolean[] echo) + throws Exception; +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/KnownHosts.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/KnownHosts.java new file mode 100644 index 0000000000..030ad70371 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/KnownHosts.java @@ -0,0 +1,894 @@ + +package com.trilead.ssh2; + +import java.io.BufferedReader; +import java.io.CharArrayReader; +import java.io.CharArrayWriter; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.io.RandomAccessFile; +import java.io.UnsupportedEncodingException; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.security.InvalidKeyException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; +import java.security.SecureRandom; +import java.security.interfaces.DSAPublicKey; +import java.security.interfaces.ECPublicKey; +import java.security.interfaces.RSAPublicKey; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Locale; + +import javax.crypto.Mac; +import javax.crypto.spec.SecretKeySpec; + +import com.trilead.ssh2.crypto.Base64; +import com.trilead.ssh2.crypto.keys.Ed25519PublicKey; +import com.trilead.ssh2.signature.DSASHA1Verify; +import com.trilead.ssh2.signature.ECDSASHA2Verify; +import com.trilead.ssh2.signature.Ed25519Verify; +import com.trilead.ssh2.signature.RSASHA1Verify; +import com.trilead.ssh2.signature.RSASHA256Verify; +import com.trilead.ssh2.signature.RSASHA512Verify; +import com.trilead.ssh2.transport.KexManager; + +/** + * The KnownHosts class is a handy tool to verify received server hostkeys + * based on the information in known_hosts files (the ones used by OpenSSH). + *

+ * It offers basically an in-memory database for known_hosts entries, as well as some + * helper functions. Entries from a known_hosts file can be loaded at construction time. + * It is also possible to add more keys later (e.g., one can parse different + * known_hosts files). + *

+ * It is a thread safe implementation, therefore, you need only to instantiate one + * KnownHosts for your whole application. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: KnownHosts.java,v 1.2 2008/04/01 12:38:09 cplattne Exp $ + */ + +public class KnownHosts +{ + public static final int HOSTKEY_IS_OK = 0; + public static final int HOSTKEY_IS_NEW = 1; + public static final int HOSTKEY_HAS_CHANGED = 2; + + protected class KnownHostsEntry + { + String[] patterns; + PublicKey key; + + KnownHostsEntry(String[] patterns, PublicKey key) + { + this.patterns = patterns; + this.key = key; + } + + @Override + public String toString() { + return "KnownHostsEntry{keyType=" + key.getAlgorithm() + "}"; + } + } + + protected final LinkedList publicKeys = new LinkedList<>(); + + public KnownHosts() + { + } + + public KnownHosts(char[] knownHostsData) throws IOException + { + initialize(knownHostsData); + } + + public KnownHosts(File knownHosts) throws IOException + { + initialize(knownHosts); + } + + /** + * Adds a single public key entry to the database. Note: this will NOT add the public key + * to any physical file (e.g., "~/.ssh/known_hosts") - use addHostkeyToFile() for that purpose. + * This method is designed to be used in a {@link ServerHostKeyVerifier}. + * + * @param hostnames a list of hostname patterns - at least one most be specified. Check out the + * OpenSSH sshd man page for a description of the pattern matching algorithm. + * @param serverHostKeyAlgorithm as passed to the {@link ServerHostKeyVerifier}. + * @param serverHostKey as passed to the {@link ServerHostKeyVerifier}. + * @throws IOException + */ + public void addHostkey(String[] hostnames, String serverHostKeyAlgorithm, byte[] serverHostKey) throws IOException + { + if (hostnames == null) + throw new IllegalArgumentException("hostnames may not be null"); + + if (RSASHA1Verify.ID_SSH_RSA.equals(serverHostKeyAlgorithm) || + RSASHA512Verify.ID_RSA_SHA_2_512.equals(serverHostKeyAlgorithm) || + RSASHA256Verify.ID_RSA_SHA_2_256.equals(serverHostKeyAlgorithm)) + { + PublicKey rpk = RSASHA1Verify.get().decodePublicKey(serverHostKey); + + synchronized (publicKeys) + { + publicKeys.add(new KnownHostsEntry(hostnames, rpk)); + } + } else if (serverHostKeyAlgorithm.equals(DSASHA1Verify.ID_SSH_DSS)) { + PublicKey dpk = DSASHA1Verify.get().decodePublicKey(serverHostKey); + + synchronized (publicKeys) + { + publicKeys.add(new KnownHostsEntry(hostnames, dpk)); + } + } else if (serverHostKeyAlgorithm.equals(ECDSASHA2Verify.ECDSASHA2NISTP256Verify.get().getKeyFormat())) { + PublicKey epk = ECDSASHA2Verify.ECDSASHA2NISTP256Verify.get().decodePublicKey(serverHostKey); + + synchronized (publicKeys) + { + publicKeys.add(new KnownHostsEntry(hostnames, epk)); + } + } else if (serverHostKeyAlgorithm.equals(ECDSASHA2Verify.ECDSASHA2NISTP384Verify.get().getKeyFormat())) { + PublicKey epk = ECDSASHA2Verify.ECDSASHA2NISTP384Verify.get().decodePublicKey(serverHostKey); + + synchronized (publicKeys) + { + publicKeys.add(new KnownHostsEntry(hostnames, epk)); + } + } else if (serverHostKeyAlgorithm.equals(ECDSASHA2Verify.ECDSASHA2NISTP521Verify.get().getKeyFormat())) { + PublicKey epk = ECDSASHA2Verify.ECDSASHA2NISTP521Verify.get().decodePublicKey(serverHostKey); + + synchronized (publicKeys) + { + publicKeys.add(new KnownHostsEntry(hostnames, epk)); + } + } else if (Ed25519Verify.ED25519_ID.equals(serverHostKeyAlgorithm)) { + PublicKey edpk = Ed25519Verify.get().decodePublicKey(serverHostKey); + + synchronized (publicKeys) + { + publicKeys.add(new KnownHostsEntry(hostnames, edpk)); + } + } else { + throw new IOException("Unknown host key type (" + serverHostKeyAlgorithm + ")"); + } + } + + /** + * Parses the given known_hosts data and adds entries to the database. + * + * @param knownHostsData + * @throws IOException + */ + public void addHostkeys(char[] knownHostsData) throws IOException + { + initialize(knownHostsData); + } + + /** + * Parses the given known_hosts file and adds entries to the database. + * + * @param knownHosts + * @throws IOException + */ + public void addHostkeys(File knownHosts) throws IOException + { + initialize(knownHosts); + } + + /** + * Generate the hashed representation of the given hostname. Useful for adding entries + * with hashed hostnames to a known_hosts file. (see -H option of OpenSSH key-gen). + * + * @param hostname + * @return the hashed representation, e.g., "|1|cDhrv7zwEUV3k71CEPHnhHZezhA=|Xo+2y6rUXo2OIWRAYhBOIijbJMA=" + */ + public static final String createHashedHostname(String hostname) + { + MessageDigest sha1; + try { + sha1 = MessageDigest.getInstance("SHA1"); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException("VM doesn't support SHA1", e); + } + + byte[] salt = new byte[sha1.getDigestLength()]; + + new SecureRandom().nextBytes(salt); + + byte[] hash = hmacSha1Hash(salt, hostname); + + String base64_salt = new String(Base64.encode(salt)); + String base64_hash = new String(Base64.encode(hash)); + + return new String("|1|" + base64_salt + "|" + base64_hash); + } + + private static final byte[] hmacSha1Hash(byte[] salt, String hostname) + { + Mac hmac; + try { + hmac = Mac.getInstance("HmacSHA1"); + if (salt.length != hmac.getMacLength()) + throw new IllegalArgumentException("Salt has wrong length (" + salt.length + ")"); + hmac.init(new SecretKeySpec(salt, "HmacSHA1")); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException("Unable to HMAC-SHA1", e); + } catch (InvalidKeyException e) { + throw new RuntimeException("Unable to create SecretKey", e); + } + + try { + hmac.update(hostname.getBytes("ISO-8859-1")); + } catch (UnsupportedEncodingException e) { + hmac.update(hostname.getBytes()); + } + + return hmac.doFinal(); + } + + private final boolean checkHashed(String entry, String hostname) + { + if (!entry.startsWith("|1|")) + return false; + + int delim_idx = entry.indexOf('|', 3); + + if (delim_idx == -1) + return false; + + String salt_base64 = entry.substring(3, delim_idx); + String hash_base64 = entry.substring(delim_idx + 1); + + byte[] salt = null; + byte[] hash = null; + + try + { + salt = Base64.decode(salt_base64.toCharArray()); + hash = Base64.decode(hash_base64.toCharArray()); + } + catch (IOException e) + { + return false; + } + + try { + MessageDigest sha1 = MessageDigest.getInstance("SHA1"); + if (salt.length != sha1.getDigestLength()) + return false; + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException("VM does not support SHA1", e); + } + + byte[] dig = hmacSha1Hash(salt, hostname); + + for (int i = 0; i < dig.length; i++) + if (dig[i] != hash[i]) + return false; + + return true; + } + + private int checkKey(String remoteHostname, PublicKey remoteKey) + { + int result = HOSTKEY_IS_NEW; + + synchronized (publicKeys) + { + Iterator i = publicKeys.iterator(); + + while (i.hasNext()) + { + KnownHostsEntry ke = i.next(); + + if (!hostnameMatches(ke.patterns, remoteHostname)) + continue; + + boolean res = matchKeys(ke.key, remoteKey); + + if (res) + return HOSTKEY_IS_OK; + + result = HOSTKEY_HAS_CHANGED; + } + } + return result; + } + + private List getAllKeys(String hostname) + { + List keys = new ArrayList<>(); + + synchronized (publicKeys) + { + Iterator i = publicKeys.iterator(); + + while (i.hasNext()) + { + KnownHostsEntry ke = i.next(); + + if (!hostnameMatches(ke.patterns, hostname)) + continue; + + keys.add(ke.key); + } + } + + return keys; + } + + /** + * Try to find the preferred order of hostkey algorithms for the given hostname. + * Based on the type of hostkey that is present in the internal database + * (i.e., either ssh-rsa or ssh-dss) + * an ordered list of hostkey algorithms is returned which can be passed + * to Connection.setServerHostKeyAlgorithms. + * + * @param hostname + * @return null if no key for the given hostname is present or + * there are keys of multiple types present for the given hostname. Otherwise, + * an array with hostkey algorithms is returned (i.e., an array of length 2). + */ + public String[] getPreferredServerHostkeyAlgorithmOrder(String hostname) + { + String[] algos = recommendHostkeyAlgorithms(hostname); + + if (algos != null) + return algos; + + InetAddress[] ipAddresses; + + try + { + ipAddresses = InetAddress.getAllByName(hostname); + } catch (UnknownHostException e) { + return null; + } + + for (InetAddress ipAddress : ipAddresses) { + algos = recommendHostkeyAlgorithms(ipAddress.getHostAddress()); + + if (algos != null) + return algos; + } + + return null; + } + + private final boolean hostnameMatches(String[] hostpatterns, String hostname) + { + boolean isMatch = false; + boolean negate = false; + + hostname = hostname.toLowerCase(Locale.US); + + for (int k = 0; k < hostpatterns.length; k++) + { + if (hostpatterns[k] == null) + continue; + + String pattern = null; + + /* In contrast to OpenSSH we also allow negated hash entries (as well as hashed + * entries in lines with multiple entries). + */ + + if ((hostpatterns[k].length() > 0) && (hostpatterns[k].charAt(0) == '!')) + { + pattern = hostpatterns[k].substring(1); + negate = true; + } + else + { + pattern = hostpatterns[k]; + negate = false; + } + + /* Optimize, no need to check this entry */ + + if ((isMatch) && (!negate)) + continue; + + /* Now compare */ + + if (pattern.charAt(0) == '|') + { + if (checkHashed(pattern, hostname)) + { + if (negate) + return false; + isMatch = true; + } + } + else + { + pattern = pattern.toLowerCase(Locale.US); + + if ((pattern.indexOf('?') != -1) || (pattern.indexOf('*') != -1)) + { + if (pseudoRegex(pattern.toCharArray(), 0, hostname.toCharArray(), 0)) + { + if (negate) + return false; + isMatch = true; + } + } + else if (pattern.compareTo(hostname) == 0) + { + if (negate) + return false; + isMatch = true; + } + } + } + + return isMatch; + } + + private void initialize(char[] knownHostsData) throws IOException + { + BufferedReader br = new BufferedReader(new CharArrayReader(knownHostsData)); + + while (true) + { + String line = br.readLine(); + + if (line == null) + break; + + line = line.trim(); + + if (line.startsWith("#")) + continue; + + String[] arr = line.split(" "); + + if (arr.length >= 3) + { + String[] hostnames = arr[0].split(","); + + byte[] msg = Base64.decode(arr[2].toCharArray()); + + addHostkey(hostnames, arr[1], msg); + } + } + } + + private void initialize(File knownHosts) throws IOException + { + char[] buff = new char[512]; + + CharArrayWriter cw = new CharArrayWriter(); + + knownHosts.createNewFile(); + + FileReader fr = new FileReader(knownHosts); + + while (true) + { + int len = fr.read(buff); + if (len < 0) + break; + cw.write(buff, 0, len); + } + + fr.close(); + + initialize(cw.toCharArray()); + } + + private final boolean matchKeys(PublicKey key1, PublicKey key2) + { + return key1.equals(key2); + } + + private final boolean pseudoRegex(char[] pattern, int i, char[] match, int j) + { + /* This matching logic is equivalent to the one present in OpenSSH 4.1 */ + + while (true) + { + /* Are we at the end of the pattern? */ + + if (pattern.length == i) + return (match.length == j); + + if (pattern[i] == '*') + { + i++; + + if (pattern.length == i) + return true; + + if ((pattern[i] != '*') && (pattern[i] != '?')) + { + while (true) + { + if ((pattern[i] == match[j]) && pseudoRegex(pattern, i + 1, match, j + 1)) + return true; + j++; + if (match.length == j) + return false; + } + } + + while (true) + { + if (pseudoRegex(pattern, i, match, j)) + return true; + j++; + if (match.length == j) + return false; + } + } + + if (match.length == j) + return false; + + if ((pattern[i] != '?') && (pattern[i] != match[j])) + return false; + + i++; + j++; + } + } + + private final String[] ALGOS_FOR_RSA = new String[] { + RSASHA512Verify.ID_RSA_SHA_2_512, + RSASHA256Verify.ID_RSA_SHA_2_256, + RSASHA1Verify.ID_SSH_RSA, + }; + + private final String ALGO_FOR_DSS = DSASHA1Verify.ID_SSH_DSS; + + private final String ALGO_FOR_EDDSA = Ed25519Verify.ED25519_ID; + + private String[] recommendHostkeyAlgorithms(String hostname) { + List preferredAlgos = new ArrayList<>(); + + List keys = getAllKeys(hostname); + + for (PublicKey key : keys) { + if (key instanceof RSAPublicKey) { + preferredAlgos.addAll(Arrays.asList(ALGOS_FOR_RSA)); + } else if (key instanceof DSAPublicKey) { + preferredAlgos.add(ALGO_FOR_DSS); + } else if (key instanceof Ed25519PublicKey) { + preferredAlgos.add(ALGO_FOR_EDDSA); + } else if (key instanceof ECPublicKey) { + preferredAlgos.add(ECDSASHA2Verify.getSshKeyType((ECPublicKey) key)); + } + } + + /* If we did not find anything that we know of, return null */ + if (preferredAlgos.isEmpty()) + return null; + + /* Now put the preferred algo to the start of the array. + * You may ask yourself why we do it that way - basically, we could just + * return only the preferred algorithm: since we have a saved key of that + * type (sent earlier from the remote host), then that should work out. + * However, imagine that the server is (for whatever reasons) not offering + * that type of hostkey anymore (e.g., "ssh-rsa" was disabled and + * now "ssh-dss" is being used). If we then do not let the server send us + * a fresh key of the new type, then we shoot ourself into the foot: + * the connection cannot be established and hence the user cannot decide + * if he/she wants to accept the new key. + */ + + List preferredAndOthers = new ArrayList<>(); + List notPreferred = new ArrayList<>(); + for (String algo : KexManager.getDefaultServerHostkeyAlgorithmList()) { + if (preferredAlgos.contains(algo)) { + preferredAndOthers.add(algo); + } else { + notPreferred.add(algo); + } + } + preferredAndOthers.addAll(notPreferred); + return preferredAndOthers.toArray(new String[0]); + } + + /** + * Checks the internal hostkey database for the given hostkey. + * If no matching key can be found, then the hostname is resolved to an IP address + * and the search is repeated using that IP address. + * + * @param hostname the server's hostname, will be matched with all hostname patterns + * @param serverHostKeyAlgorithm type of hostkey, either ssh-rsa or ssh-dss + * @param serverHostKey the key blob + * @return

    + *
  • HOSTKEY_IS_OK: the given hostkey matches an entry for the given hostname
  • + *
  • HOSTKEY_IS_NEW: no entries found for this hostname and this type of hostkey
  • + *
  • HOSTKEY_HAS_CHANGED: hostname is known, but with another key of the same type + * (man-in-the-middle attack?)
  • + *
+ * @throws IOException if the supplied key blob cannot be parsed or does not match the given hostkey type. + */ + public int verifyHostkey(String hostname, String serverHostKeyAlgorithm, byte[] serverHostKey) throws IOException + { + PublicKey remoteKey = null; + + if (RSASHA1Verify.ID_SSH_RSA.equals(serverHostKeyAlgorithm) || + RSASHA256Verify.ID_RSA_SHA_2_256.equals(serverHostKeyAlgorithm) || + RSASHA512Verify.ID_RSA_SHA_2_512.equals(serverHostKeyAlgorithm)) + { + remoteKey = RSASHA1Verify.get().decodePublicKey(serverHostKey); + } + else if (DSASHA1Verify.ID_SSH_DSS.equals(serverHostKeyAlgorithm)) + { + remoteKey = DSASHA1Verify.get().decodePublicKey(serverHostKey); + } + else if (ECDSASHA2Verify.ECDSASHA2NISTP256Verify.get().getKeyFormat().equals(serverHostKeyAlgorithm)) + { + remoteKey = ECDSASHA2Verify.ECDSASHA2NISTP256Verify.get().decodePublicKey(serverHostKey); + } + else if (ECDSASHA2Verify.ECDSASHA2NISTP384Verify.get().getKeyFormat().equals(serverHostKeyAlgorithm)) + { + remoteKey = ECDSASHA2Verify.ECDSASHA2NISTP384Verify.get().decodePublicKey(serverHostKey); + } + else if (ECDSASHA2Verify.ECDSASHA2NISTP521Verify.get().getKeyFormat().equals(serverHostKeyAlgorithm)) + { + remoteKey = ECDSASHA2Verify.ECDSASHA2NISTP521Verify.get().decodePublicKey(serverHostKey); + } + else if (Ed25519Verify.ED25519_ID.equals(serverHostKeyAlgorithm)) + { + remoteKey = Ed25519Verify.get().decodePublicKey(serverHostKey); + } + else + throw new IllegalArgumentException("Unknown hostkey type " + serverHostKeyAlgorithm); + + int result = checkKey(hostname, remoteKey); + + if (result == HOSTKEY_IS_OK) + return result; + + InetAddress[] ipAddresses = null; + + try + { + ipAddresses = InetAddress.getAllByName(hostname); + } + catch (UnknownHostException e) + { + return result; + } + + for (InetAddress ipAddress : ipAddresses) { + int newresult = checkKey(ipAddress.getHostAddress(), remoteKey); + + if (newresult == HOSTKEY_IS_OK) + return newresult; + + if (newresult == HOSTKEY_HAS_CHANGED) + result = HOSTKEY_HAS_CHANGED; + } + + return result; + } + + /** + * Adds a single public key entry to the a known_hosts file. + * This method is designed to be used in a {@link ServerHostKeyVerifier}. + * + * @param knownHosts the file where the publickey entry will be appended. + * @param hostnames a list of hostname patterns - at least one most be specified. Check out the + * OpenSSH sshd man page for a description of the pattern matching algorithm. + * @param serverHostKeyAlgorithm as passed to the {@link ServerHostKeyVerifier}. + * @param serverHostKey as passed to the {@link ServerHostKeyVerifier}. + * @throws IOException + */ + public final static void addHostkeyToFile(File knownHosts, String[] hostnames, String serverHostKeyAlgorithm, + byte[] serverHostKey) throws IOException + { + if ((hostnames == null) || (hostnames.length == 0)) + throw new IllegalArgumentException("Need at least one hostname specification"); + + if ((serverHostKeyAlgorithm == null) || (serverHostKey == null)) + throw new IllegalArgumentException(); + + CharArrayWriter writer = new CharArrayWriter(); + + for (int i = 0; i < hostnames.length; i++) + { + if (i != 0) + writer.write(','); + writer.write(hostnames[i]); + } + + writer.write(' '); + writer.write(serverHostKeyAlgorithm); + writer.write(' '); + writer.write(Base64.encode(serverHostKey)); + writer.write("\n"); + + char[] entry = writer.toCharArray(); + + RandomAccessFile raf = new RandomAccessFile(knownHosts, "rw"); + + long len = raf.length(); + + if (len > 0) + { + raf.seek(len - 1); + int last = raf.read(); + if (last != '\n') + raf.write('\n'); + } + + try { + raf.write(new String(entry).getBytes("ISO-8859-1")); + } catch (UnsupportedEncodingException e) { + raf.write(new String(entry).getBytes()); + } + raf.close(); + } + + /** + * Generates a "raw" fingerprint of a hostkey. + * + * @param type either "md5" or "sha1" + * @param keyType either "ssh-rsa" or "ssh-dss" + * @param hostkey the hostkey + * @return the raw fingerprint + */ + private static byte[] rawFingerPrint(String type, String keyType, byte[] hostkey) + { + MessageDigest dig = null; + + try { + if ("md5".equals(type)) + { + dig = MessageDigest.getInstance("MD5"); + } + else if ("sha1".equals(type)) + { + dig = MessageDigest.getInstance("SHA1"); + } + else + { + throw new IllegalArgumentException("Unknown hash type " + type); + } + } catch (NoSuchAlgorithmException e) { + throw new IllegalArgumentException("Unknown hash type " + type); + } + + if (Ed25519Verify.ED25519_ID.equals(keyType)) + { + } + else if (keyType.startsWith(ECDSASHA2Verify.ECDSA_SHA2_PREFIX)) + { + } + else if (RSASHA1Verify.ID_SSH_RSA.equals(keyType)) + { + } + else if (DSASHA1Verify.ID_SSH_DSS.equals(keyType)) + { + } + else if (RSASHA256Verify.ID_RSA_SHA_2_256.equals(keyType)) + { + } + else if (RSASHA512Verify.ID_RSA_SHA_2_512.equals(keyType)) + { + } + else + throw new IllegalArgumentException("Unknown key type " + keyType); + + if (hostkey == null) + throw new IllegalArgumentException("hostkey is null"); + + dig.update(hostkey); + return dig.digest(); + } + + /** + * Convert a raw fingerprint to hex representation (XX:YY:ZZ...). + * @param fingerprint raw fingerprint + * @return the hex representation + */ + private static String rawToHexFingerprint(byte[] fingerprint) + { + final char[] alpha = "0123456789abcdef".toCharArray(); + + StringBuilder sb = new StringBuilder(); + + for (int i = 0; i < fingerprint.length; i++) + { + if (i != 0) + sb.append(':'); + int b = fingerprint[i] & 0xff; + sb.append(alpha[b >> 4]); + sb.append(alpha[b & 15]); + } + + return sb.toString(); + } + + /** + * Convert a raw fingerprint to bubblebabble representation. + * @param raw raw fingerprint + * @return the bubblebabble representation + */ + static final private String rawToBubblebabbleFingerprint(byte[] raw) + { + final char[] v = "aeiouy".toCharArray(); + final char[] c = "bcdfghklmnprstvzx".toCharArray(); + + StringBuilder sb = new StringBuilder(); + + int seed = 1; + + int rounds = (raw.length / 2) + 1; + + sb.append('x'); + + for (int i = 0; i < rounds; i++) + { + if (((i + 1) < rounds) || ((raw.length) % 2 != 0)) + { + sb.append(v[(((raw[2 * i] >> 6) & 3) + seed) % 6]); + sb.append(c[(raw[2 * i] >> 2) & 15]); + sb.append(v[((raw[2 * i] & 3) + (seed / 6)) % 6]); + + if ((i + 1) < rounds) + { + sb.append(c[(((raw[(2 * i) + 1])) >> 4) & 15]); + sb.append('-'); + sb.append(c[(((raw[(2 * i) + 1]))) & 15]); + // As long as seed >= 0, seed will be >= 0 afterwards + seed = ((seed * 5) + (((raw[2 * i] & 0xff) * 7) + (raw[(2 * i) + 1] & 0xff))) % 36; + } + } + else + { + sb.append(v[seed % 6]); // seed >= 0, therefore index positive + sb.append('x'); + sb.append(v[seed / 6]); + } + } + + sb.append('x'); + + return sb.toString(); + } + + /** + * Convert a ssh2 key-blob into a human readable hex fingerprint. + * Generated fingerprints are identical to those generated by OpenSSH. + *

+ * Example fingerprint: d0:cb:76:19:99:5a:03:fc:73:10:70:93:f2:44:63:47. + + * @param keytype either "ssh-rsa" or "ssh-dss" + * @param publickey key blob + * @return Hex fingerprint + */ + public final static String createHexFingerprint(String keytype, byte[] publickey) + { + byte[] raw = rawFingerPrint("md5", keytype, publickey); + return rawToHexFingerprint(raw); + } + + /** + * Convert a ssh2 key-blob into a human readable bubblebabble fingerprint. + * The used bubblebabble algorithm (taken from OpenSSH) generates fingerprints + * that are easier to remember for humans. + *

+ * Example fingerprint: xofoc-bubuz-cazin-zufyl-pivuk-biduk-tacib-pybur-gonar-hotat-lyxux. + * + * @param keytype either "ssh-rsa" or "ssh-dss" + * @param publickey key data + * @return Bubblebabble fingerprint + */ + public final static String createBubblebabbleFingerprint(String keytype, byte[] publickey) + { + byte[] raw = rawFingerPrint("sha1", keytype, publickey); + return rawToBubblebabbleFingerprint(raw); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/LocalPortForwarder.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/LocalPortForwarder.java new file mode 100644 index 0000000000..6f42d5ad27 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/LocalPortForwarder.java @@ -0,0 +1,61 @@ + +package com.trilead.ssh2; + +import java.io.IOException; +import java.net.InetSocketAddress; + +import com.trilead.ssh2.channel.ChannelManager; +import com.trilead.ssh2.channel.LocalAcceptThread; + + +/** + * A LocalPortForwarder forwards TCP/IP connections to a local + * port via the secure tunnel to another host (which may or may not be identical + * to the remote SSH-2 server). Checkout {@link Connection#createLocalPortForwarder(int, String, int)} + * on how to create one. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: LocalPortForwarder.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ +public class LocalPortForwarder +{ + ChannelManager cm; + + String host_to_connect; + + int port_to_connect; + + LocalAcceptThread lat; + + LocalPortForwarder(ChannelManager cm, int local_port, String host_to_connect, int port_to_connect) + throws IOException + { + this.cm = cm; + this.host_to_connect = host_to_connect; + this.port_to_connect = port_to_connect; + + lat = new LocalAcceptThread(cm, local_port, host_to_connect, port_to_connect); + lat.setDaemon(true); + lat.start(); + } + + LocalPortForwarder(ChannelManager cm, InetSocketAddress addr, String host_to_connect, int port_to_connect) + throws IOException + { + this.cm = cm; + this.host_to_connect = host_to_connect; + this.port_to_connect = port_to_connect; + + lat = new LocalAcceptThread(cm, addr, host_to_connect, port_to_connect); + lat.setDaemon(true); + lat.start(); + } + + /** + * Stop TCP/IP forwarding of newly arriving connections. + * + */ + public void close() { + lat.stopWorking(); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/LocalStreamForwarder.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/LocalStreamForwarder.java new file mode 100644 index 0000000000..ce5c501ecc --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/LocalStreamForwarder.java @@ -0,0 +1,74 @@ + +package com.trilead.ssh2; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import com.trilead.ssh2.channel.Channel; +import com.trilead.ssh2.channel.ChannelManager; +import com.trilead.ssh2.channel.LocalAcceptThread; + + +/** + * A LocalStreamForwarder forwards an Input- and Outputstream + * pair via the secure tunnel to another host (which may or may not be identical + * to the remote SSH-2 server). + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: LocalStreamForwarder.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ +public class LocalStreamForwarder +{ + ChannelManager cm; + + String host_to_connect; + int port_to_connect; + LocalAcceptThread lat; + + Channel cn; + + LocalStreamForwarder(ChannelManager cm, String host_to_connect, int port_to_connect) throws IOException + { + this.cm = cm; + this.host_to_connect = host_to_connect; + this.port_to_connect = port_to_connect; + + cn = cm.openDirectTCPIPChannel(host_to_connect, port_to_connect, "127.0.0.1", 0); + } + + /** + * @return An InputStream object. + */ + public InputStream getInputStream() { + return cn.getStdoutStream(); + } + + /** + * Get the OutputStream. Please be aware that the implementation MAY use an + * internal buffer. To make sure that the buffered data is sent over the + * tunnel, you have to call the flush method of the + * OutputStream. To signal EOF, please use the + * close method of the OutputStream. + * + * @return An OutputStream object. + */ + public OutputStream getOutputStream() { + return cn.getStdinStream(); + } + + /** + * Close the underlying SSH forwarding channel and free up resources. + * You can also use this method to force the shutdown of the underlying + * forwarding channel. Pending output (OutputStream not flushed) will NOT + * be sent. Pending input (InputStream) can still be read. If the shutdown + * operation is already in progress (initiated from either side), then this + * call is a no-op. + * + * @throws IOException + */ + public void close() throws IOException + { + cm.closeChannel(cn, "Closed due to user request.", true); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/ProxyData.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/ProxyData.java new file mode 100644 index 0000000000..9b240bca36 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/ProxyData.java @@ -0,0 +1,28 @@ + +package com.trilead.ssh2; + +import java.io.IOException; +import java.net.Socket; + +/** + * An abstract interface implemented by all proxy data implementations. + * + * @see HTTPProxyData + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: ProxyData.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ + +public interface ProxyData +{ + /** + * Connects the socket to the given destination using the proxy method that this instance + * represents. + * @param hostname hostname of end host (not proxy) + * @param port port of end host (not proxy) + * @param connectTimeout number of seconds before giving up on connecting to end host + * @throws IOException if the connection could not be completed + * @return connected socket instance + */ + Socket openConnection(String hostname, int port, int connectTimeout) throws IOException; +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/SCPClient.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/SCPClient.java new file mode 100644 index 0000000000..71345da6ad --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/SCPClient.java @@ -0,0 +1,747 @@ + +package com.trilead.ssh2; + +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; + +/** + * A very basic SCPClient that can be used to copy files from/to + * the SSH-2 server. On the server side, the "scp" program must be in the PATH. + *

+ * This scp client is thread safe - you can download (and upload) different sets + * of files concurrently without any troubles. The SCPClient is + * actually mapping every request to a distinct {@link Session}. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: SCPClient.java,v 1.2 2008/04/01 12:38:09 cplattne Exp $ + */ + +public class SCPClient +{ + Connection conn; + + class LenNamePair + { + long length; + String filename; + } + + public SCPClient(Connection conn) + { + if (conn == null) + throw new IllegalArgumentException("Cannot accept null argument!"); + this.conn = conn; + } + + private void readResponse(InputStream is) throws IOException + { + int c = is.read(); + + if (c == 0) + return; + + if (c == -1) + throw new IOException("Remote scp terminated unexpectedly."); + + if ((c != 1) && (c != 2)) + throw new IOException("Remote scp sent illegal error code."); + + if (c == 2) + throw new IOException("Remote scp terminated with error."); + + String err = receiveLine(is); + throw new IOException("Remote scp terminated with error (" + err + ")."); + } + + private String receiveLine(InputStream is) throws IOException + { + StringBuffer sb = new StringBuffer(30); + + while (true) + { + /* + * This is a random limit - if your path names are longer, then + * adjust it + */ + + if (sb.length() > 8192) + throw new IOException("Remote scp sent a too long line"); + + int c = is.read(); + + if (c < 0) + throw new IOException("Remote scp terminated unexpectedly."); + + if (c == '\n') + break; + + sb.append((char) c); + + } + return sb.toString(); + } + + private LenNamePair parseCLine(String line) throws IOException + { + /* Minimum line: "xxxx y z" ---> 8 chars */ + + long len; + + if (line.length() < 8) + throw new IOException("Malformed C line sent by remote SCP binary, line too short."); + + if ((line.charAt(4) != ' ') || (line.charAt(5) == ' ')) + throw new IOException("Malformed C line sent by remote SCP binary."); + + int length_name_sep = line.indexOf(' ', 5); + + if (length_name_sep == -1) + throw new IOException("Malformed C line sent by remote SCP binary."); + + String length_substring = line.substring(5, length_name_sep); + String name_substring = line.substring(length_name_sep + 1); + + if ((length_substring.length() <= 0) || (name_substring.length() <= 0)) + throw new IOException("Malformed C line sent by remote SCP binary."); + + if ((6 + length_substring.length() + name_substring.length()) != line.length()) + throw new IOException("Malformed C line sent by remote SCP binary."); + + try + { + len = Long.parseLong(length_substring); + } + catch (NumberFormatException e) + { + throw new IOException("Malformed C line sent by remote SCP binary, cannot parse file length."); + } + + if (len < 0) + throw new IOException("Malformed C line sent by remote SCP binary, illegal file length."); + + LenNamePair lnp = new LenNamePair(); + lnp.length = len; + lnp.filename = name_substring; + + return lnp; + } + + private void sendBytes(Session sess, byte[] data, String fileName, String mode) throws IOException + { + OutputStream os = sess.getStdin(); + InputStream is = new BufferedInputStream(sess.getStdout(), 512); + + readResponse(is); + + String cline = "C" + mode + " " + data.length + " " + fileName + "\n"; + + try { + os.write(cline.getBytes("ISO-8859-1")); + } catch (UnsupportedEncodingException e) { + os.write(cline.getBytes()); + } + + os.flush(); + + readResponse(is); + + os.write(data, 0, data.length); + os.write(0); + os.flush(); + + readResponse(is); + + try { + os.write("E\n".getBytes("ISO-8859-1")); + } catch (UnsupportedEncodingException e) { + os.write("E\n".getBytes()); + } + os.flush(); + } + + private void sendFiles(Session sess, String[] files, String[] remoteFiles, String mode) throws IOException + { + byte[] buffer = new byte[8192]; + + OutputStream os = new BufferedOutputStream(sess.getStdin(), 40000); + InputStream is = new BufferedInputStream(sess.getStdout(), 512); + + readResponse(is); + + for (int i = 0; i < files.length; i++) + { + File f = new File(files[i]); + long remain = f.length(); + + String remoteName; + + if ((remoteFiles != null) && (remoteFiles.length > i) && (remoteFiles[i] != null)) + remoteName = remoteFiles[i]; + else + remoteName = f.getName(); + + String cline = "C" + mode + " " + remain + " " + remoteName + "\n"; + + try { + os.write(cline.getBytes("ISO-8859-1")); + } catch (UnsupportedEncodingException e) { + os.write(cline.getBytes()); + } + os.flush(); + + readResponse(is); + + FileInputStream fis = null; + + try + { + fis = new FileInputStream(f); + + while (remain > 0) + { + int trans; + if (remain > buffer.length) + trans = buffer.length; + else + trans = (int) remain; + + if (fis.read(buffer, 0, trans) != trans) + throw new IOException("Cannot read enough from local file " + files[i]); + + os.write(buffer, 0, trans); + + remain -= trans; + } + } + finally + { + if (fis != null) + fis.close(); + } + + os.write(0); + os.flush(); + + readResponse(is); + } + + try { + os.write("E\n".getBytes("ISO-8859-1")); + } catch (UnsupportedEncodingException e) { + os.write("E\n".getBytes("ISO-8859-1")); + } + os.flush(); + } + + private void receiveFiles(Session sess, OutputStream[] targets) throws IOException + { + byte[] buffer = new byte[8192]; + + OutputStream os = new BufferedOutputStream(sess.getStdin(), 512); + InputStream is = new BufferedInputStream(sess.getStdout(), 40000); + + os.write(0x0); + os.flush(); + + for (int i = 0; i < targets.length; i++) + { + LenNamePair lnp = null; + + while (true) + { + int c = is.read(); + if (c < 0) + throw new IOException("Remote scp terminated unexpectedly."); + + String line = receiveLine(is); + + if (c == 'T') + { + /* Ignore modification times */ + + continue; + } + + if ((c == 1) || (c == 2)) + throw new IOException("Remote SCP error: " + line); + + if (c == 'C') + { + lnp = parseCLine(line); + break; + + } + throw new IOException("Remote SCP error: " + ((char) c) + line); + } + + os.write(0x0); + os.flush(); + + long remain = lnp.length; + + while (remain > 0) + { + int trans; + if (remain > buffer.length) + trans = buffer.length; + else + trans = (int) remain; + + int this_time_received = is.read(buffer, 0, trans); + + if (this_time_received < 0) + { + throw new IOException("Remote scp terminated connection unexpectedly"); + } + + targets[i].write(buffer, 0, this_time_received); + + remain -= this_time_received; + } + + readResponse(is); + + os.write(0x0); + os.flush(); + } + } + + private void receiveFiles(Session sess, String[] files, String target) throws IOException + { + byte[] buffer = new byte[8192]; + + OutputStream os = new BufferedOutputStream(sess.getStdin(), 512); + InputStream is = new BufferedInputStream(sess.getStdout(), 40000); + + os.write(0x0); + os.flush(); + + for (int i = 0; i < files.length; i++) + { + LenNamePair lnp = null; + + while (true) + { + int c = is.read(); + if (c < 0) + throw new IOException("Remote scp terminated unexpectedly."); + + String line = receiveLine(is); + + if (c == 'T') + { + /* Ignore modification times */ + + continue; + } + + if ((c == 1) || (c == 2)) + throw new IOException("Remote SCP error: " + line); + + if (c == 'C') + { + lnp = parseCLine(line); + break; + + } + throw new IOException("Remote SCP error: " + ((char) c) + line); + } + + os.write(0x0); + os.flush(); + + File f = new File(target + File.separatorChar + lnp.filename); + FileOutputStream fop = null; + + try + { + fop = new FileOutputStream(f); + + long remain = lnp.length; + + while (remain > 0) + { + int trans; + if (remain > buffer.length) + trans = buffer.length; + else + trans = (int) remain; + + int this_time_received = is.read(buffer, 0, trans); + + if (this_time_received < 0) + { + throw new IOException("Remote scp terminated connection unexpectedly"); + } + + fop.write(buffer, 0, this_time_received); + + remain -= this_time_received; + } + } + finally + { + if (fop != null) + fop.close(); + } + + readResponse(is); + + os.write(0x0); + os.flush(); + } + } + + /** + * Copy a local file to a remote directory, uses mode 0600 when creating the + * file on the remote side. + * + * @param localFile + * Path and name of local file. + * @param remoteTargetDirectory + * Remote target directory. Use an empty string to specify the + * default directory. + * + * @throws IOException + */ + public void put(String localFile, String remoteTargetDirectory) throws IOException + { + put(new String[] { localFile }, remoteTargetDirectory, "0600"); + } + + /** + * Copy a set of local files to a remote directory, uses mode 0600 when + * creating files on the remote side. + * + * @param localFiles + * Paths and names of local file names. + * @param remoteTargetDirectory + * Remote target directory. Use an empty string to specify the + * default directory. + * + * @throws IOException + */ + + public void put(String[] localFiles, String remoteTargetDirectory) throws IOException + { + put(localFiles, remoteTargetDirectory, "0600"); + } + + /** + * Copy a local file to a remote directory, uses the specified mode when + * creating the file on the remote side. + * + * @param localFile + * Path and name of local file. + * @param remoteTargetDirectory + * Remote target directory. Use an empty string to specify the + * default directory. + * @param mode + * a four digit string (e.g., 0644, see "man chmod", "man open") + * @throws IOException + */ + public void put(String localFile, String remoteTargetDirectory, String mode) throws IOException + { + put(new String[] { localFile }, remoteTargetDirectory, mode); + } + + /** + * Copy a local file to a remote directory, uses the specified mode and + * remote filename when creating the file on the remote side. + * + * @param localFile + * Path and name of local file. + * @param remoteFileName + * The name of the file which will be created in the remote + * target directory. + * @param remoteTargetDirectory + * Remote target directory. Use an empty string to specify the + * default directory. + * @param mode + * a four digit string (e.g., 0644, see "man chmod", "man open") + * @throws IOException + */ + public void put(String localFile, String remoteFileName, String remoteTargetDirectory, String mode) + throws IOException + { + put(new String[] { localFile }, new String[] { remoteFileName }, remoteTargetDirectory, mode); + } + + /** + * Create a remote file and copy the contents of the passed byte array into + * it. Uses mode 0600 for creating the remote file. + * + * @param data + * the data to be copied into the remote file. + * @param remoteFileName + * The name of the file which will be created in the remote + * target directory. + * @param remoteTargetDirectory + * Remote target directory. Use an empty string to specify the + * default directory. + * @throws IOException + */ + + public void put(byte[] data, String remoteFileName, String remoteTargetDirectory) throws IOException + { + put(data, remoteFileName, remoteTargetDirectory, "0600"); + } + + /** + * Create a remote file and copy the contents of the passed byte array into + * it. The method use the specified mode when creating the file on the + * remote side. + * + * @param data + * the data to be copied into the remote file. + * @param remoteFileName + * The name of the file which will be created in the remote + * target directory. + * @param remoteTargetDirectory + * Remote target directory. Use an empty string to specify the + * default directory. + * @param mode + * a four digit string (e.g., 0644, see "man chmod", "man open") + * @throws IOException + */ + public void put(byte[] data, String remoteFileName, String remoteTargetDirectory, String mode) throws IOException + { + Session sess = null; + + if ((remoteFileName == null) || (remoteTargetDirectory == null) || (mode == null)) + throw new IllegalArgumentException("Null argument."); + + if (mode.length() != 4) + throw new IllegalArgumentException("Invalid mode."); + + for (int i = 0; i < mode.length(); i++) + if (!Character.isDigit(mode.charAt(i))) + throw new IllegalArgumentException("Invalid mode."); + + remoteTargetDirectory = remoteTargetDirectory.trim(); + remoteTargetDirectory = (remoteTargetDirectory.length() > 0) ? remoteTargetDirectory : "."; + + String cmd = "scp -t -d " + remoteTargetDirectory; + + try + { + sess = conn.openSession(); + sess.execCommand(cmd); + sendBytes(sess, data, remoteFileName, mode); + } + catch (IOException e) + { + throw new IOException("Error during SCP transfer.", e); + } + finally + { + if (sess != null) + sess.close(); + } + } + + /** + * Copy a set of local files to a remote directory, uses the specified mode + * when creating the files on the remote side. + * + * @param localFiles + * Paths and names of the local files. + * @param remoteTargetDirectory + * Remote target directory. Use an empty string to specify the + * default directory. + * @param mode + * a four digit string (e.g., 0644, see "man chmod", "man open") + * @throws IOException + */ + public void put(String[] localFiles, String remoteTargetDirectory, String mode) throws IOException + { + put(localFiles, null, remoteTargetDirectory, mode); + } + + public void put(String[] localFiles, String[] remoteFiles, String remoteTargetDirectory, String mode) + throws IOException + { + Session sess = null; + + /* + * remoteFiles may be null, indicating that the local filenames shall be + * used + */ + + if ((localFiles == null) || (remoteTargetDirectory == null) || (mode == null)) + throw new IllegalArgumentException("Null argument."); + + if (mode.length() != 4) + throw new IllegalArgumentException("Invalid mode."); + + for (int i = 0; i < mode.length(); i++) + if (!Character.isDigit(mode.charAt(i))) + throw new IllegalArgumentException("Invalid mode."); + + if (localFiles.length == 0) + return; + + remoteTargetDirectory = remoteTargetDirectory.trim(); + remoteTargetDirectory = (remoteTargetDirectory.length() > 0) ? remoteTargetDirectory : "."; + + String cmd = "scp -t -d " + remoteTargetDirectory; + + for (int i = 0; i < localFiles.length; i++) + { + if (localFiles[i] == null) + throw new IllegalArgumentException("Cannot accept null filename."); + } + + try + { + sess = conn.openSession(); + sess.execCommand(cmd); + sendFiles(sess, localFiles, remoteFiles, mode); + } + catch (IOException e) + { + throw new IOException("Error during SCP transfer.", e); + } + finally + { + if (sess != null) + sess.close(); + } + } + + /** + * Download a file from the remote server to a local directory. + * + * @param remoteFile + * Path and name of the remote file. + * @param localTargetDirectory + * Local directory to put the downloaded file. + * + * @throws IOException + */ + public void get(String remoteFile, String localTargetDirectory) throws IOException + { + get(new String[] { remoteFile }, localTargetDirectory); + } + + /** + * Download a file from the remote server and pipe its contents into an + * OutputStream. Please note that, to enable flexible usage + * of this method, the OutputStream will not be closed nor + * flushed. + * + * @param remoteFile + * Path and name of the remote file. + * @param target + * OutputStream where the contents of the file will be sent to. + * @throws IOException + */ + public void get(String remoteFile, OutputStream target) throws IOException + { + get(new String[] { remoteFile }, new OutputStream[] { target }); + } + + private void get(String remoteFiles[], OutputStream[] targets) throws IOException + { + Session sess = null; + + if ((remoteFiles == null) || (targets == null)) + throw new IllegalArgumentException("Null argument."); + + if (remoteFiles.length != targets.length) + throw new IllegalArgumentException("Length of arguments does not match."); + + if (remoteFiles.length == 0) + return; + + String cmd = "scp -f"; + + for (int i = 0; i < remoteFiles.length; i++) + { + if (remoteFiles[i] == null) + throw new IllegalArgumentException("Cannot accept null filename."); + + String tmp = remoteFiles[i].trim(); + + if (tmp.length() == 0) + throw new IllegalArgumentException("Cannot accept empty filename."); + + cmd += (" " + tmp); + } + + try + { + sess = conn.openSession(); + sess.execCommand(cmd); + receiveFiles(sess, targets); + } + catch (IOException e) + { + throw new IOException("Error during SCP transfer.", e); + } + finally + { + if (sess != null) + sess.close(); + } + } + + /** + * Download a set of files from the remote server to a local directory. + * + * @param remoteFiles + * Paths and names of the remote files. + * @param localTargetDirectory + * Local directory to put the downloaded files. + * + * @throws IOException + */ + public void get(String remoteFiles[], String localTargetDirectory) throws IOException + { + Session sess = null; + + if ((remoteFiles == null) || (localTargetDirectory == null)) + throw new IllegalArgumentException("Null argument."); + + if (remoteFiles.length == 0) + return; + + String cmd = "scp -f"; + + for (int i = 0; i < remoteFiles.length; i++) + { + if (remoteFiles[i] == null) + throw new IllegalArgumentException("Cannot accept null filename."); + + String tmp = remoteFiles[i].trim(); + + if (tmp.length() == 0) + throw new IllegalArgumentException("Cannot accept empty filename."); + + cmd += (" " + tmp); + } + + try + { + sess = conn.openSession(); + sess.execCommand(cmd); + receiveFiles(sess, remoteFiles, localTargetDirectory); + } + catch (IOException e) + { + throw new IOException("Error during SCP transfer.", e); + } + finally + { + if (sess != null) + sess.close(); + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/SFTPException.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/SFTPException.java new file mode 100644 index 0000000000..99a69d9943 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/SFTPException.java @@ -0,0 +1,91 @@ + +package com.trilead.ssh2; + +import java.io.IOException; + +import com.trilead.ssh2.sftp.ErrorCodes; + + +/** + * Used in combination with the SFTPv3Client. This exception wraps + * error messages sent by the SFTP server. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: SFTPException.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ + +public class SFTPException extends IOException +{ + private static final long serialVersionUID = 578654644222421811L; + + private final String sftpErrorMessage; + private final int sftpErrorCode; + + private static String constructMessage(String s, int errorCode) + { + String[] detail = ErrorCodes.getDescription(errorCode); + + if (detail == null) + return s + " (UNKNOW SFTP ERROR CODE)"; + + return s + " (" + detail[0] + ": " + detail[1] + ")"; + } + + SFTPException(String msg, int errorCode) + { + super(constructMessage(msg, errorCode)); + sftpErrorMessage = msg; + sftpErrorCode = errorCode; + } + + /** + * Get the error message sent by the server. Often, this + * message does not help a lot (e.g., "failure"). + * + * @return the plain string as sent by the server. + */ + public String getServerErrorMessage() + { + return sftpErrorMessage; + } + + /** + * Get the error code sent by the server. + * + * @return an error code as defined in the SFTP specs. + */ + public int getServerErrorCode() + { + return sftpErrorCode; + } + + /** + * Get the symbolic name of the error code as given in the SFTP specs. + * + * @return e.g., "SSH_FX_INVALID_FILENAME". + */ + public String getServerErrorCodeSymbol() + { + String[] detail = ErrorCodes.getDescription(sftpErrorCode); + + if (detail == null) + return "UNKNOW SFTP ERROR CODE " + sftpErrorCode; + + return detail[0]; + } + + /** + * Get the description of the error code as given in the SFTP specs. + * + * @return e.g., "The filename is not valid." + */ + public String getServerErrorCodeVerbose() + { + String[] detail = ErrorCodes.getDescription(sftpErrorCode); + + if (detail == null) + return "The error code " + sftpErrorCode + " is unknown."; + + return detail[1]; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/SFTPv3Client.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/SFTPv3Client.java new file mode 100644 index 0000000000..498300f6e1 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/SFTPv3Client.java @@ -0,0 +1,1389 @@ + +package com.trilead.ssh2; + +import java.io.BufferedOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.PrintStream; +import java.nio.charset.Charset; +import java.util.HashMap; +import java.util.Vector; + +import com.trilead.ssh2.packets.TypesReader; +import com.trilead.ssh2.packets.TypesWriter; +import com.trilead.ssh2.sftp.AttribFlags; +import com.trilead.ssh2.sftp.ErrorCodes; +import com.trilead.ssh2.sftp.Packet; + + +/** + * A SFTPv3Client represents a SFTP (protocol version 3) + * client connection tunnelled over a SSH-2 connection. This is a very simple + * (synchronous) implementation. + *

+ * Basically, most methods in this class map directly to one of + * the packet types described in draft-ietf-secsh-filexfer-02.txt. + *

+ * Note: this is experimental code. + *

+ * Error handling: the methods of this class throw IOExceptions. However, unless + * there is catastrophic failure, exceptions of the type {@link SFTPv3Client} will + * be thrown (a subclass of IOException). Therefore, you can implement more verbose + * behavior by checking if a thrown exception if of this type. If yes, then you + * can cast the exception and access detailed information about the failure. + *

+ * Notes about file names, directory names and paths, copy-pasted + * from the specs: + *

    + *
  • SFTP v3 represents file names as strings. File names are + * assumed to use the slash ('/') character as a directory separator.
  • + *
  • File names starting with a slash are "absolute", and are relative to + * the root of the file system. Names starting with any other character + * are relative to the user's default directory (home directory).
  • + *
  • Servers SHOULD interpret a path name component ".." as referring to + * the parent directory, and "." as referring to the current directory. + * If the server implementation limits access to certain parts of the + * file system, it must be extra careful in parsing file names when + * enforcing such restrictions. There have been numerous reported + * security bugs where a ".." in a path name has allowed access outside + * the intended area.
  • + *
  • An empty path name is valid, and it refers to the user's default + * directory (usually the user's home directory).
  • + *
+ *

+ * If you are still not tired then please go on and read the comment for + * {@link #setCharset(String)}. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: SFTPv3Client.java,v 1.3 2008/04/01 12:38:09 cplattne Exp $ + */ +public class SFTPv3Client +{ + final Connection conn; + final Session sess; + final PrintStream debug; + + boolean flag_closed = false; + + InputStream is; + OutputStream os; + + int protocol_version = 0; + HashMap server_extensions = new HashMap(); + + int next_request_id = 1000; + + String charsetName = null; + + /** + * Create a SFTP v3 client. + * + * @param conn The underlying SSH-2 connection to be used. + * @param debug + * @throws IOException + * + * @deprecated this constructor (debug version) will disappear in the future, + * use {@link #SFTPv3Client(Connection)} instead. + */ + @Deprecated + public SFTPv3Client(Connection conn, PrintStream debug) throws IOException + { + if (conn == null) + throw new IllegalArgumentException("Cannot accept null argument!"); + + this.conn = conn; + this.debug = debug; + + if (debug != null) + debug.println("Opening session and starting SFTP subsystem."); + + sess = conn.openSession(); + sess.startSubSystem("sftp"); + + is = sess.getStdout(); + os = new BufferedOutputStream(sess.getStdin(), 2048); + + if ((is == null) || (os == null)) + throw new IOException("There is a problem with the streams of the underlying channel."); + + init(); + } + + /** + * Create a SFTP v3 client. + * + * @param conn The underlying SSH-2 connection to be used. + * @throws IOException + */ + public SFTPv3Client(Connection conn) throws IOException + { + this(conn, null); + } + + /** + * Set the charset used to convert between Java Unicode Strings and byte encodings + * used by the server for paths and file names. Unfortunately, the SFTP v3 draft + * says NOTHING about such conversions (well, with the exception of error messages + * which have to be in UTF-8). Newer drafts specify to use UTF-8 for file names + * (if I remember correctly). However, a quick test using OpenSSH serving a EXT-3 + * filesystem has shown that UTF-8 seems to be a bad choice for SFTP v3 (tested with + * filenames containing german umlauts). "windows-1252" seems to work better for Europe. + * Luckily, "windows-1252" is the platform default in my case =). + *

+ * If you don't set anything, then the platform default will be used (this is the default + * behavior). + * + * @see #getCharset() + * + * @param charset the name of the charset to be used or null to use the platform's + * default encoding. + * @throws IOException + */ + public void setCharset(String charset) throws IOException + { + if (charset == null) + { + charsetName = charset; + return; + } + + try + { + Charset.forName(charset); + } + catch (Exception e) + { + throw new IOException("This charset is not supported", e); + } + charsetName = charset; + } + + /** + * The currently used charset for filename encoding/decoding. + * + * @see #setCharset(String) + * + * @return The name of the charset (null if the platform's default charset is being used) + */ + public String getCharset() + { + return charsetName; + } + + private final void checkHandleValidAndOpen(SFTPv3FileHandle handle) throws IOException + { + if (handle.client != this) + throw new IOException("The file handle was created with another SFTPv3FileHandle instance."); + + if (handle.isClosed) + throw new IOException("The file handle is closed."); + } + + private final void sendMessage(int type, int requestId, byte[] msg, int off, int len) throws IOException + { + int msglen = len + 1; + + if (type != Packet.SSH_FXP_INIT) + msglen += 4; + + os.write(msglen >> 24); + os.write(msglen >> 16); + os.write(msglen >> 8); + os.write(msglen); + os.write(type); + + if (type != Packet.SSH_FXP_INIT) + { + os.write(requestId >> 24); + os.write(requestId >> 16); + os.write(requestId >> 8); + os.write(requestId); + } + + os.write(msg, off, len); + os.flush(); + } + + private final void sendMessage(int type, int requestId, byte[] msg) throws IOException + { + sendMessage(type, requestId, msg, 0, msg.length); + } + + private final void readBytes(byte[] buff, int pos, int len) throws IOException + { + while (len > 0) + { + int count = is.read(buff, pos, len); + if (count < 0) + throw new IOException("Unexpected end of sftp stream."); + if ((count == 0) || (count > len)) + throw new IOException("Underlying stream implementation is bogus!"); + len -= count; + pos += count; + } + } + + /** + * Read a message and guarantee that the contents is not larger than + * maxlen bytes. + *

+ * Note: receiveMessage(34000) actually means that the message may be up to 34004 + * bytes (the length attribute preceeding the contents is 4 bytes). + * + * @param maxlen + * @return the message contents + * @throws IOException + */ + private final byte[] receiveMessage(int maxlen) throws IOException + { + byte[] msglen = new byte[4]; + + readBytes(msglen, 0, 4); + + int len = (((msglen[0] & 0xff) << 24) | ((msglen[1] & 0xff) << 16) | ((msglen[2] & 0xff) << 8) | (msglen[3] & 0xff)); + + if ((len > maxlen) || (len <= 0)) + throw new IOException("Illegal sftp packet len: " + len); + + byte[] msg = new byte[len]; + + readBytes(msg, 0, len); + + return msg; + } + + private final int generateNextRequestID() + { + synchronized (this) + { + return next_request_id++; + } + } + + private final void closeHandle(byte[] handle) throws IOException + { + int req_id = generateNextRequestID(); + + TypesWriter tw = new TypesWriter(); + tw.writeString(handle, 0, handle.length); + + sendMessage(Packet.SSH_FXP_CLOSE, req_id, tw.getBytes()); + + expectStatusOKMessage(req_id); + } + + private SFTPv3FileAttributes readAttrs(TypesReader tr) throws IOException + { + /* + * uint32 flags + * uint64 size present only if flag SSH_FILEXFER_ATTR_SIZE + * uint32 uid present only if flag SSH_FILEXFER_ATTR_V3_UIDGID + * uint32 gid present only if flag SSH_FILEXFER_ATTR_V3_UIDGID + * uint32 permissions present only if flag SSH_FILEXFER_ATTR_PERMISSIONS + * uint32 atime present only if flag SSH_FILEXFER_ATTR_V3_ACMODTIME + * uint32 mtime present only if flag SSH_FILEXFER_ATTR_V3_ACMODTIME + * uint32 extended_count present only if flag SSH_FILEXFER_ATTR_EXTENDED + * string extended_type + * string extended_data + * ... more extended data (extended_type - extended_data pairs), + * so that number of pairs equals extended_count + */ + + SFTPv3FileAttributes fa = new SFTPv3FileAttributes(); + + int flags = tr.readUINT32(); + + if ((flags & AttribFlags.SSH_FILEXFER_ATTR_SIZE) != 0) + { + if (debug != null) + debug.println("SSH_FILEXFER_ATTR_SIZE"); + fa.size = new Long(tr.readUINT64()); + } + + if ((flags & AttribFlags.SSH_FILEXFER_ATTR_V3_UIDGID) != 0) + { + if (debug != null) + debug.println("SSH_FILEXFER_ATTR_V3_UIDGID"); + fa.uid = new Integer(tr.readUINT32()); + fa.gid = new Integer(tr.readUINT32()); + } + + if ((flags & AttribFlags.SSH_FILEXFER_ATTR_PERMISSIONS) != 0) + { + if (debug != null) + debug.println("SSH_FILEXFER_ATTR_PERMISSIONS"); + fa.permissions = new Integer(tr.readUINT32()); + } + + if ((flags & AttribFlags.SSH_FILEXFER_ATTR_V3_ACMODTIME) != 0) + { + if (debug != null) + debug.println("SSH_FILEXFER_ATTR_V3_ACMODTIME"); + fa.atime = new Long(((long) tr.readUINT32()) & 0xffffffffl); + fa.mtime = new Long(((long) tr.readUINT32()) & 0xffffffffl); + + } + + if ((flags & AttribFlags.SSH_FILEXFER_ATTR_EXTENDED) != 0) + { + int count = tr.readUINT32(); + + if (debug != null) + debug.println("SSH_FILEXFER_ATTR_EXTENDED (" + count + ")"); + + /* Read it anyway to detect corrupt packets */ + + while (count > 0) + { + tr.readByteString(); + tr.readByteString(); + count--; + } + } + + return fa; + } + + /** + * Retrieve the file attributes of an open file. + * + * @param handle a SFTPv3FileHandle handle. + * @return a SFTPv3FileAttributes object. + * @throws IOException + */ + public SFTPv3FileAttributes fstat(SFTPv3FileHandle handle) throws IOException + { + checkHandleValidAndOpen(handle); + + int req_id = generateNextRequestID(); + + TypesWriter tw = new TypesWriter(); + tw.writeString(handle.fileHandle, 0, handle.fileHandle.length); + + if (debug != null) + { + debug.println("Sending SSH_FXP_FSTAT..."); + debug.flush(); + } + + sendMessage(Packet.SSH_FXP_FSTAT, req_id, tw.getBytes()); + + byte[] resp = receiveMessage(34000); + + if (debug != null) + { + debug.println("Got REPLY."); + debug.flush(); + } + + TypesReader tr = new TypesReader(resp); + + int t = tr.readByte(); + + int rep_id = tr.readUINT32(); + if (rep_id != req_id) + throw new IOException("The server sent an invalid id field."); + + if (t == Packet.SSH_FXP_ATTRS) + { + return readAttrs(tr); + } + + if (t != Packet.SSH_FXP_STATUS) + throw new IOException("The SFTP server sent an unexpected packet type (" + t + ")"); + + int errorCode = tr.readUINT32(); + + throw new SFTPException(tr.readString(), errorCode); + } + + private SFTPv3FileAttributes statBoth(String path, int statMethod) throws IOException + { + int req_id = generateNextRequestID(); + + TypesWriter tw = new TypesWriter(); + tw.writeString(path, charsetName); + + if (debug != null) + { + debug.println("Sending SSH_FXP_STAT/SSH_FXP_LSTAT..."); + debug.flush(); + } + + sendMessage(statMethod, req_id, tw.getBytes()); + + byte[] resp = receiveMessage(34000); + + if (debug != null) + { + debug.println("Got REPLY."); + debug.flush(); + } + + TypesReader tr = new TypesReader(resp); + + int t = tr.readByte(); + + int rep_id = tr.readUINT32(); + if (rep_id != req_id) + throw new IOException("The server sent an invalid id field."); + + if (t == Packet.SSH_FXP_ATTRS) + { + return readAttrs(tr); + } + + if (t != Packet.SSH_FXP_STATUS) + throw new IOException("The SFTP server sent an unexpected packet type (" + t + ")"); + + int errorCode = tr.readUINT32(); + + throw new SFTPException(tr.readString(), errorCode); + } + + /** + * Retrieve the file attributes of a file. This method + * follows symbolic links on the server. + * + * @see #lstat(String) + * + * @param path See the {@link SFTPv3Client comment} for the class for more details. + * @return a SFTPv3FileAttributes object. + * @throws IOException + */ + public SFTPv3FileAttributes stat(String path) throws IOException + { + return statBoth(path, Packet.SSH_FXP_STAT); + } + + /** + * Retrieve the file attributes of a file. This method + * does NOT follow symbolic links on the server. + * + * @see #stat(String) + * + * @param path See the {@link SFTPv3Client comment} for the class for more details. + * @return a SFTPv3FileAttributes object. + * @throws IOException + */ + public SFTPv3FileAttributes lstat(String path) throws IOException + { + return statBoth(path, Packet.SSH_FXP_LSTAT); + } + + /** + * Read the target of a symbolic link. + * + * @param path See the {@link SFTPv3Client comment} for the class for more details. + * @return The target of the link. + * @throws IOException + */ + public String readLink(String path) throws IOException + { + int req_id = generateNextRequestID(); + + TypesWriter tw = new TypesWriter(); + tw.writeString(path, charsetName); + + if (debug != null) + { + debug.println("Sending SSH_FXP_READLINK..."); + debug.flush(); + } + + sendMessage(Packet.SSH_FXP_READLINK, req_id, tw.getBytes()); + + byte[] resp = receiveMessage(34000); + + if (debug != null) + { + debug.println("Got REPLY."); + debug.flush(); + } + + TypesReader tr = new TypesReader(resp); + + int t = tr.readByte(); + + int rep_id = tr.readUINT32(); + if (rep_id != req_id) + throw new IOException("The server sent an invalid id field."); + + if (t == Packet.SSH_FXP_NAME) + { + int count = tr.readUINT32(); + + if (count != 1) + throw new IOException("The server sent an invalid SSH_FXP_NAME packet."); + + return tr.readString(charsetName); + } + + if (t != Packet.SSH_FXP_STATUS) + throw new IOException("The SFTP server sent an unexpected packet type (" + t + ")"); + + int errorCode = tr.readUINT32(); + + throw new SFTPException(tr.readString(), errorCode); + } + + private void expectStatusOKMessage(int id) throws IOException + { + byte[] resp = receiveMessage(34000); + + if (debug != null) + { + debug.println("Got REPLY."); + debug.flush(); + } + + TypesReader tr = new TypesReader(resp); + + int t = tr.readByte(); + + int rep_id = tr.readUINT32(); + if (rep_id != id) + throw new IOException("The server sent an invalid id field."); + + if (t != Packet.SSH_FXP_STATUS) + throw new IOException("The SFTP server sent an unexpected packet type (" + t + ")"); + + int errorCode = tr.readUINT32(); + + if (errorCode == ErrorCodes.SSH_FX_OK) + return; + + throw new SFTPException(tr.readString(), errorCode); + } + + /** + * Modify the attributes of a file. Used for operations such as changing + * the ownership, permissions or access times, as well as for truncating a file. + * + * @param path See the {@link SFTPv3Client comment} for the class for more details. + * @param attr A SFTPv3FileAttributes object. Specifies the modifications to be + * made to the attributes of the file. Empty fields will be ignored. + * @throws IOException + */ + public void setstat(String path, SFTPv3FileAttributes attr) throws IOException + { + int req_id = generateNextRequestID(); + + TypesWriter tw = new TypesWriter(); + tw.writeString(path, charsetName); + tw.writeBytes(createAttrs(attr)); + + if (debug != null) + { + debug.println("Sending SSH_FXP_SETSTAT..."); + debug.flush(); + } + + sendMessage(Packet.SSH_FXP_SETSTAT, req_id, tw.getBytes()); + + expectStatusOKMessage(req_id); + } + + /** + * Modify the attributes of a file. Used for operations such as changing + * the ownership, permissions or access times, as well as for truncating a file. + * + * @param handle a SFTPv3FileHandle handle + * @param attr A SFTPv3FileAttributes object. Specifies the modifications to be + * made to the attributes of the file. Empty fields will be ignored. + * @throws IOException + */ + public void fsetstat(SFTPv3FileHandle handle, SFTPv3FileAttributes attr) throws IOException + { + checkHandleValidAndOpen(handle); + + int req_id = generateNextRequestID(); + + TypesWriter tw = new TypesWriter(); + tw.writeString(handle.fileHandle, 0, handle.fileHandle.length); + tw.writeBytes(createAttrs(attr)); + + if (debug != null) + { + debug.println("Sending SSH_FXP_FSETSTAT..."); + debug.flush(); + } + + sendMessage(Packet.SSH_FXP_FSETSTAT, req_id, tw.getBytes()); + + expectStatusOKMessage(req_id); + } + + /** + * Create a symbolic link on the server. Creates a link "src" that points + * to "target". + * + * @param src See the {@link SFTPv3Client comment} for the class for more details. + * @param target See the {@link SFTPv3Client comment} for the class for more details. + * @throws IOException + */ + public void createSymlink(String src, String target) throws IOException + { + int req_id = generateNextRequestID(); + + /* Either I am too stupid to understand the SFTP draft + * or the OpenSSH guys changed the semantics of src and target. + */ + + TypesWriter tw = new TypesWriter(); + tw.writeString(target, charsetName); + tw.writeString(src, charsetName); + + if (debug != null) + { + debug.println("Sending SSH_FXP_SYMLINK..."); + debug.flush(); + } + + sendMessage(Packet.SSH_FXP_SYMLINK, req_id, tw.getBytes()); + + expectStatusOKMessage(req_id); + } + + /** + * Have the server canonicalize any given path name to an absolute path. + * This is useful for converting path names containing ".." components or + * relative pathnames without a leading slash into absolute paths. + * + * @param path See the {@link SFTPv3Client comment} for the class for more details. + * @return An absolute path. + * @throws IOException + */ + public String canonicalPath(String path) throws IOException + { + int req_id = generateNextRequestID(); + + TypesWriter tw = new TypesWriter(); + tw.writeString(path, charsetName); + + if (debug != null) + { + debug.println("Sending SSH_FXP_REALPATH..."); + debug.flush(); + } + + sendMessage(Packet.SSH_FXP_REALPATH, req_id, tw.getBytes()); + + byte[] resp = receiveMessage(34000); + + if (debug != null) + { + debug.println("Got REPLY."); + debug.flush(); + } + + TypesReader tr = new TypesReader(resp); + + int t = tr.readByte(); + + int rep_id = tr.readUINT32(); + if (rep_id != req_id) + throw new IOException("The server sent an invalid id field."); + + if (t == Packet.SSH_FXP_NAME) + { + int count = tr.readUINT32(); + + if (count != 1) + throw new IOException("The server sent an invalid SSH_FXP_NAME packet."); + + return tr.readString(charsetName); + } + + if (t != Packet.SSH_FXP_STATUS) + throw new IOException("The SFTP server sent an unexpected packet type (" + t + ")"); + + int errorCode = tr.readUINT32(); + + throw new SFTPException(tr.readString(), errorCode); + } + + private final Vector scanDirectory(byte[] handle) throws IOException + { + Vector files = new Vector(); + + while (true) + { + int req_id = generateNextRequestID(); + + TypesWriter tw = new TypesWriter(); + tw.writeString(handle, 0, handle.length); + + if (debug != null) + { + debug.println("Sending SSH_FXP_READDIR..."); + debug.flush(); + } + + sendMessage(Packet.SSH_FXP_READDIR, req_id, tw.getBytes()); + + /* Some servers send here a packet with size > 34000 */ + /* To whom it may concern: please learn to read the specs. */ + + byte[] resp = receiveMessage(65536); + + if (debug != null) + { + debug.println("Got REPLY."); + debug.flush(); + } + + TypesReader tr = new TypesReader(resp); + + int t = tr.readByte(); + + int rep_id = tr.readUINT32(); + if (rep_id != req_id) + throw new IOException("The server sent an invalid id field."); + + if (t == Packet.SSH_FXP_NAME) + { + int count = tr.readUINT32(); + + if (debug != null) + debug.println("Parsing " + count + " name entries..."); + + while (count > 0) + { + SFTPv3DirectoryEntry dirEnt = new SFTPv3DirectoryEntry(); + + dirEnt.filename = tr.readString(charsetName); + dirEnt.longEntry = tr.readString(charsetName); + + dirEnt.attributes = readAttrs(tr); + files.addElement(dirEnt); + + if (debug != null) + debug.println("File: '" + dirEnt.filename + "'"); + count--; + } + continue; + } + + if (t != Packet.SSH_FXP_STATUS) + throw new IOException("The SFTP server sent an unexpected packet type (" + t + ")"); + + int errorCode = tr.readUINT32(); + + if (errorCode == ErrorCodes.SSH_FX_EOF) + return files; + + throw new SFTPException(tr.readString(), errorCode); + } + } + + private final byte[] openDirectory(String path) throws IOException + { + int req_id = generateNextRequestID(); + + TypesWriter tw = new TypesWriter(); + tw.writeString(path, charsetName); + + if (debug != null) + { + debug.println("Sending SSH_FXP_OPENDIR..."); + debug.flush(); + } + + sendMessage(Packet.SSH_FXP_OPENDIR, req_id, tw.getBytes()); + + byte[] resp = receiveMessage(34000); + + TypesReader tr = new TypesReader(resp); + + int t = tr.readByte(); + + int rep_id = tr.readUINT32(); + if (rep_id != req_id) + throw new IOException("The server sent an invalid id field."); + + if (t == Packet.SSH_FXP_HANDLE) + { + if (debug != null) + { + debug.println("Got SSH_FXP_HANDLE."); + debug.flush(); + } + + byte[] handle = tr.readByteString(); + return handle; + } + + if (t != Packet.SSH_FXP_STATUS) + throw new IOException("The SFTP server sent an unexpected packet type (" + t + ")"); + + int errorCode = tr.readUINT32(); + String errorMessage = tr.readString(); + + throw new SFTPException(errorMessage, errorCode); + } + + private final String expandString(byte[] b, int off, int len) + { + StringBuffer sb = new StringBuffer(); + + for (int i = 0; i < len; i++) + { + int c = b[off + i] & 0xff; + + if ((c >= 32) && (c <= 126)) + { + sb.append((char) c); + } + else + { + sb.append("{0x" + Integer.toHexString(c) + "}"); + } + } + + return sb.toString(); + } + + private void init() throws IOException + { + /* Send SSH_FXP_INIT (version 3) */ + + final int client_version = 3; + + if (debug != null) + debug.println("Sending SSH_FXP_INIT (" + client_version + ")..."); + + TypesWriter tw = new TypesWriter(); + tw.writeUINT32(client_version); + sendMessage(Packet.SSH_FXP_INIT, 0, tw.getBytes()); + + /* Receive SSH_FXP_VERSION */ + + if (debug != null) + debug.println("Waiting for SSH_FXP_VERSION..."); + + TypesReader tr = new TypesReader(receiveMessage(34000)); /* Should be enough for any reasonable server */ + + int type = tr.readByte(); + + if (type != Packet.SSH_FXP_VERSION) + { + throw new IOException("The server did not send a SSH_FXP_VERSION packet (got " + type + ")"); + } + + protocol_version = tr.readUINT32(); + + if (debug != null) + debug.println("SSH_FXP_VERSION: protocol_version = " + protocol_version); + + if (protocol_version != 3) + throw new IOException("Server version " + protocol_version + " is currently not supported"); + + /* Read and save extensions (if any) for later use */ + + while (tr.remain() != 0) + { + String name = tr.readString(); + byte[] value = tr.readByteString(); + server_extensions.put(name, value); + + if (debug != null) + debug.println("SSH_FXP_VERSION: extension: " + name + " = '" + expandString(value, 0, value.length) + + "'"); + } + } + + /** + * Returns the negotiated SFTP protocol version between the client and the server. + * + * @return SFTP protocol version, i.e., "3". + * + */ + public int getProtocolVersion() + { + return protocol_version; + } + + /** + * Close this SFTP session. NEVER forget to call this method to free up + * resources - even if you got an exception from one of the other methods. + * Sometimes these other methods may throw an exception, saying that the + * underlying channel is closed (this can happen, e.g., if the other server + * sent a close message.) However, as long as you have not called the + * close() method, you are likely wasting resources. + * + */ + public void close() + { + sess.close(); + } + + /** + * List the contents of a directory. + * + * @param dirName See the {@link SFTPv3Client comment} for the class for more details. + * @return A Vector containing {@link SFTPv3DirectoryEntry} objects. + * @throws IOException + */ + public Vector ls(String dirName) throws IOException + { + byte[] handle = openDirectory(dirName); + Vector result = scanDirectory(handle); + closeHandle(handle); + return result; + } + + /** + * Create a new directory. + * + * @param dirName See the {@link SFTPv3Client comment} for the class for more details. + * @param posixPermissions the permissions for this directory, e.g., "0700" (remember that + * this is octal noation). The server will likely apply a umask. + * + * @throws IOException + */ + public void mkdir(String dirName, int posixPermissions) throws IOException + { + int req_id = generateNextRequestID(); + + TypesWriter tw = new TypesWriter(); + tw.writeString(dirName, charsetName); + tw.writeUINT32(AttribFlags.SSH_FILEXFER_ATTR_PERMISSIONS); + tw.writeUINT32(posixPermissions); + + sendMessage(Packet.SSH_FXP_MKDIR, req_id, tw.getBytes()); + + expectStatusOKMessage(req_id); + } + + /** + * Remove a file. + * + * @param fileName See the {@link SFTPv3Client comment} for the class for more details. + * @throws IOException + */ + public void rm(String fileName) throws IOException + { + int req_id = generateNextRequestID(); + + TypesWriter tw = new TypesWriter(); + tw.writeString(fileName, charsetName); + + sendMessage(Packet.SSH_FXP_REMOVE, req_id, tw.getBytes()); + + expectStatusOKMessage(req_id); + } + + /** + * Remove an empty directory. + * + * @param dirName See the {@link SFTPv3Client comment} for the class for more details. + * @throws IOException + */ + public void rmdir(String dirName) throws IOException + { + int req_id = generateNextRequestID(); + + TypesWriter tw = new TypesWriter(); + tw.writeString(dirName, charsetName); + + sendMessage(Packet.SSH_FXP_RMDIR, req_id, tw.getBytes()); + + expectStatusOKMessage(req_id); + } + + /** + * Move a file or directory. + * + * @param oldPath See the {@link SFTPv3Client comment} for the class for more details. + * @param newPath See the {@link SFTPv3Client comment} for the class for more details. + * @throws IOException + */ + public void mv(String oldPath, String newPath) throws IOException + { + int req_id = generateNextRequestID(); + + TypesWriter tw = new TypesWriter(); + tw.writeString(oldPath, charsetName); + tw.writeString(newPath, charsetName); + + sendMessage(Packet.SSH_FXP_RENAME, req_id, tw.getBytes()); + + expectStatusOKMessage(req_id); + } + + /** + * Open a file for reading. + * + * @param fileName See the {@link SFTPv3Client comment} for the class for more details. + * @return a SFTPv3FileHandle handle + * @throws IOException + */ + public SFTPv3FileHandle openFileRO(String fileName) throws IOException + { + return openFile(fileName, 0x00000001, null); // SSH_FXF_READ + } + + /** + * Open a file for reading and writing. + * + * @param fileName See the {@link SFTPv3Client comment} for the class for more details. + * @return a SFTPv3FileHandle handle + * @throws IOException + */ + public SFTPv3FileHandle openFileRW(String fileName) throws IOException + { + return openFile(fileName, 0x00000003, null); // SSH_FXF_READ | SSH_FXF_WRITE + } + + // Append is broken (already in the specification, because there is no way to + // send a write operation (what offset to use??)) + // public SFTPv3FileHandle openFileRWAppend(String fileName) throws IOException + // { + // return openFile(fileName, 0x00000007, null); // SSH_FXF_READ | SSH_FXF_WRITE | SSH_FXF_APPEND + // } + + /** + * Create a file and open it for reading and writing. + * Same as {@link #createFile(String, SFTPv3FileAttributes) createFile(fileName, null)}. + * + * @param fileName See the {@link SFTPv3Client comment} for the class for more details. + * @return a SFTPv3FileHandle handle + * @throws IOException + */ + public SFTPv3FileHandle createFile(String fileName) throws IOException + { + return createFile(fileName, null); + } + + /** + * Create a file and open it for reading and writing. + * You can specify the default attributes of the file (the server may or may + * not respect your wishes). + * + * @param fileName See the {@link SFTPv3Client comment} for the class for more details. + * @param attr may be null to use server defaults. Probably only + * the uid, gid and permissions + * (remember the server may apply a umask) entries of the {@link SFTPv3FileHandle} + * structure make sense. You need only to set those fields where you want + * to override the server's defaults. + * @return a SFTPv3FileHandle handle + * @throws IOException + */ + public SFTPv3FileHandle createFile(String fileName, SFTPv3FileAttributes attr) throws IOException + { + return openFile(fileName, 0x00000008 | 0x00000003, attr); // SSH_FXF_CREAT | SSH_FXF_READ | SSH_FXF_WRITE + } + + /** + * Create a file (truncate it if it already exists) and open it for reading and writing. + * Same as {@link #createFileTruncate(String, SFTPv3FileAttributes) createFileTruncate(fileName, null)}. + * + * @param fileName See the {@link SFTPv3Client comment} for the class for more details. + * @return a SFTPv3FileHandle handle + * @throws IOException + */ + public SFTPv3FileHandle createFileTruncate(String fileName) throws IOException + { + return createFileTruncate(fileName, null); + } + + /** + * reate a file (truncate it if it already exists) and open it for reading and writing. + * You can specify the default attributes of the file (the server may or may + * not respect your wishes). + * + * @param fileName See the {@link SFTPv3Client comment} for the class for more details. + * @param attr may be null to use server defaults. Probably only + * the uid, gid and permissions + * (remember the server may apply a umask) entries of the {@link SFTPv3FileHandle} + * structure make sense. You need only to set those fields where you want + * to override the server's defaults. + * @return a SFTPv3FileHandle handle + * @throws IOException + */ + public SFTPv3FileHandle createFileTruncate(String fileName, SFTPv3FileAttributes attr) throws IOException + { + return openFile(fileName, 0x00000018 | 0x00000003, attr); // SSH_FXF_CREAT | SSH_FXF_TRUNC | SSH_FXF_READ | SSH_FXF_WRITE + } + + private byte[] createAttrs(SFTPv3FileAttributes attr) + { + TypesWriter tw = new TypesWriter(); + + int attrFlags = 0; + + if (attr == null) + { + tw.writeUINT32(0); + } + else + { + if (attr.size != null) + attrFlags = attrFlags | AttribFlags.SSH_FILEXFER_ATTR_SIZE; + + if ((attr.uid != null) && (attr.gid != null)) + attrFlags = attrFlags | AttribFlags.SSH_FILEXFER_ATTR_V3_UIDGID; + + if (attr.permissions != null) + attrFlags = attrFlags | AttribFlags.SSH_FILEXFER_ATTR_PERMISSIONS; + + if ((attr.atime != null) && (attr.mtime != null)) + attrFlags = attrFlags | AttribFlags.SSH_FILEXFER_ATTR_V3_ACMODTIME; + + tw.writeUINT32(attrFlags); + + if (attr.size != null) + tw.writeUINT64(attr.size.longValue()); + + if ((attr.uid != null) && (attr.gid != null)) + { + tw.writeUINT32(attr.uid.intValue()); + tw.writeUINT32(attr.gid.intValue()); + } + + if (attr.permissions != null) + tw.writeUINT32(attr.permissions.intValue()); + + if ((attr.atime != null) && (attr.mtime != null)) + { + tw.writeUINT32(attr.atime.intValue()); + tw.writeUINT32(attr.mtime.intValue()); + } + } + + return tw.getBytes(); + } + + private SFTPv3FileHandle openFile(String fileName, int flags, SFTPv3FileAttributes attr) throws IOException + { + int req_id = generateNextRequestID(); + + TypesWriter tw = new TypesWriter(); + tw.writeString(fileName, charsetName); + tw.writeUINT32(flags); + tw.writeBytes(createAttrs(attr)); + + if (debug != null) + { + debug.println("Sending SSH_FXP_OPEN..."); + debug.flush(); + } + + sendMessage(Packet.SSH_FXP_OPEN, req_id, tw.getBytes()); + + byte[] resp = receiveMessage(34000); + + TypesReader tr = new TypesReader(resp); + + int t = tr.readByte(); + + int rep_id = tr.readUINT32(); + if (rep_id != req_id) + throw new IOException("The server sent an invalid id field."); + + if (t == Packet.SSH_FXP_HANDLE) + { + if (debug != null) + { + debug.println("Got SSH_FXP_HANDLE."); + debug.flush(); + } + + return new SFTPv3FileHandle(this, tr.readByteString()); + } + + if (t != Packet.SSH_FXP_STATUS) + throw new IOException("The SFTP server sent an unexpected packet type (" + t + ")"); + + int errorCode = tr.readUINT32(); + String errorMessage = tr.readString(); + + throw new SFTPException(errorMessage, errorCode); + } + + /** + * Read bytes from a file. No more than 32768 bytes may be read at once. + * Be aware that the semantics of read() are different than for Java streams. + *

+ *

    + *
  • The server will read as many bytes as it can from the file (up to len), + * and return them.
  • + *
  • If EOF is encountered before reading any data, -1 is returned.
  • + *
  • If an error occurs, an exception is thrown.
  • + *
  • For normal disk files, it is guaranteed that the server will return the specified + * number of bytes, or up to end of file. For, e.g., device files this may return + * fewer bytes than requested.
  • + *
+ * + * @param handle a SFTPv3FileHandle handle + * @param fileOffset offset (in bytes) in the file + * @param dst the destination byte array + * @param dstoff offset in the destination byte array + * @param len how many bytes to read, 0 < len <= 32768 bytes + * @return the number of bytes that could be read, may be less than requested if + * the end of the file is reached, -1 is returned in case of EOF + * @throws IOException + */ + public int read(SFTPv3FileHandle handle, long fileOffset, byte[] dst, int dstoff, int len) throws IOException + { + checkHandleValidAndOpen(handle); + + if ((len > 32768) || (len <= 0)) + throw new IllegalArgumentException("invalid len argument"); + + int req_id = generateNextRequestID(); + + TypesWriter tw = new TypesWriter(); + tw.writeString(handle.fileHandle, 0, handle.fileHandle.length); + tw.writeUINT64(fileOffset); + tw.writeUINT32(len); + + if (debug != null) + { + debug.println("Sending SSH_FXP_READ..."); + debug.flush(); + } + + sendMessage(Packet.SSH_FXP_READ, req_id, tw.getBytes()); + + byte[] resp = receiveMessage(34000); + + TypesReader tr = new TypesReader(resp); + + int t = tr.readByte(); + + int rep_id = tr.readUINT32(); + if (rep_id != req_id) + throw new IOException("The server sent an invalid id field."); + + if (t == Packet.SSH_FXP_DATA) + { + if (debug != null) + { + debug.println("Got SSH_FXP_DATA..."); + debug.flush(); + } + + int readLen = tr.readUINT32(); + + if ((readLen < 0) || (readLen > len)) + throw new IOException("The server sent an invalid length field."); + + tr.readBytes(dst, dstoff, readLen); + + return readLen; + } + + if (t != Packet.SSH_FXP_STATUS) + throw new IOException("The SFTP server sent an unexpected packet type (" + t + ")"); + + int errorCode = tr.readUINT32(); + + if (errorCode == ErrorCodes.SSH_FX_EOF) + { + if (debug != null) + { + debug.println("Got SSH_FX_EOF."); + debug.flush(); + } + + return -1; + } + + String errorMessage = tr.readString(); + + throw new SFTPException(errorMessage, errorCode); + } + + /** + * Write bytes to a file. If len > 32768, then the write operation will + * be split into multiple writes. + * + * @param handle a SFTPv3FileHandle handle. + * @param fileOffset offset (in bytes) in the file. + * @param src the source byte array. + * @param srcoff offset in the source byte array. + * @param len how many bytes to write. + * @throws IOException + */ + public void write(SFTPv3FileHandle handle, long fileOffset, byte[] src, int srcoff, int len) throws IOException + { + checkHandleValidAndOpen(handle); + + while (len > 0) + { + int writeRequestLen = len; + + if (writeRequestLen > 32768) + writeRequestLen = 32768; + + int req_id = generateNextRequestID(); + + TypesWriter tw = new TypesWriter(); + tw.writeString(handle.fileHandle, 0, handle.fileHandle.length); + tw.writeUINT64(fileOffset); + tw.writeString(src, srcoff, writeRequestLen); + + if (debug != null) + { + debug.println("Sending SSH_FXP_WRITE..."); + debug.flush(); + } + + sendMessage(Packet.SSH_FXP_WRITE, req_id, tw.getBytes()); + + fileOffset += writeRequestLen; + + srcoff += writeRequestLen; + len -= writeRequestLen; + + byte[] resp = receiveMessage(34000); + + TypesReader tr = new TypesReader(resp); + + int t = tr.readByte(); + + int rep_id = tr.readUINT32(); + if (rep_id != req_id) + throw new IOException("The server sent an invalid id field."); + + if (t != Packet.SSH_FXP_STATUS) + throw new IOException("The SFTP server sent an unexpected packet type (" + t + ")"); + + int errorCode = tr.readUINT32(); + + if (errorCode == ErrorCodes.SSH_FX_OK) + continue; + + String errorMessage = tr.readString(); + + throw new SFTPException(errorMessage, errorCode); + } + } + + /** + * Close a file. + * + * @param handle a SFTPv3FileHandle handle + * @throws IOException + */ + public void closeFile(SFTPv3FileHandle handle) throws IOException + { + if (handle == null) + throw new IllegalArgumentException("the handle argument may not be null"); + + try + { + if (!handle.isClosed) + { + closeHandle(handle.fileHandle); + } + } + finally + { + handle.isClosed = true; + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/SFTPv3DirectoryEntry.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/SFTPv3DirectoryEntry.java new file mode 100644 index 0000000000..547c7d2e0d --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/SFTPv3DirectoryEntry.java @@ -0,0 +1,38 @@ + +package com.trilead.ssh2; + +/** + * A SFTPv3DirectoryEntry as returned by {@link SFTPv3Client#ls(String)}. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: SFTPv3DirectoryEntry.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ + +public class SFTPv3DirectoryEntry +{ + /** + * A relative name within the directory, without any path components. + */ + public String filename; + + /** + * An expanded format for the file name, similar to what is returned by + * "ls -l" on Un*x systems. + *

+ * The format of this field is unspecified by the SFTP v3 protocol. + * It MUST be suitable for use in the output of a directory listing + * command (in fact, the recommended operation for a directory listing + * command is to simply display this data). However, clients SHOULD NOT + * attempt to parse the longname field for file attributes; they SHOULD + * use the attrs field instead. + *

+ * The recommended format for the longname field is as follows:
+ * -rwxr-xr-x 1 mjos staff 348911 Mar 25 14:29 t-filexfer + */ + public String longEntry; + + /** + * The attributes of this entry. + */ + public SFTPv3FileAttributes attributes; +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/SFTPv3FileAttributes.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/SFTPv3FileAttributes.java new file mode 100644 index 0000000000..8fc1cc5bf7 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/SFTPv3FileAttributes.java @@ -0,0 +1,145 @@ + +package com.trilead.ssh2; + +/** + * A SFTPv3FileAttributes object represents detail information + * about a file on the server. Not all fields may/must be present. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: SFTPv3FileAttributes.java,v 1.2 2008/04/01 12:38:09 cplattne Exp $ + */ + +public class SFTPv3FileAttributes +{ + /** + * The SIZE attribute. NULL if not present. + */ + public Long size = null; + + /** + * The UID attribute. NULL if not present. + */ + public Integer uid = null; + + /** + * The GID attribute. NULL if not present. + */ + public Integer gid = null; + + /** + * The POSIX permissions. NULL if not present. + *

+ * Here is a list: + *

+ *

Note: these numbers are all OCTAL.
+	 *
+	 *  S_IFMT     0170000   bitmask for the file type bitfields
+	 *  S_IFSOCK   0140000   socket
+	 *  S_IFLNK    0120000   symbolic link
+	 *  S_IFREG    0100000   regular file
+	 *  S_IFBLK    0060000   block device
+	 *  S_IFDIR    0040000   directory
+	 *  S_IFCHR    0020000   character device
+	 *  S_IFIFO    0010000   fifo
+	 *  S_ISUID    0004000   set UID bit
+	 *  S_ISGID    0002000   set GID bit
+	 *  S_ISVTX    0001000   sticky bit
+	 *
+	 *  S_IRWXU    00700     mask for file owner permissions
+	 *  S_IRUSR    00400     owner has read permission
+	 *  S_IWUSR    00200     owner has write permission
+	 *  S_IXUSR    00100     owner has execute permission
+	 *  S_IRWXG    00070     mask for group permissions
+	 *  S_IRGRP    00040     group has read permission
+	 *  S_IWGRP    00020     group has write permission
+	 *  S_IXGRP    00010     group has execute permission
+	 *  S_IRWXO    00007     mask for permissions for others (not in group)
+	 *  S_IROTH    00004     others have read permission
+	 *  S_IWOTH    00002     others have write permisson
+	 *  S_IXOTH    00001     others have execute permission
+	 * 
+ */ + public Integer permissions = null; + + /** + * The ATIME attribute. Represented as seconds from Jan 1, 1970 in UTC. + * NULL if not present. + */ + public Long atime = null; + + /** + * The MTIME attribute. Represented as seconds from Jan 1, 1970 in UTC. + * NULL if not present. + */ + public Long mtime = null; + + /** + * Checks if this entry is a directory. + * + * @return Returns true if permissions are available and they indicate + * that this entry represents a directory. + */ + public boolean isDirectory() + { + if (permissions == null) + return false; + + return ((permissions.intValue() & 0040000) != 0); + } + + /** + * Checks if this entry is a regular file. + * + * @return Returns true if permissions are available and they indicate + * that this entry represents a regular file. + */ + public boolean isRegularFile() + { + if (permissions == null) + return false; + + return ((permissions.intValue() & 0100000) != 0); + } + + /** + * Checks if this entry is a a symlink. + * + * @return Returns true if permissions are available and they indicate + * that this entry represents a symlink. + */ + public boolean isSymlink() + { + if (permissions == null) + return false; + + return ((permissions.intValue() & 0120000) != 0); + } + + /** + * Turn the POSIX permissions into a 7 digit octal representation. + * Note: the returned value is first masked with 0177777. + * + * @return NULL if permissions are not available. + */ + public String getOctalPermissions() + { + if (permissions == null) + return null; + + String res = Integer.toString(permissions.intValue() & 0177777, 8); + + StringBuffer sb = new StringBuffer(); + + int leadingZeros = 7 - res.length(); + + while (leadingZeros > 0) + { + sb.append('0'); + leadingZeros--; + } + + sb.append(res); + + return sb.toString(); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/SFTPv3FileHandle.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/SFTPv3FileHandle.java new file mode 100644 index 0000000000..817b9cf534 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/SFTPv3FileHandle.java @@ -0,0 +1,45 @@ + +package com.trilead.ssh2; + +/** + * A SFTPv3FileHandle. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: SFTPv3FileHandle.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ + +public class SFTPv3FileHandle +{ + final SFTPv3Client client; + final byte[] fileHandle; + boolean isClosed = false; + + /* The constructor is NOT public */ + + SFTPv3FileHandle(SFTPv3Client client, byte[] h) + { + this.client = client; + this.fileHandle = h; + } + + /** + * Get the SFTPv3Client instance which created this handle. + * + * @return A SFTPv3Client instance. + */ + public SFTPv3Client getClient() + { + return client; + } + + /** + * Check if this handle was closed with the {@link SFTPv3Client#closeFile(SFTPv3FileHandle)} method + * of the SFTPv3Client instance which created the handle. + * + * @return if the handle is closed. + */ + public boolean isClosed() + { + return isClosed; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/ServerHostKeyVerifier.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/ServerHostKeyVerifier.java new file mode 100644 index 0000000000..0cdfb8401d --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/ServerHostKeyVerifier.java @@ -0,0 +1,31 @@ + +package com.trilead.ssh2; + +/** + * A callback interface used to implement a client specific method of checking + * server host keys. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: ServerHostKeyVerifier.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ + +public interface ServerHostKeyVerifier +{ + /** + * The actual verifier method, it will be called by the key exchange code + * on EVERY key exchange - this can happen several times during the lifetime + * of a connection. + *

+ * Note: SSH-2 servers are allowed to change their hostkey at ANY time. + * + * @param hostname the hostname used to create the {@link Connection} object + * @param port the remote TCP port + * @param serverHostKeyAlgorithm the public key algorithm (ssh-rsa or ssh-dss) + * @param serverHostKey the server's public key blob + * @return if the client wants to accept the server's host key - if not, the + * connection will be closed. + * @throws Exception Will be wrapped with an IOException, extended version of returning false =) + */ + boolean verifyServerHostKey(String hostname, int port, String serverHostKeyAlgorithm, byte[] serverHostKey) + throws Exception; +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/Session.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/Session.java new file mode 100644 index 0000000000..29c96e422f --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/Session.java @@ -0,0 +1,529 @@ + +package com.trilead.ssh2; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.security.SecureRandom; + +import com.trilead.ssh2.channel.Channel; +import com.trilead.ssh2.channel.ChannelManager; +import com.trilead.ssh2.channel.X11ServerData; + + +/** + * A Session is a remote execution of a program. "Program" means + * in this context either a shell, an application or a system command. The + * program may or may not have a tty. Only one single program can be started on + * a session. However, multiple sessions can be active simultaneously. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: Session.java,v 1.2 2008/03/03 07:01:36 cplattne Exp $ + */ +public class Session implements AutoCloseable +{ + ChannelManager cm; + Channel cn; + + boolean flag_pty_requested = false; + boolean flag_x11_requested = false; + boolean flag_execution_started = false; + boolean flag_closed = false; + + String x11FakeCookie = null; + + final SecureRandom rnd; + + Session(ChannelManager cm, SecureRandom rnd) throws IOException + { + this.cm = cm; + this.cn = cm.openSessionChannel(); + this.rnd = rnd; + } + + /** + * Basically just a wrapper for lazy people - identical to calling + * requestPTY("dumb", 0, 0, 0, 0, null). + * + * @throws IOException + */ + public void requestDumbPTY() throws IOException + { + requestPTY("dumb", 0, 0, 0, 0, null); + } + + /** + * Basically just another wrapper for lazy people - identical to calling + * requestPTY(term, 0, 0, 0, 0, null). + * + * @throws IOException + */ + public void requestPTY(String term) throws IOException + { + requestPTY(term, 0, 0, 0, 0, null); + } + + /** + * Allocate a pseudo-terminal for this session. + *

+ * This method may only be called before a program or shell is started in + * this session. + *

+ * Different aspects can be specified: + *

+ *

    + *
  • The TERM environment variable value (e.g., vt100)
  • + *
  • The terminal's dimensions.
  • + *
  • The encoded terminal modes.
  • + *
+ * Zero dimension parameters are ignored. The character/row dimensions + * override the pixel dimensions (when nonzero). Pixel dimensions refer to + * the drawable area of the window. The dimension parameters are only + * informational. The encoding of terminal modes (parameter + * terminal_modes) is described in RFC4254. + * + * @param term + * The TERM environment variable value (e.g., vt100) + * @param term_width_characters + * terminal width, characters (e.g., 80) + * @param term_height_characters + * terminal height, rows (e.g., 24) + * @param term_width_pixels + * terminal width, pixels (e.g., 640) + * @param term_height_pixels + * terminal height, pixels (e.g., 480) + * @param terminal_modes + * encoded terminal modes (may be null) + * @throws IOException + */ + public void requestPTY(String term, int term_width_characters, int term_height_characters, int term_width_pixels, + int term_height_pixels, byte[] terminal_modes) throws IOException + { + if (term == null) + throw new IllegalArgumentException("TERM cannot be null."); + + if ((terminal_modes != null) && (terminal_modes.length > 0)) + { + if (terminal_modes[terminal_modes.length - 1] != 0) + throw new IOException("Illegal terminal modes description, does not end in zero byte"); + } + else + terminal_modes = new byte[] { 0 }; + + synchronized (this) + { + /* The following is just a nicer error, we would catch it anyway later in the channel code */ + if (flag_closed) + throw new IOException("This session is closed."); + + if (flag_pty_requested) + throw new IOException("A PTY was already requested."); + + if (flag_execution_started) + throw new IOException( + "Cannot request PTY at this stage anymore, a remote execution has already started."); + + flag_pty_requested = true; + } + + cm.requestPTY(cn, term, term_width_characters, term_height_characters, term_width_pixels, term_height_pixels, + terminal_modes); + } + + /** + * Inform other side of connection that our PTY has resized. + *

+ * Zero dimension parameters are ignored. The character/row dimensions + * override the pixel dimensions (when nonzero). Pixel dimensions refer to + * the drawable area of the window. The dimension parameters are only + * informational. + * + * @param term_width_characters + * terminal width, characters (e.g., 80) + * @param term_height_characters + * terminal height, rows (e.g., 24) + * @param term_width_pixels + * terminal width, pixels (e.g., 640) + * @param term_height_pixels + * terminal height, pixels (e.g., 480) + * @throws IOException + */ + public void resizePTY(int term_width_characters, int term_height_characters, int term_width_pixels, + int term_height_pixels) throws IOException { + synchronized (this) + { + /* The following is just a nicer error, we would catch it anyway later in the channel code */ + if (flag_closed) + throw new IOException("This session is closed."); + } + + cm.resizePTY(cn, term_width_characters, term_height_characters, term_width_pixels, term_height_pixels); + } + + /** + * Request X11 forwarding for the current session. + *

+ * You have to supply the name and port of your X-server. + *

+ * This method may only be called before a program or shell is started in + * this session. + * + * @param hostname the hostname of the real (target) X11 server (e.g., 127.0.0.1) + * @param port the port of the real (target) X11 server (e.g., 6010) + * @param cookie if non-null, then present this cookie to the real X11 server + * @param singleConnection if true, then the server is instructed to only forward one single + * connection, no more connections shall be forwarded after first, or after the session + * channel has been closed + * @throws IOException + */ + public void requestX11Forwarding(String hostname, int port, byte[] cookie, boolean singleConnection) + throws IOException + { + if (hostname == null) + throw new IllegalArgumentException("hostname argument may not be null"); + + synchronized (this) + { + /* The following is just a nicer error, we would catch it anyway later in the channel code */ + if (flag_closed) + throw new IOException("This session is closed."); + + if (flag_x11_requested) + throw new IOException("X11 forwarding was already requested."); + + if (flag_execution_started) + throw new IOException( + "Cannot request X11 forwarding at this stage anymore, a remote execution has already started."); + + flag_x11_requested = true; + } + + /* X11ServerData - used to store data about the target X11 server */ + + X11ServerData x11data = new X11ServerData(); + + x11data.hostname = hostname; + x11data.port = port; + x11data.x11_magic_cookie = cookie; /* if non-null, then present this cookie to the real X11 server */ + + /* Generate fake cookie - this one is used between remote clients and our proxy */ + + byte[] fakeCookie = new byte[16]; + String hexEncodedFakeCookie; + + /* Make sure that this fake cookie is unique for this connection */ + + while (true) + { + rnd.nextBytes(fakeCookie); + + /* Generate also hex representation of fake cookie */ + + StringBuffer tmp = new StringBuffer(32); + for (int i = 0; i < fakeCookie.length; i++) + { + String digit2 = Integer.toHexString(fakeCookie[i] & 0xff); + tmp.append((digit2.length() == 2) ? digit2 : "0" + digit2); + } + hexEncodedFakeCookie = tmp.toString(); + + /* Well, yes, chances are low, but we want to be on the safe side */ + + if (cm.checkX11Cookie(hexEncodedFakeCookie) == null) + break; + } + + /* Ask for X11 forwarding */ + + cm.requestX11(cn, singleConnection, "MIT-MAGIC-COOKIE-1", hexEncodedFakeCookie, 0); + + /* OK, that went fine, get ready to accept X11 connections... */ + /* ... but only if the user has not called close() in the meantime =) */ + + synchronized (this) + { + if (!flag_closed) + { + this.x11FakeCookie = hexEncodedFakeCookie; + cm.registerX11Cookie(hexEncodedFakeCookie, x11data); + } + } + + /* Now it is safe to start remote X11 programs */ + } + + /** + * Execute a command on the remote machine. + * + * @param cmd + * The command to execute on the remote host. + * @throws IOException + */ + public void execCommand(String cmd) throws IOException + { + if (cmd == null) + throw new IllegalArgumentException("cmd argument may not be null"); + + synchronized (this) + { + /* The following is just a nicer error, we would catch it anyway later in the channel code */ + if (flag_closed) + throw new IOException("This session is closed."); + + if (flag_execution_started) + throw new IOException("A remote execution has already started."); + + flag_execution_started = true; + } + + cm.requestExecCommand(cn, cmd); + } + + /** + * Start a shell on the remote machine. + * + * @throws IOException + */ + public void startShell() throws IOException + { + synchronized (this) + { + /* The following is just a nicer error, we would catch it anyway later in the channel code */ + if (flag_closed) + throw new IOException("This session is closed."); + + if (flag_execution_started) + throw new IOException("A remote execution has already started."); + + flag_execution_started = true; + } + + cm.requestShell(cn); + } + + /** + * Start a subsystem on the remote machine. + * Unless you know what you are doing, you will never need this. + * + * @param name the name of the subsystem. + * @throws IOException + */ + public void startSubSystem(String name) throws IOException + { + if (name == null) + throw new IllegalArgumentException("name argument may not be null"); + + synchronized (this) + { + /* The following is just a nicer error, we would catch it anyway later in the channel code */ + if (flag_closed) + throw new IOException("This session is closed."); + + if (flag_execution_started) + throw new IOException("A remote execution has already started."); + + flag_execution_started = true; + } + + cm.requestSubSystem(cn, name); + } + + /** + * This method can be used to perform end-to-end session (i.e., SSH channel) + * testing. It sends a 'ping' message to the server and waits for the 'pong' + * from the server. + *

+ * Implementation details: this method sends a SSH_MSG_CHANNEL_REQUEST request + * ('trilead-ping') to the server and waits for the SSH_MSG_CHANNEL_FAILURE reply + * packet. + * + * @throws IOException in case of any problem or when the session is closed + */ + public void ping() throws IOException + { + synchronized (this) + { + /* + * The following is just a nicer error, we would catch it anyway + * later in the channel code + */ + if (flag_closed) + throw new IOException("This session is closed."); + } + + cm.requestChannelTrileadPing(cn); + } + + /** + * Request authentication agent forwarding. + * @param agent object that implements the callbacks + * + * @throws IOException in case of any problem or when the session is closed + */ + public synchronized boolean requestAuthAgentForwarding(AuthAgentCallback agent) throws IOException + { + synchronized (this) + { + /* + * The following is just a nicer error, we would catch it anyway + * later in the channel code + */ + if (flag_closed) + throw new IOException("This session is closed."); + } + + return cm.requestChannelAgentForwarding(cn, agent); + } + + public InputStream getStdout() + { + return cn.getStdoutStream(); + } + + public InputStream getStderr() + { + return cn.getStderrStream(); + } + + public OutputStream getStdin() + { + return cn.getStdinStream(); + } + + /** + * This method blocks until there is more data available on either the + * stdout or stderr InputStream of this Session. Very useful + * if you do not want to use two parallel threads for reading from the two + * InputStreams. One can also specify a timeout. NOTE: do NOT call this + * method if you use concurrent threads that operate on either of the two + * InputStreams of this Session (otherwise this method may + * block, even though more data is available). + * + * @param timeout + * The (non-negative) timeout in ms. 0 means no + * timeout, the call may block forever. + * @return + *

    + *
  • 0 if no more data will arrive.
  • + *
  • 1 if more data is available.
  • + *
  • -1 if a timeout occurred.
  • + *
+ * + * @deprecated This method has been replaced with a much more powerful wait-for-condition + * interface and therefore acts only as a wrapper. + * + */ + @Deprecated + public int waitUntilDataAvailable(long timeout) { + if (timeout < 0) + throw new IllegalArgumentException("timeout must not be negative!"); + + int conditions = cm.waitForCondition(cn, timeout, ChannelCondition.STDOUT_DATA | ChannelCondition.STDERR_DATA + | ChannelCondition.EOF); + + if ((conditions & ChannelCondition.TIMEOUT) != 0) + return -1; + + if ((conditions & (ChannelCondition.STDOUT_DATA | ChannelCondition.STDERR_DATA)) != 0) + return 1; + + /* Here we do not need to check separately for CLOSED, since CLOSED implies EOF */ + + if ((conditions & ChannelCondition.EOF) != 0) + return 0; + + throw new IllegalStateException("Unexpected condition result (" + conditions + ")"); + } + + /** + * This method blocks until certain conditions hold true on the underlying SSH-2 channel. + *

+ * This method returns as soon as one of the following happens: + *

    + *
  • at least of the specified conditions (see {@link ChannelCondition}) holds true
  • + *
  • timeout > 0 and a timeout occured (TIMEOUT will be set in result conditions)
  • + *
  • the underlying channel was closed (CLOSED will be set in result conditions)
  • + *
+ *

+ * In any case, the result value contains ALL current conditions, which may be more + * than the specified condition set (i.e., never use the "==" operator to test for conditions + * in the bitmask, see also comments in {@link ChannelCondition}). + *

+ * Note: do NOT call this method if you want to wait for STDOUT_DATA or STDERR_DATA and + * there are concurrent threads (e.g., StreamGobblers) that operate on either of the two + * InputStreams of this Session (otherwise this method may + * block, even though more data is available in the StreamGobblers). + * + * @param condition_set a bitmask based on {@link ChannelCondition} values + * @param timeout non-negative timeout in ms, 0 means no timeout + * @return all bitmask specifying all current conditions that are true + */ + + public int waitForCondition(int condition_set, long timeout) + { + if (timeout < 0) + throw new IllegalArgumentException("timeout must be non-negative!"); + + return cm.waitForCondition(cn, timeout, condition_set); + } + + /** + * Get the exit code/status from the remote command - if available. Be + * careful - not all server implementations return this value. It is + * generally a good idea to call this method only when all data from the + * remote side has been consumed (see also the WaitForCondition method). + * + * @return An Integer holding the exit code, or + * null if no exit code is (yet) available. + */ + public Integer getExitStatus() + { + return cn.getExitStatus(); + } + + /** + * Get the name of the signal by which the process on the remote side was + * stopped - if available and applicable. Be careful - not all server + * implementations return this value. + * + * @return An String holding the name of the signal, or + * null if the process exited normally or is still + * running (or if the server forgot to send this information). + */ + public String getExitSignal() + { + return cn.getExitSignal(); + } + + /** + * Close this session. NEVER forget to call this method to free up resources - + * even if you got an exception from one of the other methods (or when + * getting an Exception on the Input- or OutputStreams). Sometimes these other + * methods may throw an exception, saying that the underlying channel is + * closed (this can happen, e.g., if the other server sent a close message.) + * However, as long as you have not called the close() + * method, you may be wasting (local) resources. + * + */ + public void close() + { + synchronized (this) + { + if (flag_closed) + return; + + flag_closed = true; + + if (x11FakeCookie != null) + cm.unRegisterX11Cookie(x11FakeCookie, true); + + try + { + cm.closeChannel(cn, "Closed due to user request", true); + } + catch (IOException ignored) + { + } + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/StreamGobbler.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/StreamGobbler.java new file mode 100644 index 0000000000..3c9572768b --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/StreamGobbler.java @@ -0,0 +1,229 @@ + +package com.trilead.ssh2; + +import java.io.IOException; +import java.io.InputStream; + +/** + * A StreamGobbler is an InputStream that uses an internal worker + * thread to constantly consume input from another InputStream. It uses a buffer + * to store the consumed data. The buffer size is automatically adjusted, if needed. + *

+ * This class is sometimes very convenient - if you wrap a session's STDOUT and STDERR + * InputStreams with instances of this class, then you don't have to bother about + * the shared window of STDOUT and STDERR in the low level SSH-2 protocol, + * since all arriving data will be immediatelly consumed by the worker threads. + * Also, as a side effect, the streams will be buffered (e.g., single byte + * read() operations are faster). + *

+ * Other SSH for Java libraries include this functionality by default in + * their STDOUT and STDERR InputStream implementations, however, please be aware + * that this approach has also a downside: + *

+ * If you do not call the StreamGobbler's read() method often enough + * and the peer is constantly sending huge amounts of data, then you will sooner or later + * encounter a low memory situation due to the aggregated data (well, it also depends on the Java heap size). + * Joe Average will like this class anyway - a paranoid programmer would never use such an approach. + *

+ * The term "StreamGobbler" was taken from an article called "When Runtime.exec() won't", + * see http://www.javaworld.com/javaworld/jw-12-2000/jw-1229-traps.html. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: StreamGobbler.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ + +public class StreamGobbler extends InputStream +{ + class GobblerThread extends Thread + { + public void run() + { + byte[] buff = new byte[8192]; + + while (true) + { + try + { + int avail = is.read(buff); + + synchronized (synchronizer) + { + if (avail <= 0) + { + isEOF = true; + synchronizer.notifyAll(); + break; + } + + int space_available = buffer.length - write_pos; + + if (space_available < avail) + { + /* compact/resize buffer */ + + int unread_size = write_pos - read_pos; + int need_space = unread_size + avail; + + byte[] new_buffer = buffer; + + if (need_space > buffer.length) + { + int inc = need_space / 3; + inc = (inc < 256) ? 256 : inc; + inc = (inc > 8192) ? 8192 : inc; + new_buffer = new byte[need_space + inc]; + } + + if (unread_size > 0) + System.arraycopy(buffer, read_pos, new_buffer, 0, unread_size); + + buffer = new_buffer; + + read_pos = 0; + write_pos = unread_size; + } + + System.arraycopy(buff, 0, buffer, write_pos, avail); + write_pos += avail; + + synchronizer.notifyAll(); + } + } + catch (IOException e) + { + synchronized (synchronizer) + { + exception = e; + synchronizer.notifyAll(); + break; + } + } + } + } + } + + private InputStream is; + private GobblerThread t; + + private Object synchronizer = new Object(); + + private boolean isEOF = false; + private boolean isClosed = false; + private IOException exception = null; + + private byte[] buffer = new byte[2048]; + private int read_pos = 0; + private int write_pos = 0; + + public StreamGobbler(InputStream is) + { + this.is = is; + t = new GobblerThread(); + t.setDaemon(true); + t.start(); + } + + public int read() throws IOException + { + synchronized (synchronizer) + { + if (isClosed) + throw new IOException("This StreamGobbler is closed."); + + while (read_pos == write_pos) + { + if (exception != null) + throw exception; + + if (isEOF) + return -1; + + try + { + synchronizer.wait(); + } + catch (InterruptedException e) + { + } + } + + int b = buffer[read_pos++] & 0xff; + + return b; + } + } + + public int available() throws IOException + { + synchronized (synchronizer) + { + if (isClosed) + throw new IOException("This StreamGobbler is closed."); + + return write_pos - read_pos; + } + } + + public int read(byte[] b) throws IOException + { + return read(b, 0, b.length); + } + + public void close() throws IOException + { + synchronized (synchronizer) + { + if (isClosed) + return; + isClosed = true; + isEOF = true; + synchronizer.notifyAll(); + is.close(); + } + } + + public int read(byte[] b, int off, int len) throws IOException + { + if (b == null) + throw new NullPointerException(); + + if ((off < 0) || (len < 0) || ((off + len) > b.length) || ((off + len) < 0) || (off > b.length)) + throw new IndexOutOfBoundsException(); + + if (len == 0) + return 0; + + synchronized (synchronizer) + { + if (isClosed) + throw new IOException("This StreamGobbler is closed."); + + while (read_pos == write_pos) + { + if (exception != null) + throw exception; + + if (isEOF) + return -1; + + try + { + synchronizer.wait(); + } + catch (InterruptedException e) + { + } + } + + int avail = write_pos - read_pos; + + avail = (avail > len) ? len : avail; + + System.arraycopy(buffer, read_pos, b, off, avail); + + read_pos += avail; + + return avail; + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/auth/AuthenticationManager.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/auth/AuthenticationManager.java new file mode 100644 index 0000000000..47460ca307 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/auth/AuthenticationManager.java @@ -0,0 +1,518 @@ + +package com.trilead.ssh2.auth; + +import com.trilead.ssh2.crypto.keys.Ed25519PrivateKey; +import com.trilead.ssh2.crypto.keys.Ed25519PublicKey; +import com.trilead.ssh2.signature.RSASHA256Verify; +import com.trilead.ssh2.signature.RSASHA512Verify; +import java.io.IOException; +import java.security.KeyPair; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.SecureRandom; +import java.security.interfaces.DSAPublicKey; +import java.security.interfaces.ECPublicKey; +import java.security.interfaces.RSAPublicKey; +import java.util.Set; +import java.util.Vector; + +import com.trilead.ssh2.InteractiveCallback; +import com.trilead.ssh2.crypto.PEMDecoder; +import com.trilead.ssh2.packets.PacketServiceAccept; +import com.trilead.ssh2.packets.PacketServiceRequest; +import com.trilead.ssh2.packets.PacketUserauthBanner; +import com.trilead.ssh2.packets.PacketUserauthFailure; +import com.trilead.ssh2.packets.PacketUserauthInfoRequest; +import com.trilead.ssh2.packets.PacketUserauthInfoResponse; +import com.trilead.ssh2.packets.PacketUserauthRequestInteractive; +import com.trilead.ssh2.packets.PacketUserauthRequestNone; +import com.trilead.ssh2.packets.PacketUserauthRequestPassword; +import com.trilead.ssh2.packets.PacketUserauthRequestPublicKey; +import com.trilead.ssh2.packets.Packets; +import com.trilead.ssh2.packets.TypesWriter; +import com.trilead.ssh2.signature.DSASHA1Verify; +import com.trilead.ssh2.signature.ECDSASHA2Verify; +import com.trilead.ssh2.signature.Ed25519Verify; +import com.trilead.ssh2.signature.RSASHA1Verify; +import com.trilead.ssh2.signature.SSHSignature; +import com.trilead.ssh2.transport.MessageHandler; +import com.trilead.ssh2.transport.TransportManager; + + +/** + * AuthenticationManager. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: AuthenticationManager.java,v 1.1 2007/10/15 12:49:57 cplattne Exp $ + */ +public class AuthenticationManager implements MessageHandler +{ + TransportManager tm; + + Vector packets = new Vector(); + boolean connectionClosed = false; + + String banner; + + String[] remainingMethods = new String[0]; + boolean isPartialSuccess = false; + + boolean authenticated = false; + boolean initDone = false; + + public AuthenticationManager(TransportManager tm) + { + this.tm = tm; + } + + boolean methodPossible(String methName) + { + if (remainingMethods == null) + return false; + + for (int i = 0; i < remainingMethods.length; i++) + { + if (remainingMethods[i].compareTo(methName) == 0) + return true; + } + return false; + } + + byte[] deQueue() throws IOException + { + synchronized (packets) + { + while (packets.size() == 0) + { + if (connectionClosed) + throw new IOException("The connection is closed.", tm.getReasonClosedCause()); + + try + { + packets.wait(); + } + catch (InterruptedException ign) + { + } + } + /* This sequence works with J2ME */ + byte[] res = (byte[]) packets.firstElement(); + packets.removeElementAt(0); + return res; + } + } + + byte[] getNextMessage() throws IOException + { + while (true) + { + byte[] msg = deQueue(); + + if (msg[0] != Packets.SSH_MSG_USERAUTH_BANNER) + return msg; + + PacketUserauthBanner sb = new PacketUserauthBanner(msg, 0, msg.length); + + banner = sb.getBanner(); + } + } + + public String[] getRemainingMethods(String user) throws IOException + { + initialize(user); + return remainingMethods; + } + + public boolean getPartialSuccess() + { + return isPartialSuccess; + } + + private boolean initialize(String user) throws IOException + { + if (!initDone) + { + tm.registerMessageHandler(this, 0, 255); + + PacketServiceRequest sr = new PacketServiceRequest("ssh-userauth"); + tm.sendMessage(sr.getPayload()); + + PacketUserauthRequestNone urn = new PacketUserauthRequestNone("ssh-connection", user); + tm.sendMessage(urn.getPayload()); + + byte[] msg = getNextMessage(); + new PacketServiceAccept(msg, 0, msg.length); + msg = getNextMessage(); + + initDone = true; + + if (msg[0] == Packets.SSH_MSG_USERAUTH_SUCCESS) + { + authenticated = true; + tm.removeMessageHandler(this, 0, 255); + return true; + } + + if (msg[0] == Packets.SSH_MSG_USERAUTH_FAILURE) + { + PacketUserauthFailure puf = new PacketUserauthFailure(msg, 0, msg.length); + + remainingMethods = puf.getAuthThatCanContinue(); + isPartialSuccess = puf.isPartialSuccess(); + return false; + } + + throw new IOException("Unexpected SSH message (type " + msg[0] + ")"); + } + return authenticated; + } + + public boolean authenticatePublicKey(String user, char[] PEMPrivateKey, String password, SecureRandom rnd) + throws IOException + { + KeyPair pair = PEMDecoder.decode(PEMPrivateKey, password); + + return authenticatePublicKey(user, pair, rnd); + } + + public boolean authenticatePublicKey(String user, KeyPair pair, SecureRandom rnd) + throws IOException + { + return authenticatePublicKey(user, pair, rnd, null); + } + + public boolean authenticatePublicKey(String user, SignatureProxy signatureProxy) + throws IOException + { + return authenticatePublicKey(user, null, null, signatureProxy); + } + + public boolean authenticatePublicKey(String user, KeyPair pair, SecureRandom rnd, SignatureProxy signatureProxy) + throws IOException + { + PrivateKey privateKey = null; + PublicKey publicKey = null; + if (pair != null) + { + privateKey = pair.getPrivate(); + publicKey = pair.getPublic(); + } + if (signatureProxy != null) + { + publicKey = signatureProxy.getPublicKey(); + } + + try + { + initialize(user); + + if (!methodPossible("publickey")) + throw new IOException("Authentication method publickey not supported by the server at this stage."); + + if (publicKey instanceof DSAPublicKey) + { + SSHSignature s = DSASHA1Verify.get(); + byte[] pk_enc = s.encodePublicKey(publicKey); + + byte[] msg = this.generatePublicKeyUserAuthenticationRequest(user, DSASHA1Verify.ID_SSH_DSS, pk_enc); + + byte[] ds_enc; + if (signatureProxy != null) + { + ds_enc = signatureProxy.sign(msg, SignatureProxy.SHA1); + } + else + { + ds_enc = s.generateSignature(msg, privateKey, rnd); + } + + PacketUserauthRequestPublicKey ua = new PacketUserauthRequestPublicKey("ssh-connection", user, + DSASHA1Verify.ID_SSH_DSS, pk_enc, ds_enc); + tm.sendMessage(ua.getPayload()); + } + else if (publicKey instanceof RSAPublicKey) + { + byte[] pk_enc = RSASHA1Verify.get().encodePublicKey(publicKey); + String pk_algorithm; + + + // Servers support different hash algorithms for RSA keys + // https://tools.ietf.org/html/draft-ietf-curdle-rsa-sha2-12 + Set algsAccepted = tm.getExtensionInfo().getSignatureAlgorithmsAccepted(); + final byte[] rsa_sig_enc; + + if (algsAccepted.contains(RSASHA512Verify.get().getKeyFormat())) + { + SSHSignature s = RSASHA512Verify.get(); + pk_algorithm = s.getKeyFormat(); + byte[] msg = this.generatePublicKeyUserAuthenticationRequest(user, pk_algorithm, pk_enc); + if (signatureProxy != null) + { + rsa_sig_enc = signatureProxy.sign(msg, SignatureProxy.SHA512); + } + else + { + rsa_sig_enc = s.generateSignature(msg, privateKey, rnd); + } + } + else if (algsAccepted.contains(RSASHA256Verify.ID_RSA_SHA_2_256)) + { + pk_algorithm = RSASHA256Verify.ID_RSA_SHA_2_256; + byte[] msg = this.generatePublicKeyUserAuthenticationRequest(user, pk_algorithm, pk_enc); + + if (signatureProxy != null) + { + rsa_sig_enc = signatureProxy.sign(msg, SignatureProxy.SHA256); + } + else + { + rsa_sig_enc = RSASHA256Verify.get().generateSignature(msg, privateKey, rnd); + } + } + else + { + pk_algorithm = "ssh-rsa"; + byte[] msg = this.generatePublicKeyUserAuthenticationRequest(user, pk_algorithm, pk_enc); + if (signatureProxy != null) + { + rsa_sig_enc = signatureProxy.sign(msg, SignatureProxy.SHA1); + } + else + { + // Server always accepts RSA with SHA1 + rsa_sig_enc = RSASHA1Verify.get().generateSignature(msg, privateKey, rnd); + } + } + + PacketUserauthRequestPublicKey ua = new PacketUserauthRequestPublicKey("ssh-connection", user, + pk_algorithm, pk_enc, rsa_sig_enc); + + tm.sendMessage(ua.getPayload()); + } + else if (publicKey instanceof ECPublicKey) + { + ECPublicKey ecPublicKey = (ECPublicKey) publicKey; + + ECDSASHA2Verify verifier = ECDSASHA2Verify.getVerifierForKey(ecPublicKey); + + final String algo = verifier.getKeyFormat(); + + byte[] pk_enc = verifier.encodePublicKey(ecPublicKey); + + byte[] msg = this.generatePublicKeyUserAuthenticationRequest(user, algo, pk_enc); + + byte[] ec_sig_enc; + if (signatureProxy != null) + { + ec_sig_enc = signatureProxy.sign(msg, ECDSASHA2Verify.getDigestAlgorithmForParams(ecPublicKey)); + } + else + { + ec_sig_enc = verifier.generateSignature(msg, privateKey, rnd); + } + + PacketUserauthRequestPublicKey ua = new PacketUserauthRequestPublicKey("ssh-connection", user, + algo, pk_enc, ec_sig_enc); + + tm.sendMessage(ua.getPayload()); + } + else if (publicKey instanceof Ed25519PublicKey) + { + final String algo = Ed25519Verify.ED25519_ID; + + byte[] pk_enc = Ed25519Verify.get().encodePublicKey(publicKey); + + byte[] msg = this.generatePublicKeyUserAuthenticationRequest(user, algo, pk_enc); + + byte[] ed_sig_enc; + if (signatureProxy != null) + { + ed_sig_enc = signatureProxy.sign(msg, SignatureProxy.SHA512); + } + else + { + Ed25519PrivateKey pk = (Ed25519PrivateKey) privateKey; + ed_sig_enc = Ed25519Verify.get().generateSignature(msg, pk, rnd); + } + + PacketUserauthRequestPublicKey ua = new PacketUserauthRequestPublicKey("ssh-connection", user, + algo, pk_enc, ed_sig_enc); + + tm.sendMessage(ua.getPayload()); + } + else + { + throw new IOException("Unknown public key type."); + } + + byte[] ar = getNextMessage(); + + return isAuthenticationSuccessful(ar); + } + catch (IOException e) + { + e.printStackTrace(); + tm.close(e, false); + throw new IOException("Publickey authentication failed.", e); + } + } + + public boolean authenticateNone(String user) throws IOException + { + try + { + initialize(user); + return authenticated; + } + catch (IOException e) + { + tm.close(e, false); + throw new IOException("None authentication failed.", e); + } + } + + public boolean authenticatePassword(String user, String pass) throws IOException + { + try + { + initialize(user); + + if (!methodPossible("password")) + throw new IOException("Authentication method password not supported by the server at this stage."); + + PacketUserauthRequestPassword ua = new PacketUserauthRequestPassword("ssh-connection", user, pass); + tm.sendMessage(ua.getPayload()); + + byte[] ar = getNextMessage(); + + return isAuthenticationSuccessful(ar); + } + catch (IOException e) + { + tm.close(e, false); + throw new IOException("Password authentication failed.", e); + } + } + + public boolean authenticateInteractive(String user, String[] submethods, InteractiveCallback cb) throws IOException + { + try + { + initialize(user); + + if (!methodPossible("keyboard-interactive")) + throw new IOException( + "Authentication method keyboard-interactive not supported by the server at this stage."); + + if (submethods == null) + submethods = new String[0]; + + PacketUserauthRequestInteractive ua = new PacketUserauthRequestInteractive("ssh-connection", user, + submethods); + + tm.sendMessage(ua.getPayload()); + + while (true) + { + byte[] ar = getNextMessage(); + + if (ar[0] == Packets.SSH_MSG_USERAUTH_INFO_REQUEST) + { + PacketUserauthInfoRequest pui = new PacketUserauthInfoRequest(ar, 0, ar.length); + + String[] responses; + + try + { + responses = cb.replyToChallenge(pui.getName(), pui.getInstruction(), pui.getNumPrompts(), pui + .getPrompt(), pui.getEcho()); + } + catch (Exception e) + { + throw new IOException("Exception in callback.", e); + } + + if (responses == null) + throw new IOException("Your callback may not return NULL!"); + + PacketUserauthInfoResponse puir = new PacketUserauthInfoResponse(responses); + tm.sendMessage(puir.getPayload()); + + continue; + } + + return isAuthenticationSuccessful(ar); + } + } + catch (IOException e) + { + tm.close(e, false); + throw new IOException("Keyboard-interactive authentication failed.", e); + } + } + + public void handleMessage(byte[] msg, int msglen) throws IOException + { + synchronized (packets) + { + if (msg == null) + { + connectionClosed = true; + } + else + { + byte[] tmp = new byte[msglen]; + System.arraycopy(msg, 0, tmp, 0, msglen); + packets.addElement(tmp); + } + + packets.notifyAll(); + + if (packets.size() > 5) + { + connectionClosed = true; + throw new IOException("Error, peer is flooding us with authentication packets."); + } + } + } + + private boolean isAuthenticationSuccessful(byte[] ar) throws IOException + { + if (ar[0] == Packets.SSH_MSG_USERAUTH_SUCCESS) + { + authenticated = true; + tm.removeMessageHandler(this, 0, 255); + return true; + } + + if (ar[0] == Packets.SSH_MSG_USERAUTH_FAILURE) + { + PacketUserauthFailure puf = new PacketUserauthFailure(ar, 0, ar.length); + + remainingMethods = puf.getAuthThatCanContinue(); + isPartialSuccess = puf.isPartialSuccess(); + + return false; + } + + throw new IOException("Unexpected SSH message (type " + ar[0] + ")"); + } + + private byte[] generatePublicKeyUserAuthenticationRequest(String user, String algorithm, byte[] publicKeyEncoded) { + TypesWriter tw = new TypesWriter(); + { + byte[] H = tm.getSessionIdentifier(); + + tw.writeString(H, 0, H.length); + tw.writeByte(Packets.SSH_MSG_USERAUTH_REQUEST); + tw.writeString(user); + tw.writeString("ssh-connection"); + tw.writeString("publickey"); + tw.writeBoolean(true); + tw.writeString(algorithm); + tw.writeString(publicKeyEncoded, 0, publicKeyEncoded.length); + } + + return tw.getBytes(); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/auth/SignatureProxy.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/auth/SignatureProxy.java new file mode 100644 index 0000000000..bdf00bbcfd --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/auth/SignatureProxy.java @@ -0,0 +1,52 @@ +/* + * Copyright 2017 Jonas Dippel, Michael Perk, Marc Totzke + */ + +package com.trilead.ssh2.auth; + +import java.io.IOException; +import java.security.PublicKey; + +public abstract class SignatureProxy +{ + public static final String SHA1 = "SHA-1"; + public static final String SHA256 = "SHA-256"; + public static final String SHA384 = "SHA-384"; + public static final String SHA512 = "SHA-512"; + + /** + * Holds the public key which belongs to the private key which is used in the signing process. + */ + private PublicKey mPublicKey; + + /** + * Instantiates a new SignatureProxy which needs a public key for the + * later authentication process. + * + * @param publicKey The public key. + * @throws IllegalArgumentException Might be thrown id the public key is invalid. + */ + public SignatureProxy(PublicKey publicKey) + { + if (publicKey == null) + { + throw new IllegalArgumentException("Public key must not be null"); + } + mPublicKey = publicKey; + } + + /** + * This method should sign a given byte array message using the private key. + * + * @param message The message which should be signed. + * @param hashAlgorithm The hashing algorithm which should be used. + * @return The signed message. + * @throws IOException This exception might be thrown during the signing process. + */ + public abstract byte[] sign(byte[] message, String hashAlgorithm) throws IOException; + + public PublicKey getPublicKey() + { + return mPublicKey; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/AuthAgentForwardThread.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/AuthAgentForwardThread.java new file mode 100644 index 0000000000..b7c753a6ed --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/AuthAgentForwardThread.java @@ -0,0 +1,605 @@ +/* + * Copyright 2007 Kenny Root, Jeffrey Sharkey + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * a.) Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * b.) Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * c.) Neither the name of Trilead nor the names of its contributors may + * be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +package com.trilead.ssh2.channel; + +import com.trilead.ssh2.signature.RSASHA256Verify; +import com.trilead.ssh2.signature.RSASHA512Verify; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.math.BigInteger; +import java.security.KeyFactory; +import java.security.KeyPair; +import java.security.NoSuchAlgorithmException; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.SecureRandom; +import java.security.interfaces.DSAPrivateKey; +import java.security.interfaces.RSAPrivateKey; +import java.security.spec.DSAPrivateKeySpec; +import java.security.spec.DSAPublicKeySpec; +import java.security.spec.ECParameterSpec; +import java.security.spec.ECPoint; +import java.security.spec.ECPrivateKeySpec; +import java.security.spec.ECPublicKeySpec; +import java.security.spec.InvalidKeySpecException; +import java.security.spec.KeySpec; +import java.security.spec.RSAPrivateCrtKeySpec; +import java.security.spec.RSAPublicKeySpec; +import java.util.Map; +import java.util.Map.Entry; + +import com.trilead.ssh2.AuthAgentCallback; +import com.trilead.ssh2.crypto.keys.Ed25519PrivateKey; +import com.trilead.ssh2.log.Logger; +import com.trilead.ssh2.packets.TypesReader; +import com.trilead.ssh2.packets.TypesWriter; +import com.trilead.ssh2.signature.DSASHA1Verify; +import com.trilead.ssh2.signature.ECDSASHA2Verify; +import com.trilead.ssh2.signature.Ed25519Verify; +import com.trilead.ssh2.signature.RSASHA1Verify; + +/** + * AuthAgentForwardThread. + * + * @author Kenny Root + * @version $Id$ + */ +public class AuthAgentForwardThread extends Thread implements IChannelWorkerThread +{ + private static final byte[] SSH_AGENT_FAILURE = {0, 0, 0, 1, 5}; // 5 + private static final byte[] SSH_AGENT_SUCCESS = {0, 0, 0, 1, 6}; // 6 + + private static final int SSH2_AGENTC_REQUEST_IDENTITIES = 11; + private static final int SSH2_AGENT_IDENTITIES_ANSWER = 12; + + private static final int SSH2_AGENTC_SIGN_REQUEST = 13; + private static final int SSH2_AGENT_SIGN_RESPONSE = 14; + + private static final int SSH2_AGENTC_ADD_IDENTITY = 17; + private static final int SSH2_AGENTC_REMOVE_IDENTITY = 18; + private static final int SSH2_AGENTC_REMOVE_ALL_IDENTITIES = 19; + +// private static final int SSH_AGENTC_ADD_SMARTCARD_KEY = 20; +// private static final int SSH_AGENTC_REMOVE_SMARTCARD_KEY = 21; + + private static final int SSH_AGENTC_LOCK = 22; + private static final int SSH_AGENTC_UNLOCK = 23; + + private static final int SSH2_AGENTC_ADD_ID_CONSTRAINED = 25; +// private static final int SSH_AGENTC_ADD_SMARTCARD_KEY_CONSTRAINED = 26; + + // Constraints for adding keys + private static final int SSH_AGENT_CONSTRAIN_LIFETIME = 1; + private static final int SSH_AGENT_CONSTRAIN_CONFIRM = 2; + + // Flags for signature requests +// private static final int SSH_AGENT_OLD_SIGNATURE = 1; + // https://tools.ietf.org/html/draft-miller-ssh-agent-02#section-7.3 + private static final int SSH_AGENT_RSA_SHA2_256 = 0x02; + private static final int SSH_AGENT_RSA_SHA2_512 = 0x04; + + private static final Logger log = Logger.getLogger(RemoteAcceptThread.class); + + AuthAgentCallback authAgent; + OutputStream os; + InputStream is; + Channel c; + + byte[] buffer = new byte[Channel.CHANNEL_BUFFER_SIZE]; + + public AuthAgentForwardThread(Channel c, AuthAgentCallback authAgent) + { + this.c = c; + this.authAgent = authAgent; + + if (log.isEnabled()) + log.log(20, "AuthAgentForwardThread started"); + } + + @Override + public void run() + { + try + { + c.cm.registerThread(this); + } + catch (IOException e) + { + stopWorking(); + return; + } + + try + { + c.cm.sendOpenConfirmation(c); + + is = c.getStdoutStream(); + os = c.getStdinStream(); + + int totalSize = 4; + int readSoFar = 0; + + while (true) { + int len; + + try + { + len = is.read(buffer, readSoFar, buffer.length - readSoFar); + } + catch (IOException e) + { + stopWorking(); + return; + } + + if (len <= 0) + break; + + readSoFar += len; + + if (readSoFar >= 4) { + TypesReader tr = new TypesReader(buffer, 0, 4); + totalSize = tr.readUINT32() + 4; + } + + if (totalSize == readSoFar) { + TypesReader tr = new TypesReader(buffer, 4, readSoFar - 4); + int messageType = tr.readByte(); + + switch (messageType) { + case SSH2_AGENTC_REQUEST_IDENTITIES: + sendIdentities(); + break; + case SSH2_AGENTC_ADD_IDENTITY: + addIdentity(tr, false); + break; + case SSH2_AGENTC_ADD_ID_CONSTRAINED: + addIdentity(tr, true); + break; + case SSH2_AGENTC_REMOVE_IDENTITY: + removeIdentity(tr); + break; + case SSH2_AGENTC_REMOVE_ALL_IDENTITIES: + removeAllIdentities(tr); + break; + case SSH2_AGENTC_SIGN_REQUEST: + processSignRequest(tr); + break; + case SSH_AGENTC_LOCK: + processLockRequest(tr); + break; + case SSH_AGENTC_UNLOCK: + processUnlockRequest(tr); + break; + default: + os.write(SSH_AGENT_FAILURE); + break; + } + + readSoFar = 0; + } + } + + c.cm.closeChannel(c, "EOF on both streams reached.", true); + } + catch (IOException e) + { + log.log(50, "IOException in agent forwarder: " + e.getMessage()); + + try + { + is.close(); + } + catch (IOException e1) + { + } + + try + { + os.close(); + } + catch (IOException e2) + { + } + + try + { + c.cm.closeChannel(c, "IOException in agent forwarder (" + e.getMessage() + ")", true); + } + catch (IOException e3) + { + } + } + } + + public void stopWorking() { + try + { + /* This will lead to an IOException in the is.read() call */ + is.close(); + } + catch (IOException e) + { + } + } + + /** + * @return whether the agent is locked + */ + private boolean failWhenLocked() throws IOException + { + if (authAgent.isAgentLocked()) { + os.write(SSH_AGENT_FAILURE); + return true; + } else + return false; + } + + private void sendIdentities() throws IOException + { + Map keys = null; + + TypesWriter tw = new TypesWriter(); + tw.writeByte(SSH2_AGENT_IDENTITIES_ANSWER); + int numKeys = 0; + + if (!authAgent.isAgentLocked()) + keys = authAgent.retrieveIdentities(); + + if (keys != null) + numKeys = keys.size(); + + tw.writeUINT32(numKeys); + + if (keys != null) { + for (Entry entry : keys.entrySet()) { + byte[] keyBytes = entry.getValue(); + tw.writeString(keyBytes, 0, keyBytes.length); + tw.writeString(entry.getKey()); + } + } + + sendPacket(tw.getBytes()); + } + + /** + * @param tr + */ + private void addIdentity(TypesReader tr, boolean checkConstraints) { + try + { + if (failWhenLocked()) + return; + + String type = tr.readString(); + + String comment; + String keyType; + KeySpec pubSpec; + KeySpec privSpec; + + if (type.equals("ssh-rsa")) { + keyType = "RSA"; + + BigInteger n = tr.readMPINT(); + BigInteger e = tr.readMPINT(); + BigInteger d = tr.readMPINT(); + BigInteger iqmp = tr.readMPINT(); + BigInteger p = tr.readMPINT(); + BigInteger q = tr.readMPINT(); + comment = tr.readString(); + + // Derive the extra values Java needs. + BigInteger dmp1 = d.mod(p.subtract(BigInteger.ONE)); + BigInteger dmq1 = d.mod(q.subtract(BigInteger.ONE)); + + pubSpec = new RSAPublicKeySpec(n, e); + privSpec = new RSAPrivateCrtKeySpec(n, e, d, p, q, dmp1, dmq1, iqmp); + } else if (type.equals(DSASHA1Verify.ID_SSH_DSS)) { + keyType = "DSA"; + + BigInteger p = tr.readMPINT(); + BigInteger q = tr.readMPINT(); + BigInteger g = tr.readMPINT(); + BigInteger y = tr.readMPINT(); + BigInteger x = tr.readMPINT(); + comment = tr.readString(); + + pubSpec = new DSAPublicKeySpec(y, p, q, g); + privSpec = new DSAPrivateKeySpec(x, p, q, g); + } else if (type.equals(ECDSASHA2Verify.ECDSASHA2NISTP256Verify.get().getKeyFormat())) { + ECDSASHA2Verify verifier = ECDSASHA2Verify.ECDSASHA2NISTP256Verify.get(); + keyType = "EC"; + + String curveName = tr.readString(); + byte[] groupBytes = tr.readByteString(); + BigInteger exponent = tr.readMPINT(); + comment = tr.readString(); + + if (!"nistp256".equals(curveName)) { + log.log(2, "Invalid curve name for ecdsa-sha2-nistp256: " + curveName); + os.write(SSH_AGENT_FAILURE); + return; + } + + ECParameterSpec params = verifier.getParameterSpec(); + ECPoint group = verifier.decodeECPoint(groupBytes); + if (group == null) { + // TODO log error + os.write(SSH_AGENT_FAILURE); + return; + } + + pubSpec = new ECPublicKeySpec(group, params); + privSpec = new ECPrivateKeySpec(exponent, params); + } else { + log.log(2, "Unknown key type: " + type); + os.write(SSH_AGENT_FAILURE); + return; + } + + PublicKey pubKey; + PrivateKey privKey; + try { + KeyFactory kf = KeyFactory.getInstance(keyType); + pubKey = kf.generatePublic(pubSpec); + privKey = kf.generatePrivate(privSpec); + } catch (NoSuchAlgorithmException ex) { + // TODO: log error + os.write(SSH_AGENT_FAILURE); + return; + } catch (InvalidKeySpecException ex) { + // TODO: log error + os.write(SSH_AGENT_FAILURE); + return; + } + + KeyPair pair = new KeyPair(pubKey, privKey); + + boolean confirmUse = false; + int lifetime = 0; + + if (checkConstraints) { + while (tr.remain() > 0) { + int constraint = tr.readByte(); + if (constraint == SSH_AGENT_CONSTRAIN_CONFIRM) + confirmUse = true; + else if (constraint == SSH_AGENT_CONSTRAIN_LIFETIME) + lifetime = tr.readUINT32(); + else { + // Unknown constraint. Bail. + os.write(SSH_AGENT_FAILURE); + return; + } + } + } + + if (authAgent.addIdentity(pair, comment, confirmUse, lifetime)) + os.write(SSH_AGENT_SUCCESS); + else + os.write(SSH_AGENT_FAILURE); + } + catch (IOException e) + { + try + { + os.write(SSH_AGENT_FAILURE); + } + catch (IOException e1) + { + } + } + } + + /** + * @param tr + */ + private void removeIdentity(TypesReader tr) { + try + { + if (failWhenLocked()) + return; + + byte[] publicKey = tr.readByteString(); + if (authAgent.removeIdentity(publicKey)) + os.write(SSH_AGENT_SUCCESS); + else + os.write(SSH_AGENT_FAILURE); + } + catch (IOException e) + { + try + { + os.write(SSH_AGENT_FAILURE); + } + catch (IOException e1) + { + } + } + } + + /** + * @param tr + */ + private void removeAllIdentities(TypesReader tr) { + try + { + if (failWhenLocked()) + return; + + if (authAgent.removeAllIdentities()) + os.write(SSH_AGENT_SUCCESS); + else + os.write(SSH_AGENT_FAILURE); + } + catch (IOException e) + { + try + { + os.write(SSH_AGENT_FAILURE); + } + catch (IOException e1) + { + } + } + } + + private void processSignRequest(TypesReader tr) + { + try + { + if (failWhenLocked()) + return; + + byte[] publicKeyBytes = tr.readByteString(); + byte[] challenge = tr.readByteString(); + + int flags = tr.readUINT32(); + + if ((flags & ~SSH_AGENT_RSA_SHA2_512 & ~SSH_AGENT_RSA_SHA2_256) != 0) { + // We don't understand these flags; abort! + log.log(2, "Unrecognized ssh-agent flags: " + flags); + os.write(SSH_AGENT_FAILURE); + return; + } + + KeyPair pair = authAgent.getKeyPair(publicKeyBytes); + + if (pair == null) { + os.write(SSH_AGENT_FAILURE); + return; + } + + byte[] response; + + PrivateKey privKey = pair.getPrivate(); + if (privKey instanceof RSAPrivateKey) { + RSAPrivateKey rsaPrivKey = (RSAPrivateKey) privKey; + if ((flags & SSH_AGENT_RSA_SHA2_512) != 0) { + response = RSASHA512Verify.get().generateSignature(challenge, rsaPrivKey, new SecureRandom()); + } else if ((flags & SSH_AGENT_RSA_SHA2_256) != 0) { + response = RSASHA256Verify.get().generateSignature(challenge, rsaPrivKey, new SecureRandom()); + } else { + response = RSASHA1Verify.get().generateSignature(challenge, rsaPrivKey, new SecureRandom()); + } + } else if (privKey instanceof DSAPrivateKey) { + response = DSASHA1Verify.get().generateSignature(challenge, privKey, new SecureRandom()); + } else if (privKey instanceof Ed25519PrivateKey) { + response = Ed25519Verify.get().generateSignature(challenge, privKey, new SecureRandom()); + } else { + os.write(SSH_AGENT_FAILURE); + return; + } + + TypesWriter tw = new TypesWriter(); + tw.writeByte(SSH2_AGENT_SIGN_RESPONSE); + tw.writeString(response, 0, response.length); + + sendPacket(tw.getBytes()); + } + catch (IOException e) + { + try + { + os.write(SSH_AGENT_FAILURE); + } + catch (IOException e1) + { + } + } + } + + /** + * @param tr + */ + private void processLockRequest(TypesReader tr) { + try + { + if (failWhenLocked()) + return; + + String lockPassphrase = tr.readString(); + if (!authAgent.setAgentLock(lockPassphrase)) { + os.write(SSH_AGENT_FAILURE); + return; + } else + os.write(SSH_AGENT_SUCCESS); + } + catch (IOException e) + { + try + { + os.write(SSH_AGENT_FAILURE); + } + catch (IOException e1) + { + } + } + } + + /** + * @param tr + */ + private void processUnlockRequest(TypesReader tr) + { + try + { + String unlockPassphrase = tr.readString(); + + if (authAgent.requestAgentUnlock(unlockPassphrase)) + os.write(SSH_AGENT_SUCCESS); + else + os.write(SSH_AGENT_FAILURE); + } + catch (IOException e) + { + try + { + os.write(SSH_AGENT_FAILURE); + } + catch (IOException e1) + { + } + } + } + + /** + * @param message + * @throws IOException + */ + private void sendPacket(byte[] message) throws IOException + { + TypesWriter packet = new TypesWriter(); + packet.writeUINT32(message.length); + packet.writeBytes(message); + os.write(packet.getBytes()); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/Channel.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/Channel.java new file mode 100644 index 0000000000..c6d4354cf3 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/Channel.java @@ -0,0 +1,207 @@ + +package com.trilead.ssh2.channel; + +/** + * Channel. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: Channel.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ +public class Channel +{ + /* + * OK. Here is an important part of the JVM Specification: + * (http://java.sun.com/docs/books/vmspec/2nd-edition/html/Threads.doc.html#22214) + * + * Any association between locks and variables is purely conventional. + * Locking any lock conceptually flushes all variables from a thread's + * working memory, and unlocking any lock forces the writing out to main + * memory of all variables that the thread has assigned. That a lock may be + * associated with a particular object or a class is purely a convention. + * (...) + * + * If a thread uses a particular shared variable only after locking a + * particular lock and before the corresponding unlocking of that same lock, + * then the thread will read the shared value of that variable from main + * memory after the lock operation, if necessary, and will copy back to main + * memory the value most recently assigned to that variable before the + * unlock operation. + * + * This, in conjunction with the mutual exclusion rules for locks, suffices + * to guarantee that values are correctly transmitted from one thread to + * another through shared variables. + * + * ====> Always keep that in mind when modifying the Channel/ChannelManger + * code. + * + */ + + static final int STATE_OPENING = 1; + static final int STATE_OPEN = 2; + static final int STATE_CLOSED = 4; + + static final int CHANNEL_BUFFER_SIZE = 30000; + + /* + * To achieve correctness, the following rules have to be respected when + * accessing this object: + */ + + // These fields can always be read + final ChannelManager cm; + final ChannelOutputStream stdinStream; + final ChannelInputStream stdoutStream; + final ChannelInputStream stderrStream; + + // These two fields will only be written while the Channel is in state + // STATE_OPENING. + // The code makes sure that the two fields are written out when the state is + // changing to STATE_OPEN. + // Therefore, if you know that the Channel is in state STATE_OPEN, then you + // can read these two fields without synchronizing on the Channel. However, make + // sure that you get the latest values (e.g., flush caches by synchronizing on any + // object). However, to be on the safe side, you can lock the channel. + + int localID = -1; + int remoteID = -1; + + /* + * Make sure that we never send a data/EOF/WindowChange msg after a CLOSE + * msg. + * + * This is a little bit complicated, but we have to do it in that way, since + * we cannot keep a lock on the Channel during the send operation (this + * would block sometimes the receiver thread, and, in extreme cases, can + * lead to a deadlock on both sides of the connection (senders are blocked + * since the receive buffers on the other side are full, and receiver + * threads wait for the senders to finish). It all depends on the + * implementation on the other side. But we cannot make any assumptions, we + * have to assume the worst case. Confused? Just believe me. + */ + + /* + * If you send a message on a channel, then you have to aquire the + * "channelSendLock" and check the "closeMessageSent" flag (this variable + * may only be accessed while holding the "channelSendLock" !!! + * + * BTW: NEVER EVER SEND MESSAGES FROM THE RECEIVE THREAD - see explanation + * above. + */ + + final Object channelSendLock = new Object(); + boolean closeMessageSent = false; + + /* + * Stop memory fragmentation by allocating this often used buffer. + * May only be used while holding the channelSendLock + */ + + final byte[] msgWindowAdjust = new byte[9]; + + // If you access (read or write) any of the following fields, then you have + // to synchronize on the channel. + + int state = STATE_OPENING; + + boolean closeMessageRecv = false; + + /* This is a stupid implementation. At the moment we can only wait + * for one pending request per channel. + */ + int successCounter = 0; + int failedCounter = 0; + + int localWindow = 0; /* locally, we use a small window, < 2^31 */ + long remoteWindow = 0; /* long for readable 2^32 - 1 window support */ + + int localMaxPacketSize = -1; + int remoteMaxPacketSize = -1; + + final byte[] stdoutBuffer = new byte[CHANNEL_BUFFER_SIZE]; + final byte[] stderrBuffer = new byte[CHANNEL_BUFFER_SIZE]; + + int stdoutReadpos = 0; + int stdoutWritepos = 0; + int stderrReadpos = 0; + int stderrWritepos = 0; + + boolean EOF = false; + + Integer exit_status; + + String exit_signal; + + // we keep the x11 cookie so that this channel can be closed when this + // specific x11 forwarding gets stopped + + String hexX11FakeCookie; + + // reasonClosed is special, since we sometimes need to access it + // while holding the channelSendLock. + // We protect it with a private short term lock. + + private final Object reasonClosedLock = new Object(); + private String reasonClosed = null; + + public Channel(ChannelManager cm) + { + this.cm = cm; + + this.localWindow = CHANNEL_BUFFER_SIZE; + this.localMaxPacketSize = 35000 - 1024; // leave enough slack + + this.stdinStream = new ChannelOutputStream(this); + this.stdoutStream = new ChannelInputStream(this, false); + this.stderrStream = new ChannelInputStream(this, true); + } + + /* Methods to allow access from classes outside of this package */ + + public ChannelInputStream getStderrStream() + { + return stderrStream; + } + + public ChannelOutputStream getStdinStream() + { + return stdinStream; + } + + public ChannelInputStream getStdoutStream() + { + return stdoutStream; + } + + public String getExitSignal() + { + synchronized (this) + { + return exit_signal; + } + } + + public Integer getExitStatus() + { + synchronized (this) + { + return exit_status; + } + } + + public String getReasonClosed() + { + synchronized (reasonClosedLock) + { + return reasonClosed; + } + } + + public void setReasonClosed(String reasonClosed) + { + synchronized (reasonClosedLock) + { + if (this.reasonClosed == null) + this.reasonClosed = reasonClosed; + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/ChannelInputStream.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/ChannelInputStream.java new file mode 100644 index 0000000000..e1f6a9c1e2 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/ChannelInputStream.java @@ -0,0 +1,85 @@ + +package com.trilead.ssh2.channel; + +import java.io.IOException; +import java.io.InputStream; + +/** + * ChannelInputStream. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: ChannelInputStream.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ +public final class ChannelInputStream extends InputStream +{ + Channel c; + + boolean isClosed = false; + boolean isEOF = false; + boolean extendedFlag = false; + + ChannelInputStream(Channel c, boolean isExtended) + { + this.c = c; + this.extendedFlag = isExtended; + } + + public int available() throws IOException + { + if (isEOF) + return 0; + + int avail = c.cm.getAvailable(c, extendedFlag); + + /* We must not return -1 on EOF */ + + return (avail > 0) ? avail : 0; + } + + public void close() { + isClosed = true; + } + + public int read(byte[] b, int off, int len) throws IOException + { + if (b == null) + throw new NullPointerException(); + + if ((off < 0) || (len < 0) || ((off + len) > b.length) || ((off + len) < 0) || (off > b.length)) + throw new IndexOutOfBoundsException(); + + if (len == 0) + return 0; + + if (isEOF) + return -1; + + int ret = c.cm.getChannelData(c, extendedFlag, b, off, len); + + if (ret == -1) + { + isEOF = true; + } + + return ret; + } + + public int read(byte[] b) throws IOException + { + return read(b, 0, b.length); + } + + public int read() throws IOException + { + /* Yes, this stream is pure and unbuffered, a single byte read() is slow */ + + final byte b[] = new byte[1]; + + int ret = read(b, 0, 1); + + if (ret != 1) + return -1; + + return b[0] & 0xff; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/ChannelManager.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/ChannelManager.java new file mode 100644 index 0000000000..7858a57af6 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/ChannelManager.java @@ -0,0 +1,1749 @@ + +package com.trilead.ssh2.channel; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import com.trilead.ssh2.AuthAgentCallback; +import com.trilead.ssh2.ChannelCondition; +import com.trilead.ssh2.log.Logger; +import com.trilead.ssh2.packets.PacketChannelAuthAgentReq; +import com.trilead.ssh2.packets.PacketChannelOpenConfirmation; +import com.trilead.ssh2.packets.PacketChannelOpenFailure; +import com.trilead.ssh2.packets.PacketChannelTrileadPing; +import com.trilead.ssh2.packets.PacketGlobalCancelForwardRequest; +import com.trilead.ssh2.packets.PacketGlobalForwardRequest; +import com.trilead.ssh2.packets.PacketGlobalTrileadPing; +import com.trilead.ssh2.packets.PacketOpenDirectTCPIPChannel; +import com.trilead.ssh2.packets.PacketOpenSessionChannel; +import com.trilead.ssh2.packets.PacketSessionExecCommand; +import com.trilead.ssh2.packets.PacketSessionPtyRequest; +import com.trilead.ssh2.packets.PacketSessionPtyResize; +import com.trilead.ssh2.packets.PacketSessionStartShell; +import com.trilead.ssh2.packets.PacketSessionSubsystemRequest; +import com.trilead.ssh2.packets.PacketSessionX11Request; +import com.trilead.ssh2.packets.Packets; +import com.trilead.ssh2.packets.TypesReader; +import com.trilead.ssh2.transport.MessageHandler; +import com.trilead.ssh2.transport.TransportManager; + +/** + * ChannelManager. Please read the comments in Channel.java. + *

+ * Besides the crypto part, this is the core of the library. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: ChannelManager.java,v 1.2 2008/03/03 07:01:36 cplattne Exp $ + */ +public class ChannelManager implements MessageHandler +{ + private static final Logger log = Logger.getLogger(ChannelManager.class); + + private final HashMap x11_magic_cookies = new HashMap<>(); + + private TransportManager tm; + + private final List channels = new ArrayList<>(); + private int nextLocalChannel = 100; + private boolean shutdown = false; + private int globalSuccessCounter = 0; + private int globalFailedCounter = 0; + + private final HashMap remoteForwardings = new HashMap<>(); + + private AuthAgentCallback authAgent; + + private final List listenerThreads = new ArrayList<>(); + + private boolean listenerThreadsAllowed = true; + + public ChannelManager(TransportManager tm) + { + this.tm = tm; + tm.registerMessageHandler(this, 80, 100); + } + + private Channel getChannel(int id) + { + synchronized (channels) + { + for (Channel c : channels) + { + if (c.localID == id) + return c; + } + } + return null; + } + + private void removeChannel(int id) + { + synchronized (channels) + { + for (int i = 0; i < channels.size(); i++) + { + Channel c = channels.get(i); + if (c.localID == id) + { + channels.remove(i); + break; + } + } + } + } + + private int addChannel(Channel c) + { + synchronized (channels) + { + channels.add(c); + return nextLocalChannel++; + } + } + + private void waitUntilChannelOpen(Channel c) throws IOException + { + synchronized (c) + { + while (c.state == Channel.STATE_OPENING) + { + try + { + c.wait(); + } + catch (InterruptedException ignore) + { + } + } + + if (c.state != Channel.STATE_OPEN) + { + removeChannel(c.localID); + + String detail = c.getReasonClosed(); + + if (detail == null) + detail = "state: " + c.state; + + throw new IOException("Could not open channel (" + detail + ")"); + } + } + } + + private boolean waitForGlobalRequestResult() throws IOException + { + synchronized (channels) + { + while ((globalSuccessCounter == 0) && (globalFailedCounter == 0)) + { + if (shutdown) + { + throw new IOException("The connection is being shutdown"); + } + + try + { + channels.wait(); + } + catch (InterruptedException ignore) + { + } + } + + if ((globalFailedCounter == 0) && (globalSuccessCounter == 1)) + return true; + + if ((globalFailedCounter == 1) && (globalSuccessCounter == 0)) + return false; + + throw new IOException("Illegal state. The server sent " + globalSuccessCounter + + " SSH_MSG_REQUEST_SUCCESS and " + globalFailedCounter + " SSH_MSG_REQUEST_FAILURE messages."); + } + } + + private boolean waitForChannelRequestResult(Channel c) throws IOException + { + synchronized (c) + { + while ((c.successCounter == 0) && (c.failedCounter == 0)) + { + if (c.state != Channel.STATE_OPEN) + { + String detail = c.getReasonClosed(); + + if (detail == null) + detail = "state: " + c.state; + + throw new IOException("This SSH2 channel is not open (" + detail + ")"); + } + + try + { + c.wait(); + } + catch (InterruptedException ignore) + { + } + } + + if ((c.failedCounter == 0) && (c.successCounter == 1)) + return true; + + if ((c.failedCounter == 1) && (c.successCounter == 0)) + return false; + + throw new IOException("Illegal state. The server sent " + c.successCounter + + " SSH_MSG_CHANNEL_SUCCESS and " + c.failedCounter + " SSH_MSG_CHANNEL_FAILURE messages."); + } + } + + public void registerX11Cookie(String hexFakeCookie, X11ServerData data) + { + synchronized (x11_magic_cookies) + { + x11_magic_cookies.put(hexFakeCookie, data); + } + } + + public void unRegisterX11Cookie(String hexFakeCookie, boolean killChannels) + { + if (hexFakeCookie == null) + throw new IllegalStateException("hexFakeCookie may not be null"); + + synchronized (x11_magic_cookies) + { + x11_magic_cookies.remove(hexFakeCookie); + } + + if (!killChannels) + return; + + if (log.isEnabled()) + log.log(50, "Closing all X11 channels for the given fake cookie"); + + List channel_copy; + + synchronized (channels) + { + channel_copy = new ArrayList<>(channels); + } + + for (int i = 0; i < channel_copy.size(); i++) + { + Channel c = channel_copy.get(i); + + synchronized (c) + { + if (!hexFakeCookie.equals(c.hexX11FakeCookie)) + continue; + } + + try + { + closeChannel(c, "Closing X11 channel since the corresponding session is closing", true); + } + catch (IOException e) + { + } + } + } + + public X11ServerData checkX11Cookie(String hexFakeCookie) + { + synchronized (x11_magic_cookies) + { + if (hexFakeCookie != null) + return x11_magic_cookies.get(hexFakeCookie); + } + return null; + } + + public void closeAllChannels() + { + if (log.isEnabled()) + log.log(50, "Closing all channels"); + + List channel_copy; + + synchronized (channels) + { + channel_copy = new ArrayList<>(channels); + } + + for (int i = 0; i < channel_copy.size(); i++) + { + Channel c = channel_copy.get(i); + try + { + closeChannel(c, "Closing all channels", true); + } + catch (IOException e) + { + } + } + } + + public void closeChannel(Channel c, String reason, boolean force) throws IOException + { + byte msg[] = new byte[5]; + + synchronized (c) + { + if (force) + { + c.state = Channel.STATE_CLOSED; + c.EOF = true; + } + + c.setReasonClosed(reason); + + msg[0] = Packets.SSH_MSG_CHANNEL_CLOSE; + msg[1] = (byte) (c.remoteID >> 24); + msg[2] = (byte) (c.remoteID >> 16); + msg[3] = (byte) (c.remoteID >> 8); + msg[4] = (byte) (c.remoteID); + + c.notifyAll(); + } + + synchronized (c.channelSendLock) + { + if (c.closeMessageSent) + return; + tm.sendMessage(msg); + c.closeMessageSent = true; + } + + if (log.isEnabled()) + log.log(50, "Sent SSH_MSG_CHANNEL_CLOSE (channel " + c.localID + ")"); + } + + public void sendEOF(Channel c) throws IOException + { + byte[] msg = new byte[5]; + + synchronized (c) + { + if (c.state != Channel.STATE_OPEN) + return; + + msg[0] = Packets.SSH_MSG_CHANNEL_EOF; + msg[1] = (byte) (c.remoteID >> 24); + msg[2] = (byte) (c.remoteID >> 16); + msg[3] = (byte) (c.remoteID >> 8); + msg[4] = (byte) (c.remoteID); + } + + synchronized (c.channelSendLock) + { + if (c.closeMessageSent) + return; + tm.sendMessage(msg); + } + + if (log.isEnabled()) + log.log(50, "Sent EOF (Channel " + c.localID + "/" + c.remoteID + ")"); + } + + public void sendOpenConfirmation(Channel c) throws IOException + { + PacketChannelOpenConfirmation pcoc = null; + + synchronized (c) + { + if (c.state != Channel.STATE_OPENING) + return; + + c.state = Channel.STATE_OPEN; + + pcoc = new PacketChannelOpenConfirmation(c.remoteID, c.localID, c.localWindow, c.localMaxPacketSize); + } + + synchronized (c.channelSendLock) + { + if (c.closeMessageSent) + return; + tm.sendMessage(pcoc.getPayload()); + } + } + + public void sendData(Channel c, byte[] buffer, int pos, int len) throws IOException + { + while (len > 0) + { + int thislen = 0; + byte[] msg; + + synchronized (c) + { + while (true) + { + if (c.state == Channel.STATE_CLOSED) + throw new IOException("SSH channel is closed. (" + c.getReasonClosed() + ")"); + + if (c.state != Channel.STATE_OPEN) + throw new IOException("SSH channel in strange state. (" + c.state + ")"); + + if (c.remoteWindow != 0) + break; + + try + { + c.wait(); + } + catch (InterruptedException ignore) + { + } + } + + /* len > 0, no sign extension can happen when comparing */ + + thislen = (c.remoteWindow >= len) ? len : (int) c.remoteWindow; + + int estimatedMaxDataLen = c.remoteMaxPacketSize - (tm.getPacketOverheadEstimate() + 9); + + /* The worst case scenario =) a true bottleneck */ + + if (estimatedMaxDataLen <= 0) + { + estimatedMaxDataLen = 1; + } + + if (thislen > estimatedMaxDataLen) + thislen = estimatedMaxDataLen; + + c.remoteWindow -= thislen; + + msg = new byte[1 + 8 + thislen]; + + msg[0] = Packets.SSH_MSG_CHANNEL_DATA; + msg[1] = (byte) (c.remoteID >> 24); + msg[2] = (byte) (c.remoteID >> 16); + msg[3] = (byte) (c.remoteID >> 8); + msg[4] = (byte) (c.remoteID); + msg[5] = (byte) (thislen >> 24); + msg[6] = (byte) (thislen >> 16); + msg[7] = (byte) (thislen >> 8); + msg[8] = (byte) (thislen); + + System.arraycopy(buffer, pos, msg, 9, thislen); + } + + synchronized (c.channelSendLock) + { + if (c.closeMessageSent) + throw new IOException("SSH channel is closed. (" + c.getReasonClosed() + ")"); + + tm.sendMessage(msg); + } + + pos += thislen; + len -= thislen; + } + } + + public int requestGlobalForward(String bindAddress, int bindPort, String targetAddress, int targetPort) + throws IOException + { + RemoteForwardingData rfd = new RemoteForwardingData(); + + rfd.bindAddress = bindAddress; + rfd.bindPort = bindPort; + rfd.targetAddress = targetAddress; + rfd.targetPort = targetPort; + + synchronized (remoteForwardings) + { + if (remoteForwardings.get(bindPort) != null) + { + throw new IOException("There is already a forwarding for remote port " + bindPort); + } + + remoteForwardings.put(bindPort, rfd); + } + + synchronized (channels) + { + globalSuccessCounter = globalFailedCounter = 0; + } + + PacketGlobalForwardRequest pgf = new PacketGlobalForwardRequest(true, bindAddress, bindPort); + tm.sendMessage(pgf.getPayload()); + + if (log.isEnabled()) + log.log(50, "Requesting a remote forwarding ('" + bindAddress + "', " + bindPort + ")"); + + try + { + if (!waitForGlobalRequestResult()) + throw new IOException("The server denied the request (did you enable port forwarding?)"); + } + catch (IOException e) + { + synchronized (remoteForwardings) + { + remoteForwardings.remove(rfd.bindPort); + } + throw e; + } + + return bindPort; + } + + public void requestCancelGlobalForward(int bindPort) throws IOException + { + RemoteForwardingData rfd = null; + + synchronized (remoteForwardings) + { + rfd = remoteForwardings.get(bindPort); + + if (rfd == null) + throw new IOException("Sorry, there is no known remote forwarding for remote port " + bindPort); + } + + synchronized (channels) + { + globalSuccessCounter = globalFailedCounter = 0; + } + + PacketGlobalCancelForwardRequest pgcf = new PacketGlobalCancelForwardRequest(true, rfd.bindAddress, + rfd.bindPort); + tm.sendMessage(pgcf.getPayload()); + + if (log.isEnabled()) + log.log(50, "Requesting cancelation of remote forward ('" + rfd.bindAddress + "', " + rfd.bindPort + ")"); + + try + { + if (!waitForGlobalRequestResult()) + throw new IOException("The server denied the request."); + } + finally + { + synchronized (remoteForwardings) + { + /* Only now we are sure that no more forwarded connections will arrive */ + remoteForwardings.remove(rfd.bindPort); + } + } + + } + + /** + * @param c + * @param authAgent + * @throws IOException + */ + public boolean requestChannelAgentForwarding(Channel c, AuthAgentCallback authAgent) throws IOException { + synchronized (this) + { + if (this.authAgent != null) + throw new IllegalStateException("Auth agent already exists"); + + this.authAgent = authAgent; + } + + synchronized (channels) + { + globalSuccessCounter = globalFailedCounter = 0; + } + + if (log.isEnabled()) + log.log(50, "Requesting agent forwarding"); + + PacketChannelAuthAgentReq aar = new PacketChannelAuthAgentReq(c.remoteID); + tm.sendMessage(aar.getPayload()); + + if (!waitForChannelRequestResult(c)) { + authAgent = null; + return false; + } + + return true; + } + + public void registerThread(IChannelWorkerThread thr) throws IOException + { + synchronized (listenerThreads) + { + if (!listenerThreadsAllowed) + throw new IOException("Too late, this connection is closed."); + listenerThreads.add(thr); + } + } + + public Channel openDirectTCPIPChannel(String host_to_connect, int port_to_connect, String originator_IP_address, + int originator_port) throws IOException + { + Channel c = new Channel(this); + + synchronized (c) + { + c.localID = addChannel(c); + // end of synchronized block forces writing out to main memory + } + + PacketOpenDirectTCPIPChannel dtc = new PacketOpenDirectTCPIPChannel(c.localID, c.localWindow, + c.localMaxPacketSize, host_to_connect, port_to_connect, originator_IP_address, originator_port); + + tm.sendMessage(dtc.getPayload()); + + waitUntilChannelOpen(c); + + return c; + } + + public Channel openSessionChannel() throws IOException + { + Channel c = new Channel(this); + + synchronized (c) + { + c.localID = addChannel(c); + // end of synchronized block forces the writing out to main memory + } + + if (log.isEnabled()) + log.log(50, "Sending SSH_MSG_CHANNEL_OPEN (Channel " + c.localID + ")"); + + PacketOpenSessionChannel smo = new PacketOpenSessionChannel(c.localID, c.localWindow, c.localMaxPacketSize); + tm.sendMessage(smo.getPayload()); + + waitUntilChannelOpen(c); + + return c; + } + + public void requestGlobalTrileadPing() throws IOException + { + synchronized (channels) + { + globalSuccessCounter = globalFailedCounter = 0; + } + + PacketGlobalTrileadPing pgtp = new PacketGlobalTrileadPing(); + + tm.sendMessage(pgtp.getPayload()); + + if (log.isEnabled()) + log.log(50, "Sending SSH_MSG_GLOBAL_REQUEST 'trilead-ping'."); + + try + { + if (waitForGlobalRequestResult()) + throw new IOException("Your server is alive - but buggy. " + + "It replied with SSH_MSG_REQUEST_SUCCESS when it actually should not."); + + } + catch (IOException e) + { + throw new IOException("The ping request failed.", e); + } + } + + public void requestChannelTrileadPing(Channel c) throws IOException + { + PacketChannelTrileadPing pctp; + + synchronized (c) + { + if (c.state != Channel.STATE_OPEN) + throw new IOException("Cannot ping this channel (" + c.getReasonClosed() + ")"); + + pctp = new PacketChannelTrileadPing(c.remoteID); + + c.successCounter = c.failedCounter = 0; + } + + synchronized (c.channelSendLock) + { + if (c.closeMessageSent) + throw new IOException("Cannot ping this channel (" + c.getReasonClosed() + ")"); + tm.sendMessage(pctp.getPayload()); + } + + try + { + if (waitForChannelRequestResult(c)) + throw new IOException("Your server is alive - but buggy. " + + "It replied with SSH_MSG_SESSION_SUCCESS when it actually should not."); + + } + catch (IOException e) + { + throw new IOException("The ping request failed.", e); + } + } + + public void requestPTY(Channel c, String term, int term_width_characters, int term_height_characters, + int term_width_pixels, int term_height_pixels, byte[] terminal_modes) throws IOException + { + PacketSessionPtyRequest spr; + + synchronized (c) + { + if (c.state != Channel.STATE_OPEN) + throw new IOException("Cannot request PTY on this channel (" + c.getReasonClosed() + ")"); + + spr = new PacketSessionPtyRequest(c.remoteID, true, term, term_width_characters, term_height_characters, + term_width_pixels, term_height_pixels, terminal_modes); + + c.successCounter = c.failedCounter = 0; + } + + synchronized (c.channelSendLock) + { + if (c.closeMessageSent) + throw new IOException("Cannot request PTY on this channel (" + c.getReasonClosed() + ")"); + tm.sendMessage(spr.getPayload()); + } + + try + { + if (!waitForChannelRequestResult(c)) + throw new IOException("The server denied the request."); + } + catch (IOException e) + { + throw new IOException("PTY request failed", e); + } + } + + + public void resizePTY(Channel c, int term_width_characters, int term_height_characters, + int term_width_pixels, int term_height_pixels) throws IOException { + PacketSessionPtyResize spr; + + synchronized (c) { + if (c.state != Channel.STATE_OPEN) + throw new IOException("Cannot request PTY on this channel (" + + c.getReasonClosed() + ")"); + + spr = new PacketSessionPtyResize(c.remoteID, term_width_characters, term_height_characters, + term_width_pixels, term_height_pixels); + c.successCounter = c.failedCounter = 0; + } + + synchronized (c.channelSendLock) { + if (c.closeMessageSent) + throw new IOException("Cannot request PTY on this channel (" + + c.getReasonClosed() + ")"); + tm.sendMessage(spr.getPayload()); + } + } + + + public void requestX11(Channel c, boolean singleConnection, String x11AuthenticationProtocol, + String x11AuthenticationCookie, int x11ScreenNumber) throws IOException + { + PacketSessionX11Request psr; + + synchronized (c) + { + if (c.state != Channel.STATE_OPEN) + throw new IOException("Cannot request X11 on this channel (" + c.getReasonClosed() + ")"); + + psr = new PacketSessionX11Request(c.remoteID, true, singleConnection, x11AuthenticationProtocol, + x11AuthenticationCookie, x11ScreenNumber); + + c.successCounter = c.failedCounter = 0; + } + + synchronized (c.channelSendLock) + { + if (c.closeMessageSent) + throw new IOException("Cannot request X11 on this channel (" + c.getReasonClosed() + ")"); + tm.sendMessage(psr.getPayload()); + } + + if (log.isEnabled()) + log.log(50, "Requesting X11 forwarding (Channel " + c.localID + "/" + c.remoteID + ")"); + + try + { + if (!waitForChannelRequestResult(c)) + throw new IOException("The server denied the request."); + } + catch (IOException e) + { + throw new IOException("The X11 request failed.", e); + } + } + + public void requestSubSystem(Channel c, String subSystemName) throws IOException + { + PacketSessionSubsystemRequest ssr; + + synchronized (c) + { + if (c.state != Channel.STATE_OPEN) + throw new IOException("Cannot request subsystem on this channel (" + c.getReasonClosed() + ")"); + + ssr = new PacketSessionSubsystemRequest(c.remoteID, true, subSystemName); + + c.successCounter = c.failedCounter = 0; + } + + synchronized (c.channelSendLock) + { + if (c.closeMessageSent) + throw new IOException("Cannot request subsystem on this channel (" + c.getReasonClosed() + ")"); + tm.sendMessage(ssr.getPayload()); + } + + try + { + if (!waitForChannelRequestResult(c)) + throw new IOException("The server denied the request."); + } + catch (IOException e) + { + throw new IOException("The subsystem request failed.", e); + } + } + + public void requestExecCommand(Channel c, String cmd) throws IOException + { + PacketSessionExecCommand sm; + + synchronized (c) + { + if (c.state != Channel.STATE_OPEN) + throw new IOException("Cannot execute command on this channel (" + c.getReasonClosed() + ")"); + + sm = new PacketSessionExecCommand(c.remoteID, true, cmd); + + c.successCounter = c.failedCounter = 0; + } + + synchronized (c.channelSendLock) + { + if (c.closeMessageSent) + throw new IOException("Cannot execute command on this channel (" + c.getReasonClosed() + ")"); + tm.sendMessage(sm.getPayload()); + } + + if (log.isEnabled()) + log.log(50, "Executing command (channel " + c.localID + ", '" + cmd + "')"); + + try + { + if (!waitForChannelRequestResult(c)) + throw new IOException("The server denied the request."); + } + catch (IOException e) + { + throw new IOException("The execute request failed.", e); + } + } + + public void requestShell(Channel c) throws IOException + { + PacketSessionStartShell sm; + + synchronized (c) + { + if (c.state != Channel.STATE_OPEN) + throw new IOException("Cannot start shell on this channel (" + c.getReasonClosed() + ")"); + + sm = new PacketSessionStartShell(c.remoteID, true); + + c.successCounter = c.failedCounter = 0; + } + + synchronized (c.channelSendLock) + { + if (c.closeMessageSent) + throw new IOException("Cannot start shell on this channel (" + c.getReasonClosed() + ")"); + tm.sendMessage(sm.getPayload()); + } + + try + { + if (!waitForChannelRequestResult(c)) + throw new IOException("The server denied the request."); + } + catch (IOException e) + { + throw new IOException("The shell request failed.", e); + } + } + + public void msgChannelExtendedData(byte[] msg, int msglen) throws IOException + { + if (msglen <= 13) + throw new IOException("SSH_MSG_CHANNEL_EXTENDED_DATA message has wrong size (" + msglen + ")"); + + int id = ((msg[1] & 0xff) << 24) | ((msg[2] & 0xff) << 16) | ((msg[3] & 0xff) << 8) | (msg[4] & 0xff); + int dataType = ((msg[5] & 0xff) << 24) | ((msg[6] & 0xff) << 16) | ((msg[7] & 0xff) << 8) | (msg[8] & 0xff); + int len = ((msg[9] & 0xff) << 24) | ((msg[10] & 0xff) << 16) | ((msg[11] & 0xff) << 8) | (msg[12] & 0xff); + + Channel c = getChannel(id); + + if (c == null) + throw new IOException("Unexpected SSH_MSG_CHANNEL_EXTENDED_DATA message for non-existent channel " + id); + + if (dataType != Packets.SSH_EXTENDED_DATA_STDERR) + throw new IOException("SSH_MSG_CHANNEL_EXTENDED_DATA message has unknown type (" + dataType + ")"); + + if (len != (msglen - 13)) + throw new IOException("SSH_MSG_CHANNEL_EXTENDED_DATA message has wrong len (calculated " + (msglen - 13) + + ", got " + len + ")"); + + if (log.isEnabled()) + log.log(80, "Got SSH_MSG_CHANNEL_EXTENDED_DATA (channel " + id + ", " + len + ")"); + + synchronized (c) + { + if (c.state == Channel.STATE_CLOSED) + return; // ignore + + if (c.state != Channel.STATE_OPEN) + throw new IOException("Got SSH_MSG_CHANNEL_EXTENDED_DATA, but channel is not in correct state (" + + c.state + ")"); + + if (c.localWindow < len) + throw new IOException("Remote sent too much data, does not fit into window."); + + c.localWindow -= len; + + System.arraycopy(msg, 13, c.stderrBuffer, c.stderrWritepos, len); + c.stderrWritepos += len; + + c.notifyAll(); + } + } + + /** + * Wait until for a condition. + * + * @param c + * Channel + * @param timeout + * in ms, 0 means no timeout. + * @param condition_mask + * minimum event mask + * @return all current events + * + */ + public int waitForCondition(Channel c, long timeout, int condition_mask) + { + long end_time = 0; + boolean end_time_set = false; + + synchronized (c) + { + while (true) + { + int current_cond = 0; + + int stdoutAvail = c.stdoutWritepos - c.stdoutReadpos; + int stderrAvail = c.stderrWritepos - c.stderrReadpos; + + if (stdoutAvail > 0) + current_cond = current_cond | ChannelCondition.STDOUT_DATA; + + if (stderrAvail > 0) + current_cond = current_cond | ChannelCondition.STDERR_DATA; + + if (c.EOF) + current_cond = current_cond | ChannelCondition.EOF; + + if (c.getExitStatus() != null) + current_cond = current_cond | ChannelCondition.EXIT_STATUS; + + if (c.getExitSignal() != null) + current_cond = current_cond | ChannelCondition.EXIT_SIGNAL; + + if (c.state == Channel.STATE_CLOSED) + return current_cond | ChannelCondition.CLOSED | ChannelCondition.EOF; + + if ((current_cond & condition_mask) != 0) + return current_cond; + + if (timeout > 0) + { + if (!end_time_set) + { + end_time = System.currentTimeMillis() + timeout; + end_time_set = true; + } + else + { + timeout = end_time - System.currentTimeMillis(); + + if (timeout <= 0) + return current_cond | ChannelCondition.TIMEOUT; + } + } + + try + { + if (timeout > 0) + c.wait(timeout); + else + c.wait(); + } + catch (InterruptedException e) + { + } + } + } + } + + public int getAvailable(Channel c, boolean extended) { + synchronized (c) + { + int avail; + + if (extended) + avail = c.stderrWritepos - c.stderrReadpos; + else + avail = c.stdoutWritepos - c.stdoutReadpos; + + return ((avail > 0) ? avail : (c.EOF ? -1 : 0)); + } + } + + public int getChannelData(Channel c, boolean extended, byte[] target, int off, int len) throws IOException + { + int copylen = 0; + int increment = 0; + int remoteID = 0; + int localID = 0; + + synchronized (c) + { + int stdoutAvail = 0; + int stderrAvail = 0; + + while (true) + { + /* + * Data available? We have to return remaining data even if the + * channel is already closed. + */ + + stdoutAvail = c.stdoutWritepos - c.stdoutReadpos; + stderrAvail = c.stderrWritepos - c.stderrReadpos; + + if ((!extended) && (stdoutAvail != 0)) + break; + + if ((extended) && (stderrAvail != 0)) + break; + + /* Do not wait if more data will never arrive (EOF or CLOSED) */ + + if ((c.EOF) || (c.state != Channel.STATE_OPEN)) + return -1; + + try + { + c.wait(); + } + catch (InterruptedException ignore) + { + } + } + + /* OK, there is some data. Return it. */ + + if (!extended) + { + copylen = (stdoutAvail > len) ? len : stdoutAvail; + System.arraycopy(c.stdoutBuffer, c.stdoutReadpos, target, off, copylen); + c.stdoutReadpos += copylen; + + if (c.stdoutReadpos != c.stdoutWritepos) + + System.arraycopy(c.stdoutBuffer, c.stdoutReadpos, c.stdoutBuffer, 0, c.stdoutWritepos + - c.stdoutReadpos); + + c.stdoutWritepos -= c.stdoutReadpos; + c.stdoutReadpos = 0; + } + else + { + copylen = (stderrAvail > len) ? len : stderrAvail; + System.arraycopy(c.stderrBuffer, c.stderrReadpos, target, off, copylen); + c.stderrReadpos += copylen; + + if (c.stderrReadpos != c.stderrWritepos) + + System.arraycopy(c.stderrBuffer, c.stderrReadpos, c.stderrBuffer, 0, c.stderrWritepos + - c.stderrReadpos); + + c.stderrWritepos -= c.stderrReadpos; + c.stderrReadpos = 0; + } + + if (c.state != Channel.STATE_OPEN) + return copylen; + + if (c.localWindow < ((Channel.CHANNEL_BUFFER_SIZE + 1) / 2)) + { + int minFreeSpace = Math.min(Channel.CHANNEL_BUFFER_SIZE - c.stdoutWritepos, Channel.CHANNEL_BUFFER_SIZE + - c.stderrWritepos); + + increment = minFreeSpace - c.localWindow; + c.localWindow = minFreeSpace; + } + + remoteID = c.remoteID; /* read while holding the lock */ + localID = c.localID; /* read while holding the lock */ + } + + /* + * If a consumer reads stdout and stdin in parallel, we may end up with + * sending two msgWindowAdjust messages. Luckily, it + * does not matter in which order they arrive at the server. + */ + + if (increment > 0) + { + if (log.isEnabled()) + log.log(80, "Sending SSH_MSG_CHANNEL_WINDOW_ADJUST (channel " + localID + ", " + increment + ")"); + + synchronized (c.channelSendLock) + { + byte[] msg = c.msgWindowAdjust; + + msg[0] = Packets.SSH_MSG_CHANNEL_WINDOW_ADJUST; + msg[1] = (byte) (remoteID >> 24); + msg[2] = (byte) (remoteID >> 16); + msg[3] = (byte) (remoteID >> 8); + msg[4] = (byte) (remoteID); + msg[5] = (byte) (increment >> 24); + msg[6] = (byte) (increment >> 16); + msg[7] = (byte) (increment >> 8); + msg[8] = (byte) (increment); + + if (!c.closeMessageSent) + tm.sendMessage(msg); + } + } + + return copylen; + } + + public void msgChannelData(byte[] msg, int msglen) throws IOException + { + if (msglen <= 9) + throw new IOException("SSH_MSG_CHANNEL_DATA message has wrong size (" + msglen + ")"); + + int id = ((msg[1] & 0xff) << 24) | ((msg[2] & 0xff) << 16) | ((msg[3] & 0xff) << 8) | (msg[4] & 0xff); + int len = ((msg[5] & 0xff) << 24) | ((msg[6] & 0xff) << 16) | ((msg[7] & 0xff) << 8) | (msg[8] & 0xff); + + Channel c = getChannel(id); + + if (c == null) + throw new IOException("Unexpected SSH_MSG_CHANNEL_DATA message for non-existent channel " + id); + + if (len != (msglen - 9)) + throw new IOException("SSH_MSG_CHANNEL_DATA message has wrong len (calculated " + (msglen - 9) + ", got " + + len + ")"); + + if (log.isEnabled()) + log.log(80, "Got SSH_MSG_CHANNEL_DATA (channel " + id + ", " + len + ")"); + + synchronized (c) + { + if (c.state == Channel.STATE_CLOSED) + return; // ignore + + if (c.state != Channel.STATE_OPEN) + throw new IOException("Got SSH_MSG_CHANNEL_DATA, but channel is not in correct state (" + c.state + ")"); + + if (c.localWindow < len) + throw new IOException("Remote sent too much data, does not fit into window."); + + c.localWindow -= len; + + System.arraycopy(msg, 9, c.stdoutBuffer, c.stdoutWritepos, len); + c.stdoutWritepos += len; + + c.notifyAll(); + } + } + + public void msgChannelWindowAdjust(byte[] msg, int msglen) throws IOException + { + if (msglen != 9) + throw new IOException("SSH_MSG_CHANNEL_WINDOW_ADJUST message has wrong size (" + msglen + ")"); + + int id = ((msg[1] & 0xff) << 24) | ((msg[2] & 0xff) << 16) | ((msg[3] & 0xff) << 8) | (msg[4] & 0xff); + int windowChange = ((msg[5] & 0xff) << 24) | ((msg[6] & 0xff) << 16) | ((msg[7] & 0xff) << 8) | (msg[8] & 0xff); + + Channel c = getChannel(id); + + if (c == null) + throw new IOException("Unexpected SSH_MSG_CHANNEL_WINDOW_ADJUST message for non-existent channel " + id); + + synchronized (c) + { + final long huge = 0xFFFFffffL; /* 2^32 - 1 */ + + c.remoteWindow += (windowChange & huge); /* avoid sign extension */ + + /* TODO - is this a good heuristic? */ + + if ((c.remoteWindow > huge)) + c.remoteWindow = huge; + + c.notifyAll(); + } + + if (log.isEnabled()) + log.log(80, "Got SSH_MSG_CHANNEL_WINDOW_ADJUST (channel " + id + ", " + windowChange + ")"); + } + + public void msgChannelOpen(byte[] msg, int msglen) throws IOException + { + TypesReader tr = new TypesReader(msg, 0, msglen); + + tr.readByte(); // skip packet type + String channelType = tr.readString(); + int remoteID = tr.readUINT32(); /* sender channel */ + int remoteWindow = tr.readUINT32(); /* initial window size */ + int remoteMaxPacketSize = tr.readUINT32(); /* maximum packet size */ + + if ("x11".equals(channelType)) + { + synchronized (x11_magic_cookies) + { + /* If we did not request X11 forwarding, then simply ignore this bogus request. */ + + if (x11_magic_cookies.size() == 0) + { + PacketChannelOpenFailure pcof = new PacketChannelOpenFailure(remoteID, + Packets.SSH_OPEN_ADMINISTRATIVELY_PROHIBITED, "X11 forwarding not activated", ""); + + tm.sendAsynchronousMessage(pcof.getPayload()); + + if (log.isEnabled()) + log.log(20, "Unexpected X11 request, denying it!"); + + return; + } + } + + String remoteOriginatorAddress = tr.readString(); + int remoteOriginatorPort = tr.readUINT32(); + + Channel c = new Channel(this); + + synchronized (c) + { + c.remoteID = remoteID; + c.remoteWindow = remoteWindow & 0xFFFFffffL; /* properly convert UINT32 to long */ + c.remoteMaxPacketSize = remoteMaxPacketSize; + c.localID = addChannel(c); + } + + /* + * The open confirmation message will be sent from another thread + */ + + RemoteX11AcceptThread rxat = new RemoteX11AcceptThread(c, remoteOriginatorAddress, remoteOriginatorPort); + rxat.setDaemon(true); + rxat.start(); + + return; + } + + if ("forwarded-tcpip".equals(channelType)) + { + String remoteConnectedAddress = tr.readString(); /* address that was connected */ + int remoteConnectedPort = tr.readUINT32(); /* port that was connected */ + String remoteOriginatorAddress = tr.readString(); /* originator IP address */ + int remoteOriginatorPort = tr.readUINT32(); /* originator port */ + + RemoteForwardingData rfd = null; + + synchronized (remoteForwardings) + { + rfd = remoteForwardings.get(Integer.valueOf(remoteConnectedPort)); + } + + if (rfd == null) + { + PacketChannelOpenFailure pcof = new PacketChannelOpenFailure(remoteID, + Packets.SSH_OPEN_ADMINISTRATIVELY_PROHIBITED, + "No thanks, unknown port in forwarded-tcpip request", ""); + + /* Always try to be polite. */ + + tm.sendAsynchronousMessage(pcof.getPayload()); + + if (log.isEnabled()) + log.log(20, "Unexpected forwarded-tcpip request, denying it!"); + + return; + } + + Channel c = new Channel(this); + + synchronized (c) + { + c.remoteID = remoteID; + c.remoteWindow = remoteWindow & 0xFFFFffffL; /* convert UINT32 to long */ + c.remoteMaxPacketSize = remoteMaxPacketSize; + c.localID = addChannel(c); + } + + /* + * The open confirmation message will be sent from another thread. + */ + + RemoteAcceptThread rat = new RemoteAcceptThread(c, remoteConnectedAddress, remoteConnectedPort, + remoteOriginatorAddress, remoteOriginatorPort, rfd.targetAddress, rfd.targetPort); + + rat.setDaemon(true); + rat.start(); + + return; + } + + if ("auth-agent@openssh.com".equals(channelType)) { + Channel c = new Channel(this); + + synchronized (c) + { + c.remoteID = remoteID; + c.remoteWindow = remoteWindow & 0xFFFFffffL; /* properly convert UINT32 to long */ + c.remoteMaxPacketSize = remoteMaxPacketSize; + c.localID = addChannel(c); + } + + AuthAgentForwardThread aat = new AuthAgentForwardThread(c, authAgent); + + aat.setDaemon(true); + aat.start(); + + return; + } + + /* Tell the server that we have no idea what it is talking about */ + + PacketChannelOpenFailure pcof = new PacketChannelOpenFailure(remoteID, Packets.SSH_OPEN_UNKNOWN_CHANNEL_TYPE, + "Unknown channel type", ""); + + tm.sendAsynchronousMessage(pcof.getPayload()); + + if (log.isEnabled()) + log.log(20, "The peer tried to open an unsupported channel type (" + channelType + ")"); + } + + public void msgChannelRequest(byte[] msg, int msglen) throws IOException + { + TypesReader tr = new TypesReader(msg, 0, msglen); + + tr.readByte(); // skip packet type + int id = tr.readUINT32(); + + Channel c = getChannel(id); + + if (c == null) + throw new IOException("Unexpected SSH_MSG_CHANNEL_REQUEST message for non-existent channel " + id); + + String type = tr.readString("US-ASCII"); + boolean wantReply = tr.readBoolean(); + + if (log.isEnabled()) + log.log(80, "Got SSH_MSG_CHANNEL_REQUEST (channel " + id + ", '" + type + "')"); + + if (type.equals("exit-status")) + { + if (wantReply) + throw new IOException("Badly formatted SSH_MSG_CHANNEL_REQUEST message, 'want reply' is true"); + + int exit_status = tr.readUINT32(); + + if (tr.remain() != 0) + throw new IOException("Badly formatted SSH_MSG_CHANNEL_REQUEST message"); + + synchronized (c) + { + c.exit_status = Integer.valueOf(exit_status); + c.notifyAll(); + } + + if (log.isEnabled()) + log.log(50, "Got EXIT STATUS (channel " + id + ", status " + exit_status + ")"); + + return; + } + + if (type.equals("exit-signal")) + { + if (wantReply) + throw new IOException("Badly formatted SSH_MSG_CHANNEL_REQUEST message, 'want reply' is true"); + + String signame = tr.readString("US-ASCII"); + tr.readBoolean(); + tr.readString(); + tr.readString(); + + if (tr.remain() != 0) + throw new IOException("Badly formatted SSH_MSG_CHANNEL_REQUEST message"); + + synchronized (c) + { + c.exit_signal = signame; + c.notifyAll(); + } + + if (log.isEnabled()) + log.log(50, "Got EXIT SIGNAL (channel " + id + ", signal " + signame + ")"); + + return; + } + + /* We simply ignore unknown channel requests, however, if the server wants a reply, + * then we signal that we have no idea what it is about. + */ + + if (wantReply) + { + byte[] reply = new byte[5]; + + reply[0] = Packets.SSH_MSG_CHANNEL_FAILURE; + reply[1] = (byte) (c.remoteID >> 24); + reply[2] = (byte) (c.remoteID >> 16); + reply[3] = (byte) (c.remoteID >> 8); + reply[4] = (byte) (c.remoteID); + + tm.sendAsynchronousMessage(reply); + } + + if (log.isEnabled()) + log.log(50, "Channel request '" + type + "' is not known, ignoring it"); + } + + public void msgChannelEOF(byte[] msg, int msglen) throws IOException + { + if (msglen != 5) + throw new IOException("SSH_MSG_CHANNEL_EOF message has wrong size (" + msglen + ")"); + + int id = ((msg[1] & 0xff) << 24) | ((msg[2] & 0xff) << 16) | ((msg[3] & 0xff) << 8) | (msg[4] & 0xff); + + Channel c = getChannel(id); + + if (c == null) + throw new IOException("Unexpected SSH_MSG_CHANNEL_EOF message for non-existent channel " + id); + + synchronized (c) + { + c.EOF = true; + c.notifyAll(); + } + + if (log.isEnabled()) + log.log(50, "Got SSH_MSG_CHANNEL_EOF (channel " + id + ")"); + } + + public void msgChannelClose(byte[] msg, int msglen) throws IOException + { + if (msglen != 5) + throw new IOException("SSH_MSG_CHANNEL_CLOSE message has wrong size (" + msglen + ")"); + + int id = ((msg[1] & 0xff) << 24) | ((msg[2] & 0xff) << 16) | ((msg[3] & 0xff) << 8) | (msg[4] & 0xff); + + Channel c = getChannel(id); + + if (c == null) + throw new IOException("Unexpected SSH_MSG_CHANNEL_CLOSE message for non-existent channel " + id); + + synchronized (c) + { + c.EOF = true; + c.state = Channel.STATE_CLOSED; + c.setReasonClosed("Close requested by remote"); + c.closeMessageRecv = true; + + removeChannel(c.localID); + + c.notifyAll(); + } + + if (log.isEnabled()) + log.log(50, "Got SSH_MSG_CHANNEL_CLOSE (channel " + id + ")"); + } + + public void msgChannelSuccess(byte[] msg, int msglen) throws IOException + { + if (msglen != 5) + throw new IOException("SSH_MSG_CHANNEL_SUCCESS message has wrong size (" + msglen + ")"); + + int id = ((msg[1] & 0xff) << 24) | ((msg[2] & 0xff) << 16) | ((msg[3] & 0xff) << 8) | (msg[4] & 0xff); + + Channel c = getChannel(id); + + if (c == null) + throw new IOException("Unexpected SSH_MSG_CHANNEL_SUCCESS message for non-existent channel " + id); + + synchronized (c) + { + c.successCounter++; + c.notifyAll(); + } + + if (log.isEnabled()) + log.log(80, "Got SSH_MSG_CHANNEL_SUCCESS (channel " + id + ")"); + } + + public void msgChannelFailure(byte[] msg, int msglen) throws IOException + { + if (msglen != 5) + throw new IOException("SSH_MSG_CHANNEL_FAILURE message has wrong size (" + msglen + ")"); + + int id = ((msg[1] & 0xff) << 24) | ((msg[2] & 0xff) << 16) | ((msg[3] & 0xff) << 8) | (msg[4] & 0xff); + + Channel c = getChannel(id); + + if (c == null) + throw new IOException("Unexpected SSH_MSG_CHANNEL_FAILURE message for non-existent channel " + id); + + synchronized (c) + { + c.failedCounter++; + c.notifyAll(); + } + + if (log.isEnabled()) + log.log(50, "Got SSH_MSG_CHANNEL_FAILURE (channel " + id + ")"); + } + + public void msgChannelOpenConfirmation(byte[] msg, int msglen) throws IOException + { + PacketChannelOpenConfirmation sm = new PacketChannelOpenConfirmation(msg, 0, msglen); + + Channel c = getChannel(sm.recipientChannelID); + + if (c == null) + throw new IOException("Unexpected SSH_MSG_CHANNEL_OPEN_CONFIRMATION message for non-existent channel " + + sm.recipientChannelID); + + synchronized (c) + { + if (c.state != Channel.STATE_OPENING) + throw new IOException("Unexpected SSH_MSG_CHANNEL_OPEN_CONFIRMATION message for channel " + + sm.recipientChannelID); + + c.remoteID = sm.senderChannelID; + c.remoteWindow = sm.initialWindowSize & 0xFFFFffffL; /* convert UINT32 to long */ + c.remoteMaxPacketSize = sm.maxPacketSize; + c.state = Channel.STATE_OPEN; + c.notifyAll(); + } + + if (log.isEnabled()) + log.log(50, "Got SSH_MSG_CHANNEL_OPEN_CONFIRMATION (channel " + sm.recipientChannelID + " / remote: " + + sm.senderChannelID + ")"); + } + + public void msgChannelOpenFailure(byte[] msg, int msglen) throws IOException + { + if (msglen < 5) + throw new IOException("SSH_MSG_CHANNEL_OPEN_FAILURE message has wrong size (" + msglen + ")"); + + TypesReader tr = new TypesReader(msg, 0, msglen); + + tr.readByte(); // skip packet type + int id = tr.readUINT32(); /* sender channel */ + + Channel c = getChannel(id); + + if (c == null) + throw new IOException("Unexpected SSH_MSG_CHANNEL_OPEN_FAILURE message for non-existent channel " + id); + + int reasonCode = tr.readUINT32(); + String description = tr.readString("UTF-8"); + + String reasonCodeSymbolicName = null; + + switch (reasonCode) + { + case 1: + reasonCodeSymbolicName = "SSH_OPEN_ADMINISTRATIVELY_PROHIBITED"; + break; + case 2: + reasonCodeSymbolicName = "SSH_OPEN_CONNECT_FAILED"; + break; + case 3: + reasonCodeSymbolicName = "SSH_OPEN_UNKNOWN_CHANNEL_TYPE"; + break; + case 4: + reasonCodeSymbolicName = "SSH_OPEN_RESOURCE_SHORTAGE"; + break; + default: + reasonCodeSymbolicName = "UNKNOWN REASON CODE (" + reasonCode + ")"; + } + + StringBuilder descriptionBuffer = new StringBuilder(); + descriptionBuffer.append(description); + + for (int i = 0; i < descriptionBuffer.length(); i++) + { + char cc = descriptionBuffer.charAt(i); + + if ((cc >= 32) && (cc <= 126)) + continue; + descriptionBuffer.setCharAt(i, '\uFFFD'); + } + + synchronized (c) + { + c.EOF = true; + c.state = Channel.STATE_CLOSED; + c.setReasonClosed("The server refused to open the channel (" + reasonCodeSymbolicName + ", '" + + descriptionBuffer.toString() + "')"); + c.notifyAll(); + } + + if (log.isEnabled()) + log.log(50, "Got SSH_MSG_CHANNEL_OPEN_FAILURE (channel " + id + ")"); + } + + public void msgGlobalRequest(byte[] msg, int msglen) throws IOException + { + /* Currently we do not support any kind of global request */ + + TypesReader tr = new TypesReader(msg, 0, msglen); + + tr.readByte(); // skip packet type + String requestName = tr.readString(); + boolean wantReply = tr.readBoolean(); + + if (wantReply) + { + byte[] reply_failure = new byte[1]; + reply_failure[0] = Packets.SSH_MSG_REQUEST_FAILURE; + + tm.sendAsynchronousMessage(reply_failure); + } + + /* We do not clean up the requestName String - that is OK for debug */ + + if (log.isEnabled()) + log.log(80, "Got SSH_MSG_GLOBAL_REQUEST (" + requestName + ")"); + } + + public void msgGlobalSuccess() { + synchronized (channels) + { + globalSuccessCounter++; + channels.notifyAll(); + } + + if (log.isEnabled()) + log.log(80, "Got SSH_MSG_REQUEST_SUCCESS"); + } + + public void msgGlobalFailure() { + synchronized (channels) + { + globalFailedCounter++; + channels.notifyAll(); + } + + if (log.isEnabled()) + log.log(80, "Got SSH_MSG_REQUEST_FAILURE"); + } + + public void handleMessage(byte[] msg, int msglen) throws IOException + { + if (msg == null) + { + if (log.isEnabled()) + log.log(50, "HandleMessage: got shutdown"); + + synchronized (listenerThreads) + { + for (IChannelWorkerThread lat : listenerThreads) + { + lat.stopWorking(); + } + listenerThreadsAllowed = false; + } + + synchronized (channels) + { + shutdown = true; + + for (Channel c : channels) + { + synchronized (c) + { + c.EOF = true; + c.state = Channel.STATE_CLOSED; + c.setReasonClosed("The connection is being shutdown"); + c.closeMessageRecv = true; /* + * You never know, perhaps + * we are waiting for a + * pending close message + * from the server... + */ + c.notifyAll(); + } + } + /* Works with J2ME */ + channels.clear(); + channels.notifyAll(); /* Notify global response waiters */ + return; + } + } + + switch (msg[0]) + { + case Packets.SSH_MSG_CHANNEL_OPEN_CONFIRMATION: + msgChannelOpenConfirmation(msg, msglen); + break; + case Packets.SSH_MSG_CHANNEL_WINDOW_ADJUST: + msgChannelWindowAdjust(msg, msglen); + break; + case Packets.SSH_MSG_CHANNEL_DATA: + msgChannelData(msg, msglen); + break; + case Packets.SSH_MSG_CHANNEL_EXTENDED_DATA: + msgChannelExtendedData(msg, msglen); + break; + case Packets.SSH_MSG_CHANNEL_REQUEST: + msgChannelRequest(msg, msglen); + break; + case Packets.SSH_MSG_CHANNEL_EOF: + msgChannelEOF(msg, msglen); + break; + case Packets.SSH_MSG_CHANNEL_OPEN: + msgChannelOpen(msg, msglen); + break; + case Packets.SSH_MSG_CHANNEL_CLOSE: + msgChannelClose(msg, msglen); + break; + case Packets.SSH_MSG_CHANNEL_SUCCESS: + msgChannelSuccess(msg, msglen); + break; + case Packets.SSH_MSG_CHANNEL_FAILURE: + msgChannelFailure(msg, msglen); + break; + case Packets.SSH_MSG_CHANNEL_OPEN_FAILURE: + msgChannelOpenFailure(msg, msglen); + break; + case Packets.SSH_MSG_GLOBAL_REQUEST: + msgGlobalRequest(msg, msglen); + break; + case Packets.SSH_MSG_REQUEST_SUCCESS: + msgGlobalSuccess(); + break; + case Packets.SSH_MSG_REQUEST_FAILURE: + msgGlobalFailure(); + break; + default: + throw new IOException("Cannot handle unknown channel message " + (msg[0] & 0xff)); + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/ChannelOutputStream.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/ChannelOutputStream.java new file mode 100644 index 0000000000..ef7acd9eca --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/ChannelOutputStream.java @@ -0,0 +1,71 @@ +package com.trilead.ssh2.channel; + +import java.io.IOException; +import java.io.OutputStream; + +/** + * ChannelOutputStream. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: ChannelOutputStream.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ +public final class ChannelOutputStream extends OutputStream +{ + Channel c; + + private byte[] writeBuffer; + + boolean isClosed = false; + + ChannelOutputStream(Channel c) + { + this.c = c; + writeBuffer = new byte[1]; + } + + public void write(int b) throws IOException + { + writeBuffer[0] = (byte) b; + + write(writeBuffer, 0, 1); + } + + public void close() throws IOException + { + if (!isClosed) + { + isClosed = true; + c.cm.sendEOF(c); + } + } + + public void flush() throws IOException + { + if (isClosed) + throw new IOException("This OutputStream is closed."); + + /* This is a no-op, since this stream is unbuffered */ + } + + public void write(byte[] b, int off, int len) throws IOException + { + if (isClosed) + throw new IOException("This OutputStream is closed."); + + if (b == null) + throw new NullPointerException(); + + if ((off < 0) || (len < 0) || ((off + len) > b.length) || ((off + len) < 0) || (off > b.length)) + throw new IndexOutOfBoundsException(); + + if (len == 0) + return; + + c.cm.sendData(c, b, off, len); + } + + public void write(byte[] b) throws IOException + { + write(b, 0, b.length); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/DynamicAcceptThread.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/DynamicAcceptThread.java new file mode 100644 index 0000000000..629a70108c --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/DynamicAcceptThread.java @@ -0,0 +1,194 @@ +/* + * Copyright 2007 Kenny Root, Jeffrey Sharkey + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * a.) Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * b.) Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * c.) Neither the name of Trilead nor the names of its contributors may + * be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +package com.trilead.ssh2.channel; + +import org.connectbot.simplesocks.Socks5Server; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.InetSocketAddress; +import java.net.ServerSocket; +import java.net.Socket; + +/** + * DynamicAcceptThread. + * + * @author Kenny Root + * @version $Id$ + */ +public class DynamicAcceptThread extends Thread implements IChannelWorkerThread { + private ChannelManager cm; + private ServerSocket ss; + + public DynamicAcceptThread(ChannelManager cm, int local_port) + throws IOException { + this.cm = cm; + + setName("DynamicAcceptThread"); + + ss = new ServerSocket(local_port); + } + + public DynamicAcceptThread(ChannelManager cm, InetSocketAddress localAddress) + throws IOException { + this.cm = cm; + + ss = new ServerSocket(); + ss.bind(localAddress); + } + + @Override + public void run() { + try { + cm.registerThread(this); + } catch (IOException e) { + stopWorking(); + return; + } + + while (true) { + final Socket sock; + try { + sock = ss.accept(); + } catch (IOException e) { + stopWorking(); + return; + } + + DynamicAcceptRunnable dar = new DynamicAcceptRunnable(sock); + Thread t = new Thread(dar); + t.setDaemon(true); + t.start(); + } + } + + @Override + public void stopWorking() { + try { + /* This will lead to an IOException in the ss.accept() call */ + ss.close(); + } catch (IOException ignore) { + } + } + + class DynamicAcceptRunnable implements Runnable { + private static final int idleTimeout = 180000; //3 minutes + + private Socket sock; + private InputStream in; + private OutputStream out; + + public DynamicAcceptRunnable(Socket sock) { + this.sock = sock; + + setName("DynamicAcceptRunnable"); + } + + public void run() { + try { + startSession(); + } catch (IOException ioe) { + try { + sock.close(); + } catch (IOException ignore) { + } + } + } + + private void startSession() throws IOException { + sock.setSoTimeout(idleTimeout); + + in = sock.getInputStream(); + out = sock.getOutputStream(); + Socks5Server server = new Socks5Server(in, out); + try { + if (!server.acceptAuthentication() || !server.readRequest()) { + System.out.println("Could not start SOCKS session"); + return; + } + } catch (IOException ioe) { + server.sendReply(Socks5Server.ResponseCode.GENERAL_FAILURE); + return; + } + + if (server.getCommand() == Socks5Server.Command.CONNECT) { + onConnect(server); + } else { + server.sendReply(Socks5Server.ResponseCode.COMMAND_NOT_SUPPORTED); + } + } + + private void onConnect(Socks5Server server) throws IOException { + final Channel cn; + + String destHost = server.getHostName(); + if (destHost == null) { + destHost = server.getAddress().getHostAddress(); + } + + try { + /* + * This may fail, e.g., if the remote port is closed (in + * optimistic terms: not open yet) + */ + + cn = cm.openDirectTCPIPChannel(destHost, server.getPort(), + "127.0.0.1", 0); + + } catch (IOException e) { + /* + * Try to send a notification back to the client and then close the socket. + */ + try { + server.sendReply(Socks5Server.ResponseCode.GENERAL_FAILURE); + } catch (IOException ignore) { + } + + try { + sock.close(); + } catch (IOException ignore) { + } + + return; + } + + server.sendReply(Socks5Server.ResponseCode.SUCCESS); + + final StreamForwarder r2l = new StreamForwarder(cn, null, sock, cn.stdoutStream, out, "RemoteToLocal"); + final StreamForwarder l2r = new StreamForwarder(cn, r2l, sock, in, cn.stdinStream, "LocalToRemote"); + + r2l.setDaemon(true); + l2r.setDaemon(true); + r2l.start(); + l2r.start(); + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/IChannelWorkerThread.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/IChannelWorkerThread.java new file mode 100644 index 0000000000..7610b9d2e9 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/IChannelWorkerThread.java @@ -0,0 +1,13 @@ + +package com.trilead.ssh2.channel; + +/** + * IChannelWorkerThread. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: IChannelWorkerThread.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ +interface IChannelWorkerThread +{ + void stopWorking(); +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/LocalAcceptThread.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/LocalAcceptThread.java new file mode 100644 index 0000000000..e0b92e0b73 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/LocalAcceptThread.java @@ -0,0 +1,135 @@ + +package com.trilead.ssh2.channel; + +import java.io.IOException; +import java.net.InetSocketAddress; +import java.net.ServerSocket; +import java.net.Socket; + +/** + * LocalAcceptThread. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: LocalAcceptThread.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ +public class LocalAcceptThread extends Thread implements IChannelWorkerThread +{ + ChannelManager cm; + String host_to_connect; + int port_to_connect; + + final ServerSocket ss; + + public LocalAcceptThread(ChannelManager cm, int local_port, String host_to_connect, int port_to_connect) + throws IOException + { + this.cm = cm; + this.host_to_connect = host_to_connect; + this.port_to_connect = port_to_connect; + + ss = new ServerSocket(local_port); + } + + public LocalAcceptThread(ChannelManager cm, InetSocketAddress localAddress, String host_to_connect, + int port_to_connect) throws IOException + { + this.cm = cm; + this.host_to_connect = host_to_connect; + this.port_to_connect = port_to_connect; + + ss = new ServerSocket(); + ss.bind(localAddress); + } + + public void run() + { + try + { + cm.registerThread(this); + } + catch (IOException e) + { + stopWorking(); + return; + } + + while (true) + { + Socket s = null; + + try + { + s = ss.accept(); + } + catch (IOException e) + { + stopWorking(); + return; + } + + Channel cn = null; + StreamForwarder r2l = null; + StreamForwarder l2r = null; + + try + { + /* This may fail, e.g., if the remote port is closed (in optimistic terms: not open yet) */ + + cn = cm.openDirectTCPIPChannel(host_to_connect, port_to_connect, s.getInetAddress().getHostAddress(), s + .getPort()); + + } + catch (IOException e) + { + /* Simply close the local socket and wait for the next incoming connection */ + + try + { + s.close(); + } + catch (IOException ignore) + { + } + + continue; + } + + try + { + r2l = new StreamForwarder(cn, null, s, cn.stdoutStream, s.getOutputStream(), "RemoteToLocal"); + l2r = new StreamForwarder(cn, r2l, s, s.getInputStream(), cn.stdinStream, "LocalToRemote"); + } + catch (IOException e) + { + try + { + /* This message is only visible during debugging, since we discard the channel immediatelly */ + cn.cm.closeChannel(cn, "Weird error during creation of StreamForwarder (" + e.getMessage() + ")", + true); + } + catch (IOException ignore) + { + } + + continue; + } + + r2l.setDaemon(true); + l2r.setDaemon(true); + r2l.start(); + l2r.start(); + } + } + + public void stopWorking() + { + try + { + /* This will lead to an IOException in the ss.accept() call */ + ss.close(); + } + catch (IOException e) + { + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/RemoteAcceptThread.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/RemoteAcceptThread.java new file mode 100644 index 0000000000..3ad9045231 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/RemoteAcceptThread.java @@ -0,0 +1,103 @@ + +package com.trilead.ssh2.channel; + +import java.io.IOException; +import java.net.Socket; + +import com.trilead.ssh2.log.Logger; + + +/** + * RemoteAcceptThread. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: RemoteAcceptThread.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ +public class RemoteAcceptThread extends Thread +{ + private static final Logger log = Logger.getLogger(RemoteAcceptThread.class); + + Channel c; + + String remoteConnectedAddress; + int remoteConnectedPort; + String remoteOriginatorAddress; + int remoteOriginatorPort; + String targetAddress; + int targetPort; + + Socket s; + + public RemoteAcceptThread(Channel c, String remoteConnectedAddress, int remoteConnectedPort, + String remoteOriginatorAddress, int remoteOriginatorPort, String targetAddress, int targetPort) + { + this.c = c; + this.remoteConnectedAddress = remoteConnectedAddress; + this.remoteConnectedPort = remoteConnectedPort; + this.remoteOriginatorAddress = remoteOriginatorAddress; + this.remoteOriginatorPort = remoteOriginatorPort; + this.targetAddress = targetAddress; + this.targetPort = targetPort; + + if (log.isEnabled()) + log.log(20, "RemoteAcceptThread: " + remoteConnectedAddress + "/" + remoteConnectedPort + ", R: " + + remoteOriginatorAddress + "/" + remoteOriginatorPort); + } + + public void run() + { + try + { + c.cm.sendOpenConfirmation(c); + + s = new Socket(targetAddress, targetPort); + + StreamForwarder r2l = new StreamForwarder(c, null, s, c.getStdoutStream(), s.getOutputStream(), + "RemoteToLocal"); + StreamForwarder l2r = new StreamForwarder(c, null, null, s.getInputStream(), c.getStdinStream(), + "LocalToRemote"); + + /* No need to start two threads, one can be executed in the current thread */ + + r2l.setDaemon(true); + r2l.start(); + l2r.run(); + + while (r2l.isAlive()) + { + try + { + r2l.join(); + } + catch (InterruptedException e) + { + } + } + + /* If the channel is already closed, then this is a no-op */ + + c.cm.closeChannel(c, "EOF on both streams reached.", true); + s.close(); + } + catch (IOException e) + { + log.log(50, "IOException in proxy code: " + e.getMessage()); + + try + { + c.cm.closeChannel(c, "IOException in proxy code (" + e.getMessage() + ")", true); + } + catch (IOException e1) + { + } + try + { + if (s != null) + s.close(); + } + catch (IOException e1) + { + } + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/RemoteForwardingData.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/RemoteForwardingData.java new file mode 100644 index 0000000000..fbf4b65413 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/RemoteForwardingData.java @@ -0,0 +1,17 @@ + +package com.trilead.ssh2.channel; + +/** + * RemoteForwardingData. Data about a requested remote forwarding. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: RemoteForwardingData.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ +public class RemoteForwardingData +{ + public String bindAddress; + public int bindPort; + + String targetAddress; + int targetPort; +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/RemoteX11AcceptThread.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/RemoteX11AcceptThread.java new file mode 100644 index 0000000000..95667a2d57 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/RemoteX11AcceptThread.java @@ -0,0 +1,247 @@ + +package com.trilead.ssh2.channel; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; +import java.net.Socket; + +import com.trilead.ssh2.log.Logger; + + +/** + * RemoteX11AcceptThread. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: RemoteX11AcceptThread.java,v 1.2 2008/04/01 12:38:09 cplattne Exp $ + */ +public class RemoteX11AcceptThread extends Thread +{ + private static final Logger log = Logger.getLogger(RemoteX11AcceptThread.class); + + Channel c; + + String remoteOriginatorAddress; + int remoteOriginatorPort; + + Socket s; + + public RemoteX11AcceptThread(Channel c, String remoteOriginatorAddress, int remoteOriginatorPort) + { + this.c = c; + this.remoteOriginatorAddress = remoteOriginatorAddress; + this.remoteOriginatorPort = remoteOriginatorPort; + } + + public void run() + { + try + { + /* Send Open Confirmation */ + + c.cm.sendOpenConfirmation(c); + + /* Read startup packet from client */ + + OutputStream remote_os = c.getStdinStream(); + InputStream remote_is = c.getStdoutStream(); + + /* The following code is based on the protocol description given in: + * Scheifler/Gettys, + * X Windows System: Core and Extension Protocols: + * X Version 11, Releases 6 and 6.1 ISBN 1-55558-148-X + */ + + /* + * Client startup: + * + * 1 0X42 MSB first/0x6c lSB first - byteorder + * 1 - unused + * 2 card16 - protocol-major-version + * 2 card16 - protocol-minor-version + * 2 n - lenght of authorization-protocol-name + * 2 d - lenght of authorization-protocol-data + * 2 - unused + * string8 - authorization-protocol-name + * p - unused, p=pad(n) + * string8 - authorization-protocol-data + * q - unused, q=pad(d) + * + * pad(X) = (4 - (X mod 4)) mod 4 + * + * Server response: + * + * 1 (0 failed, 2 authenticate, 1 success) + * ... + * + */ + + /* Later on we will simply forward the first 6 header bytes to the "real" X11 server */ + + byte[] header = new byte[6]; + + if (remote_is.read(header) != 6) + throw new IOException("Unexpected EOF on X11 startup!"); + + if ((header[0] != 0x42) && (header[0] != 0x6c)) // 0x42 MSB first, 0x6C LSB first + throw new IOException("Unknown endian format in X11 message!"); + + /* Yes, I came up with this myself - shall I file an application for a patent? =) */ + + int idxMSB = (header[0] == 0x42) ? 0 : 1; + + /* Read authorization data header */ + + byte[] auth_buff = new byte[6]; + + if (remote_is.read(auth_buff) != 6) + throw new IOException("Unexpected EOF on X11 startup!"); + + int authProtocolNameLength = ((auth_buff[idxMSB] & 0xff) << 8) | (auth_buff[1 - idxMSB] & 0xff); + int authProtocolDataLength = ((auth_buff[2 + idxMSB] & 0xff) << 8) | (auth_buff[3 - idxMSB] & 0xff); + + if ((authProtocolNameLength > 256) || (authProtocolDataLength > 256)) + throw new IOException("Buggy X11 authorization data"); + + int authProtocolNamePadding = ((4 - (authProtocolNameLength % 4)) % 4); + int authProtocolDataPadding = ((4 - (authProtocolDataLength % 4)) % 4); + + byte[] authProtocolName = new byte[authProtocolNameLength]; + byte[] authProtocolData = new byte[authProtocolDataLength]; + + byte[] paddingBuffer = new byte[4]; + + if (remote_is.read(authProtocolName) != authProtocolNameLength) + throw new IOException("Unexpected EOF on X11 startup! (authProtocolName)"); + + if (remote_is.read(paddingBuffer, 0, authProtocolNamePadding) != authProtocolNamePadding) + throw new IOException("Unexpected EOF on X11 startup! (authProtocolNamePadding)"); + + if (remote_is.read(authProtocolData) != authProtocolDataLength) + throw new IOException("Unexpected EOF on X11 startup! (authProtocolData)"); + + if (remote_is.read(paddingBuffer, 0, authProtocolDataPadding) != authProtocolDataPadding) + throw new IOException("Unexpected EOF on X11 startup! (authProtocolDataPadding)"); + + String authProtocolNameStr; + try { + authProtocolNameStr = new String(authProtocolName, "ISO-8859-1"); + } catch (UnsupportedEncodingException e) { + authProtocolNameStr = new String(authProtocolName); + } + if (!"MIT-MAGIC-COOKIE-1".equals(authProtocolNameStr)) + throw new IOException("Unknown X11 authorization protocol!"); + + if (authProtocolDataLength != 16) + throw new IOException("Wrong data length for X11 authorization data!"); + + StringBuffer tmp = new StringBuffer(32); + for (int i = 0; i < authProtocolData.length; i++) + { + String digit2 = Integer.toHexString(authProtocolData[i] & 0xff); + tmp.append((digit2.length() == 2) ? digit2 : "0" + digit2); + } + String hexEncodedFakeCookie = tmp.toString(); + + /* Order is very important here - it may be that a certain x11 forwarding + * gets disabled right in the moment when we check and register our connection + * */ + + synchronized (c) + { + /* Please read the comment in Channel.java */ + c.hexX11FakeCookie = hexEncodedFakeCookie; + } + + /* Now check our fake cookie directory to see if we produced this cookie */ + + X11ServerData sd = c.cm.checkX11Cookie(hexEncodedFakeCookie); + + if (sd == null) + throw new IOException("Invalid X11 cookie received."); + + /* If the session which corresponds to this cookie is closed then we will + * detect this: the session's close code will close all channels + * with the session's assigned x11 fake cookie. + */ + + s = new Socket(sd.hostname, sd.port); + + OutputStream x11_os = s.getOutputStream(); + InputStream x11_is = s.getInputStream(); + + /* Now we are sending the startup packet to the real X11 server */ + + x11_os.write(header); + + if (sd.x11_magic_cookie == null) + { + byte[] emptyAuthData = new byte[6]; + /* empty auth data, hopefully you are connecting to localhost =) */ + x11_os.write(emptyAuthData); + } + else + { + if (sd.x11_magic_cookie.length != 16) + throw new IOException("The real X11 cookie has an invalid length!"); + + /* send X11 cookie specified by client */ + x11_os.write(auth_buff); + x11_os.write(authProtocolName); /* re-use */ + x11_os.write(paddingBuffer, 0, authProtocolNamePadding); + x11_os.write(sd.x11_magic_cookie); + x11_os.write(paddingBuffer, 0, authProtocolDataPadding); + } + + x11_os.flush(); + + /* Start forwarding traffic */ + + StreamForwarder r2l = new StreamForwarder(c, null, s, remote_is, x11_os, "RemoteToX11"); + StreamForwarder l2r = new StreamForwarder(c, null, null, x11_is, remote_os, "X11ToRemote"); + + /* No need to start two threads, one can be executed in the current thread */ + + r2l.setDaemon(true); + r2l.start(); + l2r.run(); + + while (r2l.isAlive()) + { + try + { + r2l.join(); + } + catch (InterruptedException e) + { + } + } + + /* If the channel is already closed, then this is a no-op */ + + c.cm.closeChannel(c, "EOF on both X11 streams reached.", true); + s.close(); + } + catch (IOException e) + { + log.log(50, "IOException in X11 proxy code: " + e.getMessage()); + + try + { + c.cm.closeChannel(c, "IOException in X11 proxy code (" + e.getMessage() + ")", true); + } + catch (IOException e1) + { + } + try + { + if (s != null) + s.close(); + } + catch (IOException e1) + { + } + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/StreamForwarder.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/StreamForwarder.java new file mode 100644 index 0000000000..496b5736a0 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/StreamForwarder.java @@ -0,0 +1,111 @@ + +package com.trilead.ssh2.channel; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.Socket; + +/** + * A StreamForwarder forwards data between two given streams. + * If two StreamForwarder threads are used (one for each direction) + * then one can be configured to shutdown the underlying channel/socket + * if both threads have finished forwarding (EOF). + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: StreamForwarder.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ +public class StreamForwarder extends Thread +{ + final OutputStream os; + final InputStream is; + final byte[] buffer = new byte[Channel.CHANNEL_BUFFER_SIZE]; + final Channel c; + final StreamForwarder sibling; + final Socket s; + final String mode; + + StreamForwarder(Channel c, StreamForwarder sibling, Socket s, InputStream is, OutputStream os, String mode) { + this.is = is; + this.os = os; + this.mode = mode; + this.c = c; + this.sibling = sibling; + this.s = s; + } + + public void run() + { + try + { + while (true) + { + int len = is.read(buffer); + if (len <= 0) + break; + os.write(buffer, 0, len); + os.flush(); + } + } + catch (IOException ignore) + { + try + { + c.cm.closeChannel(c, "Closed due to exception in StreamForwarder (" + mode + "): " + + ignore.getMessage(), true); + } + catch (IOException e) + { + } + } + finally + { + try + { + os.close(); + } + catch (IOException e1) + { + } + try + { + is.close(); + } + catch (IOException e2) + { + } + + if (sibling != null) + { + while (sibling.isAlive()) + { + try + { + sibling.join(); + } + catch (InterruptedException e) + { + } + } + + try + { + c.cm.closeChannel(c, "StreamForwarder (" + mode + ") is cleaning up the connection", true); + } + catch (IOException e3) + { + } + } + + if (s != null) { + try + { + s.close(); + } + catch (IOException e1) + { + } + } + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/X11ServerData.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/X11ServerData.java new file mode 100644 index 0000000000..2c85b98ba8 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/channel/X11ServerData.java @@ -0,0 +1,16 @@ + +package com.trilead.ssh2.channel; + +/** + * X11ServerData. Data regarding an x11 forwarding target. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: X11ServerData.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + * + */ +public class X11ServerData +{ + public String hostname; + public int port; + public byte[] x11_magic_cookie; /* not the remote (fake) one, the local (real) one */ +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/compression/CompressionFactory.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/compression/CompressionFactory.java new file mode 100644 index 0000000000..153a74f56d --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/compression/CompressionFactory.java @@ -0,0 +1,113 @@ +/* + * Copyright 2007 Kenny Root, Jeffrey Sharkey + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * a.) Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * b.) Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * c.) Neither the name of Trilead nor the names of its contributors may + * be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +package com.trilead.ssh2.compression; + +import java.lang.reflect.Constructor; +import java.util.ArrayList; +import java.util.List; + +/** + * @author Kenny Root + * + */ +public class CompressionFactory { + private CompressionFactory() { } + + private static class CompressorEntry + { + String type; + String compressorClass; + + private CompressorEntry(String type, String compressorClass) + { + this.type = type; + this.compressorClass = compressorClass; + } + } + + private static List compressors = new ArrayList<>(); + + static + { + /* Higher Priority First */ + compressors.add(new CompressorEntry("zlib", "com.trilead.ssh2.compression.Zlib")); + compressors.add(new CompressorEntry("zlib@openssh.com", "com.trilead.ssh2.compression.ZlibOpenSSH")); + compressors.add(new CompressorEntry("none", "")); + } + + static void addCompressor(String protocolName, String className) { + compressors.add(new CompressorEntry(protocolName, className)); + } + + public static String[] getDefaultCompressorList() + { + String[] list = new String[compressors.size()]; + for (int i = 0; i < compressors.size(); i++) + { + CompressorEntry ce = compressors.get(i); + list[i] = ce.type; + } + return list; + } + + public static void checkCompressorList(String[] compressorCandidates) + { + for (String compressorCandidate : compressorCandidates) { + getEntry(compressorCandidate); + } + } + + public static ICompressor createCompressor(String type) + { + try + { + CompressorEntry ce = getEntry(type); + if ("".equals(ce.compressorClass)) + return null; + + Class cc = Class.forName(ce.compressorClass); + Constructor constructor = cc.getConstructor(); + return (ICompressor) constructor.newInstance(); + } + catch (Exception e) + { + throw new IllegalArgumentException("Cannot instantiate " + type); + } + } + + private static CompressorEntry getEntry(String type) + { + for (CompressorEntry ce : compressors) { + if (ce.type.equals(type)) + return ce; + } + throw new IllegalArgumentException("Unknown algorithm " + type); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/compression/ICompressor.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/compression/ICompressor.java new file mode 100644 index 0000000000..5b733ec94c --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/compression/ICompressor.java @@ -0,0 +1,44 @@ +/* + * Copyright 2007 Kenny Root, Jeffrey Sharkey + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * a.) Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * b.) Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * c.) Neither the name of Trilead nor the names of its contributors may + * be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +package com.trilead.ssh2.compression; + +/** + * @author Kenny Root + * + */ +public interface ICompressor { + int getBufferSize(); + + int compress(byte[] buf, int start, int len, byte[] output); + + byte[] uncompress(byte[] buf, int start, int[] len); + + boolean canCompressPreauth(); +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/compression/Zlib.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/compression/Zlib.java new file mode 100644 index 0000000000..c1acab3f6c --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/compression/Zlib.java @@ -0,0 +1,142 @@ +/* + * Copyright 2007 Kenny Root, Jeffrey Sharkey + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * a.) Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * b.) Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * c.) Neither the name of Trilead nor the names of its contributors may + * be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +package com.trilead.ssh2.compression; + +import com.jcraft.jzlib.JZlib; +import com.jcraft.jzlib.ZStream; + +/** + * @author Kenny Root + * + */ +public class Zlib implements ICompressor { + static private final int DEFAULT_BUF_SIZE = 4096; + static private final int LEVEL = 5; + + private ZStream deflate; + private byte[] deflate_tmpbuf; + + private ZStream inflate; + private byte[] inflate_tmpbuf; + private byte[] inflated_buf; + + public Zlib() { + deflate = new ZStream(); + inflate = new ZStream(); + + deflate.deflateInit(LEVEL); + inflate.inflateInit(); + + deflate_tmpbuf = new byte[DEFAULT_BUF_SIZE]; + inflate_tmpbuf = new byte[DEFAULT_BUF_SIZE]; + inflated_buf = new byte[DEFAULT_BUF_SIZE]; + } + + public boolean canCompressPreauth() { + return true; + } + + public int getBufferSize() { + return DEFAULT_BUF_SIZE; + } + + public int compress(byte[] buf, int start, int len, byte[] output) { + deflate.next_in = buf; + deflate.next_in_index = start; + deflate.avail_in = len - start; + + if ((buf.length + 1024) > deflate_tmpbuf.length) { + deflate_tmpbuf = new byte[buf.length + 1024]; + } + + deflate.next_out = deflate_tmpbuf; + deflate.next_out_index = 0; + deflate.avail_out = output.length; + + if (deflate.deflate(JZlib.Z_PARTIAL_FLUSH) != JZlib.Z_OK) { + System.err.println("compress: compression failure"); + } + + if (deflate.avail_in > 0) { + System.err.println("compress: deflated data too large"); + } + + int outputlen = output.length - deflate.avail_out; + + System.arraycopy(deflate_tmpbuf, 0, output, 0, outputlen); + + return outputlen; + } + + public byte[] uncompress(byte[] buffer, int start, int[] length) { + int inflated_end = 0; + + inflate.next_in = buffer; + inflate.next_in_index = start; + inflate.avail_in = length[0]; + + while (true) { + inflate.next_out = inflate_tmpbuf; + inflate.next_out_index = 0; + inflate.avail_out = DEFAULT_BUF_SIZE; + int status = inflate.inflate(JZlib.Z_PARTIAL_FLUSH); + switch (status) { + case JZlib.Z_OK: + if (inflated_buf.length < inflated_end + DEFAULT_BUF_SIZE + - inflate.avail_out) { + byte[] foo = new byte[inflated_end + DEFAULT_BUF_SIZE + - inflate.avail_out]; + System.arraycopy(inflated_buf, 0, foo, 0, inflated_end); + inflated_buf = foo; + } + System.arraycopy(inflate_tmpbuf, 0, inflated_buf, inflated_end, + DEFAULT_BUF_SIZE - inflate.avail_out); + inflated_end += (DEFAULT_BUF_SIZE - inflate.avail_out); + length[0] = inflated_end; + break; + case JZlib.Z_BUF_ERROR: + if (inflated_end > buffer.length - start) { + byte[] foo = new byte[inflated_end + start]; + System.arraycopy(buffer, 0, foo, 0, start); + System.arraycopy(inflated_buf, 0, foo, start, inflated_end); + buffer = foo; + } else { + System.arraycopy(inflated_buf, 0, buffer, start, + inflated_end); + } + length[0] = inflated_end; + return buffer; + default: + System.err.println("uncompress: inflate returnd " + status); + return null; + } + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/compression/ZlibOpenSSH.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/compression/ZlibOpenSSH.java new file mode 100644 index 0000000000..039766a849 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/compression/ZlibOpenSSH.java @@ -0,0 +1,47 @@ +/* + * Copyright 2007 Kenny Root, Jeffrey Sharkey + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * a.) Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * b.) Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * c.) Neither the name of Trilead nor the names of its contributors may + * be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +package com.trilead.ssh2.compression; + +/** + * Defines how zlib@openssh.org compression works. + * See + * http://www.openssh.org/txt/draft-miller-secsh-compression-delayed-00.txt + * compression is disabled until userauth has occurred. + * + * @author Matt Johnston + * + */ +public class ZlibOpenSSH extends Zlib { + + public boolean canCompressPreauth() { + return false; + } + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/Base64.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/Base64.java new file mode 100644 index 0000000000..096f6734af --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/Base64.java @@ -0,0 +1,148 @@ + +package com.trilead.ssh2.crypto; + +import java.io.CharArrayWriter; +import java.io.IOException; + +/** + * Basic Base64 Support. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: Base64.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ +public class Base64 +{ + static final char[] alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".toCharArray(); + + public static char[] encode(byte[] content) + { + CharArrayWriter cw = new CharArrayWriter((4 * content.length) / 3); + + int idx = 0; + + int x = 0; + + for (int i = 0; i < content.length; i++) + { + if (idx == 0) + x = (content[i] & 0xff) << 16; + else if (idx == 1) + x = x | ((content[i] & 0xff) << 8); + else + x = x | (content[i] & 0xff); + + idx++; + + if (idx == 3) + { + cw.write(alphabet[x >> 18]); + cw.write(alphabet[(x >> 12) & 0x3f]); + cw.write(alphabet[(x >> 6) & 0x3f]); + cw.write(alphabet[x & 0x3f]); + + idx = 0; + } + } + + if (idx == 1) + { + cw.write(alphabet[x >> 18]); + cw.write(alphabet[(x >> 12) & 0x3f]); + cw.write('='); + cw.write('='); + } + + if (idx == 2) + { + cw.write(alphabet[x >> 18]); + cw.write(alphabet[(x >> 12) & 0x3f]); + cw.write(alphabet[(x >> 6) & 0x3f]); + cw.write('='); + } + + return cw.toCharArray(); + } + + public static byte[] decode(char[] message) throws IOException + { + byte buff[] = new byte[4]; + byte dest[] = new byte[message.length]; + + int bpos = 0; + int destpos = 0; + + for (int i = 0; i < message.length; i++) + { + int c = message[i]; + + if ((c == '\n') || (c == '\r') || (c == ' ') || (c == '\t')) + continue; + + if ((c >= 'A') && (c <= 'Z')) + { + buff[bpos++] = (byte) (c - 'A'); + } + else if ((c >= 'a') && (c <= 'z')) + { + buff[bpos++] = (byte) ((c - 'a') + 26); + } + else if ((c >= '0') && (c <= '9')) + { + buff[bpos++] = (byte) ((c - '0') + 52); + } + else if (c == '+') + { + buff[bpos++] = 62; + } + else if (c == '/') + { + buff[bpos++] = 63; + } + else if (c == '=') + { + buff[bpos++] = 64; + } + else + { + throw new IOException("Illegal char in base64 code."); + } + + if (bpos == 4) + { + bpos = 0; + + if (buff[0] == 64) + break; + + if (buff[1] == 64) + throw new IOException("Unexpected '=' in base64 code."); + + if (buff[2] == 64) + { + int v = (((buff[0] & 0x3f) << 6) | ((buff[1] & 0x3f))); + dest[destpos++] = (byte) (v >> 4); + break; + } + else if (buff[3] == 64) + { + int v = (((buff[0] & 0x3f) << 12) | ((buff[1] & 0x3f) << 6) | ((buff[2] & 0x3f))); + dest[destpos++] = (byte) (v >> 10); + dest[destpos++] = (byte) (v >> 2); + break; + } + else + { + int v = (((buff[0] & 0x3f) << 18) | ((buff[1] & 0x3f) << 12) | ((buff[2] & 0x3f) << 6) | ((buff[3] & 0x3f))); + dest[destpos++] = (byte) (v >> 16); + dest[destpos++] = (byte) (v >> 8); + dest[destpos++] = (byte) (v); + } + } + } + + byte[] res = new byte[destpos]; + System.arraycopy(dest, 0, res, 0, destpos); + + return res; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/CryptoWishList.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/CryptoWishList.java new file mode 100644 index 0000000000..f080c8d0db --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/CryptoWishList.java @@ -0,0 +1,26 @@ + +package com.trilead.ssh2.crypto; + +import com.trilead.ssh2.compression.CompressionFactory; +import com.trilead.ssh2.crypto.cipher.BlockCipherFactory; +import com.trilead.ssh2.crypto.digest.MACs; +import com.trilead.ssh2.transport.KexManager; + + +/** + * CryptoWishList. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: CryptoWishList.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ +public class CryptoWishList +{ + public String[] kexAlgorithms = KexManager.getDefaultKexAlgorithmList(); + public String[] serverHostKeyAlgorithms = KexManager.getDefaultServerHostkeyAlgorithmList(); + public String[] c2s_enc_algos = BlockCipherFactory.getDefaultCipherList(); + public String[] s2c_enc_algos = BlockCipherFactory.getDefaultCipherList(); + public String[] c2s_mac_algos = MACs.getMacList(); + public String[] s2c_mac_algos = MACs.getMacList(); + public String[] c2s_comp_algos = CompressionFactory.getDefaultCompressorList(); + public String[] s2c_comp_algos = CompressionFactory.getDefaultCompressorList(); +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/KeyMaterial.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/KeyMaterial.java new file mode 100644 index 0000000000..e711f5b7ca --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/KeyMaterial.java @@ -0,0 +1,91 @@ + +package com.trilead.ssh2.crypto; + + +import java.math.BigInteger; + +import com.trilead.ssh2.crypto.digest.HashForSSH2Types; + +/** + * Establishes key material for iv/key/mac (both directions). + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: KeyMaterial.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ +public class KeyMaterial +{ + public byte[] initial_iv_client_to_server; + public byte[] initial_iv_server_to_client; + public byte[] enc_key_client_to_server; + public byte[] enc_key_server_to_client; + public byte[] integrity_key_client_to_server; + public byte[] integrity_key_server_to_client; + + private static byte[] calculateKey(HashForSSH2Types sh, BigInteger K, byte[] H, byte type, byte[] SessionID, + int keyLength) + { + byte[] res = new byte[keyLength]; + + int dglen = sh.getDigestLength(); + int numRounds = (keyLength + dglen - 1) / dglen; + + byte[][] tmp = new byte[numRounds][]; + + sh.reset(); + sh.updateBigInt(K); + sh.updateBytes(H); + sh.updateByte(type); + sh.updateBytes(SessionID); + + tmp[0] = sh.getDigest(); + + int off = 0; + int produced = Math.min(dglen, keyLength); + + System.arraycopy(tmp[0], 0, res, off, produced); + + keyLength -= produced; + off += produced; + + for (int i = 1; i < numRounds; i++) + { + sh.updateBigInt(K); + sh.updateBytes(H); + + for (int j = 0; j < i; j++) + sh.updateBytes(tmp[j]); + + tmp[i] = sh.getDigest(); + + produced = Math.min(dglen, keyLength); + System.arraycopy(tmp[i], 0, res, off, produced); + keyLength -= produced; + off += produced; + } + + return res; + } + + public static KeyMaterial create(String hashAlgo, byte[] H, BigInteger K, byte[] SessionID, int keyLengthCS, + int blockSizeCS, int macLengthCS, int keyLengthSC, int blockSizeSC, int macLengthSC) + throws IllegalArgumentException + { + KeyMaterial km = new KeyMaterial(); + + HashForSSH2Types sh = new HashForSSH2Types(hashAlgo); + + km.initial_iv_client_to_server = calculateKey(sh, K, H, (byte) 'A', SessionID, blockSizeCS); + + km.initial_iv_server_to_client = calculateKey(sh, K, H, (byte) 'B', SessionID, blockSizeSC); + + km.enc_key_client_to_server = calculateKey(sh, K, H, (byte) 'C', SessionID, keyLengthCS); + + km.enc_key_server_to_client = calculateKey(sh, K, H, (byte) 'D', SessionID, keyLengthSC); + + km.integrity_key_client_to_server = calculateKey(sh, K, H, (byte) 'E', SessionID, macLengthCS); + + km.integrity_key_server_to_client = calculateKey(sh, K, H, (byte) 'F', SessionID, macLengthSC); + + return km; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/PEMDecoder.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/PEMDecoder.java new file mode 100644 index 0000000000..cc0c2f4f54 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/PEMDecoder.java @@ -0,0 +1,696 @@ + +package com.trilead.ssh2.crypto; + +import java.io.BufferedReader; +import java.io.CharArrayReader; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.math.BigInteger; +import java.security.DigestException; +import java.security.KeyFactory; +import java.security.KeyPair; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.spec.DSAPrivateKeySpec; +import java.security.spec.DSAPublicKeySpec; +import java.security.spec.ECParameterSpec; +import java.security.spec.ECPoint; +import java.security.spec.ECPrivateKeySpec; +import java.security.spec.ECPublicKeySpec; +import java.security.spec.InvalidKeySpecException; +import java.security.spec.KeySpec; +import java.security.spec.RSAPrivateCrtKeySpec; +import java.security.spec.RSAPrivateKeySpec; +import java.security.spec.RSAPublicKeySpec; +import java.util.Arrays; +import java.util.Locale; + +import com.trilead.ssh2.crypto.cipher.AES; +import com.trilead.ssh2.crypto.cipher.BlockCipher; +import com.trilead.ssh2.crypto.cipher.DES; +import com.trilead.ssh2.crypto.cipher.DESede; +import com.trilead.ssh2.crypto.keys.Ed25519PrivateKey; +import com.trilead.ssh2.crypto.keys.Ed25519PublicKey; +import com.trilead.ssh2.packets.TypesReader; +import com.trilead.ssh2.signature.DSASHA1Verify; +import com.trilead.ssh2.signature.ECDSASHA2Verify; +import com.trilead.ssh2.signature.Ed25519Verify; +import com.trilead.ssh2.signature.RSASHA1Verify; +import org.mindrot.jbcrypt.BCrypt; + +/** + * PEM Support. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PEMDecoder.java,v 1.2 2008/04/01 12:38:09 cplattne Exp $ + */ +public class PEMDecoder +{ + public static final int PEM_RSA_PRIVATE_KEY = 1; + public static final int PEM_DSA_PRIVATE_KEY = 2; + public static final int PEM_EC_PRIVATE_KEY = 3; + public static final int PEM_OPENSSH_PRIVATE_KEY = 4; + + private static final byte[] OPENSSH_V1_MAGIC = new byte[] { + 'o', 'p', 'e', 'n', 's', 's', 'h', '-', 'k', 'e', 'y', '-', 'v', '1', '\0', + }; + + private static int hexToInt(char c) + { + if ((c >= 'a') && (c <= 'f')) + { + return (c - 'a') + 10; + } + + if ((c >= 'A') && (c <= 'F')) + { + return (c - 'A') + 10; + } + + if ((c >= '0') && (c <= '9')) + { + return (c - '0'); + } + + throw new IllegalArgumentException("Need hex char"); + } + + private static byte[] hexToByteArray(String hex) + { + if (hex == null) + throw new IllegalArgumentException("null argument"); + + if ((hex.length() % 2) != 0) + throw new IllegalArgumentException("Uneven string length in hex encoding."); + + byte decoded[] = new byte[hex.length() / 2]; + + for (int i = 0; i < decoded.length; i++) + { + int hi = hexToInt(hex.charAt(i * 2)); + int lo = hexToInt(hex.charAt((i * 2) + 1)); + + decoded[i] = (byte) (hi * 16 + lo); + } + + return decoded; + } + + private static byte[] generateKeyFromPasswordSaltWithMD5(byte[] password, byte[] salt, int keyLen) + throws IOException + { + if (salt.length < 8) + throw new IllegalArgumentException("Salt needs to be at least 8 bytes for key generation."); + + MessageDigest md5; + try { + md5 = MessageDigest.getInstance("MD5"); + } catch (NoSuchAlgorithmException e) { + throw new IllegalArgumentException("VM does not support MD5", e); + } + + byte[] key = new byte[keyLen]; + byte[] tmp = new byte[md5.getDigestLength()]; + + while (true) + { + md5.update(password, 0, password.length); + md5.update(salt, 0, 8); // ARGH we only use the first 8 bytes of the + // salt in this step. + // This took me two hours until I got AES-xxx running. + + int copy = (keyLen < tmp.length) ? keyLen : tmp.length; + + try { + md5.digest(tmp, 0, tmp.length); + } catch (DigestException e) { + throw new IOException("could not digest password", e); + } + + System.arraycopy(tmp, 0, key, key.length - keyLen, copy); + + keyLen -= copy; + + if (keyLen == 0) + return key; + + md5.update(tmp, 0, tmp.length); + } + } + + private static byte[] removePadding(byte[] buff, int blockSize) throws IOException + { + /* Removes RFC 1423/PKCS #7 padding */ + + int rfc_1423_padding = buff[buff.length - 1] & 0xff; + + if ((rfc_1423_padding < 1) || (rfc_1423_padding > blockSize)) + throw new IOException("Decrypted PEM has wrong padding, did you specify the correct password?"); + + for (int i = 2; i <= rfc_1423_padding; i++) + { + if (buff[buff.length - i] != rfc_1423_padding) + throw new IOException("Decrypted PEM has wrong padding, did you specify the correct password?"); + } + + byte[] tmp = new byte[buff.length - rfc_1423_padding]; + System.arraycopy(buff, 0, tmp, 0, buff.length - rfc_1423_padding); + return tmp; + } + + public static final PEMStructure parsePEM(char[] pem) throws IOException + { + PEMStructure ps = new PEMStructure(); + + String line = null; + + BufferedReader br = new BufferedReader(new CharArrayReader(pem)); + + String endLine = null; + + while (true) + { + line = br.readLine(); + + if (line == null) + throw new IOException("Invalid PEM structure, '-----BEGIN...' missing"); + + line = line.trim(); + + if (line.startsWith("-----BEGIN DSA PRIVATE KEY-----")) + { + endLine = "-----END DSA PRIVATE KEY-----"; + ps.pemType = PEM_DSA_PRIVATE_KEY; + break; + } + + if (line.startsWith("-----BEGIN RSA PRIVATE KEY-----")) + { + endLine = "-----END RSA PRIVATE KEY-----"; + ps.pemType = PEM_RSA_PRIVATE_KEY; + break; + } + + if (line.startsWith("-----BEGIN EC PRIVATE KEY-----")) { + endLine = "-----END EC PRIVATE KEY-----"; + ps.pemType = PEM_EC_PRIVATE_KEY; + break; + } + + if (line.startsWith("-----BEGIN OPENSSH PRIVATE KEY-----")) { + endLine = "-----END OPENSSH PRIVATE KEY-----"; + ps.pemType = PEM_OPENSSH_PRIVATE_KEY; + break; + } + } + + while (true) + { + line = br.readLine(); + + if (line == null) + throw new IOException("Invalid PEM structure, " + endLine + " missing"); + + line = line.trim(); + + int sem_idx = line.indexOf(':'); + + if (sem_idx == -1) + break; + + String name = line.substring(0, sem_idx + 1); + String value = line.substring(sem_idx + 1); + + String values[] = value.split(","); + + for (int i = 0; i < values.length; i++) + values[i] = values[i].trim(); + + // Proc-Type: 4,ENCRYPTED + // DEK-Info: DES-EDE3-CBC,579B6BE3E5C60483 + + if ("Proc-Type:".equals(name)) + { + ps.procType = values; + continue; + } + + if ("DEK-Info:".equals(name)) + { + ps.dekInfo = values; + continue; + } + /* Ignore line */ + } + + StringBuffer keyData = new StringBuffer(); + + while (true) + { + if (line == null) + throw new IOException("Invalid PEM structure, " + endLine + " missing"); + + line = line.trim(); + + if (line.startsWith(endLine)) + break; + + keyData.append(line); + + line = br.readLine(); + } + + char[] pem_chars = new char[keyData.length()]; + keyData.getChars(0, pem_chars.length, pem_chars, 0); + + ps.data = Base64.decode(pem_chars); + + if (ps.data.length == 0) + throw new IOException("Invalid PEM structure, no data available"); + + return ps; + } + + private static byte[] decryptData(byte[] data, byte[] pw, byte[] salt, int rounds, String algo) throws IOException + { + BlockCipher bc; + int keySize; + + String algoLower = algo.toLowerCase(Locale.US); + if (algoLower.equals("des-ede3-cbc")) + { + bc = new DESede.CBC(); + keySize = 24; + } + else if (algoLower.equals("des-cbc")) + { + bc = new DES.CBC(); + keySize = 8; + } + else if (algoLower.equals("aes-128-cbc") || algoLower.equals("aes128-cbc")) + { + bc = new AES.CBC(); + keySize = 16; + } + else if (algoLower.equals("aes-192-cbc") || algoLower.equals("aes192-cbc")) + { + bc = new AES.CBC(); + keySize = 24; + } + else if (algoLower.equals("aes-256-cbc") || algoLower.equals("aes256-cbc")) + { + bc = new AES.CBC(); + keySize = 32; + } + else if (algoLower.equals("aes-128-ctr") || algoLower.equals("aes128-ctr")) + { + bc = new AES.CTR(); + keySize = 16; + } + else if (algoLower.equals("aes-192-ctr") || algoLower.equals("aes192-ctr")) + { + bc = new AES.CTR(); + keySize = 24; + } + else if (algoLower.equals("aes-256-ctr") || algoLower.equals("aes256-ctr")) + { + bc = new AES.CTR(); + keySize = 32; + } + else + { + throw new IOException("Cannot decrypt PEM structure, unknown cipher " + algo); + } + + if (rounds == -1) + { + bc.init(false, generateKeyFromPasswordSaltWithMD5(pw, salt, keySize), salt); + } + else + { + byte[] key = new byte[keySize]; + byte[] iv = new byte[bc.getBlockSize()]; + + byte[] keyAndIV = new byte[key.length + iv.length]; + + new BCrypt().pbkdf(pw, salt, rounds, keyAndIV); + + System.arraycopy(keyAndIV, 0, key, 0, key.length); + System.arraycopy(keyAndIV, key.length, iv, 0, iv.length); + + bc.init(false, key, iv); + } + + + if ((data.length % bc.getBlockSize()) != 0) + throw new IOException("Invalid PEM structure, size of encrypted block is not a multiple of " + + bc.getBlockSize()); + + /* Now decrypt the content */ + byte[] dz = new byte[data.length]; + + for (int i = 0; i < data.length / bc.getBlockSize(); i++) + { + bc.transformBlock(data, i * bc.getBlockSize(), dz, i * bc.getBlockSize()); + } + + if (rounds == -1) { + /* Now check and remove RFC 1423/PKCS #7 padding */ + return removePadding(dz, bc.getBlockSize()); + } else { + /* New style is to check the padding after reading the comment. */ + return dz; + } + } + + private static void decryptPEM(PEMStructure ps, byte[] pw) throws IOException + { + if (ps.dekInfo == null) + throw new IOException("Broken PEM, no mode and salt given, but encryption enabled"); + + if (ps.dekInfo.length != 2) + throw new IOException("Broken PEM, DEK-Info is incomplete!"); + + String algo = ps.dekInfo[0]; + byte[] salt = hexToByteArray(ps.dekInfo[1]); + + byte[] dz = decryptData(ps.data, pw, salt, -1, algo); + + ps.data = dz; + ps.dekInfo = null; + ps.procType = null; + } + + public static final boolean isPEMEncrypted(PEMStructure ps) throws IOException + { + if (ps.pemType == PEM_OPENSSH_PRIVATE_KEY) { + TypesReader tr = new TypesReader(ps.data); + byte[] magic = tr.readBytes(OPENSSH_V1_MAGIC.length); + if (!Arrays.equals(OPENSSH_V1_MAGIC, magic)) { + throw new IOException("Could not find OPENSSH key magic: " + new String(magic)); + } + + tr.readString(); + String kdfname = tr.readString(); + return !"none".equals(kdfname); + } + + if (ps.procType == null) + return false; + + if (ps.procType.length != 2) + throw new IOException("Unknown Proc-Type field."); + + if (!"4".equals(ps.procType[0])) + throw new IOException("Unknown Proc-Type field (" + ps.procType[0] + ")"); + + return "ENCRYPTED".equals(ps.procType[1]); + + } + + public static KeyPair decode(char[] pem, String password) throws IOException + { + PEMStructure ps = parsePEM(pem); + return decode(ps, password); + } + + public static KeyPair decode(PEMStructure ps, String password) throws IOException + { + if (isPEMEncrypted(ps) && ps.pemType != PEM_OPENSSH_PRIVATE_KEY) + { + if (password == null) + throw new IOException("PEM is encrypted, but no password was specified"); + + try { + decryptPEM(ps, password.getBytes("ISO-8859-1")); + } catch (UnsupportedEncodingException e) { + decryptPEM(ps, password.getBytes("ISO-8859-1")); + } + } + + if (ps.pemType == PEM_DSA_PRIVATE_KEY) + { + SimpleDERReader dr = new SimpleDERReader(ps.data); + + byte[] seq = dr.readSequenceAsByteArray(); + + if (dr.available() != 0) + throw new IOException("Padding in DSA PRIVATE KEY DER stream."); + + dr.resetInput(seq); + + BigInteger version = dr.readInt(); + + if (version.compareTo(BigInteger.ZERO) != 0) + throw new IOException("Wrong version (" + version + ") in DSA PRIVATE KEY DER stream."); + + BigInteger p = dr.readInt(); + BigInteger q = dr.readInt(); + BigInteger g = dr.readInt(); + BigInteger y = dr.readInt(); + BigInteger x = dr.readInt(); + + if (dr.available() != 0) + throw new IOException("Padding in DSA PRIVATE KEY DER stream."); + + DSAPrivateKeySpec privSpec = new DSAPrivateKeySpec(x, p, q, g); + DSAPublicKeySpec pubSpec = new DSAPublicKeySpec(y, p, q, g); + + return generateKeyPair("DSA", privSpec, pubSpec); + } + + if (ps.pemType == PEM_RSA_PRIVATE_KEY) + { + SimpleDERReader dr = new SimpleDERReader(ps.data); + + byte[] seq = dr.readSequenceAsByteArray(); + + if (dr.available() != 0) + throw new IOException("Padding in RSA PRIVATE KEY DER stream."); + + dr.resetInput(seq); + + BigInteger version = dr.readInt(); + + if ((version.compareTo(BigInteger.ZERO) != 0) && (version.compareTo(BigInteger.ONE) != 0)) + throw new IOException("Wrong version (" + version + ") in RSA PRIVATE KEY DER stream."); + + BigInteger n = dr.readInt(); + BigInteger e = dr.readInt(); + BigInteger d = dr.readInt(); + // TODO: is this right? + BigInteger primeP = dr.readInt(); + BigInteger primeQ = dr.readInt(); + BigInteger expP = dr.readInt(); + BigInteger expQ = dr.readInt(); + BigInteger coeff = dr.readInt(); + + RSAPrivateKeySpec privSpec = new RSAPrivateCrtKeySpec(n, e, d, primeP, primeQ, expP, expQ, coeff); + RSAPublicKeySpec pubSpec = new RSAPublicKeySpec(n, e); + + return generateKeyPair("RSA", privSpec, pubSpec); + } + + if (ps.pemType == PEM_EC_PRIVATE_KEY) { + SimpleDERReader dr = new SimpleDERReader(ps.data); + + byte[] seq = dr.readSequenceAsByteArray(); + + if (dr.available() != 0) + throw new IOException("Padding in EC PRIVATE KEY DER stream."); + + dr.resetInput(seq); + + BigInteger version = dr.readInt(); + + if ((version.compareTo(BigInteger.ONE) != 0)) + throw new IOException("Wrong version (" + version + ") in EC PRIVATE KEY DER stream."); + + byte[] privateBytes = dr.readOctetString(); + + String curveOid = null; + byte[] publicBytes = null; + while (dr.available() > 0) { + int type = dr.readConstructedType(); + SimpleDERReader cr = dr.readConstructed(); + switch (type) { + case 0: + curveOid = cr.readOid(); + break; + case 1: + publicBytes = cr.readOctetString(); + break; + } + } + + ECDSASHA2Verify verifier = ECDSASHA2Verify.getVerifierForOID(curveOid); + if (verifier == null) + throw new IOException("invalid OID"); + + BigInteger s = new BigInteger(1, privateBytes); + byte[] publicBytesSlice = new byte[publicBytes.length - 1]; + System.arraycopy(publicBytes, 1, publicBytesSlice, 0, publicBytesSlice.length); + ECParameterSpec params = verifier.getParameterSpec(); + ECPoint w = verifier.decodeECPoint(publicBytesSlice); + + ECPrivateKeySpec privSpec = new ECPrivateKeySpec(s, params); + ECPublicKeySpec pubSpec = new ECPublicKeySpec(w, params); + + return generateKeyPair("EC", privSpec, pubSpec); + } + + if (ps.pemType == PEM_OPENSSH_PRIVATE_KEY) { + TypesReader tr = new TypesReader(ps.data); + byte[] magic = tr.readBytes(OPENSSH_V1_MAGIC.length); + if (!Arrays.equals(OPENSSH_V1_MAGIC, magic)) { + throw new IOException("Could not find OPENSSH key magic: " + new String(magic)); + } + + String ciphername = tr.readString(); + String kdfname = tr.readString(); + byte[] kdfoptions = tr.readByteString(); + int numberOfKeys = tr.readUINT32(); + + // TODO support multiple keys + if (numberOfKeys != 1) { + throw new IOException("Only one key supported, but encountered bundle of " + numberOfKeys); + } + + // OpenSSH discards this, so we will as well. + tr.readByteString(); + + byte[] dataBytes = tr.readByteString(); + + if ("bcrypt".equals(kdfname)) { + if (password == null) { + throw new IOException("PEM is encrypted, but no password was specified"); + } + + TypesReader optionsReader = new TypesReader(kdfoptions); + byte[] salt = optionsReader.readByteString(); + int rounds = optionsReader.readUINT32(); + byte[] passwordBytes; + try { + passwordBytes = password.getBytes("UTF-8"); + } catch (UnsupportedEncodingException e) { + passwordBytes = password.getBytes(); + } + dataBytes = decryptData(dataBytes, passwordBytes, salt, rounds, ciphername); + } else if (!"none".equals(ciphername) || !"none".equals(kdfname)) { + throw new IOException("encryption not supported"); + } + + TypesReader trEnc = new TypesReader(dataBytes); + + int checkInt1 = trEnc.readUINT32(); + int checkInt2 = trEnc.readUINT32(); + + if (checkInt1 != checkInt2) { + throw new IOException("Decryption failed when trying to read private keys"); + } + + String keyType = trEnc.readString(); + + KeyPair keyPair; + if (Ed25519Verify.ED25519_ID.equals(keyType)) { + byte[] publicBytes = trEnc.readByteString(); + byte[] privateBytes = trEnc.readByteString(); + PrivateKey privKey = new Ed25519PrivateKey( + Arrays.copyOfRange(privateBytes, 0, 32)); + PublicKey pubKey = new Ed25519PublicKey(publicBytes); + keyPair = new KeyPair(pubKey, privKey); + } else if (keyType.startsWith("ecdsa-sha2-")) { + String curveName = trEnc.readString(); + + byte[] groupBytes = trEnc.readByteString(); + BigInteger privateKey = trEnc.readMPINT(); + + final ECDSASHA2Verify verifier; + if (curveName.equals(ECDSASHA2Verify.ECDSASHA2NISTP256Verify.get().getCurveName())) { + verifier = ECDSASHA2Verify.ECDSASHA2NISTP256Verify.get(); + } else if (curveName.equals(ECDSASHA2Verify.ECDSASHA2NISTP384Verify.get().getCurveName())) { + verifier = ECDSASHA2Verify.ECDSASHA2NISTP384Verify.get(); + } else if (curveName.equals(ECDSASHA2Verify.ECDSASHA2NISTP521Verify.get().getCurveName())) { + verifier = ECDSASHA2Verify.ECDSASHA2NISTP521Verify.get(); + } else { + throw new IOException("Invalid ECDSA group"); + } + + ECParameterSpec spec = verifier.getParameterSpec(); + ECPoint group = verifier.decodeECPoint(groupBytes); + + ECPublicKeySpec publicKeySpec = new ECPublicKeySpec(group, spec); + ECPrivateKeySpec privateKeySpec = new ECPrivateKeySpec(privateKey, spec); + keyPair = generateKeyPair("EC", privateKeySpec, publicKeySpec); + } else if (RSASHA1Verify.get().getKeyFormat().equals(keyType)) { + BigInteger n = trEnc.readMPINT(); + BigInteger e = trEnc.readMPINT(); + BigInteger d = trEnc.readMPINT(); + + BigInteger crtCoefficient = trEnc.readMPINT(); + BigInteger p = trEnc.readMPINT(); + + RSAPrivateKeySpec privateKeySpec; + if (null == p || null == crtCoefficient) { + privateKeySpec = new RSAPrivateKeySpec(n, d); + } else { + BigInteger q = crtCoefficient.modInverse(p); + BigInteger pE = d.mod(p.subtract(BigInteger.ONE)); + BigInteger qE = d.mod(q.subtract(BigInteger.ONE)); + privateKeySpec = new RSAPrivateCrtKeySpec(n, e, d, p, q, pE, qE, crtCoefficient); + + } + + RSAPublicKeySpec publicKeySpec = new RSAPublicKeySpec(n, e); + + keyPair = generateKeyPair("RSA", privateKeySpec, publicKeySpec); + } else if (DSASHA1Verify.get().getKeyFormat().equals(keyType)) { + BigInteger p = trEnc.readMPINT(); + BigInteger q = trEnc.readMPINT(); + BigInteger g = trEnc.readMPINT(); + BigInteger y = trEnc.readMPINT(); + BigInteger x = trEnc.readMPINT(); + + DSAPrivateKeySpec privateKeySpec = new DSAPrivateKeySpec(x, p, q, g); + DSAPublicKeySpec publicKeySpec = new DSAPublicKeySpec(y, p, q, g); + + keyPair = generateKeyPair("DSA", privateKeySpec, publicKeySpec); + } else { + throw new IOException("Unknown key type " + keyType); + } + + byte[] comment = trEnc.readByteString(); + + // Make sure the padding is correct first. + int remaining = tr.remain(); + for (int i = 1; i <= remaining; i++) { + if (i != tr.readByte()) { + throw new IOException("Bad padding value on decrypted private keys"); + } + } + + return keyPair; + } + + throw new IOException("PEM problem: it is of unknown type"); + } + + /** + * Generate a {@code KeyPair} given an {@code algorithm} and {@code KeySpec}. + */ + private static KeyPair generateKeyPair(String algorithm, KeySpec privSpec, KeySpec pubSpec) + throws IOException { + try { + final KeyFactory kf = KeyFactory.getInstance(algorithm); + final PublicKey pubKey = kf.generatePublic(pubSpec); + final PrivateKey privKey = kf.generatePrivate(privSpec); + return new KeyPair(pubKey, privKey); + } catch (NoSuchAlgorithmException ex) { + throw new IOException(ex); + } catch (InvalidKeySpecException ex) { + throw new IOException("invalid keyspec", ex); + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/PEMStructure.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/PEMStructure.java new file mode 100644 index 0000000000..d7bb562920 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/PEMStructure.java @@ -0,0 +1,17 @@ + +package com.trilead.ssh2.crypto; + +/** + * Parsed PEM structure. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PEMStructure.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ + +public class PEMStructure +{ + public int pemType; + String dekInfo[]; + String procType[]; + public byte[] data; +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/SimpleDERReader.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/SimpleDERReader.java new file mode 100644 index 0000000000..dca2e00272 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/SimpleDERReader.java @@ -0,0 +1,235 @@ +package com.trilead.ssh2.crypto; + +import java.io.IOException; + +import java.math.BigInteger; + +/** + * SimpleDERReader. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: SimpleDERReader.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ +public class SimpleDERReader +{ + private static final int CONSTRUCTED = 0x20; + + byte[] buffer; + int pos; + int count; + + public SimpleDERReader(byte[] b) + { + resetInput(b); + } + + public SimpleDERReader(byte[] b, int off, int len) + { + resetInput(b, off, len); + } + + public void resetInput(byte[] b) + { + resetInput(b, 0, b.length); + } + + public void resetInput(byte[] b, int off, int len) + { + buffer = b; + pos = off; + count = len; + } + + private byte readByte() throws IOException + { + if (count <= 0) + throw new IOException("DER byte array: out of data"); + count--; + return buffer[pos++]; + } + + private byte[] readBytes(int len) throws IOException + { + if (len > count) + throw new IOException("DER byte array: out of data"); + + byte[] b = new byte[len]; + + System.arraycopy(buffer, pos, b, 0, len); + + pos += len; + count -= len; + + return b; + } + + public int available() + { + return count; + } + + /* visible for testing */ + int readLength() throws IOException + { + int len = readByte() & 0xff; + + if ((len & 0x80) == 0) + return len; + + int remain = len & 0x7F; + + if (remain == 0) + return -1; + else if (remain > 4) + return -1; + + len = 0; + + while (remain > 0) + { + len = len << 8; + len = len | (readByte() & 0xff); + remain--; + } + + if (len < 0) + return -1; + + return len; + } + + public int ignoreNextObject() throws IOException + { + int type = readByte() & 0xff; + + int len = readLength(); + + if ((len < 0) || len > available()) + throw new IOException("Illegal len in DER object (" + len + ")"); + + readBytes(len); + + return type; + } + + public BigInteger readInt() throws IOException + { + int type = readByte() & 0xff; + + if (type != 0x02) + throw new IOException("Expected DER Integer, but found type " + type); + + int len = readLength(); + + if ((len < 0) || len > available()) + throw new IOException("Illegal len in DER object (" + len + ")"); + + byte[] b = readBytes(len); + + BigInteger bi = new BigInteger(1, b); + + return bi; + } + + public int readConstructedType() throws IOException { + int type = readByte() & 0xff; + + if ((type & CONSTRUCTED) != CONSTRUCTED) + throw new IOException("Expected constructed type, but was " + type); + + return type & 0x1f; + } + + public SimpleDERReader readConstructed() throws IOException + { + int len = readLength(); + + if ((len < 0) || len > available()) + throw new IOException("Illegal len in DER object (" + len + ")"); + + SimpleDERReader cr = new SimpleDERReader(buffer, pos, len); + + pos += len; + count -= len; + + return cr; + } + + public byte[] readSequenceAsByteArray() throws IOException + { + int type = readByte() & 0xff; + + if (type != 0x30) + throw new IOException("Expected DER Sequence, but found type " + type); + + int len = readLength(); + + if ((len < 0) || len > available()) + throw new IOException("Illegal len in DER object (" + len + ")"); + + byte[] b = readBytes(len); + + return b; + } + + public String readOid() throws IOException + { + int type = readByte() & 0xff; + + if (type != 0x06) + throw new IOException("Expected DER OID, but found type " + type); + + int len = readLength(); + + if ((len < 1) || len > available()) + throw new IOException("Illegal len in DER object (" + len + ")"); + + byte[] b = readBytes(len); + + long value = 0; + + StringBuilder sb = new StringBuilder(64); + switch (b[0] / 40) { + case 0: + sb.append('0'); + break; + case 1: + sb.append('1'); + b[0] -= 40; + break; + default: + sb.append('2'); + b[0] -= 80; + break; + } + + for (int i = 0; i < len; i++) { + value = (value << 7) + (b[i] & 0x7F); + if ((b[i] & 0x80) == 0) { + sb.append('.'); + sb.append(value); + value = 0; + } + } + + return sb.toString(); + } + + public byte[] readOctetString() throws IOException + { + int type = readByte() & 0xff; + + if (type != 0x04 && type != 0x03) + throw new IOException("Expected DER Octetstring, but found type " + type); + + int len = readLength(); + + if ((len < 0) || len > available()) + throw new IOException("Illegal len in DER object (" + len + ")"); + + byte[] b = readBytes(len); + + return b; + } + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/AES.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/AES.java new file mode 100644 index 0000000000..fef4fafd32 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/AES.java @@ -0,0 +1,66 @@ + +package com.trilead.ssh2.crypto.cipher; + +import javax.crypto.Cipher; +import javax.crypto.NoSuchPaddingException; +import javax.crypto.ShortBufferException; +import javax.crypto.spec.IvParameterSpec; +import javax.crypto.spec.SecretKeySpec; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; + +/** + * AES modes for SSH using the JCE. + */ +public abstract class AES implements BlockCipher +{ + private final int AES_BLOCK_SIZE = 16; + + protected Cipher cipher; + + @Override + public void init(boolean forEncryption, byte[] key, byte[] iv) { + try { + cipher.init(forEncryption ? Cipher.ENCRYPT_MODE : Cipher.DECRYPT_MODE, + new SecretKeySpec(key, "AES"), + new IvParameterSpec(iv)); + } catch (InvalidKeyException | InvalidAlgorithmParameterException e) { + throw new IllegalArgumentException("Cannot initialize " + cipher.getAlgorithm(), e); + } + } + + @Override + public int getBlockSize() { + return AES_BLOCK_SIZE; + } + + @Override + public void transformBlock(byte[] src, int srcoff, byte[] dst, int dstoff) { + try { + cipher.update(src, srcoff, AES_BLOCK_SIZE, dst, dstoff); + } catch (ShortBufferException e) { + throw new AssertionError(e); + } + } + + public static class CBC extends AES { + public CBC() throws IllegalArgumentException { + try { + cipher = Cipher.getInstance("AES/CBC/NoPadding"); + } catch (NoSuchAlgorithmException | NoSuchPaddingException e) { + throw new IllegalArgumentException("Cannot initialize AES/CBC/NoPadding", e); + } + } + } + + public static class CTR extends AES { + public CTR() throws IllegalArgumentException { + try { + cipher = Cipher.getInstance("AES/CTR/NoPadding"); + } catch (NoSuchAlgorithmException | NoSuchPaddingException e) { + throw new IllegalArgumentException("Cannot initialize AES/CBC/NoPadding", e); + } + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/BlockCipher.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/BlockCipher.java new file mode 100644 index 0000000000..7c1abd4179 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/BlockCipher.java @@ -0,0 +1,16 @@ +package com.trilead.ssh2.crypto.cipher; + +/** + * BlockCipher. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: BlockCipher.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public interface BlockCipher +{ + void init(boolean forEncryption, byte[] key, byte[] iv) throws IllegalArgumentException; + + int getBlockSize(); + + void transformBlock(byte[] src, int srcoff, byte[] dst, int dstoff); +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/BlockCipherFactory.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/BlockCipherFactory.java new file mode 100644 index 0000000000..be734aaf35 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/BlockCipherFactory.java @@ -0,0 +1,103 @@ + +package com.trilead.ssh2.crypto.cipher; + +import java.lang.reflect.Constructor; +import java.util.ArrayList; + +/** + * BlockCipherFactory. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: BlockCipherFactory.java,v 1.2 2008/04/01 12:38:09 cplattne Exp $ + */ +public class BlockCipherFactory +{ + private static class CipherEntry + { + final String type; + final int blocksize; + final int keysize; + final String cipherClass; + + CipherEntry(String type, int blockSize, int keySize, String cipherClass) + { + this.type = type; + this.blocksize = blockSize; + this.keysize = keySize; + this.cipherClass = cipherClass; + } + } + + private static final ArrayList ciphers = new ArrayList<>(); + + static + { + /* Higher Priority First */ + + ciphers.add(new CipherEntry("aes256-ctr", 16, 32, "com.trilead.ssh2.crypto.cipher.AES$CTR")); + ciphers.add(new CipherEntry("aes128-ctr", 16, 16, "com.trilead.ssh2.crypto.cipher.AES$CTR")); + ciphers.add(new CipherEntry("blowfish-ctr", 8, 16, "com.trilead.ssh2.crypto.cipher.BlowFish$CTR")); + + ciphers.add(new CipherEntry("aes256-cbc", 16, 32, "com.trilead.ssh2.crypto.cipher.AES$CBC")); + ciphers.add(new CipherEntry("aes128-cbc", 16, 16, "com.trilead.ssh2.crypto.cipher.AES$CBC")); + ciphers.add(new CipherEntry("blowfish-cbc", 8, 16, "com.trilead.ssh2.crypto.cipher.BlowFish$CBC")); + + ciphers.add(new CipherEntry("3des-ctr", 8, 24, "com.trilead.ssh2.crypto.cipher.DESede$CTR")); + ciphers.add(new CipherEntry("3des-cbc", 8, 24, "com.trilead.ssh2.crypto.cipher.DESede$CBC")); + } + + public static String[] getDefaultCipherList() + { + String list[] = new String[ciphers.size()]; + for (int i = 0; i < ciphers.size(); i++) + { + CipherEntry ce = ciphers.get(i); + list[i] = ce.type; + } + return list; + } + + public static void checkCipherList(String[] cipherCandidates) + { + for (String cipherCandidate : cipherCandidates) + getEntry(cipherCandidate); + } + + public static BlockCipher createCipher(String type, boolean encrypt, byte[] key, byte[] iv) + { + try + { + CipherEntry ce = getEntry(type); + Class cc = Class.forName(ce.cipherClass); + Constructor constructor = cc.getConstructor(); + BlockCipher bc = constructor.newInstance(); + bc.init(encrypt, key, iv); + return bc; + } + catch (Exception e) + { + throw new IllegalArgumentException("Cannot instantiate " + type, e); + } + } + + private static CipherEntry getEntry(String type) + { + for (CipherEntry ce : ciphers) { + if (ce.type.equals(type)) + return ce; + } + throw new IllegalArgumentException("Unknown algorithm " + type); + } + + public static int getBlockSize(String type) + { + CipherEntry ce = getEntry(type); + return ce.blocksize; + } + + public static int getKeySize(String type) + { + CipherEntry ce = getEntry(type); + return ce.keysize; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/BlowFish.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/BlowFish.java new file mode 100644 index 0000000000..1727fc068b --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/BlowFish.java @@ -0,0 +1,435 @@ + +package com.trilead.ssh2.crypto.cipher; + +/* + * This file was shamelessly taken from the Bouncy Castle Crypto package. + * Their licence file states the following: + * + * Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle + * (http://www.bouncycastle.org) + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +/** + * A class that provides Blowfish key encryption operations, such as encoding + * data and generating keys. All the algorithms herein are from Applied + * Cryptography and implement a simplified cryptography interface. + * + * @author See comments in the source file + * @version $Id: BlowFish.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class BlowFish implements BlockCipher +{ + + private final static int[] KP = { 0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344, 0xA4093822, 0x299F31D0, + 0x082EFA98, 0xEC4E6C89, 0x452821E6, 0x38D01377, 0xBE5466CF, 0x34E90C6C, 0xC0AC29B7, 0xC97C50DD, 0x3F84D5B5, + 0xB5470917, 0x9216D5D9, 0x8979FB1B }, + + KS0 = { 0xD1310BA6, 0x98DFB5AC, 0x2FFD72DB, 0xD01ADFB7, 0xB8E1AFED, 0x6A267E96, 0xBA7C9045, 0xF12C7F99, 0x24A19947, + 0xB3916CF7, 0x0801F2E2, 0x858EFC16, 0x636920D8, 0x71574E69, 0xA458FEA3, 0xF4933D7E, 0x0D95748F, 0x728EB658, + 0x718BCD58, 0x82154AEE, 0x7B54A41D, 0xC25A59B5, 0x9C30D539, 0x2AF26013, 0xC5D1B023, 0x286085F0, 0xCA417918, + 0xB8DB38EF, 0x8E79DCB0, 0x603A180E, 0x6C9E0E8B, 0xB01E8A3E, 0xD71577C1, 0xBD314B27, 0x78AF2FDA, 0x55605C60, + 0xE65525F3, 0xAA55AB94, 0x57489862, 0x63E81440, 0x55CA396A, 0x2AAB10B6, 0xB4CC5C34, 0x1141E8CE, 0xA15486AF, + 0x7C72E993, 0xB3EE1411, 0x636FBC2A, 0x2BA9C55D, 0x741831F6, 0xCE5C3E16, 0x9B87931E, 0xAFD6BA33, 0x6C24CF5C, + 0x7A325381, 0x28958677, 0x3B8F4898, 0x6B4BB9AF, 0xC4BFE81B, 0x66282193, 0x61D809CC, 0xFB21A991, 0x487CAC60, + 0x5DEC8032, 0xEF845D5D, 0xE98575B1, 0xDC262302, 0xEB651B88, 0x23893E81, 0xD396ACC5, 0x0F6D6FF3, 0x83F44239, + 0x2E0B4482, 0xA4842004, 0x69C8F04A, 0x9E1F9B5E, 0x21C66842, 0xF6E96C9A, 0x670C9C61, 0xABD388F0, 0x6A51A0D2, + 0xD8542F68, 0x960FA728, 0xAB5133A3, 0x6EEF0B6C, 0x137A3BE4, 0xBA3BF050, 0x7EFB2A98, 0xA1F1651D, 0x39AF0176, + 0x66CA593E, 0x82430E88, 0x8CEE8619, 0x456F9FB4, 0x7D84A5C3, 0x3B8B5EBE, 0xE06F75D8, 0x85C12073, 0x401A449F, + 0x56C16AA6, 0x4ED3AA62, 0x363F7706, 0x1BFEDF72, 0x429B023D, 0x37D0D724, 0xD00A1248, 0xDB0FEAD3, 0x49F1C09B, + 0x075372C9, 0x80991B7B, 0x25D479D8, 0xF6E8DEF7, 0xE3FE501A, 0xB6794C3B, 0x976CE0BD, 0x04C006BA, 0xC1A94FB6, + 0x409F60C4, 0x5E5C9EC2, 0x196A2463, 0x68FB6FAF, 0x3E6C53B5, 0x1339B2EB, 0x3B52EC6F, 0x6DFC511F, 0x9B30952C, + 0xCC814544, 0xAF5EBD09, 0xBEE3D004, 0xDE334AFD, 0x660F2807, 0x192E4BB3, 0xC0CBA857, 0x45C8740F, 0xD20B5F39, + 0xB9D3FBDB, 0x5579C0BD, 0x1A60320A, 0xD6A100C6, 0x402C7279, 0x679F25FE, 0xFB1FA3CC, 0x8EA5E9F8, 0xDB3222F8, + 0x3C7516DF, 0xFD616B15, 0x2F501EC8, 0xAD0552AB, 0x323DB5FA, 0xFD238760, 0x53317B48, 0x3E00DF82, 0x9E5C57BB, + 0xCA6F8CA0, 0x1A87562E, 0xDF1769DB, 0xD542A8F6, 0x287EFFC3, 0xAC6732C6, 0x8C4F5573, 0x695B27B0, 0xBBCA58C8, + 0xE1FFA35D, 0xB8F011A0, 0x10FA3D98, 0xFD2183B8, 0x4AFCB56C, 0x2DD1D35B, 0x9A53E479, 0xB6F84565, 0xD28E49BC, + 0x4BFB9790, 0xE1DDF2DA, 0xA4CB7E33, 0x62FB1341, 0xCEE4C6E8, 0xEF20CADA, 0x36774C01, 0xD07E9EFE, 0x2BF11FB4, + 0x95DBDA4D, 0xAE909198, 0xEAAD8E71, 0x6B93D5A0, 0xD08ED1D0, 0xAFC725E0, 0x8E3C5B2F, 0x8E7594B7, 0x8FF6E2FB, + 0xF2122B64, 0x8888B812, 0x900DF01C, 0x4FAD5EA0, 0x688FC31C, 0xD1CFF191, 0xB3A8C1AD, 0x2F2F2218, 0xBE0E1777, + 0xEA752DFE, 0x8B021FA1, 0xE5A0CC0F, 0xB56F74E8, 0x18ACF3D6, 0xCE89E299, 0xB4A84FE0, 0xFD13E0B7, 0x7CC43B81, + 0xD2ADA8D9, 0x165FA266, 0x80957705, 0x93CC7314, 0x211A1477, 0xE6AD2065, 0x77B5FA86, 0xC75442F5, 0xFB9D35CF, + 0xEBCDAF0C, 0x7B3E89A0, 0xD6411BD3, 0xAE1E7E49, 0x00250E2D, 0x2071B35E, 0x226800BB, 0x57B8E0AF, 0x2464369B, + 0xF009B91E, 0x5563911D, 0x59DFA6AA, 0x78C14389, 0xD95A537F, 0x207D5BA2, 0x02E5B9C5, 0x83260376, 0x6295CFA9, + 0x11C81968, 0x4E734A41, 0xB3472DCA, 0x7B14A94A, 0x1B510052, 0x9A532915, 0xD60F573F, 0xBC9BC6E4, 0x2B60A476, + 0x81E67400, 0x08BA6FB5, 0x571BE91F, 0xF296EC6B, 0x2A0DD915, 0xB6636521, 0xE7B9F9B6, 0xFF34052E, 0xC5855664, + 0x53B02D5D, 0xA99F8FA1, 0x08BA4799, 0x6E85076A }, + + KS1 = { 0x4B7A70E9, 0xB5B32944, 0xDB75092E, 0xC4192623, 0xAD6EA6B0, 0x49A7DF7D, 0x9CEE60B8, 0x8FEDB266, 0xECAA8C71, + 0x699A17FF, 0x5664526C, 0xC2B19EE1, 0x193602A5, 0x75094C29, 0xA0591340, 0xE4183A3E, 0x3F54989A, 0x5B429D65, + 0x6B8FE4D6, 0x99F73FD6, 0xA1D29C07, 0xEFE830F5, 0x4D2D38E6, 0xF0255DC1, 0x4CDD2086, 0x8470EB26, 0x6382E9C6, + 0x021ECC5E, 0x09686B3F, 0x3EBAEFC9, 0x3C971814, 0x6B6A70A1, 0x687F3584, 0x52A0E286, 0xB79C5305, 0xAA500737, + 0x3E07841C, 0x7FDEAE5C, 0x8E7D44EC, 0x5716F2B8, 0xB03ADA37, 0xF0500C0D, 0xF01C1F04, 0x0200B3FF, 0xAE0CF51A, + 0x3CB574B2, 0x25837A58, 0xDC0921BD, 0xD19113F9, 0x7CA92FF6, 0x94324773, 0x22F54701, 0x3AE5E581, 0x37C2DADC, + 0xC8B57634, 0x9AF3DDA7, 0xA9446146, 0x0FD0030E, 0xECC8C73E, 0xA4751E41, 0xE238CD99, 0x3BEA0E2F, 0x3280BBA1, + 0x183EB331, 0x4E548B38, 0x4F6DB908, 0x6F420D03, 0xF60A04BF, 0x2CB81290, 0x24977C79, 0x5679B072, 0xBCAF89AF, + 0xDE9A771F, 0xD9930810, 0xB38BAE12, 0xDCCF3F2E, 0x5512721F, 0x2E6B7124, 0x501ADDE6, 0x9F84CD87, 0x7A584718, + 0x7408DA17, 0xBC9F9ABC, 0xE94B7D8C, 0xEC7AEC3A, 0xDB851DFA, 0x63094366, 0xC464C3D2, 0xEF1C1847, 0x3215D908, + 0xDD433B37, 0x24C2BA16, 0x12A14D43, 0x2A65C451, 0x50940002, 0x133AE4DD, 0x71DFF89E, 0x10314E55, 0x81AC77D6, + 0x5F11199B, 0x043556F1, 0xD7A3C76B, 0x3C11183B, 0x5924A509, 0xF28FE6ED, 0x97F1FBFA, 0x9EBABF2C, 0x1E153C6E, + 0x86E34570, 0xEAE96FB1, 0x860E5E0A, 0x5A3E2AB3, 0x771FE71C, 0x4E3D06FA, 0x2965DCB9, 0x99E71D0F, 0x803E89D6, + 0x5266C825, 0x2E4CC978, 0x9C10B36A, 0xC6150EBA, 0x94E2EA78, 0xA5FC3C53, 0x1E0A2DF4, 0xF2F74EA7, 0x361D2B3D, + 0x1939260F, 0x19C27960, 0x5223A708, 0xF71312B6, 0xEBADFE6E, 0xEAC31F66, 0xE3BC4595, 0xA67BC883, 0xB17F37D1, + 0x018CFF28, 0xC332DDEF, 0xBE6C5AA5, 0x65582185, 0x68AB9802, 0xEECEA50F, 0xDB2F953B, 0x2AEF7DAD, 0x5B6E2F84, + 0x1521B628, 0x29076170, 0xECDD4775, 0x619F1510, 0x13CCA830, 0xEB61BD96, 0x0334FE1E, 0xAA0363CF, 0xB5735C90, + 0x4C70A239, 0xD59E9E0B, 0xCBAADE14, 0xEECC86BC, 0x60622CA7, 0x9CAB5CAB, 0xB2F3846E, 0x648B1EAF, 0x19BDF0CA, + 0xA02369B9, 0x655ABB50, 0x40685A32, 0x3C2AB4B3, 0x319EE9D5, 0xC021B8F7, 0x9B540B19, 0x875FA099, 0x95F7997E, + 0x623D7DA8, 0xF837889A, 0x97E32D77, 0x11ED935F, 0x16681281, 0x0E358829, 0xC7E61FD6, 0x96DEDFA1, 0x7858BA99, + 0x57F584A5, 0x1B227263, 0x9B83C3FF, 0x1AC24696, 0xCDB30AEB, 0x532E3054, 0x8FD948E4, 0x6DBC3128, 0x58EBF2EF, + 0x34C6FFEA, 0xFE28ED61, 0xEE7C3C73, 0x5D4A14D9, 0xE864B7E3, 0x42105D14, 0x203E13E0, 0x45EEE2B6, 0xA3AAABEA, + 0xDB6C4F15, 0xFACB4FD0, 0xC742F442, 0xEF6ABBB5, 0x654F3B1D, 0x41CD2105, 0xD81E799E, 0x86854DC7, 0xE44B476A, + 0x3D816250, 0xCF62A1F2, 0x5B8D2646, 0xFC8883A0, 0xC1C7B6A3, 0x7F1524C3, 0x69CB7492, 0x47848A0B, 0x5692B285, + 0x095BBF00, 0xAD19489D, 0x1462B174, 0x23820E00, 0x58428D2A, 0x0C55F5EA, 0x1DADF43E, 0x233F7061, 0x3372F092, + 0x8D937E41, 0xD65FECF1, 0x6C223BDB, 0x7CDE3759, 0xCBEE7460, 0x4085F2A7, 0xCE77326E, 0xA6078084, 0x19F8509E, + 0xE8EFD855, 0x61D99735, 0xA969A7AA, 0xC50C06C2, 0x5A04ABFC, 0x800BCADC, 0x9E447A2E, 0xC3453484, 0xFDD56705, + 0x0E1E9EC9, 0xDB73DBD3, 0x105588CD, 0x675FDA79, 0xE3674340, 0xC5C43465, 0x713E38D8, 0x3D28F89E, 0xF16DFF20, + 0x153E21E7, 0x8FB03D4A, 0xE6E39F2B, 0xDB83ADF7 }, + + KS2 = { 0xE93D5A68, 0x948140F7, 0xF64C261C, 0x94692934, 0x411520F7, 0x7602D4F7, 0xBCF46B2E, 0xD4A20068, 0xD4082471, + 0x3320F46A, 0x43B7D4B7, 0x500061AF, 0x1E39F62E, 0x97244546, 0x14214F74, 0xBF8B8840, 0x4D95FC1D, 0x96B591AF, + 0x70F4DDD3, 0x66A02F45, 0xBFBC09EC, 0x03BD9785, 0x7FAC6DD0, 0x31CB8504, 0x96EB27B3, 0x55FD3941, 0xDA2547E6, + 0xABCA0A9A, 0x28507825, 0x530429F4, 0x0A2C86DA, 0xE9B66DFB, 0x68DC1462, 0xD7486900, 0x680EC0A4, 0x27A18DEE, + 0x4F3FFEA2, 0xE887AD8C, 0xB58CE006, 0x7AF4D6B6, 0xAACE1E7C, 0xD3375FEC, 0xCE78A399, 0x406B2A42, 0x20FE9E35, + 0xD9F385B9, 0xEE39D7AB, 0x3B124E8B, 0x1DC9FAF7, 0x4B6D1856, 0x26A36631, 0xEAE397B2, 0x3A6EFA74, 0xDD5B4332, + 0x6841E7F7, 0xCA7820FB, 0xFB0AF54E, 0xD8FEB397, 0x454056AC, 0xBA489527, 0x55533A3A, 0x20838D87, 0xFE6BA9B7, + 0xD096954B, 0x55A867BC, 0xA1159A58, 0xCCA92963, 0x99E1DB33, 0xA62A4A56, 0x3F3125F9, 0x5EF47E1C, 0x9029317C, + 0xFDF8E802, 0x04272F70, 0x80BB155C, 0x05282CE3, 0x95C11548, 0xE4C66D22, 0x48C1133F, 0xC70F86DC, 0x07F9C9EE, + 0x41041F0F, 0x404779A4, 0x5D886E17, 0x325F51EB, 0xD59BC0D1, 0xF2BCC18F, 0x41113564, 0x257B7834, 0x602A9C60, + 0xDFF8E8A3, 0x1F636C1B, 0x0E12B4C2, 0x02E1329E, 0xAF664FD1, 0xCAD18115, 0x6B2395E0, 0x333E92E1, 0x3B240B62, + 0xEEBEB922, 0x85B2A20E, 0xE6BA0D99, 0xDE720C8C, 0x2DA2F728, 0xD0127845, 0x95B794FD, 0x647D0862, 0xE7CCF5F0, + 0x5449A36F, 0x877D48FA, 0xC39DFD27, 0xF33E8D1E, 0x0A476341, 0x992EFF74, 0x3A6F6EAB, 0xF4F8FD37, 0xA812DC60, + 0xA1EBDDF8, 0x991BE14C, 0xDB6E6B0D, 0xC67B5510, 0x6D672C37, 0x2765D43B, 0xDCD0E804, 0xF1290DC7, 0xCC00FFA3, + 0xB5390F92, 0x690FED0B, 0x667B9FFB, 0xCEDB7D9C, 0xA091CF0B, 0xD9155EA3, 0xBB132F88, 0x515BAD24, 0x7B9479BF, + 0x763BD6EB, 0x37392EB3, 0xCC115979, 0x8026E297, 0xF42E312D, 0x6842ADA7, 0xC66A2B3B, 0x12754CCC, 0x782EF11C, + 0x6A124237, 0xB79251E7, 0x06A1BBE6, 0x4BFB6350, 0x1A6B1018, 0x11CAEDFA, 0x3D25BDD8, 0xE2E1C3C9, 0x44421659, + 0x0A121386, 0xD90CEC6E, 0xD5ABEA2A, 0x64AF674E, 0xDA86A85F, 0xBEBFE988, 0x64E4C3FE, 0x9DBC8057, 0xF0F7C086, + 0x60787BF8, 0x6003604D, 0xD1FD8346, 0xF6381FB0, 0x7745AE04, 0xD736FCCC, 0x83426B33, 0xF01EAB71, 0xB0804187, + 0x3C005E5F, 0x77A057BE, 0xBDE8AE24, 0x55464299, 0xBF582E61, 0x4E58F48F, 0xF2DDFDA2, 0xF474EF38, 0x8789BDC2, + 0x5366F9C3, 0xC8B38E74, 0xB475F255, 0x46FCD9B9, 0x7AEB2661, 0x8B1DDF84, 0x846A0E79, 0x915F95E2, 0x466E598E, + 0x20B45770, 0x8CD55591, 0xC902DE4C, 0xB90BACE1, 0xBB8205D0, 0x11A86248, 0x7574A99E, 0xB77F19B6, 0xE0A9DC09, + 0x662D09A1, 0xC4324633, 0xE85A1F02, 0x09F0BE8C, 0x4A99A025, 0x1D6EFE10, 0x1AB93D1D, 0x0BA5A4DF, 0xA186F20F, + 0x2868F169, 0xDCB7DA83, 0x573906FE, 0xA1E2CE9B, 0x4FCD7F52, 0x50115E01, 0xA70683FA, 0xA002B5C4, 0x0DE6D027, + 0x9AF88C27, 0x773F8641, 0xC3604C06, 0x61A806B5, 0xF0177A28, 0xC0F586E0, 0x006058AA, 0x30DC7D62, 0x11E69ED7, + 0x2338EA63, 0x53C2DD94, 0xC2C21634, 0xBBCBEE56, 0x90BCB6DE, 0xEBFC7DA1, 0xCE591D76, 0x6F05E409, 0x4B7C0188, + 0x39720A3D, 0x7C927C24, 0x86E3725F, 0x724D9DB9, 0x1AC15BB4, 0xD39EB8FC, 0xED545578, 0x08FCA5B5, 0xD83D7CD3, + 0x4DAD0FC4, 0x1E50EF5E, 0xB161E6F8, 0xA28514D9, 0x6C51133C, 0x6FD5C7E7, 0x56E14EC4, 0x362ABFCE, 0xDDC6C837, + 0xD79A3234, 0x92638212, 0x670EFA8E, 0x406000E0 }, + + KS3 = { 0x3A39CE37, 0xD3FAF5CF, 0xABC27737, 0x5AC52D1B, 0x5CB0679E, 0x4FA33742, 0xD3822740, 0x99BC9BBE, 0xD5118E9D, + 0xBF0F7315, 0xD62D1C7E, 0xC700C47B, 0xB78C1B6B, 0x21A19045, 0xB26EB1BE, 0x6A366EB4, 0x5748AB2F, 0xBC946E79, + 0xC6A376D2, 0x6549C2C8, 0x530FF8EE, 0x468DDE7D, 0xD5730A1D, 0x4CD04DC6, 0x2939BBDB, 0xA9BA4650, 0xAC9526E8, + 0xBE5EE304, 0xA1FAD5F0, 0x6A2D519A, 0x63EF8CE2, 0x9A86EE22, 0xC089C2B8, 0x43242EF6, 0xA51E03AA, 0x9CF2D0A4, + 0x83C061BA, 0x9BE96A4D, 0x8FE51550, 0xBA645BD6, 0x2826A2F9, 0xA73A3AE1, 0x4BA99586, 0xEF5562E9, 0xC72FEFD3, + 0xF752F7DA, 0x3F046F69, 0x77FA0A59, 0x80E4A915, 0x87B08601, 0x9B09E6AD, 0x3B3EE593, 0xE990FD5A, 0x9E34D797, + 0x2CF0B7D9, 0x022B8B51, 0x96D5AC3A, 0x017DA67D, 0xD1CF3ED6, 0x7C7D2D28, 0x1F9F25CF, 0xADF2B89B, 0x5AD6B472, + 0x5A88F54C, 0xE029AC71, 0xE019A5E6, 0x47B0ACFD, 0xED93FA9B, 0xE8D3C48D, 0x283B57CC, 0xF8D56629, 0x79132E28, + 0x785F0191, 0xED756055, 0xF7960E44, 0xE3D35E8C, 0x15056DD4, 0x88F46DBA, 0x03A16125, 0x0564F0BD, 0xC3EB9E15, + 0x3C9057A2, 0x97271AEC, 0xA93A072A, 0x1B3F6D9B, 0x1E6321F5, 0xF59C66FB, 0x26DCF319, 0x7533D928, 0xB155FDF5, + 0x03563482, 0x8ABA3CBB, 0x28517711, 0xC20AD9F8, 0xABCC5167, 0xCCAD925F, 0x4DE81751, 0x3830DC8E, 0x379D5862, + 0x9320F991, 0xEA7A90C2, 0xFB3E7BCE, 0x5121CE64, 0x774FBE32, 0xA8B6E37E, 0xC3293D46, 0x48DE5369, 0x6413E680, + 0xA2AE0810, 0xDD6DB224, 0x69852DFD, 0x09072166, 0xB39A460A, 0x6445C0DD, 0x586CDECF, 0x1C20C8AE, 0x5BBEF7DD, + 0x1B588D40, 0xCCD2017F, 0x6BB4E3BB, 0xDDA26A7E, 0x3A59FF45, 0x3E350A44, 0xBCB4CDD5, 0x72EACEA8, 0xFA6484BB, + 0x8D6612AE, 0xBF3C6F47, 0xD29BE463, 0x542F5D9E, 0xAEC2771B, 0xF64E6370, 0x740E0D8D, 0xE75B1357, 0xF8721671, + 0xAF537D5D, 0x4040CB08, 0x4EB4E2CC, 0x34D2466A, 0x0115AF84, 0xE1B00428, 0x95983A1D, 0x06B89FB4, 0xCE6EA048, + 0x6F3F3B82, 0x3520AB82, 0x011A1D4B, 0x277227F8, 0x611560B1, 0xE7933FDC, 0xBB3A792B, 0x344525BD, 0xA08839E1, + 0x51CE794B, 0x2F32C9B7, 0xA01FBAC9, 0xE01CC87E, 0xBCC7D1F6, 0xCF0111C3, 0xA1E8AAC7, 0x1A908749, 0xD44FBD9A, + 0xD0DADECB, 0xD50ADA38, 0x0339C32A, 0xC6913667, 0x8DF9317C, 0xE0B12B4F, 0xF79E59B7, 0x43F5BB3A, 0xF2D519FF, + 0x27D9459C, 0xBF97222C, 0x15E6FC2A, 0x0F91FC71, 0x9B941525, 0xFAE59361, 0xCEB69CEB, 0xC2A86459, 0x12BAA8D1, + 0xB6C1075E, 0xE3056A0C, 0x10D25065, 0xCB03A442, 0xE0EC6E0E, 0x1698DB3B, 0x4C98A0BE, 0x3278E964, 0x9F1F9532, + 0xE0D392DF, 0xD3A0342B, 0x8971F21E, 0x1B0A7441, 0x4BA3348C, 0xC5BE7120, 0xC37632D8, 0xDF359F8D, 0x9B992F2E, + 0xE60B6F47, 0x0FE3F11D, 0xE54CDA54, 0x1EDAD891, 0xCE6279CF, 0xCD3E7E6F, 0x1618B166, 0xFD2C1D05, 0x848FD2C5, + 0xF6FB2299, 0xF523F357, 0xA6327623, 0x93A83531, 0x56CCCD02, 0xACF08162, 0x5A75EBB5, 0x6E163697, 0x88D273CC, + 0xDE966292, 0x81B949D0, 0x4C50901B, 0x71C65614, 0xE6C6C7BD, 0x327A140A, 0x45E1D006, 0xC3F27B9A, 0xC9AA53FD, + 0x62A80F00, 0xBB25BFE2, 0x35BDD2F6, 0x71126905, 0xB2040222, 0xB6CBCF7C, 0xCD769C2B, 0x53113EC0, 0x1640E3D3, + 0x38ABBD60, 0x2547ADF0, 0xBA38209C, 0xF746CE76, 0x77AFA1C5, 0x20756060, 0x85CBFE4E, 0x8AE88DD8, 0x7AAAF9B0, + 0x4CF9AA7E, 0x1948C25C, 0x02FB8A8C, 0x01C36AE4, 0xD6EBE1F9, 0x90D4F869, 0xA65CDEA0, 0x3F09252D, 0xC208E69F, + 0xB74E6132, 0xCE77E25B, 0x578FDFE3, 0x3AC372E6 }; + + // ==================================== + // Useful constants + // ==================================== + + private static final int ROUNDS = 16; + private static final int BLOCK_SIZE = 8; // bytes = 64 bits + private static final int SBOX_SK = 256; + private static final int P_SZ = ROUNDS + 2; + + private final int[] S0, S1, S2, S3; // the s-boxes + private final int[] P; // the p-array + + private boolean doEncrypt = false; + + private byte[] workingKey = null; + + public BlowFish() + { + S0 = new int[SBOX_SK]; + S1 = new int[SBOX_SK]; + S2 = new int[SBOX_SK]; + S3 = new int[SBOX_SK]; + P = new int[P_SZ]; + } + + /** + * initialise a Blowfish cipher. + * + * @param encrypting + * whether or not we are for encryption. + * @param key + * the key required to set up the cipher. + * @param iv + * initial vector; not used for stream ciphers + * @exception IllegalArgumentException + * if the params argument is inappropriate. + */ + @Override + public void init(boolean encrypting, byte[] key, byte[] iv) + { + this.doEncrypt = encrypting; + this.workingKey = key; + setKey(this.workingKey); + } + + public String getAlgorithmName() + { + return "Blowfish"; + } + + @Override + public final void transformBlock(byte[] in, int inOff, byte[] out, int outOff) + { + if (workingKey == null) + { + throw new IllegalStateException("Blowfish not initialised"); + } + + if (doEncrypt) + { + encryptBlock(in, inOff, out, outOff); + } + else + { + decryptBlock(in, inOff, out, outOff); + } + } + + @Override + public int getBlockSize() + { + return BLOCK_SIZE; + } + + // ================================== + // Private Implementation + // ================================== + + private int F(int x) + { + return (((S0[(x >>> 24)] + S1[(x >>> 16) & 0xff]) ^ S2[(x >>> 8) & 0xff]) + S3[x & 0xff]); + } + + /** + * apply the encryption cycle to each value pair in the table. + */ + private void processTable(int xl, int xr, int[] table) + { + int size = table.length; + + for (int s = 0; s < size; s += 2) + { + xl ^= P[0]; + + for (int i = 1; i < ROUNDS; i += 2) + { + xr ^= F(xl) ^ P[i]; + xl ^= F(xr) ^ P[i + 1]; + } + + xr ^= P[ROUNDS + 1]; + + table[s] = xr; + table[s + 1] = xl; + + xr = xl; // end of cycle swap + xl = table[s]; + } + } + + private void setKey(byte[] key) + { + /* + * - comments are from _Applied Crypto_, Schneier, p338 please be + * careful comparing the two, AC numbers the arrays from 1, the enclosed + * code from 0. + * + * (1) Initialise the S-boxes and the P-array, with a fixed string This + * string contains the hexadecimal digits of pi (3.141...) + */ + System.arraycopy(KS0, 0, S0, 0, SBOX_SK); + System.arraycopy(KS1, 0, S1, 0, SBOX_SK); + System.arraycopy(KS2, 0, S2, 0, SBOX_SK); + System.arraycopy(KS3, 0, S3, 0, SBOX_SK); + + System.arraycopy(KP, 0, P, 0, P_SZ); + + /* + * (2) Now, XOR P[0] with the first 32 bits of the key, XOR P[1] with + * the second 32-bits of the key, and so on for all bits of the key (up + * to P[17]). Repeatedly cycle through the key bits until the entire + * P-array has been XOR-ed with the key bits + */ + int keyLength = key.length; + int keyIndex = 0; + + for (int i = 0; i < P_SZ; i++) + { + // get the 32 bits of the key, in 4 * 8 bit chunks + int data = 0x0000000; + for (int j = 0; j < 4; j++) + { + // create a 32 bit block + data = (data << 8) | (key[keyIndex++] & 0xff); + + // wrap when we get to the end of the key + if (keyIndex >= keyLength) + { + keyIndex = 0; + } + } + // XOR the newly created 32 bit chunk onto the P-array + P[i] ^= data; + } + + /* + * (3) Encrypt the all-zero string with the Blowfish algorithm, using + * the subkeys described in (1) and (2) + * + * (4) Replace P1 and P2 with the output of step (3) + * + * (5) Encrypt the output of step(3) using the Blowfish algorithm, with + * the modified subkeys. + * + * (6) Replace P3 and P4 with the output of step (5) + * + * (7) Continue the process, replacing all elements of the P-array and + * then all four S-boxes in order, with the output of the continuously + * changing Blowfish algorithm + */ + + processTable(0, 0, P); + processTable(P[P_SZ - 2], P[P_SZ - 1], S0); + processTable(S0[SBOX_SK - 2], S0[SBOX_SK - 1], S1); + processTable(S1[SBOX_SK - 2], S1[SBOX_SK - 1], S2); + processTable(S2[SBOX_SK - 2], S2[SBOX_SK - 1], S3); + } + + /** + * Encrypt the given input starting at the given offset and place the result + * in the provided buffer starting at the given offset. The input will be an + * exact multiple of our blocksize. + */ + private void encryptBlock(byte[] src, int srcIndex, byte[] dst, int dstIndex) + { + int xl = BytesTo32bits(src, srcIndex); + int xr = BytesTo32bits(src, srcIndex + 4); + + xl ^= P[0]; + + for (int i = 1; i < ROUNDS; i += 2) + { + xr ^= F(xl) ^ P[i]; + xl ^= F(xr) ^ P[i + 1]; + } + + xr ^= P[ROUNDS + 1]; + + Bits32ToBytes(xr, dst, dstIndex); + Bits32ToBytes(xl, dst, dstIndex + 4); + } + + /** + * Decrypt the given input starting at the given offset and place the result + * in the provided buffer starting at the given offset. The input will be an + * exact multiple of our blocksize. + */ + private void decryptBlock(byte[] src, int srcIndex, byte[] dst, int dstIndex) + { + int xl = BytesTo32bits(src, srcIndex); + int xr = BytesTo32bits(src, srcIndex + 4); + + xl ^= P[ROUNDS + 1]; + + for (int i = ROUNDS; i > 0; i -= 2) + { + xr ^= F(xl) ^ P[i]; + xl ^= F(xr) ^ P[i - 1]; + } + + xr ^= P[0]; + + Bits32ToBytes(xr, dst, dstIndex); + Bits32ToBytes(xl, dst, dstIndex + 4); + } + + private int BytesTo32bits(byte[] b, int i) + { + return ((b[i] & 0xff) << 24) | ((b[i + 1] & 0xff) << 16) | ((b[i + 2] & 0xff) << 8) | ((b[i + 3] & 0xff)); + } + + private void Bits32ToBytes(int in, byte[] b, int offset) + { + b[offset + 3] = (byte) in; + b[offset + 2] = (byte) (in >> 8); + b[offset + 1] = (byte) (in >> 16); + b[offset] = (byte) (in >> 24); + } + + private abstract static class Wrapper implements BlockCipher { + protected BlockCipher bc; + + @Override + public int getBlockSize() { + return bc.getBlockSize(); + } + + @Override + public void transformBlock(byte[] src, int srcoff, byte[] dst, int dstoff) { + bc.transformBlock(src, srcoff, dst, dstoff); + } + } + + public static class CBC extends Wrapper { + @Override + public void init(boolean forEncryption, byte[] key, byte[] iv) throws IllegalArgumentException { + BlockCipher rawCipher = new BlowFish(); + rawCipher.init(forEncryption, key, iv); + bc = new CBCMode(rawCipher, iv, forEncryption); + } + } + + public static class CTR extends Wrapper { + @Override + public void init(boolean forEncryption, byte[] key, byte[] iv) throws IllegalArgumentException { + BlockCipher rawCipher = new BlowFish(); + rawCipher.init(true, key, iv); + bc = new CTRMode(rawCipher, iv, forEncryption); + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/CBCMode.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/CBCMode.java new file mode 100644 index 0000000000..078aacdc37 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/CBCMode.java @@ -0,0 +1,78 @@ +package com.trilead.ssh2.crypto.cipher; + +/** + * CBCMode. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: CBCMode.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class CBCMode implements BlockCipher +{ + BlockCipher tc; + int blockSize; + boolean doEncrypt; + + byte[] cbc_vector; + byte[] tmp_vector; + + public void init(boolean forEncryption, byte[] key, byte[] iv) + { + } + + public CBCMode(BlockCipher tc, byte[] iv, boolean doEncrypt) + throws IllegalArgumentException + { + this.tc = tc; + this.blockSize = tc.getBlockSize(); + this.doEncrypt = doEncrypt; + + if (this.blockSize != iv.length) + throw new IllegalArgumentException("IV must be " + blockSize + + " bytes long! (currently " + iv.length + ")"); + + this.cbc_vector = new byte[blockSize]; + this.tmp_vector = new byte[blockSize]; + System.arraycopy(iv, 0, cbc_vector, 0, blockSize); + } + + public int getBlockSize() + { + return blockSize; + } + + private void encryptBlock(byte[] src, int srcoff, byte[] dst, int dstoff) + { + for (int i = 0; i < blockSize; i++) + cbc_vector[i] ^= src[srcoff + i]; + + tc.transformBlock(cbc_vector, 0, dst, dstoff); + + System.arraycopy(dst, dstoff, cbc_vector, 0, blockSize); + } + + private void decryptBlock(byte[] src, int srcoff, byte[] dst, int dstoff) + { + /* Assume the worst, src and dst are overlapping... */ + + System.arraycopy(src, srcoff, tmp_vector, 0, blockSize); + + tc.transformBlock(src, srcoff, dst, dstoff); + + for (int i = 0; i < blockSize; i++) + dst[dstoff + i] ^= cbc_vector[i]; + + /* ...that is why we need a tmp buffer. */ + + byte[] swap = cbc_vector; + cbc_vector = tmp_vector; + tmp_vector = swap; + } + + public void transformBlock(byte[] src, int srcoff, byte[] dst, int dstoff) + { + if (doEncrypt) + encryptBlock(src, srcoff, dst, dstoff); + else + decryptBlock(src, srcoff, dst, dstoff); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/CTRMode.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/CTRMode.java new file mode 100644 index 0000000000..2c68f4abaa --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/CTRMode.java @@ -0,0 +1,62 @@ + +package com.trilead.ssh2.crypto.cipher; + +/** + * This is CTR mode as described in draft-ietf-secsh-newmodes-XY.txt + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: CTRMode.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class CTRMode implements BlockCipher +{ + byte[] X; + byte[] Xenc; + + BlockCipher bc; + int blockSize; + boolean doEncrypt; + + int count = 0; + + public void init(boolean forEncryption, byte[] key, byte[] iv) + { + } + + public CTRMode(BlockCipher tc, byte[] iv, boolean doEnc) throws IllegalArgumentException + { + bc = tc; + blockSize = bc.getBlockSize(); + doEncrypt = doEnc; + + if (blockSize != iv.length) + throw new IllegalArgumentException("IV must be " + blockSize + " bytes long! (currently " + iv.length + ")"); + + X = new byte[blockSize]; + Xenc = new byte[blockSize]; + + System.arraycopy(iv, 0, X, 0, blockSize); + } + + public final int getBlockSize() + { + return blockSize; + } + + public final void transformBlock(byte[] src, int srcoff, byte[] dst, int dstoff) + { + bc.transformBlock(X, 0, Xenc, 0); + + for (int i = 0; i < blockSize; i++) + { + dst[dstoff + i] = (byte) (src[srcoff + i] ^ Xenc[i]); + } + + for (int i = (blockSize - 1); i >= 0; i--) + { + X[i]++; + if (X[i] != 0) + break; + + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/CipherInputStream.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/CipherInputStream.java new file mode 100644 index 0000000000..851cc2843a --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/CipherInputStream.java @@ -0,0 +1,133 @@ + +package com.trilead.ssh2.crypto.cipher; + +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; + +/** + * CipherInputStream. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: CipherInputStream.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class CipherInputStream +{ + private BlockCipher currentCipher; + private final BufferedInputStream bi; + private byte[] buffer; + private byte[] enc; + private int blockSize; + private int pos; + + public CipherInputStream(BlockCipher tc, InputStream bi) + { + if (bi instanceof BufferedInputStream) { + this.bi = (BufferedInputStream) bi; + } else { + this.bi = new BufferedInputStream(bi); + } + changeCipher(tc); + } + + public void changeCipher(BlockCipher bc) + { + this.currentCipher = bc; + blockSize = bc.getBlockSize(); + buffer = new byte[blockSize]; + enc = new byte[blockSize]; + pos = blockSize; + } + + private void getBlock() throws IOException + { + int n = 0; + while (n < blockSize) + { + int len = bi.read(enc, n, blockSize - n); + if (len < 0) + throw new IOException("Cannot read full block, EOF reached."); + n += len; + } + + try + { + currentCipher.transformBlock(enc, 0, buffer, 0); + } + catch (Exception e) + { + throw new IOException("Error while decrypting block."); + } + pos = 0; + } + + public int read(byte[] dst) throws IOException + { + return read(dst, 0, dst.length); + } + + public int read(byte[] dst, int off, int len) throws IOException + { + int count = 0; + + while (len > 0) + { + if (pos >= blockSize) + getBlock(); + + int avail = blockSize - pos; + int copy = Math.min(avail, len); + System.arraycopy(buffer, pos, dst, off, copy); + pos += copy; + off += copy; + len -= copy; + count += copy; + } + return count; + } + + public int read() throws IOException + { + if (pos >= blockSize) + { + getBlock(); + } + return buffer[pos++] & 0xff; + } + + public int readPlain(byte[] b, int off, int len) throws IOException + { + if (pos != blockSize) + throw new IOException("Cannot read plain since crypto buffer is not aligned."); + int n = 0; + while (n < len) + { + int cnt = bi.read(b, off + n, len - n); + if (cnt < 0) + throw new IOException("Cannot fill buffer, EOF reached."); + n += cnt; + } + return n; + } + + public int peekPlain(byte[] b, int off, int len) throws IOException + { + if (pos != blockSize) + throw new IOException("Cannot read plain since crypto buffer is not aligned."); + int n = 0; + + bi.mark(len); + try { + while (n < len) { + int cnt = bi.read(b, off + n, len - n); + if (cnt < 0) + throw new IOException("Cannot fill buffer, EOF reached."); + n += cnt; + } + } finally { + bi.reset(); + } + + return n; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/CipherOutputStream.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/CipherOutputStream.java new file mode 100644 index 0000000000..b01ec3a45d --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/CipherOutputStream.java @@ -0,0 +1,120 @@ + +package com.trilead.ssh2.crypto.cipher; + +import java.io.BufferedOutputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; + +/** + * CipherOutputStream. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: CipherOutputStream.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class CipherOutputStream +{ + private BlockCipher currentCipher; + private final BufferedOutputStream bo; + private byte[] buffer; + private byte[] enc; + private int blockSize; + private int pos; + private boolean recordingOutput; + private final ByteArrayOutputStream recordingOutputStream = new ByteArrayOutputStream(); + + public CipherOutputStream(BlockCipher tc, OutputStream bo) + { + if (bo instanceof BufferedOutputStream) { + this.bo = (BufferedOutputStream) bo; + } else { + this.bo = new BufferedOutputStream(bo); + } + changeCipher(tc); + } + + public void flush() throws IOException + { + if (pos != 0) + throw new IOException("FATAL: cannot flush since crypto buffer is not aligned."); + + bo.flush(); + } + + public void changeCipher(BlockCipher bc) + { + this.currentCipher = bc; + blockSize = bc.getBlockSize(); + buffer = new byte[blockSize]; + enc = new byte[blockSize]; + pos = 0; + } + + public void startRecording() { + recordingOutput = true; + } + + public byte[] getRecordedOutput() { + recordingOutput = false; + byte[] recordedOutput = recordingOutputStream.toByteArray(); + recordingOutputStream.reset(); + return recordedOutput; + } + + private void writeBlock() throws IOException + { + try + { + currentCipher.transformBlock(buffer, 0, enc, 0); + } + catch (Exception e) + { + throw new IOException("Error while decrypting block.", e); + } + + bo.write(enc, 0, blockSize); + pos = 0; + + if (recordingOutput) { + recordingOutputStream.write(enc, 0, blockSize); + } + } + + public void write(byte[] src, int off, int len) throws IOException + { + while (len > 0) + { + int avail = blockSize - pos; + int copy = Math.min(avail, len); + + System.arraycopy(src, off, buffer, pos, copy); + pos += copy; + off += copy; + len -= copy; + + if (pos >= blockSize) + writeBlock(); + } + } + + public void write(int b) throws IOException + { + buffer[pos++] = (byte) b; + if (pos >= blockSize) + writeBlock(); + } + + public void writePlain(int b) throws IOException + { + if (pos != 0) + throw new IOException("Cannot write plain since crypto buffer is not aligned."); + bo.write(b); + } + + public void writePlain(byte[] b, int off, int len) throws IOException + { + if (pos != 0) + throw new IOException("Cannot write plain since crypto buffer is not aligned."); + bo.write(b, off, len); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/DES.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/DES.java new file mode 100644 index 0000000000..81caa9944b --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/DES.java @@ -0,0 +1,392 @@ + +package com.trilead.ssh2.crypto.cipher; + +/* + * This file is based on the 3DES implementation from the Bouncy Castle Crypto package. + * Their licence file states the following: + * + * Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle + * (http://www.bouncycastle.org) + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +/** + * DES. + * + * @author See comments in the source file + * @version $Id: DES.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + * + */ +public class DES implements BlockCipher +{ + private int[] workingKey = null; + + /** + * standard constructor. + */ + public DES() + { + } + + /** + * initialise a DES cipher. + * + * @param encrypting + * whether or not we are for encryption. + * @param key + * the parameters required to set up the cipher. + * @exception IllegalArgumentException + * if the params argument is inappropriate. + */ + @Override + public void init(boolean encrypting, byte[] key, byte[] iv) + { + this.workingKey = generateWorkingKey(encrypting, key, 0); + } + + public String getAlgorithmName() + { + return "DES"; + } + + @Override + public int getBlockSize() + { + return 8; + } + + public void transformBlock(byte[] in, int inOff, byte[] out, int outOff) + { + if (workingKey == null) + { + throw new IllegalStateException("DES engine not initialised!"); + } + + desFunc(workingKey, in, inOff, out, outOff); + } + + /** + * what follows is mainly taken from "Applied Cryptography", by Bruce + * Schneier, however it also bears great resemblance to Richard + * Outerbridge's D3DES... + */ + + static short[] Df_Key = { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, + 0x10, 0x89, 0xab, 0xcd, 0xef, 0x01, 0x23, 0x45, 0x67 }; + + static short[] bytebit = { 0200, 0100, 040, 020, 010, 04, 02, 01 }; + + static int[] bigbyte = { 0x800000, 0x400000, 0x200000, 0x100000, 0x80000, 0x40000, 0x20000, 0x10000, 0x8000, + 0x4000, 0x2000, 0x1000, 0x800, 0x400, 0x200, 0x100, 0x80, 0x40, 0x20, 0x10, 0x8, 0x4, 0x2, 0x1 }; + + /* + * Use the key schedule specified in the Standard (ANSI X3.92-1981). + */ + + static byte[] pc1 = { 56, 48, 40, 32, 24, 16, 8, 0, 57, 49, 41, 33, 25, 17, 9, 1, 58, 50, 42, 34, 26, 18, 10, 2, + 59, 51, 43, 35, 62, 54, 46, 38, 30, 22, 14, 6, 61, 53, 45, 37, 29, 21, 13, 5, 60, 52, 44, 36, 28, 20, 12, + 4, 27, 19, 11, 3 }; + + static byte[] totrot = { 1, 2, 4, 6, 8, 10, 12, 14, 15, 17, 19, 21, 23, 25, 27, 28 }; + + static byte[] pc2 = { 13, 16, 10, 23, 0, 4, 2, 27, 14, 5, 20, 9, 22, 18, 11, 3, 25, 7, 15, 6, 26, 19, 12, 1, 40, + 51, 30, 36, 46, 54, 29, 39, 50, 44, 32, 47, 43, 48, 38, 55, 33, 52, 45, 41, 49, 35, 28, 31 }; + + static int[] SP1 = { 0x01010400, 0x00000000, 0x00010000, 0x01010404, 0x01010004, 0x00010404, 0x00000004, + 0x00010000, 0x00000400, 0x01010400, 0x01010404, 0x00000400, 0x01000404, 0x01010004, 0x01000000, 0x00000004, + 0x00000404, 0x01000400, 0x01000400, 0x00010400, 0x00010400, 0x01010000, 0x01010000, 0x01000404, 0x00010004, + 0x01000004, 0x01000004, 0x00010004, 0x00000000, 0x00000404, 0x00010404, 0x01000000, 0x00010000, 0x01010404, + 0x00000004, 0x01010000, 0x01010400, 0x01000000, 0x01000000, 0x00000400, 0x01010004, 0x00010000, 0x00010400, + 0x01000004, 0x00000400, 0x00000004, 0x01000404, 0x00010404, 0x01010404, 0x00010004, 0x01010000, 0x01000404, + 0x01000004, 0x00000404, 0x00010404, 0x01010400, 0x00000404, 0x01000400, 0x01000400, 0x00000000, 0x00010004, + 0x00010400, 0x00000000, 0x01010004 }; + + static int[] SP2 = { 0x80108020, 0x80008000, 0x00008000, 0x00108020, 0x00100000, 0x00000020, 0x80100020, + 0x80008020, 0x80000020, 0x80108020, 0x80108000, 0x80000000, 0x80008000, 0x00100000, 0x00000020, 0x80100020, + 0x00108000, 0x00100020, 0x80008020, 0x00000000, 0x80000000, 0x00008000, 0x00108020, 0x80100000, 0x00100020, + 0x80000020, 0x00000000, 0x00108000, 0x00008020, 0x80108000, 0x80100000, 0x00008020, 0x00000000, 0x00108020, + 0x80100020, 0x00100000, 0x80008020, 0x80100000, 0x80108000, 0x00008000, 0x80100000, 0x80008000, 0x00000020, + 0x80108020, 0x00108020, 0x00000020, 0x00008000, 0x80000000, 0x00008020, 0x80108000, 0x00100000, 0x80000020, + 0x00100020, 0x80008020, 0x80000020, 0x00100020, 0x00108000, 0x00000000, 0x80008000, 0x00008020, 0x80000000, + 0x80100020, 0x80108020, 0x00108000 }; + + static int[] SP3 = { 0x00000208, 0x08020200, 0x00000000, 0x08020008, 0x08000200, 0x00000000, 0x00020208, + 0x08000200, 0x00020008, 0x08000008, 0x08000008, 0x00020000, 0x08020208, 0x00020008, 0x08020000, 0x00000208, + 0x08000000, 0x00000008, 0x08020200, 0x00000200, 0x00020200, 0x08020000, 0x08020008, 0x00020208, 0x08000208, + 0x00020200, 0x00020000, 0x08000208, 0x00000008, 0x08020208, 0x00000200, 0x08000000, 0x08020200, 0x08000000, + 0x00020008, 0x00000208, 0x00020000, 0x08020200, 0x08000200, 0x00000000, 0x00000200, 0x00020008, 0x08020208, + 0x08000200, 0x08000008, 0x00000200, 0x00000000, 0x08020008, 0x08000208, 0x00020000, 0x08000000, 0x08020208, + 0x00000008, 0x00020208, 0x00020200, 0x08000008, 0x08020000, 0x08000208, 0x00000208, 0x08020000, 0x00020208, + 0x00000008, 0x08020008, 0x00020200 }; + + static int[] SP4 = { 0x00802001, 0x00002081, 0x00002081, 0x00000080, 0x00802080, 0x00800081, 0x00800001, + 0x00002001, 0x00000000, 0x00802000, 0x00802000, 0x00802081, 0x00000081, 0x00000000, 0x00800080, 0x00800001, + 0x00000001, 0x00002000, 0x00800000, 0x00802001, 0x00000080, 0x00800000, 0x00002001, 0x00002080, 0x00800081, + 0x00000001, 0x00002080, 0x00800080, 0x00002000, 0x00802080, 0x00802081, 0x00000081, 0x00800080, 0x00800001, + 0x00802000, 0x00802081, 0x00000081, 0x00000000, 0x00000000, 0x00802000, 0x00002080, 0x00800080, 0x00800081, + 0x00000001, 0x00802001, 0x00002081, 0x00002081, 0x00000080, 0x00802081, 0x00000081, 0x00000001, 0x00002000, + 0x00800001, 0x00002001, 0x00802080, 0x00800081, 0x00002001, 0x00002080, 0x00800000, 0x00802001, 0x00000080, + 0x00800000, 0x00002000, 0x00802080 }; + + static int[] SP5 = { 0x00000100, 0x02080100, 0x02080000, 0x42000100, 0x00080000, 0x00000100, 0x40000000, + 0x02080000, 0x40080100, 0x00080000, 0x02000100, 0x40080100, 0x42000100, 0x42080000, 0x00080100, 0x40000000, + 0x02000000, 0x40080000, 0x40080000, 0x00000000, 0x40000100, 0x42080100, 0x42080100, 0x02000100, 0x42080000, + 0x40000100, 0x00000000, 0x42000000, 0x02080100, 0x02000000, 0x42000000, 0x00080100, 0x00080000, 0x42000100, + 0x00000100, 0x02000000, 0x40000000, 0x02080000, 0x42000100, 0x40080100, 0x02000100, 0x40000000, 0x42080000, + 0x02080100, 0x40080100, 0x00000100, 0x02000000, 0x42080000, 0x42080100, 0x00080100, 0x42000000, 0x42080100, + 0x02080000, 0x00000000, 0x40080000, 0x42000000, 0x00080100, 0x02000100, 0x40000100, 0x00080000, 0x00000000, + 0x40080000, 0x02080100, 0x40000100 }; + + static int[] SP6 = { 0x20000010, 0x20400000, 0x00004000, 0x20404010, 0x20400000, 0x00000010, 0x20404010, + 0x00400000, 0x20004000, 0x00404010, 0x00400000, 0x20000010, 0x00400010, 0x20004000, 0x20000000, 0x00004010, + 0x00000000, 0x00400010, 0x20004010, 0x00004000, 0x00404000, 0x20004010, 0x00000010, 0x20400010, 0x20400010, + 0x00000000, 0x00404010, 0x20404000, 0x00004010, 0x00404000, 0x20404000, 0x20000000, 0x20004000, 0x00000010, + 0x20400010, 0x00404000, 0x20404010, 0x00400000, 0x00004010, 0x20000010, 0x00400000, 0x20004000, 0x20000000, + 0x00004010, 0x20000010, 0x20404010, 0x00404000, 0x20400000, 0x00404010, 0x20404000, 0x00000000, 0x20400010, + 0x00000010, 0x00004000, 0x20400000, 0x00404010, 0x00004000, 0x00400010, 0x20004010, 0x00000000, 0x20404000, + 0x20000000, 0x00400010, 0x20004010 }; + + static int[] SP7 = { 0x00200000, 0x04200002, 0x04000802, 0x00000000, 0x00000800, 0x04000802, 0x00200802, + 0x04200800, 0x04200802, 0x00200000, 0x00000000, 0x04000002, 0x00000002, 0x04000000, 0x04200002, 0x00000802, + 0x04000800, 0x00200802, 0x00200002, 0x04000800, 0x04000002, 0x04200000, 0x04200800, 0x00200002, 0x04200000, + 0x00000800, 0x00000802, 0x04200802, 0x00200800, 0x00000002, 0x04000000, 0x00200800, 0x04000000, 0x00200800, + 0x00200000, 0x04000802, 0x04000802, 0x04200002, 0x04200002, 0x00000002, 0x00200002, 0x04000000, 0x04000800, + 0x00200000, 0x04200800, 0x00000802, 0x00200802, 0x04200800, 0x00000802, 0x04000002, 0x04200802, 0x04200000, + 0x00200800, 0x00000000, 0x00000002, 0x04200802, 0x00000000, 0x00200802, 0x04200000, 0x00000800, 0x04000002, + 0x04000800, 0x00000800, 0x00200002 }; + + static int[] SP8 = { 0x10001040, 0x00001000, 0x00040000, 0x10041040, 0x10000000, 0x10001040, 0x00000040, + 0x10000000, 0x00040040, 0x10040000, 0x10041040, 0x00041000, 0x10041000, 0x00041040, 0x00001000, 0x00000040, + 0x10040000, 0x10000040, 0x10001000, 0x00001040, 0x00041000, 0x00040040, 0x10040040, 0x10041000, 0x00001040, + 0x00000000, 0x00000000, 0x10040040, 0x10000040, 0x10001000, 0x00041040, 0x00040000, 0x00041040, 0x00040000, + 0x10041000, 0x00001000, 0x00000040, 0x10040040, 0x00001000, 0x00041040, 0x10001000, 0x00000040, 0x10000040, + 0x10040000, 0x10040040, 0x10000000, 0x00040000, 0x10001040, 0x00000000, 0x10041040, 0x00040040, 0x10000040, + 0x10040000, 0x10001000, 0x10001040, 0x00000000, 0x10041040, 0x00041000, 0x00041000, 0x00001040, 0x00001040, + 0x00040040, 0x10000000, 0x10041000 }; + + /** + * generate an integer based working key based on our secret key and what we + * processing we are planning to do. + * + * Acknowledgements for this routine go to James Gillogly & Phil Karn. + * (whoever, and wherever they are!). + */ + protected int[] generateWorkingKey(boolean encrypting, byte[] key, int off) + { + int[] newKey = new int[32]; + boolean[] pc1m = new boolean[56], pcr = new boolean[56]; + + for (int j = 0; j < 56; j++) + { + int l = pc1[j]; + + pc1m[j] = ((key[off + (l >>> 3)] & bytebit[l & 07]) != 0); + } + + for (int i = 0; i < 16; i++) + { + int l, m, n; + + if (encrypting) + { + m = i << 1; + } + else + { + m = (15 - i) << 1; + } + + n = m + 1; + newKey[m] = newKey[n] = 0; + + for (int j = 0; j < 28; j++) + { + l = j + totrot[i]; + if (l < 28) + { + pcr[j] = pc1m[l]; + } + else + { + pcr[j] = pc1m[l - 28]; + } + } + + for (int j = 28; j < 56; j++) + { + l = j + totrot[i]; + if (l < 56) + { + pcr[j] = pc1m[l]; + } + else + { + pcr[j] = pc1m[l - 28]; + } + } + + for (int j = 0; j < 24; j++) + { + if (pcr[pc2[j]]) + { + newKey[m] |= bigbyte[j]; + } + + if (pcr[pc2[j + 24]]) + { + newKey[n] |= bigbyte[j]; + } + } + } + + // + // store the processed key + // + for (int i = 0; i != 32; i += 2) + { + int i1, i2; + + i1 = newKey[i]; + i2 = newKey[i + 1]; + + newKey[i] = ((i1 & 0x00fc0000) << 6) | ((i1 & 0x00000fc0) << 10) | ((i2 & 0x00fc0000) >>> 10) + | ((i2 & 0x00000fc0) >>> 6); + + newKey[i + 1] = ((i1 & 0x0003f000) << 12) | ((i1 & 0x0000003f) << 16) | ((i2 & 0x0003f000) >>> 4) + | (i2 & 0x0000003f); + } + + return newKey; + } + + /** + * the DES engine. + */ + protected void desFunc(int[] wKey, byte[] in, int inOff, byte[] out, int outOff) + { + int work, right, left; + + left = (in[inOff + 0] & 0xff) << 24; + left |= (in[inOff + 1] & 0xff) << 16; + left |= (in[inOff + 2] & 0xff) << 8; + left |= (in[inOff + 3] & 0xff); + + right = (in[inOff + 4] & 0xff) << 24; + right |= (in[inOff + 5] & 0xff) << 16; + right |= (in[inOff + 6] & 0xff) << 8; + right |= (in[inOff + 7] & 0xff); + + work = ((left >>> 4) ^ right) & 0x0f0f0f0f; + right ^= work; + left ^= (work << 4); + work = ((left >>> 16) ^ right) & 0x0000ffff; + right ^= work; + left ^= (work << 16); + work = ((right >>> 2) ^ left) & 0x33333333; + left ^= work; + right ^= (work << 2); + work = ((right >>> 8) ^ left) & 0x00ff00ff; + left ^= work; + right ^= (work << 8); + right = ((right << 1) | ((right >>> 31) & 1)) & 0xffffffff; + work = (left ^ right) & 0xaaaaaaaa; + left ^= work; + right ^= work; + left = ((left << 1) | ((left >>> 31) & 1)) & 0xffffffff; + + for (int round = 0; round < 8; round++) + { + int fval; + + work = (right << 28) | (right >>> 4); + work ^= wKey[round * 4 + 0]; + fval = SP7[work & 0x3f]; + fval |= SP5[(work >>> 8) & 0x3f]; + fval |= SP3[(work >>> 16) & 0x3f]; + fval |= SP1[(work >>> 24) & 0x3f]; + work = right ^ wKey[round * 4 + 1]; + fval |= SP8[work & 0x3f]; + fval |= SP6[(work >>> 8) & 0x3f]; + fval |= SP4[(work >>> 16) & 0x3f]; + fval |= SP2[(work >>> 24) & 0x3f]; + left ^= fval; + work = (left << 28) | (left >>> 4); + work ^= wKey[round * 4 + 2]; + fval = SP7[work & 0x3f]; + fval |= SP5[(work >>> 8) & 0x3f]; + fval |= SP3[(work >>> 16) & 0x3f]; + fval |= SP1[(work >>> 24) & 0x3f]; + work = left ^ wKey[round * 4 + 3]; + fval |= SP8[work & 0x3f]; + fval |= SP6[(work >>> 8) & 0x3f]; + fval |= SP4[(work >>> 16) & 0x3f]; + fval |= SP2[(work >>> 24) & 0x3f]; + right ^= fval; + } + + right = (right << 31) | (right >>> 1); + work = (left ^ right) & 0xaaaaaaaa; + left ^= work; + right ^= work; + left = (left << 31) | (left >>> 1); + work = ((left >>> 8) ^ right) & 0x00ff00ff; + right ^= work; + left ^= (work << 8); + work = ((left >>> 2) ^ right) & 0x33333333; + right ^= work; + left ^= (work << 2); + work = ((right >>> 16) ^ left) & 0x0000ffff; + left ^= work; + right ^= (work << 16); + work = ((right >>> 4) ^ left) & 0x0f0f0f0f; + left ^= work; + right ^= (work << 4); + + out[outOff + 0] = (byte) ((right >>> 24) & 0xff); + out[outOff + 1] = (byte) ((right >>> 16) & 0xff); + out[outOff + 2] = (byte) ((right >>> 8) & 0xff); + out[outOff + 3] = (byte) (right & 0xff); + out[outOff + 4] = (byte) ((left >>> 24) & 0xff); + out[outOff + 5] = (byte) ((left >>> 16) & 0xff); + out[outOff + 6] = (byte) ((left >>> 8) & 0xff); + out[outOff + 7] = (byte) (left & 0xff); + } + + public static class CBC implements BlockCipher { + protected BlockCipher bc; + + @Override + public void init(boolean forEncryption, byte[] key, byte[] iv) throws IllegalArgumentException { + BlockCipher rawCipher = new DESede(); + rawCipher.init(forEncryption, key, iv); + bc = new CBCMode(rawCipher, iv, forEncryption); + } + + @Override + public int getBlockSize() { + return bc.getBlockSize(); + } + + @Override + public void transformBlock(byte[] src, int srcoff, byte[] dst, int dstoff) { + bc.transformBlock(src, srcoff, dst, dstoff); + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/DESede.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/DESede.java new file mode 100644 index 0000000000..480a7fe640 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/DESede.java @@ -0,0 +1,130 @@ + +package com.trilead.ssh2.crypto.cipher; + +/* + * This file was shamelessly taken (and modified) from the Bouncy Castle Crypto package. + * Their licence file states the following: + * + * Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle + * (http://www.bouncycastle.org) + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +/** + * DESede. + * + * @author See comments in the source file + * @version $Id: DESede.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + * + */ +public class DESede extends DES +{ + private int[] key1 = null; + private int[] key2 = null; + private int[] key3 = null; + + private boolean encrypt; + + /** + * standard constructor. + */ + public DESede() + { + } + + /** + * initialise a DES cipher. + * + * @param encrypting + * whether or not we are for encryption. + * @param key + * the parameters required to set up the cipher. + * @exception IllegalArgumentException + * if the params argument is inappropriate. + */ + @Override + public void init(boolean encrypting, byte[] key, byte[] iv) + { + key1 = generateWorkingKey(encrypting, key, 0); + key2 = generateWorkingKey(!encrypting, key, 8); + key3 = generateWorkingKey(encrypting, key, 16); + + encrypt = encrypting; + } + + public String getAlgorithmName() + { + return "DESede"; + } + + @Override + public void transformBlock(byte[] in, int inOff, byte[] out, int outOff) + { + if (key1 == null) + { + throw new IllegalStateException("DESede engine not initialised!"); + } + + if (encrypt) + { + desFunc(key1, in, inOff, out, outOff); + desFunc(key2, out, outOff, out, outOff); + desFunc(key3, out, outOff, out, outOff); + } + else + { + desFunc(key3, in, inOff, out, outOff); + desFunc(key2, out, outOff, out, outOff); + desFunc(key1, out, outOff, out, outOff); + } + } + + private abstract static class Wrapper implements BlockCipher { + protected BlockCipher bc; + + @Override + public int getBlockSize() { + return bc.getBlockSize(); + } + + @Override + public void transformBlock(byte[] src, int srcoff, byte[] dst, int dstoff) { + bc.transformBlock(src, srcoff, dst, dstoff); + } + } + + public static class CBC extends Wrapper { + @Override + public void init(boolean forEncryption, byte[] key, byte[] iv) throws IllegalArgumentException { + BlockCipher rawCipher = new DESede(); + rawCipher.init(forEncryption, key, iv); + bc = new CBCMode(rawCipher, iv, forEncryption); + } + } + + public static class CTR extends Wrapper { + @Override + public void init(boolean forEncryption, byte[] key, byte[] iv) throws IllegalArgumentException { + BlockCipher rawCipher = new DESede(); + rawCipher.init(true, key, iv); + bc = new CTRMode(rawCipher, iv, forEncryption); + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/EtmCipher.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/EtmCipher.java new file mode 100644 index 0000000000..174b20e0b6 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/EtmCipher.java @@ -0,0 +1,4 @@ +package com.trilead.ssh2.crypto.cipher; + +public interface EtmCipher { +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/NullCipher.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/NullCipher.java new file mode 100644 index 0000000000..4617a3b081 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/cipher/NullCipher.java @@ -0,0 +1,35 @@ +package com.trilead.ssh2.crypto.cipher; + +/** + * NullCipher. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: NullCipher.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class NullCipher implements BlockCipher +{ + private int blockSize = 8; + + public NullCipher() + { + } + + public NullCipher(int blockSize) + { + this.blockSize = blockSize; + } + + public void init(boolean forEncryption, byte[] key, byte[] iv) + { + } + + public int getBlockSize() + { + return blockSize; + } + + public void transformBlock(byte[] src, int srcoff, byte[] dst, int dstoff) + { + System.arraycopy(src, srcoff, dst, dstoff, blockSize); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/dh/Curve25519Exchange.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/dh/Curve25519Exchange.java new file mode 100644 index 0000000000..01d4ab472a --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/dh/Curve25519Exchange.java @@ -0,0 +1,85 @@ +package com.trilead.ssh2.crypto.dh; + +import com.google.crypto.tink.subtle.X25519; + +import java.io.IOException; +import java.math.BigInteger; +import java.security.InvalidKeyException; + +/** + * Created by Kenny Root on 1/23/16. + */ +public class Curve25519Exchange extends GenericDhExchange { + public static final String NAME = "curve25519-sha256"; + public static final String ALT_NAME = "curve25519-sha256@libssh.org"; + public static final int KEY_SIZE = 32; + + private byte[] clientPublic; + private byte[] clientPrivate; + private byte[] serverPublic; + + public Curve25519Exchange() { + super(); + } + + /* + * Used to test known vectors. + */ + public Curve25519Exchange(byte[] secret) throws InvalidKeyException { + if (secret.length != KEY_SIZE) { + throw new AssertionError("secret must be key size"); + } + clientPrivate = secret.clone(); + } + + @Override + public void init(String name) throws IOException { + if (!NAME.equals(name) && !ALT_NAME.equals(name)) { + throw new IOException("Invalid name " + name); + } + + clientPrivate = X25519.generatePrivateKey(); + try { + clientPublic = X25519.publicFromPrivate(clientPrivate); + } catch (InvalidKeyException e) { + throw new IOException(e); + } + } + + @Override + public byte[] getE() { + return clientPublic.clone(); + } + + @Override + protected byte[] getServerE() { + return serverPublic.clone(); + } + + @Override + public void setF(byte[] f) throws IOException { + if (f.length != KEY_SIZE) { + throw new IOException("Server sent invalid key length " + f.length + " (expected " + + KEY_SIZE + ")"); + } + serverPublic = f.clone(); + try { + byte[] sharedSecretBytes = X25519.computeSharedSecret(clientPrivate, serverPublic); + int allBytes = 0; + for (int i = 0; i < sharedSecretBytes.length; i++) { + allBytes |= sharedSecretBytes[i]; + } + if (allBytes == 0) { + throw new IOException("Invalid key computed; all zeroes"); + } + sharedSecret = new BigInteger(1, sharedSecretBytes); + } catch (InvalidKeyException e) { + throw new IOException(e); + } + } + + @Override + public String getHashAlgo() { + return "SHA-256"; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/dh/DhExchange.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/dh/DhExchange.java new file mode 100644 index 0000000000..08b82eef91 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/dh/DhExchange.java @@ -0,0 +1,212 @@ +/** + * + */ +package com.trilead.ssh2.crypto.dh; + +import javax.crypto.KeyAgreement; +import javax.crypto.interfaces.DHPrivateKey; +import javax.crypto.interfaces.DHPublicKey; +import javax.crypto.spec.DHParameterSpec; +import javax.crypto.spec.DHPublicKeySpec; +import java.io.IOException; +import java.math.BigInteger; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.KeyFactory; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.NoSuchAlgorithmException; +import java.security.spec.InvalidKeySpecException; + +/** + * @author kenny + * + */ +public class DhExchange extends GenericDhExchange { + + /* Given by the standard */ + + private static final BigInteger P1 = new BigInteger( + "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1" + + "29024E088A67CC74020BBEA63B139B22514A08798E3404DD" + + "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245" + + "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED" + + "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381" + + "FFFFFFFFFFFFFFFF", 16); + + private static final BigInteger P14 = new BigInteger( + "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1" + + "29024E088A67CC74020BBEA63B139B22514A08798E3404DD" + + "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245" + + "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED" + + "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D" + + "C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F" + + "83655D23DCA3AD961C62F356208552BB9ED529077096966D" + + "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B" + + "E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9" + + "DE2BCBF6955817183995497CEA956AE515D2261898FA0510" + + "15728E5A8AACAA68FFFFFFFFFFFFFFFF", 16); + + private static final BigInteger P16 = new BigInteger( + "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1" + + "29024E088A67CC74020BBEA63B139B22514A08798E3404DD" + + "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245" + + "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED" + + "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D" + + "C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F" + + "83655D23DCA3AD961C62F356208552BB9ED529077096966D" + + "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B" + + "E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9" + + "DE2BCBF6955817183995497CEA956AE515D2261898FA0510" + + "15728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64" + + "ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7" + + "ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6B" + + "F12FFA06D98A0864D87602733EC86A64521F2B18177B200C" + + "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB31" + + "43DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D7" + + "88719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA" + + "2583E9CA2AD44CE8DBBBC2DB04DE8EF92E8EFC141FBECAA6" + + "287C59474E6BC05D99B2964FA090C3A2233BA186515BE7ED" + + "1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA9" + + "93B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934063199" + + "FFFFFFFFFFFFFFFF", 16); + + private static final BigInteger P18 = new BigInteger( + "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1" + + "29024E088A67CC74020BBEA63B139B22514A08798E3404DD" + + "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245" + + "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED" + + "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D" + + "C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F" + + "83655D23DCA3AD961C62F356208552BB9ED529077096966D" + + "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B" + + "E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9" + + "DE2BCBF6955817183995497CEA956AE515D2261898FA0510" + + "15728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64" + + "ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7" + + "ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6B" + + "F12FFA06D98A0864D87602733EC86A64521F2B18177B200C" + + "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB31" + + "43DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D7" + + "88719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA" + + "2583E9CA2AD44CE8DBBBC2DB04DE8EF92E8EFC141FBECAA6" + + "287C59474E6BC05D99B2964FA090C3A2233BA186515BE7ED" + + "1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA9" + + "93B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934028492" + + "36C3FAB4D27C7026C1D4DCB2602646DEC9751E763DBA37BD" + + "F8FF9406AD9E530EE5DB382F413001AEB06A53ED9027D831" + + "179727B0865A8918DA3EDBEBCF9B14ED44CE6CBACED4BB1B" + + "DB7F1447E6CC254B332051512BD7AF426FB8F401378CD2BF" + + "5983CA01C64B92ECF032EA15D1721D03F482D7CE6E74FEF6" + + "D55E702F46980C82B5A84031900B1C9E59E7C97FBEC7E8F3" + + "23A97A7E36CC88BE0F1D45B7FF585AC54BD407B22B4154AA" + + "CC8F6D7EBF48E1D814CC5ED20F8037E0A79715EEF29BE328" + + "06A1D58BB7C5DA76F550AA3D8A1FBFF0EB19CCB1A313D55C" + + "DA56C9EC2EF29632387FE8D76E3C0468043E8F663F4860EE" + + "12BF2D5B0B7474D6E694F91E6DBE115974A3926F12FEE5E4" + + "38777CB6A932DF8CD8BEC4D073B931BA3BC832B68D9DD300" + + "741FA7BF8AFC47ED2576F6936BA424663AAB639C5AE4F568" + + "3423B4742BF1C978238F16CBE39D652DE3FDB8BEFC848AD9" + + "22222E04A4037C0713EB57A81A23F0C73473FC646CEA306B" + + "4BCBC8862F8385DDFA9D4B7FA2C087E879683303ED5BDD3A" + + "062B3CF5B3A278A66D2A13F83F44F82DDF310EE074AB6A36" + + "4597E899A0255DC164F31CC50846851DF9AB48195DED7EA1" + + "B1D510BD7EE74D73FAF36BC31ECFA268359046F4EB879F92" + + "4009438B481C6CD7889A002ED5EE382BC9190DA6FC026E47" + + "9558E4475677E9AA9E3050E2765694DFC81F56E880B96E71" + + "60C980DD98EDD3DFFFFFFFFFFFFFFFFF", 16); + + private static final BigInteger G = BigInteger.valueOf(2); + + /* Hash algorithm to use */ + private String hashAlgo; + + /* Client public and private */ + + private DHPrivateKey clientPrivate; + private DHPublicKey clientPublic; + + /* Server public */ + + private DHPublicKey serverPublic; + + @Override + public void init(String name) throws IOException { + final DHParameterSpec spec; + if ("diffie-hellman-group18-sha512".equals(name)) { + spec = new DHParameterSpec(P18, G); + hashAlgo = "SHA-512"; + } else if ("diffie-hellman-group16-sha512".equals(name)) { + spec = new DHParameterSpec(P16, G); + hashAlgo = "SHA-512"; + } else if ("diffie-hellman-group14-sha256".equals(name)) { + spec = new DHParameterSpec(P14, G); + hashAlgo = "SHA-256"; + } else if ("diffie-hellman-group14-sha1".equals(name)) { + spec = new DHParameterSpec(P14, G); + hashAlgo = "SHA-1"; + } else if ("diffie-hellman-group1-sha1".equals(name)) { + spec = new DHParameterSpec(P1, G); + hashAlgo = "SHA-1"; + } else { + throw new IllegalArgumentException("Unknown DH group " + name); + } + + try { + KeyPairGenerator kpg = KeyPairGenerator.getInstance("DH"); + kpg.initialize(spec); + KeyPair pair = kpg.generateKeyPair(); + clientPrivate = (DHPrivateKey) pair.getPrivate(); + clientPublic = (DHPublicKey) pair.getPublic(); + } catch (NoSuchAlgorithmException e) { + throw new IOException("No DH keypair generator", e); + } catch (InvalidAlgorithmParameterException e) { + throw new IOException("Invalid DH parameters", e); + } + } + + @Override + public byte[] getE() { + if (clientPublic == null) + throw new IllegalStateException("DhExchange not initialized!"); + + return clientPublic.getY().toByteArray(); + } + + @Override + protected byte[] getServerE() { + if (serverPublic == null) + throw new IllegalStateException("DhExchange not initialized!"); + + return serverPublic.getY().toByteArray(); + } + + @Override + public void setF(byte[] f) throws IOException { + if (clientPublic == null) + throw new IllegalStateException("DhExchange not initialized!"); + + final KeyAgreement ka; + try { + KeyFactory kf = KeyFactory.getInstance("DH"); + DHParameterSpec params = clientPublic.getParams(); + this.serverPublic = (DHPublicKey) kf.generatePublic(new DHPublicKeySpec( + new BigInteger(1, f), params.getP(), params.getG())); + + ka = KeyAgreement.getInstance("DH"); + ka.init(clientPrivate); + ka.doPhase(serverPublic, true); + } catch (NoSuchAlgorithmException e) { + throw new IOException("No DH key agreement method", e); + } catch (InvalidKeyException | InvalidKeySpecException e) { + throw new IOException("Invalid DH key", e); + } + + sharedSecret = new BigInteger(1, ka.generateSecret()); + } + + @Override + public String getHashAlgo() { + return hashAlgo; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/dh/DhGroupExchange.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/dh/DhGroupExchange.java new file mode 100644 index 0000000000..1356c57e23 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/dh/DhGroupExchange.java @@ -0,0 +1,113 @@ + +package com.trilead.ssh2.crypto.dh; + +import java.math.BigInteger; +import java.security.SecureRandom; + +import com.trilead.ssh2.DHGexParameters; +import com.trilead.ssh2.crypto.digest.HashForSSH2Types; + + +/** + * DhGroupExchange. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: DhGroupExchange.java,v 1.1 2007/10/15 12:49:57 cplattne Exp $ + */ +public class DhGroupExchange +{ + /* Given by the standard */ + + private BigInteger p; + private BigInteger g; + + /* Client public and private */ + + private BigInteger e; + private BigInteger x; + + /* Server public */ + + private BigInteger f; + + /* Shared secret */ + + private BigInteger k; + + public DhGroupExchange(BigInteger p, BigInteger g) + { + this.p = p; + this.g = g; + } + + public void init(SecureRandom rnd) + { + k = null; + + x = new BigInteger(p.bitLength() - 1, rnd); + e = g.modPow(x, p); + } + + /** + * @return Returns the e. + */ + public BigInteger getE() + { + if (e == null) + throw new IllegalStateException("Not initialized!"); + + return e; + } + + /** + * @return Returns the shared secret k. + */ + public BigInteger getK() + { + if (k == null) + throw new IllegalStateException("Shared secret not yet known, need f first!"); + + return k; + } + + /** + * Sets f and calculates the shared secret. + */ + public void setF(BigInteger f) + { + if (e == null) + throw new IllegalStateException("Not initialized!"); + + BigInteger zero = BigInteger.valueOf(0); + + if (zero.compareTo(f) >= 0 || p.compareTo(f) <= 0) + throw new IllegalArgumentException("Invalid f specified!"); + + this.f = f; + this.k = f.modPow(x, p); + } + + public byte[] calculateH(String hashAlgo, byte[] clientversion, byte[] serverversion, + byte[] clientKexPayload, byte[] serverKexPayload, byte[] hostKey, DHGexParameters para) + { + HashForSSH2Types hash = new HashForSSH2Types(hashAlgo); + + hash.updateByteString(clientversion); + hash.updateByteString(serverversion); + hash.updateByteString(clientKexPayload); + hash.updateByteString(serverKexPayload); + hash.updateByteString(hostKey); + if (para.getMin_group_len() > 0) + hash.updateUINT32(para.getMin_group_len()); + hash.updateUINT32(para.getPref_group_len()); + if (para.getMax_group_len() > 0) + hash.updateUINT32(para.getMax_group_len()); + hash.updateBigInt(p); + hash.updateBigInt(g); + hash.updateBigInt(e); + hash.updateBigInt(f); + hash.updateBigInt(k); + + return hash.getDigest(); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/dh/EcDhExchange.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/dh/EcDhExchange.java new file mode 100644 index 0000000000..e6e30f6a38 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/dh/EcDhExchange.java @@ -0,0 +1,106 @@ +package com.trilead.ssh2.crypto.dh; + +import java.io.IOException; +import java.math.BigInteger; +import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; +import java.security.KeyFactory; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.NoSuchAlgorithmException; +import java.security.interfaces.ECPrivateKey; +import java.security.interfaces.ECPublicKey; +import java.security.spec.ECParameterSpec; +import java.security.spec.ECPoint; +import java.security.spec.ECPublicKeySpec; +import java.security.spec.InvalidKeySpecException; + +import javax.crypto.KeyAgreement; + +import com.trilead.ssh2.signature.ECDSASHA2Verify; + +/** + * @author kenny + * + */ +public class EcDhExchange extends GenericDhExchange { + private ECPrivateKey clientPrivate; + private ECPublicKey clientPublic; + private ECPublicKey serverPublic; + + @Override + public void init(String name) throws IOException { + final ECParameterSpec spec; + + if ("ecdh-sha2-nistp256".equals(name)) { + spec = ECDSASHA2Verify.ECDSASHA2NISTP256Verify.get().getParameterSpec(); + } else if ("ecdh-sha2-nistp384".equals(name)) { + spec = ECDSASHA2Verify.ECDSASHA2NISTP384Verify.get().getParameterSpec(); + } else if ("ecdh-sha2-nistp521".equals(name)) { + spec = ECDSASHA2Verify.ECDSASHA2NISTP521Verify.get().getParameterSpec(); + } else { + throw new IllegalArgumentException("Unknown EC curve " + name); + } + + KeyPairGenerator kpg; + try { + kpg = KeyPairGenerator.getInstance("EC"); + kpg.initialize(spec); + KeyPair pair = kpg.generateKeyPair(); + clientPrivate = (ECPrivateKey) pair.getPrivate(); + clientPublic = (ECPublicKey) pair.getPublic(); + } catch (NoSuchAlgorithmException e) { + throw new IOException("No DH keypair generator", e); + } catch (InvalidAlgorithmParameterException e) { + throw new IOException("Invalid DH parameters", e); + } + } + + @Override + public byte[] getE() { + return ECDSASHA2Verify.encodeECPoint(clientPublic.getW(), clientPublic.getParams() + .getCurve()); + } + + @Override + protected byte[] getServerE() { + return ECDSASHA2Verify.encodeECPoint(serverPublic.getW(), serverPublic.getParams() + .getCurve()); + } + + @Override + public void setF(byte[] f) throws IOException { + + if (clientPublic == null) + throw new IllegalStateException("DhDsaExchange not initialized!"); + + final KeyAgreement ka; + try { + KeyFactory kf = KeyFactory.getInstance("EC"); + ECDSASHA2Verify verifier = ECDSASHA2Verify.getVerifierForKey(clientPublic); + if (verifier == null) { + throw new IOException("No such EC group"); + } + + ECPoint serverPoint = verifier.decodeECPoint(f); + ECParameterSpec params = verifier.getParameterSpec(); + this.serverPublic = (ECPublicKey) kf.generatePublic(new ECPublicKeySpec(serverPoint, + params)); + + ka = KeyAgreement.getInstance("ECDH"); + ka.init(clientPrivate); + ka.doPhase(serverPublic, true); + } catch (NoSuchAlgorithmException e) { + throw new IOException("No ECDH key agreement method", e); + } catch (InvalidKeyException | InvalidKeySpecException e) { + throw new IOException("Invalid ECDH key", e); + } + + sharedSecret = new BigInteger(1, ka.generateSecret()); + } + + @Override + public String getHashAlgo() { + return ECDSASHA2Verify.getDigestAlgorithmForParams(clientPublic); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/dh/GenericDhExchange.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/dh/GenericDhExchange.java new file mode 100644 index 0000000000..0ea0ab1e12 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/dh/GenericDhExchange.java @@ -0,0 +1,96 @@ + +package com.trilead.ssh2.crypto.dh; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.math.BigInteger; + +import com.trilead.ssh2.crypto.digest.HashForSSH2Types; +import com.trilead.ssh2.log.Logger; + + +/** + * DhExchange. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: DhExchange.java,v 1.2 2008/04/01 12:38:09 cplattne Exp $ + */ +public abstract class GenericDhExchange +{ + private static final Logger log = Logger.getLogger(GenericDhExchange.class); + + /* Shared secret */ + + BigInteger sharedSecret; + + protected GenericDhExchange() + { + } + + public static GenericDhExchange getInstance(String algo) { + if (Curve25519Exchange.NAME.equals(algo) || Curve25519Exchange.ALT_NAME.equals(algo)) { + return new Curve25519Exchange(); + } + if (algo.startsWith("ecdh-sha2-")) { + return new EcDhExchange(); + } else { + return new DhExchange(); + } + } + + public abstract void init(String name) throws IOException; + + /** + * @return Returns the e (public value) + * @throws IllegalStateException + */ + public abstract byte[] getE(); + + /** + * @return Returns the server's e (public value) + * @throws IllegalStateException + */ + protected abstract byte[] getServerE(); + + /** + * @return Returns the shared secret k. + * @throws IllegalStateException + */ + public BigInteger getK() + { + if (sharedSecret == null) + throw new IllegalStateException("Shared secret not yet known, need f first!"); + + return sharedSecret; + } + + /** + * @param f + */ + public abstract void setF(byte[] f) throws IOException; + + public byte[] calculateH(byte[] clientversion, byte[] serverversion, byte[] clientKexPayload, + byte[] serverKexPayload, byte[] hostKey) throws UnsupportedEncodingException + { + HashForSSH2Types hash = new HashForSSH2Types(getHashAlgo()); + + if (log.isEnabled()) + { + log.log(90, "Client: '" + new String(clientversion) + "'"); + log.log(90, "Server: '" + new String(serverversion) + "'"); + } + + hash.updateByteString(clientversion); + hash.updateByteString(serverversion); + hash.updateByteString(clientKexPayload); + hash.updateByteString(serverKexPayload); + hash.updateByteString(hostKey); + hash.updateByteString(getE()); + hash.updateByteString(getServerE()); + hash.updateBigInt(sharedSecret); + + return hash.getDigest(); + } + + public abstract String getHashAlgo(); +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/digest/HMAC.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/digest/HMAC.java new file mode 100644 index 0000000000..c6ee1293e8 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/digest/HMAC.java @@ -0,0 +1,166 @@ + +package com.trilead.ssh2.crypto.digest; + +import javax.crypto.Mac; +import javax.crypto.ShortBufferException; +import javax.crypto.spec.SecretKeySpec; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; + +/** + * MAC. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: MAC.java,v 1.1 2007/10/15 12:49:57 cplattne Exp $ + */ +public final class HMAC implements MAC +{ + private static final String ETM_SUFFIX = "-etm@openssh.com"; + + /** + * From http://tools.ietf.org/html/rfc4253 + */ + static final String HMAC_MD5 = "hmac-md5"; + + /** + * From http://tools.ietf.org/html/rfc4253 + */ + static final String HMAC_MD5_96 = "hmac-md5-96"; + + /** + * From http://tools.ietf.org/html/rfc4253 + */ + static final String HMAC_SHA1 = "hmac-sha1"; + + /** + * From https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL + */ + static final String HMAC_SHA1_ETM = "hmac-sha1-etm@openssh.com"; + + /** + * From http://tools.ietf.org/html/rfc4253 + */ + static final String HMAC_SHA1_96 = "hmac-sha1-96"; + + /** + * From https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL + */ + static final String HMAC_SHA2_256_ETM = "hmac-sha2-256-etm@openssh.com"; + + /** + * From https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL + */ + static final String HMAC_SHA2_512_ETM = "hmac-sha2-512-etm@openssh.com"; + + /** + * From http://tools.ietf.org/html/rfc6668 + */ + static final String HMAC_SHA2_256 = "hmac-sha2-256"; + + /** + * From http://tools.ietf.org/html/rfc6668 + */ + static final String HMAC_SHA2_512 = "hmac-sha2-512"; + + private final Mac mac; + private final int outSize; + private final boolean encryptThenMac; + private final byte[] buffer; + + public HMAC(String type, byte[] key) + { + try { + if (HMAC_SHA1.equals(type) || HMAC_SHA1_96.equals(type)) + { + mac = Mac.getInstance("HmacSHA1"); + encryptThenMac = false; + } + else if (HMAC_SHA1_ETM.equals(type)) + { + mac = Mac.getInstance("HmacSHA1"); + encryptThenMac = true; + } + else if (HMAC_MD5.equals(type) || HMAC_MD5_96.equals(type)) + { + mac = Mac.getInstance("HmacMD5"); + encryptThenMac = false; + } + else if (HMAC_SHA2_256.equals(type)) + { + mac = Mac.getInstance("HmacSHA256"); + encryptThenMac = false; + } + else if (HMAC_SHA2_256_ETM.equals(type)) + { + mac = Mac.getInstance("HmacSHA256"); + encryptThenMac = true; + } + else if (HMAC_SHA2_512.equals(type)) + { + mac = Mac.getInstance("HmacSHA512"); + encryptThenMac = false; + } + else if (HMAC_SHA2_512_ETM.equals(type)) + { + mac = Mac.getInstance("HmacSHA512"); + encryptThenMac = true; + } + else + throw new IllegalArgumentException("Unknown algorithm " + type); + } catch (NoSuchAlgorithmException e) { + throw new IllegalArgumentException("Unknown algorithm " + type, e); + } + + int macSize = mac.getMacLength(); + if (type.endsWith("-96")) { + outSize = 12; + buffer = new byte[macSize]; + } else { + outSize = macSize; + buffer = null; + } + + try { + mac.init(new SecretKeySpec(key, type)); + } catch (InvalidKeyException e) { + throw new IllegalArgumentException(e); + } + } + + public final void initMac(int seq) + { + mac.reset(); + mac.update((byte) (seq >> 24)); + mac.update((byte) (seq >> 16)); + mac.update((byte) (seq >> 8)); + mac.update((byte) (seq)); + } + + public final void update(byte[] packetdata, int off, int len) + { + mac.update(packetdata, off, len); + } + + public final void getMac(byte[] out, int off) + { + try { + if (buffer != null) { + mac.doFinal(buffer, 0); + System.arraycopy(buffer, 0, out, off, out.length - off); + } else { + mac.doFinal(out, off); + } + } catch (ShortBufferException e) { + throw new IllegalStateException(e); + } + } + + public final int size() + { + return outSize; + } + + public boolean isEncryptThenMac() { + return encryptThenMac; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/digest/HashForSSH2Types.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/digest/HashForSSH2Types.java new file mode 100644 index 0000000000..fad40efdc3 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/digest/HashForSSH2Types.java @@ -0,0 +1,91 @@ + +package com.trilead.ssh2.crypto.digest; + +import java.math.BigInteger; +import java.security.DigestException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; + +/** + * HashForSSH2Types. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: HashForSSH2Types.java,v 1.1 2007/10/15 12:49:57 cplattne Exp $ + */ +public class HashForSSH2Types +{ + MessageDigest md; + + public HashForSSH2Types(String type) + { + try { + md = MessageDigest.getInstance(type); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException("Unsupported algorithm " + type); + } + } + + public void updateByte(byte b) + { + /* HACK - to test it with J2ME */ + byte[] tmp = new byte[1]; + tmp[0] = b; + md.update(tmp); + } + + public void updateBytes(byte[] b) + { + md.update(b); + } + + public void updateUINT32(int v) + { + md.update((byte) (v >> 24)); + md.update((byte) (v >> 16)); + md.update((byte) (v >> 8)); + md.update((byte) (v)); + } + + public void updateByteString(byte[] b) + { + updateUINT32(b.length); + updateBytes(b); + } + + public void updateBigInt(BigInteger b) + { + updateByteString(b.toByteArray()); + } + + public void reset() + { + md.reset(); + } + + public int getDigestLength() + { + return md.getDigestLength(); + } + + public byte[] getDigest() + { + byte[] tmp = new byte[md.getDigestLength()]; + getDigest(tmp); + return tmp; + } + + public void getDigest(byte[] out) + { + getDigest(out, 0); + } + + public void getDigest(byte[] out, int off) + { + try { + md.digest(out, off, out.length - off); + } catch (DigestException e) { + // TODO is this right?! + throw new RuntimeException("Unable to digest", e); + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/digest/MAC.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/digest/MAC.java new file mode 100644 index 0000000000..ea7fcecfd4 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/digest/MAC.java @@ -0,0 +1,12 @@ +package com.trilead.ssh2.crypto.digest; + +/** + * Created by kenny on 2/12/17. + */ +public interface MAC { + void initMac(int seq); + void update(byte[] packetdata, int off, int len); + void getMac(byte[] out, int off); + int size(); + boolean isEncryptThenMac(); +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/digest/MACs.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/digest/MACs.java new file mode 100644 index 0000000000..1238761aa4 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/digest/MACs.java @@ -0,0 +1,50 @@ + +package com.trilead.ssh2.crypto.digest; + +/** + * MAC. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: MAC.java,v 1.1 2007/10/15 12:49:57 cplattne Exp $ + */ +public final class MACs +{ + /* Higher Priority First */ + private static final String[] MAC_LIST = { + HMAC.HMAC_SHA2_256_ETM, + HMAC.HMAC_SHA2_512_ETM, + HMAC.HMAC_SHA1_ETM, + HMAC.HMAC_SHA2_256, + HMAC.HMAC_SHA2_512, + HMAC.HMAC_SHA1, + }; + + public final static String[] getMacList() + { + return MAC_LIST; + } + + public final static void checkMacList(String[] macs) + { + for (int i = 0; i < macs.length; i++) { + getKeyLen(macs[i]); + } + } + + public final static int getKeyLen(String type) + { + if (type == null) + throw new IllegalArgumentException("type == null"); + + if (type.startsWith(HMAC.HMAC_SHA1)) + return 20; + if (type.startsWith(HMAC.HMAC_MD5)) + return 16; + if (type.startsWith(HMAC.HMAC_SHA2_256)) + return 32; + if (type.startsWith(HMAC.HMAC_SHA2_512)) + return 64; + + throw new IllegalArgumentException("Unknown algorithm " + type); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/keys/Ed25519KeyFactory.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/keys/Ed25519KeyFactory.java new file mode 100644 index 0000000000..585331a7a2 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/keys/Ed25519KeyFactory.java @@ -0,0 +1,39 @@ +package com.trilead.ssh2.crypto.keys; + +import java.security.InvalidKeyException; +import java.security.Key; +import java.security.KeyFactorySpi; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.spec.InvalidKeySpecException; +import java.security.spec.KeySpec; +import java.security.spec.PKCS8EncodedKeySpec; +import java.security.spec.X509EncodedKeySpec; + +public class Ed25519KeyFactory extends KeyFactorySpi { + @Override + protected PublicKey engineGeneratePublic(KeySpec keySpec) throws InvalidKeySpecException { + if (keySpec instanceof X509EncodedKeySpec) { + return new Ed25519PublicKey((X509EncodedKeySpec) keySpec); + } + throw new InvalidKeySpecException("Unrecognized key spec: " + keySpec.getClass()); + } + + @Override + protected PrivateKey engineGeneratePrivate(KeySpec keySpec) throws InvalidKeySpecException { + if (keySpec instanceof PKCS8EncodedKeySpec) { + return new Ed25519PrivateKey((PKCS8EncodedKeySpec) keySpec); + } + throw new InvalidKeySpecException("Unrecognized key spec: " + keySpec.getClass()); + } + + @Override + protected T engineGetKeySpec(Key key, Class keySpec) throws InvalidKeySpecException { + throw new InvalidKeySpecException("not implemented yet " + key + " " + keySpec); + } + + @Override + protected Key engineTranslateKey(Key key) throws InvalidKeyException { + throw new InvalidKeyException("No other EdDSA key providers known"); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/keys/Ed25519KeyPairGenerator.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/keys/Ed25519KeyPairGenerator.java new file mode 100644 index 0000000000..6328d2c42b --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/keys/Ed25519KeyPairGenerator.java @@ -0,0 +1,25 @@ +package com.trilead.ssh2.crypto.keys; + +import com.google.crypto.tink.subtle.Ed25519Sign; + +import java.security.GeneralSecurityException; +import java.security.KeyPair; +import java.security.KeyPairGeneratorSpi; +import java.security.SecureRandom; + +public class Ed25519KeyPairGenerator extends KeyPairGeneratorSpi { + @Override + public void initialize(int keySize, SecureRandom secureRandom) { + // ignored. + } + + @Override + public KeyPair generateKeyPair() { + try { + Ed25519Sign.KeyPair kp = Ed25519Sign.KeyPair.newKeyPair(); + return new KeyPair(new Ed25519PublicKey(kp.getPublicKey()), new Ed25519PrivateKey(kp.getPrivateKey())); + } catch (GeneralSecurityException e) { + throw new IllegalStateException(e); + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/keys/Ed25519PrivateKey.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/keys/Ed25519PrivateKey.java new file mode 100644 index 0000000000..c4eba83bd4 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/keys/Ed25519PrivateKey.java @@ -0,0 +1,137 @@ +package com.trilead.ssh2.crypto.keys; + +import com.trilead.ssh2.packets.TypesReader; +import com.trilead.ssh2.packets.TypesWriter; + +import java.io.IOException; +import java.security.PrivateKey; +import java.security.spec.InvalidKeySpecException; +import java.security.spec.PKCS8EncodedKeySpec; +import java.util.Arrays; + +import javax.security.auth.DestroyFailedException; + +public class Ed25519PrivateKey implements PrivateKey { + private static final byte[] ED25519_OID = new byte[] {43, 101, 112}; + private static final int KEY_BYTES_LENGTH = 32; + private static final int ENCODED_SIZE = 48; + + private final byte[] seed; + private boolean destroyed; + + public Ed25519PrivateKey(byte[] hash) { + this.seed = hash; + } + + public Ed25519PrivateKey(PKCS8EncodedKeySpec keySpec) throws InvalidKeySpecException { + this.seed = decode(keySpec); + } + + @Override + public int hashCode() { + return Arrays.hashCode(seed); + } + + @Override + public boolean equals(Object o) { + if (!(o instanceof Ed25519PrivateKey)) { + return false; + } + + Ed25519PrivateKey other = (Ed25519PrivateKey) o; + + if (seed == null || other.seed == null || seed.length != other.seed.length) { + return false; + } + + int difference = 0; + for (int i = 0; i < seed.length; i++) { + difference |= seed[i] ^ other.seed[i]; + } + return difference == 0; + } + + @Override + public String getAlgorithm() { + return "EdDSA"; + } + + @Override + public String getFormat() { + return "PKCS#8"; + } + + public byte[] getSeed() { + return seed; + } + + @Override + public byte[] getEncoded() { + // From RFC 8410 section 7 "Private Key Format" + TypesWriter tw = new TypesWriter(); + // ASN.1 Sequence + tw.writeByte(0x30); + tw.writeByte(11 + ED25519_OID.length + seed.length); // Length + // Key version type + tw.writeByte(0x02); // ASN.1 Integer + tw.writeByte(1); // Length + tw.writeByte(0); // v1 == RFC 5208 format + // Algorithm OID - ASN.1 Sequence + tw.writeByte(0x30); + tw.writeByte(ED25519_OID.length + 2); // OID + tw.writeByte(0x06); // ASN.1 OID type + tw.writeByte(ED25519_OID.length); + tw.writeBytes(ED25519_OID); + // Private key sequence + tw.writeByte(0x04); // ASN.1 Octet string + tw.writeByte(2 + seed.length); + tw.writeByte(0x04); // ASN.1 Octet string + tw.writeByte(seed.length); + tw.writeBytes(seed); + + return tw.getBytes(); + } + + private static byte[] decode(PKCS8EncodedKeySpec keySpec) throws InvalidKeySpecException { + byte[] encoded = keySpec.getEncoded(); + if (encoded.length != ENCODED_SIZE) { + throw new InvalidKeySpecException("Key spec is of invalid size"); + } + try { + TypesReader tr = new TypesReader(keySpec.getEncoded()); + if (tr.readByte() != 0x30 || // ASN.1 sequence + tr.readByte() != ENCODED_SIZE - 2 || // Expected size + tr.readByte() != 0x02 || // ASN.1 Integer + tr.readByte() != 1 || // length + tr.readByte() != 0 || // v1 + tr.readByte() != 0x30 || // ASN.1 Sequence + tr.readByte() != ED25519_OID.length + 2 || // OID length + tr.readByte() != 0x06 || // ASN.1 OID + tr.readByte() != ED25519_OID.length) { + throw new InvalidKeySpecException("Key was not encoded correctly"); + } + byte[] oid = tr.readBytes(ED25519_OID.length); + if (!Arrays.equals(ED25519_OID, oid) || + tr.readByte() != 0x04 || // ASN.1 octet string + tr.readByte() != KEY_BYTES_LENGTH + 2 || // length + tr.readByte() != 0x04 || // ASN.1 octet string + tr.readByte() != KEY_BYTES_LENGTH) { + throw new InvalidKeySpecException("Key was not encoded correctly"); + } + return tr.readBytes(KEY_BYTES_LENGTH); + } catch (IOException e) { + throw new InvalidKeySpecException("Key was not encoded correctly", e); + } + } + + @Override + public void destroy() throws DestroyFailedException { + Arrays.fill(seed, (byte) 0); + destroyed = true; + } + + @Override + public boolean isDestroyed() { + return destroyed; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/keys/Ed25519Provider.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/keys/Ed25519Provider.java new file mode 100644 index 0000000000..369ca72b0a --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/keys/Ed25519Provider.java @@ -0,0 +1,42 @@ +package com.trilead.ssh2.crypto.keys; + +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.security.Provider; +import java.security.Security; + +public class Ed25519Provider extends Provider { + public static final String KEY_ALGORITHM = "Ed25519"; + private static final Object sInitLock = new Object(); + private static boolean sInitialized = false; + + public Ed25519Provider() { + super("ConnectBot Ed25519 Provider", 1.0, "Not for use elsewhere"); + AccessController.doPrivileged((PrivilegedAction) () -> { + setup(); + return null; + }); + } + + protected void setup() { + put("KeyFactory." + KEY_ALGORITHM, getClass().getPackage().getName() + ".Ed25519KeyFactory"); + put("KeyPairGenerator." + KEY_ALGORITHM, getClass().getPackage().getName() + ".Ed25519KeyPairGenerator"); + + // id-Ed25519 OBJECT IDENTIFIER ::= { 1 3 101 112 } + put("Alg.Alias.KeyFactory.1.3.101.112", KEY_ALGORITHM); + put("Alg.Alias.KeyFactory.EdDSA", KEY_ALGORITHM); + put("Alg.Alias.KeyFactory.OID.1.3.101.112", KEY_ALGORITHM); + put("Alg.Alias.KeyPairGenerator.1.3.101.112", KEY_ALGORITHM); + put("Alg.Alias.KeyPairGenerator.EdDSA", KEY_ALGORITHM); + put("Alg.Alias.KeyPairGenerator.OID.1.3.101.112", KEY_ALGORITHM); + } + + public static void insertIfNeeded() { + synchronized (sInitLock) { + if (!sInitialized) { + Security.addProvider(new Ed25519Provider()); + sInitialized = true; + } + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/keys/Ed25519PublicKey.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/keys/Ed25519PublicKey.java new file mode 100644 index 0000000000..824c925de6 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/crypto/keys/Ed25519PublicKey.java @@ -0,0 +1,106 @@ +package com.trilead.ssh2.crypto.keys; + +import com.trilead.ssh2.packets.TypesReader; +import com.trilead.ssh2.packets.TypesWriter; + +import java.io.IOException; +import java.security.PublicKey; +import java.security.spec.InvalidKeySpecException; +import java.security.spec.X509EncodedKeySpec; +import java.util.Arrays; + +public class Ed25519PublicKey implements PublicKey { + private static final byte[] ED25519_OID = new byte[]{43, 101, 112}; + private static final int KEY_BYTES_LENGTH = 32; + private static final int ENCODED_SIZE = 44; + + private final byte[] keyBytes; + + public Ed25519PublicKey(byte[] keyBytes) { + this.keyBytes = keyBytes; + } + + public Ed25519PublicKey(X509EncodedKeySpec keySpec) throws InvalidKeySpecException { + keyBytes = decode(keySpec.getEncoded()); + } + + @Override + public String getAlgorithm() { + return "EdDSA"; + } + + @Override + public String getFormat() { + return "X.509"; + } + + @Override + public byte[] getEncoded() { + TypesWriter tw = new TypesWriter(); + tw.writeByte(0x30); // ASN.1 sequence + tw.writeByte(7 + ED25519_OID.length + keyBytes.length); + // Algorithm identifier + tw.writeByte(0x30); // ASN.1 sequence + tw.writeByte(2 + ED25519_OID.length); + tw.writeByte(0x06); // ASN.1 OID + tw.writeByte(ED25519_OID.length); + tw.writeBytes(ED25519_OID); + // Public key + tw.writeByte(0x03); // ASN.1 bit string + tw.writeByte(keyBytes.length + 1); + tw.writeByte(0); + tw.writeBytes(keyBytes); + return tw.getBytes(); + } + + @Override + public int hashCode() { + return Arrays.hashCode(keyBytes); + } + + @Override + public boolean equals(Object o) { + if (!(o instanceof Ed25519PublicKey)) { + return false; + } + + Ed25519PublicKey other = (Ed25519PublicKey) o; + if (keyBytes == null || other.keyBytes == null) { + return false; + } + + return Arrays.equals(keyBytes, other.keyBytes); + } + + private static byte[] decode(byte[] input) throws InvalidKeySpecException { + if (input.length != ENCODED_SIZE) { + throw new InvalidKeySpecException("Key is not of correct size"); + } + + try { + TypesReader tr = new TypesReader(input); + if (tr.readByte() != 0x30 || + tr.readByte() != 7 + ED25519_OID.length + KEY_BYTES_LENGTH || + tr.readByte() != 0x30 || + tr.readByte() != 2 + ED25519_OID.length || + tr.readByte() != 0x06 || + tr.readByte() != ED25519_OID.length) { + throw new InvalidKeySpecException("Key was not encoded correctly"); + } + byte[] oid = tr.readBytes(ED25519_OID.length); + if (!Arrays.equals(oid, ED25519_OID) || + tr.readByte() != 0x03 || + tr.readByte() != KEY_BYTES_LENGTH + 1 || + tr.readByte() != 0) { + throw new InvalidKeySpecException("Key was not encoded correctly"); + } + return tr.readBytes(KEY_BYTES_LENGTH); + } catch (IOException e) { + throw new InvalidKeySpecException("Key was not encoded correctly"); + } + } + + public byte[] getAbyte() { + return keyBytes; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/log/Logger.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/log/Logger.java new file mode 100644 index 0000000000..baa225e513 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/log/Logger.java @@ -0,0 +1,54 @@ + +package com.trilead.ssh2.log; + +import com.trilead.ssh2.DebugLogger; + +/** + * Logger - a very simple logger, mainly used during development. + * Is not based on log4j (to reduce external dependencies). + * However, if needed, something like log4j could easily be + * hooked in. + *

+ * For speed reasons, the static variables are not protected + * with semaphores. In other words, if you dynamicaly change the + * logging settings, then some threads may still use the old setting. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: Logger.java,v 1.2 2008/03/03 07:01:36 cplattne Exp $ + */ + +public class Logger +{ + public static boolean enabled = false; + public static DebugLogger logger = null; + + private String className; + + public final static Logger getLogger(Class x) + { + return new Logger(x); + } + + public Logger(Class x) + { + this.className = x.getName(); + } + + public final boolean isEnabled() + { + return enabled; + } + + public final void log(int level, String message) + { + if (!enabled) + return; + + DebugLogger target = logger; + + if (target == null) + return; + + target.log(level, className, message); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketChannelAuthAgentReq.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketChannelAuthAgentReq.java new file mode 100644 index 0000000000..95fa3960be --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketChannelAuthAgentReq.java @@ -0,0 +1,33 @@ +package com.trilead.ssh2.packets; + +/** + * PacketGlobalAuthAgent. + * + * @author Kenny Root, kenny@the-b.org + * @version $Id$ + */ +public class PacketChannelAuthAgentReq +{ + byte[] payload; + + public int recipientChannelID; + + public PacketChannelAuthAgentReq(int recipientChannelID) + { + this.recipientChannelID = recipientChannelID; + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_CHANNEL_REQUEST); + tw.writeUINT32(recipientChannelID); + tw.writeString("auth-agent-req@openssh.com"); + tw.writeBoolean(true); // want reply + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketChannelOpenConfirmation.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketChannelOpenConfirmation.java new file mode 100644 index 0000000000..025a1aeaea --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketChannelOpenConfirmation.java @@ -0,0 +1,66 @@ +package com.trilead.ssh2.packets; + +import java.io.IOException; + +/** + * PacketChannelOpenConfirmation. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketChannelOpenConfirmation.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketChannelOpenConfirmation +{ + byte[] payload; + + public int recipientChannelID; + public int senderChannelID; + public int initialWindowSize; + public int maxPacketSize; + + public PacketChannelOpenConfirmation(int recipientChannelID, int senderChannelID, int initialWindowSize, + int maxPacketSize) + { + this.recipientChannelID = recipientChannelID; + this.senderChannelID = senderChannelID; + this.initialWindowSize = initialWindowSize; + this.maxPacketSize = maxPacketSize; + } + + public PacketChannelOpenConfirmation(byte payload[], int off, int len) throws IOException + { + this.payload = new byte[len]; + System.arraycopy(payload, off, this.payload, 0, len); + + TypesReader tr = new TypesReader(payload, off, len); + + int packet_type = tr.readByte(); + + if (packet_type != Packets.SSH_MSG_CHANNEL_OPEN_CONFIRMATION) + throw new IOException( + "This is not a SSH_MSG_CHANNEL_OPEN_CONFIRMATION! (" + + packet_type + ")"); + + recipientChannelID = tr.readUINT32(); + senderChannelID = tr.readUINT32(); + initialWindowSize = tr.readUINT32(); + maxPacketSize = tr.readUINT32(); + + if (tr.remain() != 0) + throw new IOException("Padding in SSH_MSG_CHANNEL_OPEN_CONFIRMATION packet!"); + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_CHANNEL_OPEN_CONFIRMATION); + tw.writeUINT32(recipientChannelID); + tw.writeUINT32(senderChannelID); + tw.writeUINT32(initialWindowSize); + tw.writeUINT32(maxPacketSize); + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketChannelOpenFailure.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketChannelOpenFailure.java new file mode 100644 index 0000000000..ef3430faa4 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketChannelOpenFailure.java @@ -0,0 +1,66 @@ +package com.trilead.ssh2.packets; + +import java.io.IOException; + +/** + * PacketChannelOpenFailure. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketChannelOpenFailure.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketChannelOpenFailure +{ + byte[] payload; + + public int recipientChannelID; + public int reasonCode; + public String description; + public String languageTag; + + public PacketChannelOpenFailure(int recipientChannelID, int reasonCode, String description, + String languageTag) + { + this.recipientChannelID = recipientChannelID; + this.reasonCode = reasonCode; + this.description = description; + this.languageTag = languageTag; + } + + public PacketChannelOpenFailure(byte payload[], int off, int len) throws IOException + { + this.payload = new byte[len]; + System.arraycopy(payload, off, this.payload, 0, len); + + TypesReader tr = new TypesReader(payload, off, len); + + int packet_type = tr.readByte(); + + if (packet_type != Packets.SSH_MSG_CHANNEL_OPEN_FAILURE) + throw new IOException( + "This is not a SSH_MSG_CHANNEL_OPEN_FAILURE! (" + + packet_type + ")"); + + recipientChannelID = tr.readUINT32(); + reasonCode = tr.readUINT32(); + description = tr.readString(); + languageTag = tr.readString(); + + if (tr.remain() != 0) + throw new IOException("Padding in SSH_MSG_CHANNEL_OPEN_FAILURE packet!"); + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_CHANNEL_OPEN_FAILURE); + tw.writeUINT32(recipientChannelID); + tw.writeUINT32(reasonCode); + tw.writeString(description); + tw.writeString(languageTag); + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketChannelTrileadPing.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketChannelTrileadPing.java new file mode 100644 index 0000000000..f18f42f2aa --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketChannelTrileadPing.java @@ -0,0 +1,35 @@ + +package com.trilead.ssh2.packets; + +/** + * PacketChannelTrileadPing. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketChannelTrileadPing.java,v 1.1 2008/03/03 07:01:36 + * cplattne Exp $ + */ +public class PacketChannelTrileadPing +{ + byte[] payload; + + public int recipientChannelID; + + public PacketChannelTrileadPing(int recipientChannelID) + { + this.recipientChannelID = recipientChannelID; + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_CHANNEL_REQUEST); + tw.writeUINT32(recipientChannelID); + tw.writeString("trilead-ping"); + tw.writeBoolean(true); + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketChannelWindowAdjust.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketChannelWindowAdjust.java new file mode 100644 index 0000000000..312a1d672a --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketChannelWindowAdjust.java @@ -0,0 +1,57 @@ +package com.trilead.ssh2.packets; + +import java.io.IOException; + +/** + * PacketChannelWindowAdjust. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketChannelWindowAdjust.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketChannelWindowAdjust +{ + byte[] payload; + + public int recipientChannelID; + public int windowChange; + + public PacketChannelWindowAdjust(int recipientChannelID, int windowChange) + { + this.recipientChannelID = recipientChannelID; + this.windowChange = windowChange; + } + + public PacketChannelWindowAdjust(byte payload[], int off, int len) throws IOException + { + this.payload = new byte[len]; + System.arraycopy(payload, off, this.payload, 0, len); + + TypesReader tr = new TypesReader(payload, off, len); + + int packet_type = tr.readByte(); + + if (packet_type != Packets.SSH_MSG_CHANNEL_WINDOW_ADJUST) + throw new IOException( + "This is not a SSH_MSG_CHANNEL_WINDOW_ADJUST! (" + + packet_type + ")"); + + recipientChannelID = tr.readUINT32(); + windowChange = tr.readUINT32(); + + if (tr.remain() != 0) + throw new IOException("Padding in SSH_MSG_CHANNEL_WINDOW_ADJUST packet!"); + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_CHANNEL_WINDOW_ADJUST); + tw.writeUINT32(recipientChannelID); + tw.writeUINT32(windowChange); + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketDisconnect.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketDisconnect.java new file mode 100644 index 0000000000..de8d91999b --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketDisconnect.java @@ -0,0 +1,57 @@ + +package com.trilead.ssh2.packets; + +import java.io.IOException; + +/** + * PacketDisconnect. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketDisconnect.java,v 1.2 2008/04/01 12:38:09 cplattne Exp $ + */ +public class PacketDisconnect +{ + byte[] payload; + + int reason; + String desc; + String lang; + + public PacketDisconnect(byte payload[], int off, int len) throws IOException + { + this.payload = new byte[len]; + System.arraycopy(payload, off, this.payload, 0, len); + + TypesReader tr = new TypesReader(payload, off, len); + + int packet_type = tr.readByte(); + + if (packet_type != Packets.SSH_MSG_DISCONNECT) + throw new IOException("This is not a Disconnect Packet! (" + packet_type + ")"); + + reason = tr.readUINT32(); + desc = tr.readString(); + lang = tr.readString(); + } + + public PacketDisconnect(int reason, String desc, String lang) + { + this.reason = reason; + this.desc = desc; + this.lang = lang; + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_DISCONNECT); + tw.writeUINT32(reason); + tw.writeString(desc); + tw.writeString(lang); + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketExtInfo.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketExtInfo.java new file mode 100644 index 0000000000..0639d12000 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketExtInfo.java @@ -0,0 +1,76 @@ +package com.trilead.ssh2.packets; + +import java.io.IOException; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; + +/** + * Packet format described here: + * https://tools.ietf.org/html/draft-ietf-curdle-ssh-ext-info-15#section-2.3 + */ +public class PacketExtInfo +{ + private byte[] payload; + + private final Map extNameToValue; + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_EXT_INFO); + tw.writeUINT32(extNameToValue.size()); + for (Entry nameAndValue : extNameToValue.entrySet()) + { + tw.writeString(nameAndValue.getKey()); + tw.writeString(nameAndValue.getValue()); + } + payload = tw.getBytes(); + } + return payload; + } + + public Map getExtNameToValue() + { + return extNameToValue; + } + + public PacketExtInfo(byte[] payload, int off, int len) throws IOException + { + this.payload = new byte[len]; + System.arraycopy(payload, off, this.payload, 0, len); + + TypesReader tr = new TypesReader(payload, off, len); + int packet_type = tr.readByte(); + if (packet_type != Packets.SSH_MSG_EXT_INFO) + { + throw new IOException("This is not a SSH_MSG_EXT_INFO! (" + + packet_type + ")"); + } + + // Type has dynamic number of fields + // First int tells us how many pairs to expect + int numExtensions = tr.readUINT32(); + Map extNameToValue_ = new HashMap<>(numExtensions); + for (int i = 0; i < numExtensions; i++) + { + String name = tr.readString(); + String value = tr.readString(); + extNameToValue_.put(name, value); + } + extNameToValue = Collections.unmodifiableMap(extNameToValue_); + + if (tr.remain() != 0) + { + throw new IOException("Padding in SSH_MSG_EXT_INFO packet!"); + } + } + + public PacketExtInfo(Map extNameToValue) + { + this.extNameToValue = Collections.unmodifiableMap(new HashMap<>(extNameToValue)); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketGlobalCancelForwardRequest.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketGlobalCancelForwardRequest.java new file mode 100644 index 0000000000..a5f34086b1 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketGlobalCancelForwardRequest.java @@ -0,0 +1,42 @@ + +package com.trilead.ssh2.packets; + +/** + * PacketGlobalCancelForwardRequest. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketGlobalCancelForwardRequest.java,v 1.1 2007/10/15 12:49:55 + * cplattne Exp $ + */ +public class PacketGlobalCancelForwardRequest +{ + byte[] payload; + + public boolean wantReply; + public String bindAddress; + public int bindPort; + + public PacketGlobalCancelForwardRequest(boolean wantReply, String bindAddress, int bindPort) + { + this.wantReply = wantReply; + this.bindAddress = bindAddress; + this.bindPort = bindPort; + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_GLOBAL_REQUEST); + + tw.writeString("cancel-tcpip-forward"); + tw.writeBoolean(wantReply); + tw.writeString(bindAddress); + tw.writeUINT32(bindPort); + + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketGlobalForwardRequest.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketGlobalForwardRequest.java new file mode 100644 index 0000000000..23b8ec7654 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketGlobalForwardRequest.java @@ -0,0 +1,41 @@ + +package com.trilead.ssh2.packets; + +/** + * PacketGlobalForwardRequest. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketGlobalForwardRequest.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketGlobalForwardRequest +{ + byte[] payload; + + public boolean wantReply; + public String bindAddress; + public int bindPort; + + public PacketGlobalForwardRequest(boolean wantReply, String bindAddress, int bindPort) + { + this.wantReply = wantReply; + this.bindAddress = bindAddress; + this.bindPort = bindPort; + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_GLOBAL_REQUEST); + + tw.writeString("tcpip-forward"); + tw.writeBoolean(wantReply); + tw.writeString(bindAddress); + tw.writeUINT32(bindPort); + + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketGlobalTrileadPing.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketGlobalTrileadPing.java new file mode 100644 index 0000000000..bff20e556e --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketGlobalTrileadPing.java @@ -0,0 +1,32 @@ + +package com.trilead.ssh2.packets; + +/** + * PacketGlobalTrileadPing. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketGlobalTrileadPing.java,v 1.1 2008/03/03 07:01:36 cplattne Exp $ + */ +public class PacketGlobalTrileadPing +{ + byte[] payload; + + public PacketGlobalTrileadPing() + { + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_GLOBAL_REQUEST); + + tw.writeString("trilead-ping"); + tw.writeBoolean(true); + + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketIgnore.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketIgnore.java new file mode 100644 index 0000000000..079e7cf3d4 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketIgnore.java @@ -0,0 +1,59 @@ + +package com.trilead.ssh2.packets; + +import java.io.IOException; + +/** + * PacketIgnore. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketIgnore.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketIgnore +{ + byte[] payload; + + byte[] data; + + public void setData(byte[] data) + { + this.data = data; + payload = null; + } + + public PacketIgnore() + { + } + + public PacketIgnore(byte payload[], int off, int len) throws IOException + { + this.payload = new byte[len]; + System.arraycopy(payload, off, this.payload, 0, len); + + TypesReader tr = new TypesReader(payload, off, len); + + int packet_type = tr.readByte(); + + if (packet_type != Packets.SSH_MSG_IGNORE) + throw new IOException("This is not a SSH_MSG_IGNORE packet! (" + packet_type + ")"); + + /* Could parse String body */ + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_IGNORE); + + if (data != null) + tw.writeString(data, 0, data.length); + else + tw.writeString(""); + + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketKexDHInit.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketKexDHInit.java new file mode 100644 index 0000000000..77dfdcb6ed --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketKexDHInit.java @@ -0,0 +1,31 @@ +package com.trilead.ssh2.packets; + +/** + * PacketKexDHInit. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketKexDHInit.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketKexDHInit +{ + byte[] payload; + + byte[] publicKey; + + public PacketKexDHInit(byte[] publicKey) + { + this.publicKey = publicKey; + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_KEXDH_INIT); + tw.writeString(publicKey, 0, publicKey.length); + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketKexDHReply.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketKexDHReply.java new file mode 100644 index 0000000000..2c4b20081d --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketKexDHReply.java @@ -0,0 +1,53 @@ +package com.trilead.ssh2.packets; + +import java.io.IOException; + +/** + * PacketKexDHReply. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketKexDHReply.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketKexDHReply +{ + byte[] payload; + + byte[] hostKey; + byte[] publicKey; + byte[] signature; + + public PacketKexDHReply(byte payload[], int off, int len) throws IOException + { + this.payload = new byte[len]; + System.arraycopy(payload, off, this.payload, 0, len); + + TypesReader tr = new TypesReader(payload, off, len); + + int packet_type = tr.readByte(); + + if (packet_type != Packets.SSH_MSG_KEXDH_REPLY) + throw new IOException("This is not a SSH_MSG_KEXDH_REPLY! (" + + packet_type + ")"); + + hostKey = tr.readByteString(); + publicKey = tr.readByteString(); + signature = tr.readByteString(); + + if (tr.remain() != 0) throw new IOException("PADDING IN SSH_MSG_KEXDH_REPLY!"); + } + + public byte[] getF() + { + return publicKey; + } + + public byte[] getHostKey() + { + return hostKey; + } + + public byte[] getSignature() + { + return signature; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketKexDhGexGroup.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketKexDhGexGroup.java new file mode 100644 index 0000000000..4f9483c2fc --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketKexDhGexGroup.java @@ -0,0 +1,50 @@ +package com.trilead.ssh2.packets; + +import java.io.IOException; + +import java.math.BigInteger; + +/** + * PacketKexDhGexGroup. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketKexDhGexGroup.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketKexDhGexGroup +{ + byte[] payload; + + BigInteger p; + BigInteger g; + + public PacketKexDhGexGroup(byte payload[], int off, int len) throws IOException + { + this.payload = new byte[len]; + System.arraycopy(payload, off, this.payload, 0, len); + + TypesReader tr = new TypesReader(payload, off, len); + + int packet_type = tr.readByte(); + + if (packet_type != Packets.SSH_MSG_KEX_DH_GEX_GROUP) + throw new IllegalArgumentException( + "This is not a SSH_MSG_KEX_DH_GEX_GROUP! (" + packet_type + + ")"); + + p = tr.readMPINT(); + g = tr.readMPINT(); + + if (tr.remain() != 0) + throw new IOException("PADDING IN SSH_MSG_KEX_DH_GEX_GROUP!"); + } + + public BigInteger getG() + { + return g; + } + + public BigInteger getP() + { + return p; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketKexDhGexInit.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketKexDhGexInit.java new file mode 100644 index 0000000000..eb8361bc8a --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketKexDhGexInit.java @@ -0,0 +1,33 @@ +package com.trilead.ssh2.packets; + +import java.math.BigInteger; + +/** + * PacketKexDhGexInit. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketKexDhGexInit.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketKexDhGexInit +{ + byte[] payload; + + BigInteger e; + + public PacketKexDhGexInit(BigInteger e) + { + this.e = e; + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_KEX_DH_GEX_INIT); + tw.writeMPInt(e); + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketKexDhGexReply.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketKexDhGexReply.java new file mode 100644 index 0000000000..19dd92d2d9 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketKexDhGexReply.java @@ -0,0 +1,56 @@ + +package com.trilead.ssh2.packets; + +import java.io.IOException; + +import java.math.BigInteger; + +/** + * PacketKexDhGexReply. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketKexDhGexReply.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketKexDhGexReply +{ + byte[] payload; + + byte[] hostKey; + BigInteger f; + byte[] signature; + + public PacketKexDhGexReply(byte payload[], int off, int len) throws IOException + { + this.payload = new byte[len]; + System.arraycopy(payload, off, this.payload, 0, len); + + TypesReader tr = new TypesReader(payload, off, len); + + int packet_type = tr.readByte(); + + if (packet_type != Packets.SSH_MSG_KEX_DH_GEX_REPLY) + throw new IOException("This is not a SSH_MSG_KEX_DH_GEX_REPLY! (" + packet_type + ")"); + + hostKey = tr.readByteString(); + f = tr.readMPINT(); + signature = tr.readByteString(); + + if (tr.remain() != 0) + throw new IOException("PADDING IN SSH_MSG_KEX_DH_GEX_REPLY!"); + } + + public BigInteger getF() + { + return f; + } + + public byte[] getHostKey() + { + return hostKey; + } + + public byte[] getSignature() + { + return signature; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketKexDhGexRequest.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketKexDhGexRequest.java new file mode 100644 index 0000000000..753fd0b9b3 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketKexDhGexRequest.java @@ -0,0 +1,39 @@ +package com.trilead.ssh2.packets; + +import com.trilead.ssh2.DHGexParameters; + +/** + * PacketKexDhGexRequest. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketKexDhGexRequest.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketKexDhGexRequest +{ + byte[] payload; + + int min; + int n; + int max; + + public PacketKexDhGexRequest(DHGexParameters para) + { + this.min = para.getMin_group_len(); + this.n = para.getPref_group_len(); + this.max = para.getMax_group_len(); + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_KEX_DH_GEX_REQUEST); + tw.writeUINT32(min); + tw.writeUINT32(n); + tw.writeUINT32(max); + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketKexDhGexRequestOld.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketKexDhGexRequestOld.java new file mode 100644 index 0000000000..8056ad39fc --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketKexDhGexRequestOld.java @@ -0,0 +1,34 @@ + +package com.trilead.ssh2.packets; + +import com.trilead.ssh2.DHGexParameters; + +/** + * PacketKexDhGexRequestOld. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketKexDhGexRequestOld.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketKexDhGexRequestOld +{ + byte[] payload; + + int n; + + public PacketKexDhGexRequestOld(DHGexParameters para) + { + this.n = para.getPref_group_len(); + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_KEX_DH_GEX_REQUEST_OLD); + tw.writeUINT32(n); + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketKexInit.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketKexInit.java new file mode 100644 index 0000000000..7805a80ca8 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketKexInit.java @@ -0,0 +1,165 @@ + +package com.trilead.ssh2.packets; + +import java.io.IOException; +import java.security.SecureRandom; + +import com.trilead.ssh2.crypto.CryptoWishList; +import com.trilead.ssh2.transport.KexParameters; + + +/** + * PacketKexInit. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketKexInit.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketKexInit +{ + byte[] payload; + + KexParameters kp = new KexParameters(); + + public PacketKexInit(CryptoWishList cwl) + { + kp.cookie = new byte[16]; + new SecureRandom().nextBytes(kp.cookie); + + kp.kex_algorithms = cwl.kexAlgorithms; + kp.server_host_key_algorithms = cwl.serverHostKeyAlgorithms; + kp.encryption_algorithms_client_to_server = cwl.c2s_enc_algos; + kp.encryption_algorithms_server_to_client = cwl.s2c_enc_algos; + kp.mac_algorithms_client_to_server = cwl.c2s_mac_algos; + kp.mac_algorithms_server_to_client = cwl.s2c_mac_algos; + kp.compression_algorithms_client_to_server = cwl.c2s_comp_algos; + kp.compression_algorithms_server_to_client = cwl.s2c_comp_algos; + kp.languages_client_to_server = new String[] {}; + kp.languages_server_to_client = new String[] {}; + kp.first_kex_packet_follows = false; + kp.reserved_field1 = 0; + } + + public PacketKexInit(byte payload[], int off, int len) throws IOException + { + this.payload = new byte[len]; + System.arraycopy(payload, off, this.payload, 0, len); + + TypesReader tr = new TypesReader(payload, off, len); + + int packet_type = tr.readByte(); + + if (packet_type != Packets.SSH_MSG_KEXINIT) + throw new IOException("This is not a KexInitPacket! (" + packet_type + ")"); + + kp.cookie = tr.readBytes(16); + kp.kex_algorithms = tr.readNameList(); + kp.server_host_key_algorithms = tr.readNameList(); + kp.encryption_algorithms_client_to_server = tr.readNameList(); + kp.encryption_algorithms_server_to_client = tr.readNameList(); + kp.mac_algorithms_client_to_server = tr.readNameList(); + kp.mac_algorithms_server_to_client = tr.readNameList(); + kp.compression_algorithms_client_to_server = tr.readNameList(); + kp.compression_algorithms_server_to_client = tr.readNameList(); + kp.languages_client_to_server = tr.readNameList(); + kp.languages_server_to_client = tr.readNameList(); + kp.first_kex_packet_follows = tr.readBoolean(); + kp.reserved_field1 = tr.readUINT32(); + + if (tr.remain() != 0) + throw new IOException("Padding in KexInitPacket!"); + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_KEXINIT); + tw.writeBytes(kp.cookie, 0, 16); + tw.writeNameList(kp.kex_algorithms); + tw.writeNameList(kp.server_host_key_algorithms); + tw.writeNameList(kp.encryption_algorithms_client_to_server); + tw.writeNameList(kp.encryption_algorithms_server_to_client); + tw.writeNameList(kp.mac_algorithms_client_to_server); + tw.writeNameList(kp.mac_algorithms_server_to_client); + tw.writeNameList(kp.compression_algorithms_client_to_server); + tw.writeNameList(kp.compression_algorithms_server_to_client); + tw.writeNameList(kp.languages_client_to_server); + tw.writeNameList(kp.languages_server_to_client); + tw.writeBoolean(kp.first_kex_packet_follows); + tw.writeUINT32(kp.reserved_field1); + payload = tw.getBytes(); + } + return payload; + } + + public KexParameters getKexParameters() + { + return kp; + } + + public String[] getCompression_algorithms_client_to_server() + { + return kp.compression_algorithms_client_to_server; + } + + public String[] getCompression_algorithms_server_to_client() + { + return kp.compression_algorithms_server_to_client; + } + + public byte[] getCookie() + { + return kp.cookie; + } + + public String[] getEncryption_algorithms_client_to_server() + { + return kp.encryption_algorithms_client_to_server; + } + + public String[] getEncryption_algorithms_server_to_client() + { + return kp.encryption_algorithms_server_to_client; + } + + public boolean isFirst_kex_packet_follows() + { + return kp.first_kex_packet_follows; + } + + public String[] getKex_algorithms() + { + return kp.kex_algorithms; + } + + public String[] getLanguages_client_to_server() + { + return kp.languages_client_to_server; + } + + public String[] getLanguages_server_to_client() + { + return kp.languages_server_to_client; + } + + public String[] getMac_algorithms_client_to_server() + { + return kp.mac_algorithms_client_to_server; + } + + public String[] getMac_algorithms_server_to_client() + { + return kp.mac_algorithms_server_to_client; + } + + public int getReserved_field1() + { + return kp.reserved_field1; + } + + public String[] getServer_host_key_algorithms() + { + return kp.server_host_key_algorithms; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketNewKeys.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketNewKeys.java new file mode 100644 index 0000000000..4a4c09a4ce --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketNewKeys.java @@ -0,0 +1,46 @@ +package com.trilead.ssh2.packets; + +import java.io.IOException; + +/** + * PacketNewKeys. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketNewKeys.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketNewKeys +{ + byte[] payload; + + public PacketNewKeys() + { + } + + public PacketNewKeys(byte payload[], int off, int len) throws IOException + { + this.payload = new byte[len]; + System.arraycopy(payload, off, this.payload, 0, len); + + TypesReader tr = new TypesReader(payload, off, len); + + int packet_type = tr.readByte(); + + if (packet_type != Packets.SSH_MSG_NEWKEYS) + throw new IOException("This is not a SSH_MSG_NEWKEYS! (" + + packet_type + ")"); + + if (tr.remain() != 0) + throw new IOException("Padding in SSH_MSG_NEWKEYS packet!"); + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_NEWKEYS); + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketOpenDirectTCPIPChannel.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketOpenDirectTCPIPChannel.java new file mode 100644 index 0000000000..62d7a1792b --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketOpenDirectTCPIPChannel.java @@ -0,0 +1,56 @@ +package com.trilead.ssh2.packets; + + +/** + * PacketOpenDirectTCPIPChannel. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketOpenDirectTCPIPChannel.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketOpenDirectTCPIPChannel +{ + byte[] payload; + + int channelID; + int initialWindowSize; + int maxPacketSize; + + String host_to_connect; + int port_to_connect; + String originator_IP_address; + int originator_port; + + public PacketOpenDirectTCPIPChannel(int channelID, int initialWindowSize, int maxPacketSize, + String host_to_connect, int port_to_connect, String originator_IP_address, + int originator_port) + { + this.channelID = channelID; + this.initialWindowSize = initialWindowSize; + this.maxPacketSize = maxPacketSize; + this.host_to_connect = host_to_connect; + this.port_to_connect = port_to_connect; + this.originator_IP_address = originator_IP_address; + this.originator_port = originator_port; + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + + tw.writeByte(Packets.SSH_MSG_CHANNEL_OPEN); + tw.writeString("direct-tcpip"); + tw.writeUINT32(channelID); + tw.writeUINT32(initialWindowSize); + tw.writeUINT32(maxPacketSize); + tw.writeString(host_to_connect); + tw.writeUINT32(port_to_connect); + tw.writeString(originator_IP_address); + tw.writeUINT32(originator_port); + + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketOpenSessionChannel.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketOpenSessionChannel.java new file mode 100644 index 0000000000..40dd4abb88 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketOpenSessionChannel.java @@ -0,0 +1,62 @@ +package com.trilead.ssh2.packets; + +import java.io.IOException; + +/** + * PacketOpenSessionChannel. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketOpenSessionChannel.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketOpenSessionChannel +{ + byte[] payload; + + int channelID; + int initialWindowSize; + int maxPacketSize; + + public PacketOpenSessionChannel(int channelID, int initialWindowSize, + int maxPacketSize) + { + this.channelID = channelID; + this.initialWindowSize = initialWindowSize; + this.maxPacketSize = maxPacketSize; + } + + public PacketOpenSessionChannel(byte payload[], int off, int len) throws IOException + { + this.payload = new byte[len]; + System.arraycopy(payload, off, this.payload, 0, len); + + TypesReader tr = new TypesReader(payload); + + int packet_type = tr.readByte(); + + if (packet_type != Packets.SSH_MSG_CHANNEL_OPEN) + throw new IOException("This is not a SSH_MSG_CHANNEL_OPEN! (" + + packet_type + ")"); + + channelID = tr.readUINT32(); + initialWindowSize = tr.readUINT32(); + maxPacketSize = tr.readUINT32(); + + if (tr.remain() != 0) + throw new IOException("Padding in SSH_MSG_CHANNEL_OPEN packet!"); + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_CHANNEL_OPEN); + tw.writeString("session"); + tw.writeUINT32(channelID); + tw.writeUINT32(initialWindowSize); + tw.writeUINT32(maxPacketSize); + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketServiceAccept.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketServiceAccept.java new file mode 100644 index 0000000000..f668910afb --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketServiceAccept.java @@ -0,0 +1,61 @@ + +package com.trilead.ssh2.packets; + +import java.io.IOException; + +/** + * PacketServiceAccept. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketServiceAccept.java,v 1.2 2008/04/01 12:38:09 cplattne Exp $ + */ +public class PacketServiceAccept +{ + byte[] payload; + + String serviceName; + + public PacketServiceAccept(String serviceName) + { + this.serviceName = serviceName; + } + + public PacketServiceAccept(byte payload[], int off, int len) throws IOException + { + this.payload = new byte[len]; + System.arraycopy(payload, off, this.payload, 0, len); + + TypesReader tr = new TypesReader(payload, off, len); + + int packet_type = tr.readByte(); + + if (packet_type != Packets.SSH_MSG_SERVICE_ACCEPT) + throw new IOException("This is not a SSH_MSG_SERVICE_ACCEPT! (" + packet_type + ")"); + + /* Be clever in case the server is not. Some servers seem to violate RFC4253 */ + + if (tr.remain() > 0) + { + serviceName = tr.readString(); + } + else + { + serviceName = ""; + } + + if (tr.remain() != 0) + throw new IOException("Padding in SSH_MSG_SERVICE_ACCEPT packet!"); + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_SERVICE_ACCEPT); + tw.writeString(serviceName); + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketServiceRequest.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketServiceRequest.java new file mode 100644 index 0000000000..51a10adcdf --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketServiceRequest.java @@ -0,0 +1,52 @@ +package com.trilead.ssh2.packets; + +import java.io.IOException; + +/** + * PacketServiceRequest. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketServiceRequest.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketServiceRequest +{ + byte[] payload; + + String serviceName; + + public PacketServiceRequest(String serviceName) + { + this.serviceName = serviceName; + } + + public PacketServiceRequest(byte payload[], int off, int len) throws IOException + { + this.payload = new byte[len]; + System.arraycopy(payload, off, this.payload, 0, len); + + TypesReader tr = new TypesReader(payload, off, len); + + int packet_type = tr.readByte(); + + if (packet_type != Packets.SSH_MSG_SERVICE_REQUEST) + throw new IOException("This is not a SSH_MSG_SERVICE_REQUEST! (" + + packet_type + ")"); + + serviceName = tr.readString(); + + if (tr.remain() != 0) + throw new IOException("Padding in SSH_MSG_SERVICE_REQUEST packet!"); + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_SERVICE_REQUEST); + tw.writeString(serviceName); + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketSessionExecCommand.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketSessionExecCommand.java new file mode 100644 index 0000000000..8b509ea2b2 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketSessionExecCommand.java @@ -0,0 +1,39 @@ +package com.trilead.ssh2.packets; + + +/** + * PacketSessionExecCommand. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketSessionExecCommand.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketSessionExecCommand +{ + byte[] payload; + + public int recipientChannelID; + public boolean wantReply; + public String command; + + public PacketSessionExecCommand(int recipientChannelID, boolean wantReply, String command) + { + this.recipientChannelID = recipientChannelID; + this.wantReply = wantReply; + this.command = command; + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_CHANNEL_REQUEST); + tw.writeUINT32(recipientChannelID); + tw.writeString("exec"); + tw.writeBoolean(wantReply); + tw.writeString(command); + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketSessionPtyRequest.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketSessionPtyRequest.java new file mode 100644 index 0000000000..764c165b60 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketSessionPtyRequest.java @@ -0,0 +1,57 @@ +package com.trilead.ssh2.packets; + + +/** + * PacketSessionPtyRequest. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketSessionPtyRequest.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketSessionPtyRequest +{ + byte[] payload; + + public int recipientChannelID; + public boolean wantReply; + public String term; + public int character_width; + public int character_height; + public int pixel_width; + public int pixel_height; + public byte[] terminal_modes; + + public PacketSessionPtyRequest(int recipientChannelID, boolean wantReply, String term, + int character_width, int character_height, int pixel_width, int pixel_height, + byte[] terminal_modes) + { + this.recipientChannelID = recipientChannelID; + this.wantReply = wantReply; + this.term = term; + this.character_width = character_width; + this.character_height = character_height; + this.pixel_width = pixel_width; + this.pixel_height = pixel_height; + this.terminal_modes = terminal_modes; + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_CHANNEL_REQUEST); + tw.writeUINT32(recipientChannelID); + tw.writeString("pty-req"); + tw.writeBoolean(wantReply); + tw.writeString(term); + tw.writeUINT32(character_width); + tw.writeUINT32(character_height); + tw.writeUINT32(pixel_width); + tw.writeUINT32(pixel_height); + tw.writeString(terminal_modes, 0, terminal_modes.length); + + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketSessionPtyResize.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketSessionPtyResize.java new file mode 100644 index 0000000000..1e3b558dcc --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketSessionPtyResize.java @@ -0,0 +1,40 @@ +package com.trilead.ssh2.packets; + +public class PacketSessionPtyResize { + byte[] payload; + + public int recipientChannelID; + public int width; + public int height; + public int pixelWidth; + public int pixelHeight; + + public PacketSessionPtyResize(int recipientChannelID, int width, int height, int pixelWidth, int pixelHeight) { + this.recipientChannelID = recipientChannelID; + this.width = width; + this.height = height; + this.pixelWidth = pixelWidth; + this.pixelHeight = pixelHeight; + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_CHANNEL_REQUEST); + tw.writeUINT32(recipientChannelID); + tw.writeString("window-change"); + tw.writeBoolean(false); + tw.writeUINT32(width); + tw.writeUINT32(height); + tw.writeUINT32(pixelWidth); + tw.writeUINT32(pixelHeight); + + payload = tw.getBytes(); + } + return payload; + } +} + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketSessionStartShell.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketSessionStartShell.java new file mode 100644 index 0000000000..f77d122c9a --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketSessionStartShell.java @@ -0,0 +1,36 @@ + +package com.trilead.ssh2.packets; + +/** + * PacketSessionStartShell. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketSessionStartShell.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketSessionStartShell +{ + byte[] payload; + + public int recipientChannelID; + public boolean wantReply; + + public PacketSessionStartShell(int recipientChannelID, boolean wantReply) + { + this.recipientChannelID = recipientChannelID; + this.wantReply = wantReply; + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_CHANNEL_REQUEST); + tw.writeUINT32(recipientChannelID); + tw.writeString("shell"); + tw.writeBoolean(wantReply); + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketSessionSubsystemRequest.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketSessionSubsystemRequest.java new file mode 100644 index 0000000000..a3b81086cc --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketSessionSubsystemRequest.java @@ -0,0 +1,40 @@ +package com.trilead.ssh2.packets; + + +/** + * PacketSessionSubsystemRequest. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketSessionSubsystemRequest.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketSessionSubsystemRequest +{ + byte[] payload; + + public int recipientChannelID; + public boolean wantReply; + public String subsystem; + + public PacketSessionSubsystemRequest(int recipientChannelID, boolean wantReply, String subsystem) + { + this.recipientChannelID = recipientChannelID; + this.wantReply = wantReply; + this.subsystem = subsystem; + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_CHANNEL_REQUEST); + tw.writeUINT32(recipientChannelID); + tw.writeString("subsystem"); + tw.writeBoolean(wantReply); + tw.writeString(subsystem); + payload = tw.getBytes(); + tw.getBytes(payload); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketSessionX11Request.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketSessionX11Request.java new file mode 100644 index 0000000000..c5bc60131a --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketSessionX11Request.java @@ -0,0 +1,53 @@ + +package com.trilead.ssh2.packets; + +/** + * PacketSessionX11Request. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketSessionX11Request.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketSessionX11Request +{ + byte[] payload; + + public int recipientChannelID; + public boolean wantReply; + + public boolean singleConnection; + String x11AuthenticationProtocol; + String x11AuthenticationCookie; + int x11ScreenNumber; + + public PacketSessionX11Request(int recipientChannelID, boolean wantReply, boolean singleConnection, + String x11AuthenticationProtocol, String x11AuthenticationCookie, int x11ScreenNumber) + { + this.recipientChannelID = recipientChannelID; + this.wantReply = wantReply; + + this.singleConnection = singleConnection; + this.x11AuthenticationProtocol = x11AuthenticationProtocol; + this.x11AuthenticationCookie = x11AuthenticationCookie; + this.x11ScreenNumber = x11ScreenNumber; + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_CHANNEL_REQUEST); + tw.writeUINT32(recipientChannelID); + tw.writeString("x11-req"); + tw.writeBoolean(wantReply); + + tw.writeBoolean(singleConnection); + tw.writeString(x11AuthenticationProtocol); + tw.writeString(x11AuthenticationCookie); + tw.writeUINT32(x11ScreenNumber); + + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketUserauthBanner.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketUserauthBanner.java new file mode 100644 index 0000000000..bbd8b50b66 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketUserauthBanner.java @@ -0,0 +1,60 @@ +package com.trilead.ssh2.packets; + +import java.io.IOException; + +/** + * PacketUserauthBanner. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketUserauthBanner.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketUserauthBanner +{ + byte[] payload; + + String message; + String language; + + public PacketUserauthBanner(String message, String language) + { + this.message = message; + this.language = language; + } + + public String getBanner() + { + return message; + } + + public PacketUserauthBanner(byte payload[], int off, int len) throws IOException + { + this.payload = new byte[len]; + System.arraycopy(payload, off, this.payload, 0, len); + + TypesReader tr = new TypesReader(payload, off, len); + + int packet_type = tr.readByte(); + + if (packet_type != Packets.SSH_MSG_USERAUTH_BANNER) + throw new IOException("This is not a SSH_MSG_USERAUTH_BANNER! (" + packet_type + ")"); + + message = tr.readString("UTF-8"); + language = tr.readString(); + + if (tr.remain() != 0) + throw new IOException("Padding in SSH_MSG_USERAUTH_REQUEST packet!"); + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_USERAUTH_BANNER); + tw.writeString(message); + tw.writeString(language); + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketUserauthFailure.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketUserauthFailure.java new file mode 100644 index 0000000000..506df55e60 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketUserauthFailure.java @@ -0,0 +1,53 @@ + +package com.trilead.ssh2.packets; + +import java.io.IOException; + +/** + * PacketUserauthBanner. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketUserauthFailure.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketUserauthFailure +{ + byte[] payload; + + String[] authThatCanContinue; + boolean partialSuccess; + + public PacketUserauthFailure(String[] authThatCanContinue, boolean partialSuccess) + { + this.authThatCanContinue = authThatCanContinue; + this.partialSuccess = partialSuccess; + } + + public PacketUserauthFailure(byte payload[], int off, int len) throws IOException + { + this.payload = new byte[len]; + System.arraycopy(payload, off, this.payload, 0, len); + + TypesReader tr = new TypesReader(payload, off, len); + + int packet_type = tr.readByte(); + + if (packet_type != Packets.SSH_MSG_USERAUTH_FAILURE) + throw new IOException("This is not a SSH_MSG_USERAUTH_FAILURE! (" + packet_type + ")"); + + authThatCanContinue = tr.readNameList(); + partialSuccess = tr.readBoolean(); + + if (tr.remain() != 0) + throw new IOException("Padding in SSH_MSG_USERAUTH_FAILURE packet!"); + } + + public String[] getAuthThatCanContinue() + { + return authThatCanContinue; + } + + public boolean isPartialSuccess() + { + return partialSuccess; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketUserauthInfoRequest.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketUserauthInfoRequest.java new file mode 100644 index 0000000000..d47d63a88f --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketUserauthInfoRequest.java @@ -0,0 +1,84 @@ + +package com.trilead.ssh2.packets; + +import java.io.IOException; + +/** + * PacketUserauthInfoRequest. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketUserauthInfoRequest.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketUserauthInfoRequest +{ + byte[] payload; + + String name; + String instruction; + String languageTag; + int numPrompts; + + String prompt[]; + boolean echo[]; + + public PacketUserauthInfoRequest(byte payload[], int off, int len) throws IOException + { + this.payload = new byte[len]; + System.arraycopy(payload, off, this.payload, 0, len); + + TypesReader tr = new TypesReader(payload, off, len); + + int packet_type = tr.readByte(); + + if (packet_type != Packets.SSH_MSG_USERAUTH_INFO_REQUEST) + throw new IOException("This is not a SSH_MSG_USERAUTH_INFO_REQUEST! (" + packet_type + ")"); + + name = tr.readString(); + instruction = tr.readString(); + languageTag = tr.readString(); + + numPrompts = tr.readUINT32(); + + prompt = new String[numPrompts]; + echo = new boolean[numPrompts]; + + for (int i = 0; i < numPrompts; i++) + { + prompt[i] = tr.readString(); + echo[i] = tr.readBoolean(); + } + + if (tr.remain() != 0) + throw new IOException("Padding in SSH_MSG_USERAUTH_INFO_REQUEST packet!"); + } + + public boolean[] getEcho() + { + return echo; + } + + public String getInstruction() + { + return instruction; + } + + public String getLanguageTag() + { + return languageTag; + } + + public String getName() + { + return name; + } + + public int getNumPrompts() + { + return numPrompts; + } + + public String[] getPrompt() + { + return prompt; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketUserauthInfoResponse.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketUserauthInfoResponse.java new file mode 100644 index 0000000000..054a3835d7 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketUserauthInfoResponse.java @@ -0,0 +1,35 @@ + +package com.trilead.ssh2.packets; + +/** + * PacketUserauthInfoResponse. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketUserauthInfoResponse.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketUserauthInfoResponse +{ + byte[] payload; + + String[] responses; + + public PacketUserauthInfoResponse(String[] responses) + { + this.responses = responses; + } + + public byte[] getPayload() + { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_USERAUTH_INFO_RESPONSE); + tw.writeUINT32(responses.length); + for (int i = 0; i < responses.length; i++) + tw.writeString(responses[i]); + + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketUserauthRequestInteractive.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketUserauthRequestInteractive.java new file mode 100644 index 0000000000..0e4e91f2a7 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketUserauthRequestInteractive.java @@ -0,0 +1,43 @@ + +package com.trilead.ssh2.packets; + +import java.io.UnsupportedEncodingException; + +/** + * PacketUserauthRequestInteractive. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketUserauthRequestInteractive.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketUserauthRequestInteractive +{ + byte[] payload; + + String userName; + String serviceName; + String[] submethods; + + public PacketUserauthRequestInteractive(String serviceName, String user, String[] submethods) + { + this.serviceName = serviceName; + this.userName = user; + this.submethods = submethods; + } + + public byte[] getPayload() throws UnsupportedEncodingException { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_USERAUTH_REQUEST); + tw.writeString(userName, "UTF-8"); + tw.writeString(serviceName); + tw.writeString("keyboard-interactive"); + tw.writeString(""); // draft-ietf-secsh-newmodes-04.txt says that + // the language tag should be empty. + tw.writeNameList(submethods); + + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketUserauthRequestNone.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketUserauthRequestNone.java new file mode 100644 index 0000000000..60a3defa00 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketUserauthRequestNone.java @@ -0,0 +1,61 @@ +package com.trilead.ssh2.packets; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; + +/** + * PacketUserauthRequestPassword. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketUserauthRequestNone.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketUserauthRequestNone +{ + byte[] payload; + + String userName; + String serviceName; + + public PacketUserauthRequestNone(String serviceName, String user) + { + this.serviceName = serviceName; + this.userName = user; + } + + public PacketUserauthRequestNone(byte payload[], int off, int len) throws IOException + { + this.payload = new byte[len]; + System.arraycopy(payload, off, this.payload, 0, len); + + TypesReader tr = new TypesReader(payload, off, len); + + int packet_type = tr.readByte(); + + if (packet_type != Packets.SSH_MSG_USERAUTH_REQUEST) + throw new IOException("This is not a SSH_MSG_USERAUTH_REQUEST! (" + packet_type + ")"); + + userName = tr.readString(); + serviceName = tr.readString(); + + String method = tr.readString(); + + if (!method.equals("none")) + throw new IOException("This is not a SSH_MSG_USERAUTH_REQUEST with type none!"); + + if (tr.remain() != 0) + throw new IOException("Padding in SSH_MSG_USERAUTH_REQUEST packet!"); + } + + public byte[] getPayload() throws UnsupportedEncodingException { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_USERAUTH_REQUEST); + tw.writeString(userName, "UTF-8"); + tw.writeString(serviceName); + tw.writeString("none"); + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketUserauthRequestPassword.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketUserauthRequestPassword.java new file mode 100644 index 0000000000..801d1b7e1b --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketUserauthRequestPassword.java @@ -0,0 +1,67 @@ +package com.trilead.ssh2.packets; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; + +/** + * PacketUserauthRequestPassword. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketUserauthRequestPassword.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketUserauthRequestPassword +{ + byte[] payload; + + String userName; + String serviceName; + String password; + + public PacketUserauthRequestPassword(String serviceName, String user, String pass) + { + this.serviceName = serviceName; + this.userName = user; + this.password = pass; + } + + public PacketUserauthRequestPassword(byte payload[], int off, int len) throws IOException + { + this.payload = new byte[len]; + System.arraycopy(payload, off, this.payload, 0, len); + + TypesReader tr = new TypesReader(payload, off, len); + + int packet_type = tr.readByte(); + + if (packet_type != Packets.SSH_MSG_USERAUTH_REQUEST) + throw new IOException("This is not a SSH_MSG_USERAUTH_REQUEST! (" + packet_type + ")"); + + userName = tr.readString(); + serviceName = tr.readString(); + + String method = tr.readString(); + + if (!method.equals("password")) + throw new IOException("This is not a SSH_MSG_USERAUTH_REQUEST with type password!"); + + /* ... */ + + if (tr.remain() != 0) + throw new IOException("Padding in SSH_MSG_USERAUTH_REQUEST packet!"); + } + + public byte[] getPayload() throws UnsupportedEncodingException { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_USERAUTH_REQUEST); + tw.writeString(userName, "UTF-8"); + tw.writeString(serviceName); + tw.writeString("password"); + tw.writeBoolean(false); + tw.writeString(password, "UTF-8"); + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketUserauthRequestPublicKey.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketUserauthRequestPublicKey.java new file mode 100644 index 0000000000..4c6945ea30 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/PacketUserauthRequestPublicKey.java @@ -0,0 +1,65 @@ +package com.trilead.ssh2.packets; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; + +/** + * PacketUserauthRequestPublicKey. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: PacketUserauthRequestPublicKey.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class PacketUserauthRequestPublicKey +{ + byte[] payload; + + String userName; + String serviceName; + String password; + String pkAlgoName; + byte[] pk; + byte[] sig; + + public PacketUserauthRequestPublicKey(String serviceName, String user, + String pkAlgorithmName, byte[] pk, byte[] sig) + { + this.serviceName = serviceName; + this.userName = user; + this.pkAlgoName = pkAlgorithmName; + this.pk = pk; + this.sig = sig; + } + + public PacketUserauthRequestPublicKey(byte payload[], int off, int len) throws IOException + { + this.payload = new byte[len]; + System.arraycopy(payload, off, this.payload, 0, len); + + TypesReader tr = new TypesReader(payload, off, len); + + int packet_type = tr.readByte(); + + if (packet_type != Packets.SSH_MSG_USERAUTH_REQUEST) + throw new IOException("This is not a SSH_MSG_USERAUTH_REQUEST! (" + + packet_type + ")"); + + throw new IOException("Not implemented!"); + } + + public byte[] getPayload() throws UnsupportedEncodingException { + if (payload == null) + { + TypesWriter tw = new TypesWriter(); + tw.writeByte(Packets.SSH_MSG_USERAUTH_REQUEST); + tw.writeString(userName, "UTF-8"); + tw.writeString(serviceName); + tw.writeString("publickey"); + tw.writeBoolean(true); + tw.writeString(pkAlgoName); + tw.writeString(pk, 0, pk.length); + tw.writeString(sig, 0, sig.length); + payload = tw.getBytes(); + } + return payload; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/Packets.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/Packets.java new file mode 100644 index 0000000000..3d00aa4498 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/Packets.java @@ -0,0 +1,153 @@ + +package com.trilead.ssh2.packets; + +/** + * Packets. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: Packets.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class Packets +{ + public static final int SSH_MSG_DISCONNECT = 1; + public static final int SSH_MSG_IGNORE = 2; + public static final int SSH_MSG_UNIMPLEMENTED = 3; + public static final int SSH_MSG_DEBUG = 4; + public static final int SSH_MSG_SERVICE_REQUEST = 5; + public static final int SSH_MSG_SERVICE_ACCEPT = 6; + public static final int SSH_MSG_EXT_INFO = 7; + + public static final int SSH_MSG_KEXINIT = 20; + public static final int SSH_MSG_NEWKEYS = 21; + + public static final int SSH_MSG_KEXDH_INIT = 30; + public static final int SSH_MSG_KEXDH_REPLY = 31; + + public static final int SSH_MSG_KEX_DH_GEX_REQUEST_OLD = 30; + public static final int SSH_MSG_KEX_DH_GEX_REQUEST = 34; + public static final int SSH_MSG_KEX_DH_GEX_GROUP = 31; + public static final int SSH_MSG_KEX_DH_GEX_INIT = 32; + public static final int SSH_MSG_KEX_DH_GEX_REPLY = 33; + + public static final int SSH_MSG_USERAUTH_REQUEST = 50; + public static final int SSH_MSG_USERAUTH_FAILURE = 51; + public static final int SSH_MSG_USERAUTH_SUCCESS = 52; + public static final int SSH_MSG_USERAUTH_BANNER = 53; + public static final int SSH_MSG_USERAUTH_INFO_REQUEST = 60; + public static final int SSH_MSG_USERAUTH_INFO_RESPONSE = 61; + + public static final int SSH_MSG_GLOBAL_REQUEST = 80; + public static final int SSH_MSG_REQUEST_SUCCESS = 81; + public static final int SSH_MSG_REQUEST_FAILURE = 82; + + public static final int SSH_MSG_CHANNEL_OPEN = 90; + public static final int SSH_MSG_CHANNEL_OPEN_CONFIRMATION = 91; + public static final int SSH_MSG_CHANNEL_OPEN_FAILURE = 92; + public static final int SSH_MSG_CHANNEL_WINDOW_ADJUST = 93; + public static final int SSH_MSG_CHANNEL_DATA = 94; + public static final int SSH_MSG_CHANNEL_EXTENDED_DATA = 95; + public static final int SSH_MSG_CHANNEL_EOF = 96; + public static final int SSH_MSG_CHANNEL_CLOSE = 97; + public static final int SSH_MSG_CHANNEL_REQUEST = 98; + public static final int SSH_MSG_CHANNEL_SUCCESS = 99; + public static final int SSH_MSG_CHANNEL_FAILURE = 100; + + public static final int SSH_EXTENDED_DATA_STDERR = 1; + + public static final int SSH_DISCONNECT_HOST_NOT_ALLOWED_TO_CONNECT = 1; + public static final int SSH_DISCONNECT_PROTOCOL_ERROR = 2; + public static final int SSH_DISCONNECT_KEY_EXCHANGE_FAILED = 3; + public static final int SSH_DISCONNECT_RESERVED = 4; + public static final int SSH_DISCONNECT_MAC_ERROR = 5; + public static final int SSH_DISCONNECT_COMPRESSION_ERROR = 6; + public static final int SSH_DISCONNECT_SERVICE_NOT_AVAILABLE = 7; + public static final int SSH_DISCONNECT_PROTOCOL_VERSION_NOT_SUPPORTED = 8; + public static final int SSH_DISCONNECT_HOST_KEY_NOT_VERIFIABLE = 9; + public static final int SSH_DISCONNECT_CONNECTION_LOST = 10; + public static final int SSH_DISCONNECT_BY_APPLICATION = 11; + public static final int SSH_DISCONNECT_TOO_MANY_CONNECTIONS = 12; + public static final int SSH_DISCONNECT_AUTH_CANCELLED_BY_USER = 13; + public static final int SSH_DISCONNECT_NO_MORE_AUTH_METHODS_AVAILABLE = 14; + public static final int SSH_DISCONNECT_ILLEGAL_USER_NAME = 15; + + public static final int SSH_OPEN_ADMINISTRATIVELY_PROHIBITED = 1; + public static final int SSH_OPEN_CONNECT_FAILED = 2; + public static final int SSH_OPEN_UNKNOWN_CHANNEL_TYPE = 3; + public static final int SSH_OPEN_RESOURCE_SHORTAGE = 4; + + private static final String[] reverseNames = new String[101]; + + private Packets() { } + + static + { + reverseNames[1] = "SSH_MSG_DISCONNECT"; + reverseNames[2] = "SSH_MSG_IGNORE"; + reverseNames[3] = "SSH_MSG_UNIMPLEMENTED"; + reverseNames[4] = "SSH_MSG_DEBUG"; + reverseNames[5] = "SSH_MSG_SERVICE_REQUEST"; + reverseNames[6] = "SSH_MSG_SERVICE_ACCEPT"; + reverseNames[7] = "SSH_MSG_EXT_INFO"; + + reverseNames[20] = "SSH_MSG_KEXINIT"; + reverseNames[21] = "SSH_MSG_NEWKEYS"; + + reverseNames[30] = "SSH_MSG_KEXDH_INIT"; + reverseNames[31] = "SSH_MSG_KEXDH_REPLY/SSH_MSG_KEX_DH_GEX_GROUP"; + reverseNames[32] = "SSH_MSG_KEX_DH_GEX_INIT"; + reverseNames[33] = "SSH_MSG_KEX_DH_GEX_REPLY"; + reverseNames[34] = "SSH_MSG_KEX_DH_GEX_REQUEST"; + + reverseNames[50] = "SSH_MSG_USERAUTH_REQUEST"; + reverseNames[51] = "SSH_MSG_USERAUTH_FAILURE"; + reverseNames[52] = "SSH_MSG_USERAUTH_SUCCESS"; + reverseNames[53] = "SSH_MSG_USERAUTH_BANNER"; + + reverseNames[60] = "SSH_MSG_USERAUTH_INFO_REQUEST"; + reverseNames[61] = "SSH_MSG_USERAUTH_INFO_RESPONSE"; + + reverseNames[80] = "SSH_MSG_GLOBAL_REQUEST"; + reverseNames[81] = "SSH_MSG_REQUEST_SUCCESS"; + reverseNames[82] = "SSH_MSG_REQUEST_FAILURE"; + + reverseNames[90] = "SSH_MSG_CHANNEL_OPEN"; + reverseNames[91] = "SSH_MSG_CHANNEL_OPEN_CONFIRMATION"; + reverseNames[92] = "SSH_MSG_CHANNEL_OPEN_FAILURE"; + reverseNames[93] = "SSH_MSG_CHANNEL_WINDOW_ADJUST"; + reverseNames[94] = "SSH_MSG_CHANNEL_DATA"; + reverseNames[95] = "SSH_MSG_CHANNEL_EXTENDED_DATA"; + reverseNames[96] = "SSH_MSG_CHANNEL_EOF"; + reverseNames[97] = "SSH_MSG_CHANNEL_CLOSE"; + reverseNames[98] = "SSH_MSG_CHANNEL_REQUEST"; + reverseNames[99] = "SSH_MSG_CHANNEL_SUCCESS"; + reverseNames[100] = "SSH_MSG_CHANNEL_FAILURE"; + } + + public static final String getMessageName(int type) + { + String res = null; + + if ((type >= 0) && (type < reverseNames.length)) + { + res = reverseNames[type]; + } + + return (res == null) ? ("UNKNOWN MSG " + type) : res; + } + + // public static final void debug(String tag, byte[] msg) + // { + // System.err.println(tag + " Type: " + msg[0] + ", LEN: " + msg.length); + // + // for (int i = 0; i < msg.length; i++) + // { + // if (((msg[i] >= 'a') && (msg[i] <= 'z')) || ((msg[i] >= 'A') && (msg[i] <= 'Z')) + // || ((msg[i] >= '0') && (msg[i] <= '9')) || (msg[i] == ' ')) + // System.err.print((char) msg[i]); + // else + // System.err.print("."); + // } + // System.err.println(); + // System.err.flush(); + // } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/TypesReader.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/TypesReader.java new file mode 100644 index 0000000000..df54f1f4c5 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/TypesReader.java @@ -0,0 +1,192 @@ + +package com.trilead.ssh2.packets; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.math.BigInteger; + +import com.trilead.ssh2.util.Tokenizer; + + +/** + * TypesReader. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: TypesReader.java,v 1.2 2008/04/01 12:38:09 cplattne Exp $ + */ +public class TypesReader +{ + byte[] arr; + int pos = 0; + int max = 0; + + public TypesReader(byte[] arr) + { + this.arr = arr; + pos = 0; + max = arr.length; + } + + public TypesReader(byte[] arr, int off) + { + this.arr = arr; + this.pos = off; + this.max = arr.length; + + if ((pos < 0) || (pos > arr.length)) + throw new IllegalArgumentException("Illegal offset."); + } + + public TypesReader(byte[] arr, int off, int len) + { + this.arr = arr; + this.pos = off; + this.max = off + len; + + if ((pos < 0) || (pos >= arr.length)) + throw new IllegalArgumentException("Illegal offset."); + + if ((max < 0) || (max > arr.length)) + throw new IllegalArgumentException("Illegal length."); + } + + public int readByte() throws IOException + { + if (pos >= max) + throw new IOException("Packet too short."); + + return (arr[pos++] & 0xff); + } + + public byte[] readBytes(int len) throws IOException + { + if (len < 0) + throw new IOException("Negative length requested"); + + if ((pos + len) > max) + throw new IOException("Packet too short."); + + byte[] res = new byte[len]; + + System.arraycopy(arr, pos, res, 0, len); + pos += len; + + return res; + } + + public void readBytes(byte[] dst, int off, int len) throws IOException + { + if (off < 0 || len < 0) + throw new IOException("Negative offset or length specified"); + + if (len > dst.length - off) + throw new IOException("Length too long for output buffer"); + + if ((pos + len) > max) + throw new IOException("Packet too short."); + + System.arraycopy(arr, pos, dst, off, len); + pos += len; + } + + public boolean readBoolean() throws IOException + { + if (pos >= max) + throw new IOException("Packet too short."); + + return (arr[pos++] != 0); + } + + public int readUINT32() throws IOException + { + if ((pos + 4) > max) + throw new IOException("Packet too short."); + + return ((arr[pos++] & 0xff) << 24) | ((arr[pos++] & 0xff) << 16) | ((arr[pos++] & 0xff) << 8) + | (arr[pos++] & 0xff); + } + + public long readUINT64() throws IOException + { + if ((pos + 8) > max) + throw new IOException("Packet too short."); + + long high = ((arr[pos++] & 0xff) << 24) | ((arr[pos++] & 0xff) << 16) | ((arr[pos++] & 0xff) << 8) + | (arr[pos++] & 0xff); /* sign extension may take place - will be shifted away =) */ + + long low = ((arr[pos++] & 0xff) << 24) | ((arr[pos++] & 0xff) << 16) | ((arr[pos++] & 0xff) << 8) + | (arr[pos++] & 0xff); /* sign extension may take place - handle below */ + + return (high << 32) | (low & 0xffffffffl); /* see Java language spec (15.22.1, 5.6.2) */ + } + + public BigInteger readMPINT() throws IOException + { + BigInteger b; + + byte[] raw = readByteString(); + + if (raw.length == 0) + b = BigInteger.ZERO; + else + b = new BigInteger(raw); + + return b; + } + + public byte[] readByteString() throws IOException + { + int len = readUINT32(); + + if ((len + pos) > max) + throw new IOException("Malformed SSH byte string."); + + byte[] res = new byte[len]; + System.arraycopy(arr, pos, res, 0, len); + pos += len; + return res; + } + + public String readString(String charsetName) throws IOException + { + int len = readUINT32(); + + if ((len + pos) > max) + throw new IOException("Malformed SSH string."); + + String res = (charsetName == null) ? new String(arr, pos, len) : new String(arr, pos, len, charsetName); + pos += len; + + return res; + } + + public String readString() throws IOException + { + int len = readUINT32(); + + if ((len + pos) > max) + throw new IOException("Malformed SSH string."); + + String res; + try { + res = new String(arr, pos, len, "ISO-8859-1"); + } catch (UnsupportedEncodingException e) { + res = new String(arr, pos, len); + } + + pos += len; + + return res; + } + + public String[] readNameList() throws IOException + { + return Tokenizer.parseTokens(readString(), ','); + } + + public int remain() + { + return max - pos; + } + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/TypesWriter.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/TypesWriter.java new file mode 100644 index 0000000000..ecd31ab22d --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/packets/TypesWriter.java @@ -0,0 +1,166 @@ + +package com.trilead.ssh2.packets; + +import java.io.UnsupportedEncodingException; +import java.math.BigInteger; + +/** + * TypesWriter. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: TypesWriter.java,v 1.2 2008/04/01 12:38:09 cplattne Exp $ + */ +public class TypesWriter +{ + byte arr[]; + int pos; + + public TypesWriter() + { + arr = new byte[256]; + pos = 0; + } + + private void resize(int len) + { + byte new_arr[] = new byte[len]; + System.arraycopy(arr, 0, new_arr, 0, arr.length); + arr = new_arr; + } + + public int length() + { + return pos; + } + + public byte[] getBytes() + { + byte[] dst = new byte[pos]; + System.arraycopy(arr, 0, dst, 0, pos); + return dst; + } + + public void getBytes(byte dst[]) + { + System.arraycopy(arr, 0, dst, 0, pos); + } + + public void writeUINT32(int val, int off) + { + if ((off + 4) > arr.length) + resize(off + 32); + + arr[off++] = (byte) (val >> 24); + arr[off++] = (byte) (val >> 16); + arr[off++] = (byte) (val >> 8); + arr[off++] = (byte) val; + } + + public void writeUINT32(int val) + { + writeUINT32(val, pos); + pos += 4; + } + + public void writeUINT64(long val) + { + if ((pos + 8) > arr.length) + resize(arr.length + 32); + + arr[pos++] = (byte) (val >> 56); + arr[pos++] = (byte) (val >> 48); + arr[pos++] = (byte) (val >> 40); + arr[pos++] = (byte) (val >> 32); + arr[pos++] = (byte) (val >> 24); + arr[pos++] = (byte) (val >> 16); + arr[pos++] = (byte) (val >> 8); + arr[pos++] = (byte) val; + } + + public void writeBoolean(boolean v) + { + if ((pos + 1) > arr.length) + resize(arr.length + 32); + + arr[pos++] = v ? (byte) 1 : (byte) 0; + } + + public void writeByte(int v, int off) + { + if ((off + 1) > arr.length) + resize(off + 32); + + arr[off] = (byte) v; + } + + public void writeByte(int v) + { + writeByte(v, pos); + pos++; + } + + public void writeMPInt(BigInteger b) + { + byte raw[] = b.toByteArray(); + + if ((raw.length == 1) && (raw[0] == 0)) + writeUINT32(0); /* String with zero bytes of data */ + else + writeString(raw, 0, raw.length); + } + + public void writeBytes(byte[] buff) + { + writeBytes(buff, 0, buff.length); + } + + public void writeBytes(byte[] buff, int off, int len) + { + if ((pos + len) > arr.length) + resize(arr.length + len + 32); + + System.arraycopy(buff, off, arr, pos, len); + pos += len; + } + + public void writeString(byte[] buff, int off, int len) + { + writeUINT32(len); + writeBytes(buff, off, len); + } + + public void writeString(String v) + { + byte[] b; + + /* All Java JVMs must support ISO-8859-1 */ + try { + b = v.getBytes("ISO-8859-1"); + } catch (UnsupportedEncodingException e) { + b = v.getBytes(); + } + + writeUINT32(b.length); + writeBytes(b, 0, b.length); + } + + public void writeString(String v, String charsetName) throws UnsupportedEncodingException + { + byte[] b = (charsetName == null) ? v.getBytes() : v.getBytes(charsetName); + + writeUINT32(b.length); + writeBytes(b, 0, b.length); + } + + public void writeNameList(String v[]) + { + StringBuffer sb = new StringBuffer(); + for (int i = 0; i < v.length; i++) + { + if (i > 0) + sb.append(','); + sb.append(v[i]); + } + writeString(sb.toString()); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/sftp/AttrTextHints.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/sftp/AttrTextHints.java new file mode 100644 index 0000000000..8c9115e955 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/sftp/AttrTextHints.java @@ -0,0 +1,38 @@ + +package com.trilead.ssh2.sftp; + +/** + * + * Values for the 'text-hint' field in the SFTP ATTRS data type. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: AttrTextHints.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + * + */ +public class AttrTextHints +{ + /** + * The server knows the file is a text file, and should be opened + * using the SSH_FXF_ACCESS_TEXT_MODE flag. + */ + public static final int SSH_FILEXFER_ATTR_KNOWN_TEXT = 0x00; + + /** + * The server has applied a heuristic or other mechanism and + * believes that the file should be opened with the + * SSH_FXF_ACCESS_TEXT_MODE flag. + */ + public static final int SSH_FILEXFER_ATTR_GUESSED_TEXT = 0x01; + + /** + * The server knows the file has binary content. + */ + public static final int SSH_FILEXFER_ATTR_KNOWN_BINARY = 0x02; + + /** + * The server has applied a heuristic or other mechanism and + * believes has binary content, and should not be opened with the + * SSH_FXF_ACCESS_TEXT_MODE flag. + */ + public static final int SSH_FILEXFER_ATTR_GUESSED_BINARY = 0x03; +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/sftp/AttribBits.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/sftp/AttribBits.java new file mode 100644 index 0000000000..1a4afd4d7c --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/sftp/AttribBits.java @@ -0,0 +1,129 @@ + +package com.trilead.ssh2.sftp; + +/** + * + * SFTP Attribute Bits for the "attrib-bits" and "attrib-bits-valid" fields + * of the SFTP ATTR data type. + *

+ * Yes, these are the "attrib-bits", even though they have "_FLAGS_" in + * their name. Don't ask - I did not invent it. + *

+ * "These fields, taken together, reflect various attributes of the file + * or directory, on the server. Bits not set in 'attrib-bits-valid' MUST be + * ignored in the 'attrib-bits' field. This allows both the server and the + * client to communicate only the bits it knows about without inadvertently + * twiddling bits they don't understand." + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: AttribBits.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + * + */ +public class AttribBits +{ + /** + * Advisory, read-only bit. This bit is not part of the access + * control information on the file, but is rather an advisory field + * indicating that the file should not be written. + */ + public static final int SSH_FILEXFER_ATTR_FLAGS_READONLY = 0x00000001; + + /** + * The file is part of the operating system. + */ + public static final int SSH_FILEXFER_ATTR_FLAGS_SYSTEM = 0x00000002; + + /** + * File SHOULD NOT be shown to user unless specifically requested. + * For example, most UNIX systems SHOULD set this bit if the filename + * begins with a 'period'. This bit may be read-only (see section 5.4 of + * the SFTP standard draft). Most UNIX systems will not allow this to be + * changed. + */ + public static final int SSH_FILEXFER_ATTR_FLAGS_HIDDEN = 0x00000004; + + /** + * This attribute applies only to directories. This attribute is + * always read-only, and cannot be modified. This attribute means + * that files and directory names in this directory should be compared + * without regard to case. + *

+ * It is recommended that where possible, the server's filesystem be + * allowed to do comparisons. For example, if a client wished to prompt + * a user before overwriting a file, it should not compare the new name + * with the previously retrieved list of names in the directory. Rather, + * it should first try to create the new file by specifying + * SSH_FXF_CREATE_NEW flag. Then, if this fails and returns + * SSH_FX_FILE_ALREADY_EXISTS, it should prompt the user and then retry + * the create specifying SSH_FXF_CREATE_TRUNCATE. + *

+ * Unless otherwise specified, filenames are assumed to be case sensitive. + */ + public static final int SSH_FILEXFER_ATTR_FLAGS_CASE_INSENSITIVE = 0x00000008; + + /** + * The file should be included in backup / archive operations. + */ + public static final int SSH_FILEXFER_ATTR_FLAGS_ARCHIVE = 0x00000010; + + /** + * The file is stored on disk using file-system level transparent + * encryption. This flag does not affect the file data on the wire + * (for either READ or WRITE requests.) + */ + public static final int SSH_FILEXFER_ATTR_FLAGS_ENCRYPTED = 0x00000020; + + /** + * The file is stored on disk using file-system level transparent + * compression. This flag does not affect the file data on the wire. + */ + public static final int SSH_FILEXFER_ATTR_FLAGS_COMPRESSED = 0x00000040; + + /** + * The file is a sparse file; this means that file blocks that have + * not been explicitly written are not stored on disk. For example, if + * a client writes a buffer at 10 M from the beginning of the file, + * the blocks between the previous EOF marker and the 10 M offset would + * not consume physical disk space. + *

+ * Some servers may store all files as sparse files, in which case + * this bit will be unconditionally set. Other servers may not have + * a mechanism for determining if the file is sparse, and so the file + * MAY be stored sparse even if this flag is not set. + */ + public static final int SSH_FILEXFER_ATTR_FLAGS_SPARSE = 0x00000080; + + /** + * Opening the file without either the SSH_FXF_ACCESS_APPEND_DATA or + * the SSH_FXF_ACCESS_APPEND_DATA_ATOMIC flag (see section 8.1.1.3 + * of the SFTP standard draft) MUST result in an + * SSH_FX_INVALID_PARAMETER error. + */ + public static final int SSH_FILEXFER_ATTR_FLAGS_APPEND_ONLY = 0x00000100; + + /** + * The file cannot be deleted or renamed, no hard link can be created + * to this file, and no data can be written to the file. + *

+ * This bit implies a stronger level of protection than + * SSH_FILEXFER_ATTR_FLAGS_READONLY, the file permission mask or ACLs. + * Typically even the superuser cannot write to immutable files, and + * only the superuser can set or remove the bit. + */ + public static final int SSH_FILEXFER_ATTR_FLAGS_IMMUTABLE = 0x00000200; + + /** + * When the file is modified, the changes are written synchronously + * to the disk. + */ + public static final int SSH_FILEXFER_ATTR_FLAGS_SYNC = 0x00000400; + + /** + * The server MAY include this bit in a directory listing or realpath + * response. It indicates there was a failure in the translation to UTF-8. + * If this flag is included, the server SHOULD also include the + * UNTRANSLATED_NAME attribute. + */ + public static final int SSH_FILEXFER_ATTR_FLAGS_TRANSLATION_ERR = 0x00000800; + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/sftp/AttribFlags.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/sftp/AttribFlags.java new file mode 100644 index 0000000000..c364afe665 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/sftp/AttribFlags.java @@ -0,0 +1,112 @@ + +package com.trilead.ssh2.sftp; + +/** + * + * Attribute Flags. The 'valid-attribute-flags' field in + * the SFTP ATTRS data type specifies which of the fields are actually present. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: AttribFlags.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + * + */ +public class AttribFlags +{ + /** + * Indicates that the 'allocation-size' field is present. + */ + public static final int SSH_FILEXFER_ATTR_SIZE = 0x00000001; + + /** Protocol version 6: + * 0x00000002 was used in a previous version of this protocol. + * It is now a reserved value and MUST NOT appear in the mask. + * Some future version of this protocol may reuse this value. + */ + public static final int SSH_FILEXFER_ATTR_V3_UIDGID = 0x00000002; + + /** + * Indicates that the 'permissions' field is present. + */ + public static final int SSH_FILEXFER_ATTR_PERMISSIONS = 0x00000004; + + /** + * Indicates that the 'atime' and 'mtime' field are present + * (protocol v3). + */ + public static final int SSH_FILEXFER_ATTR_V3_ACMODTIME = 0x00000008; + + /** + * Indicates that the 'atime' field is present. + */ + public static final int SSH_FILEXFER_ATTR_ACCESSTIME = 0x00000008; + + /** + * Indicates that the 'createtime' field is present. + */ + public static final int SSH_FILEXFER_ATTR_CREATETIME = 0x00000010; + + /** + * Indicates that the 'mtime' field is present. + */ + public static final int SSH_FILEXFER_ATTR_MODIFYTIME = 0x00000020; + + /** + * Indicates that the 'acl' field is present. + */ + public static final int SSH_FILEXFER_ATTR_ACL = 0x00000040; + + /** + * Indicates that the 'owner' and 'group' fields are present. + */ + public static final int SSH_FILEXFER_ATTR_OWNERGROUP = 0x00000080; + + /** + * Indicates that additionally to the 'atime', 'createtime', + * 'mtime' and 'ctime' fields (if present), there is also + * 'atime-nseconds', 'createtime-nseconds', 'mtime-nseconds' + * and 'ctime-nseconds'. + */ + public static final int SSH_FILEXFER_ATTR_SUBSECOND_TIMES = 0x00000100; + + /** + * Indicates that the 'attrib-bits' and 'attrib-bits-valid' + * fields are present. + */ + public static final int SSH_FILEXFER_ATTR_BITS = 0x00000200; + + /** + * Indicates that the 'allocation-size' field is present. + */ + public static final int SSH_FILEXFER_ATTR_ALLOCATION_SIZE = 0x00000400; + + /** + * Indicates that the 'text-hint' field is present. + */ + public static final int SSH_FILEXFER_ATTR_TEXT_HINT = 0x00000800; + + /** + * Indicates that the 'mime-type' field is present. + */ + public static final int SSH_FILEXFER_ATTR_MIME_TYPE = 0x00001000; + + /** + * Indicates that the 'link-count' field is present. + */ + public static final int SSH_FILEXFER_ATTR_LINK_COUNT = 0x00002000; + + /** + * Indicates that the 'untranslated-name' field is present. + */ + public static final int SSH_FILEXFER_ATTR_UNTRANSLATED_NAME = 0x00004000; + + /** + * Indicates that the 'ctime' field is present. + */ + public static final int SSH_FILEXFER_ATTR_CTIME = 0x00008000; + + /** + * Indicates that the 'extended-count' field (and probablby some + * 'extensions') is present. + */ + public static final int SSH_FILEXFER_ATTR_EXTENDED = 0x80000000; +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/sftp/AttribPermissions.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/sftp/AttribPermissions.java new file mode 100644 index 0000000000..5b668bdf72 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/sftp/AttribPermissions.java @@ -0,0 +1,32 @@ + +package com.trilead.ssh2.sftp; + +/** + * + * Permissions for the 'permissions' field in the SFTP ATTRS data type. + *

+ * "The 'permissions' field contains a bit mask specifying file permissions. + * These permissions correspond to the st_mode field of the stat structure + * defined by POSIX [IEEE.1003-1.1996]." + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: AttribPermissions.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + * + */ +public class AttribPermissions +{ + /* Octal values! */ + + public static final int S_IRUSR = 0400; + public static final int S_IWUSR = 0200; + public static final int S_IXUSR = 0100; + public static final int S_IRGRP = 0040; + public static final int S_IWGRP = 0020; + public static final int S_IXGRP = 0010; + public static final int S_IROTH = 0004; + public static final int S_IWOTH = 0002; + public static final int S_IXOTH = 0001; + public static final int S_ISUID = 04000; + public static final int S_ISGID = 02000; + public static final int S_ISVTX = 01000; +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/sftp/AttribTypes.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/sftp/AttribTypes.java new file mode 100644 index 0000000000..8302fe2b2b --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/sftp/AttribTypes.java @@ -0,0 +1,28 @@ + +package com.trilead.ssh2.sftp; + +/** + * + * Types for the 'type' field in the SFTP ATTRS data type. + *

+ * "On a POSIX system, these values would be derived from the mode field + * of the stat structure. SPECIAL should be used for files that are of + * a known type which cannot be expressed in the protocol. UNKNOWN + * should be used if the type is not known." + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: AttribTypes.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + * + */ +public class AttribTypes +{ + public static final int SSH_FILEXFER_TYPE_REGULAR = 1; + public static final int SSH_FILEXFER_TYPE_DIRECTORY = 2; + public static final int SSH_FILEXFER_TYPE_SYMLINK = 3; + public static final int SSH_FILEXFER_TYPE_SPECIAL = 4; + public static final int SSH_FILEXFER_TYPE_UNKNOWN = 5; + public static final int SSH_FILEXFER_TYPE_SOCKET = 6; + public static final int SSH_FILEXFER_TYPE_CHAR_DEVICE = 7; + public static final int SSH_FILEXFER_TYPE_BLOCK_DEVICE = 8; + public static final int SSH_FILEXFER_TYPE_FIFO = 9; +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/sftp/ErrorCodes.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/sftp/ErrorCodes.java new file mode 100644 index 0000000000..7317a0020d --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/sftp/ErrorCodes.java @@ -0,0 +1,104 @@ + +package com.trilead.ssh2.sftp; + +/** + * + * SFTP Error Codes + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: ErrorCodes.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + * + */ +public class ErrorCodes +{ + public static final int SSH_FX_OK = 0; + public static final int SSH_FX_EOF = 1; + public static final int SSH_FX_NO_SUCH_FILE = 2; + public static final int SSH_FX_PERMISSION_DENIED = 3; + public static final int SSH_FX_FAILURE = 4; + public static final int SSH_FX_BAD_MESSAGE = 5; + public static final int SSH_FX_NO_CONNECTION = 6; + public static final int SSH_FX_CONNECTION_LOST = 7; + public static final int SSH_FX_OP_UNSUPPORTED = 8; + public static final int SSH_FX_INVALID_HANDLE = 9; + public static final int SSH_FX_NO_SUCH_PATH = 10; + public static final int SSH_FX_FILE_ALREADY_EXISTS = 11; + public static final int SSH_FX_WRITE_PROTECT = 12; + public static final int SSH_FX_NO_MEDIA = 13; + public static final int SSH_FX_NO_SPACE_ON_FILESYSTEM = 14; + public static final int SSH_FX_QUOTA_EXCEEDED = 15; + public static final int SSH_FX_UNKNOWN_PRINCIPAL = 16; + public static final int SSH_FX_LOCK_CONFLICT = 17; + public static final int SSH_FX_DIR_NOT_EMPTY = 18; + public static final int SSH_FX_NOT_A_DIRECTORY = 19; + public static final int SSH_FX_INVALID_FILENAME = 20; + public static final int SSH_FX_LINK_LOOP = 21; + public static final int SSH_FX_CANNOT_DELETE = 22; + public static final int SSH_FX_INVALID_PARAMETER = 23; + public static final int SSH_FX_FILE_IS_A_DIRECTORY = 24; + public static final int SSH_FX_BYTE_RANGE_LOCK_CONFLICT = 25; + public static final int SSH_FX_BYTE_RANGE_LOCK_REFUSED = 26; + public static final int SSH_FX_DELETE_PENDING = 27; + public static final int SSH_FX_FILE_CORRUPT = 28; + public static final int SSH_FX_OWNER_INVALID = 29; + public static final int SSH_FX_GROUP_INVALID = 30; + public static final int SSH_FX_NO_MATCHING_BYTE_RANGE_LOCK = 31; + + private static final String[][] messages = { + + { "SSH_FX_OK", "Indicates successful completion of the operation." }, + { "SSH_FX_EOF", + "An attempt to read past the end-of-file was made; or, there are no more directory entries to return." }, + { "SSH_FX_NO_SUCH_FILE", "A reference was made to a file which does not exist." }, + { "SSH_FX_PERMISSION_DENIED", "The user does not have sufficient permissions to perform the operation." }, + { "SSH_FX_FAILURE", "An error occurred, but no specific error code exists to describe the failure." }, + { "SSH_FX_BAD_MESSAGE", "A badly formatted packet or other SFTP protocol incompatibility was detected." }, + { "SSH_FX_NO_CONNECTION", "There is no connection to the server." }, + { "SSH_FX_CONNECTION_LOST", "The connection to the server was lost." }, + { "SSH_FX_OP_UNSUPPORTED", + "An attempted operation could not be completed by the server because the server does not support the operation." }, + { "SSH_FX_INVALID_HANDLE", "The handle value was invalid." }, + { "SSH_FX_NO_SUCH_PATH", "The file path does not exist or is invalid." }, + { "SSH_FX_FILE_ALREADY_EXISTS", "The file already exists." }, + { "SSH_FX_WRITE_PROTECT", "The file is on read-only media, or the media is write protected." }, + { "SSH_FX_NO_MEDIA", + "The requested operation cannot be completed because there is no media available in the drive." }, + { "SSH_FX_NO_SPACE_ON_FILESYSTEM", + "The requested operation cannot be completed because there is insufficient free space on the filesystem." }, + { "SSH_FX_QUOTA_EXCEEDED", + "The operation cannot be completed because it would exceed the user's storage quota." }, + { + "SSH_FX_UNKNOWN_PRINCIPAL", + "A principal referenced by the request (either the 'owner', 'group', or 'who' field of an ACL), was unknown. The error specific data contains the problematic names." }, + { "SSH_FX_LOCK_CONFLICT", "The file could not be opened because it is locked by another process." }, + { "SSH_FX_DIR_NOT_EMPTY", "The directory is not empty." }, + { "SSH_FX_NOT_A_DIRECTORY", "The specified file is not a directory." }, + { "SSH_FX_INVALID_FILENAME", "The filename is not valid." }, + { "SSH_FX_LINK_LOOP", + "Too many symbolic links encountered or, an SSH_FXF_NOFOLLOW open encountered a symbolic link as the final component." }, + { "SSH_FX_CANNOT_DELETE", + "The file cannot be deleted. One possible reason is that the advisory READONLY attribute-bit is set." }, + { "SSH_FX_INVALID_PARAMETER", + "One of the parameters was out of range, or the parameters specified cannot be used together." }, + { "SSH_FX_FILE_IS_A_DIRECTORY", + "The specified file was a directory in a context where a directory cannot be used." }, + { "SSH_FX_BYTE_RANGE_LOCK_CONFLICT", + " A read or write operation failed because another process's mandatory byte-range lock overlaps with the request." }, + { "SSH_FX_BYTE_RANGE_LOCK_REFUSED", "A request for a byte range lock was refused." }, + { "SSH_FX_DELETE_PENDING", "An operation was attempted on a file for which a delete operation is pending." }, + { "SSH_FX_FILE_CORRUPT", "The file is corrupt; an filesystem integrity check should be run." }, + { "SSH_FX_OWNER_INVALID", "The principal specified can not be assigned as an owner of a file." }, + { "SSH_FX_GROUP_INVALID", "The principal specified can not be assigned as the primary group of a file." }, + { "SSH_FX_NO_MATCHING_BYTE_RANGE_LOCK", + "The requested operation could not be completed because the specifed byte range lock has not been granted." }, + + }; + + public static final String[] getDescription(int errorCode) + { + if ((errorCode < 0) || (errorCode >= messages.length)) + return null; + + return messages[errorCode]; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/sftp/OpenFlags.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/sftp/OpenFlags.java new file mode 100644 index 0000000000..3571414ac8 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/sftp/OpenFlags.java @@ -0,0 +1,223 @@ + +package com.trilead.ssh2.sftp; + +/** + * + * SFTP Open Flags. + * + * The following table is provided to assist in mapping POSIX semantics + * to equivalent SFTP file open parameters: + *

+ * TODO: This comment should be moved to the open method. + *

+ *

    + *
  • O_RDONLY + *
    • desired-access = READ_DATA | READ_ATTRIBUTES
    + *
  • + *
+ *
    + *
  • O_WRONLY + *
    • desired-access = WRITE_DATA | WRITE_ATTRIBUTES
    + *
  • + *
+ *
    + *
  • O_RDWR + *
    • desired-access = READ_DATA | READ_ATTRIBUTES | WRITE_DATA | WRITE_ATTRIBUTES
    + *
  • + *
+ *
    + *
  • O_APPEND + *
      + *
    • desired-access = WRITE_DATA | WRITE_ATTRIBUTES | APPEND_DATA
    • + *
    • flags = SSH_FXF_ACCESS_APPEND_DATA and or SSH_FXF_ACCESS_APPEND_DATA_ATOMIC
    • + *
    + *
  • + *
+ *
    + *
  • O_CREAT + *
      + *
    • flags = SSH_FXF_OPEN_OR_CREATE
    • + *
    + *
  • + *
+ *
    + *
  • O_TRUNC + *
      + *
    • flags = SSH_FXF_TRUNCATE_EXISTING
    • + *
    + *
  • + *
+ *
    + *
  • O_TRUNC|O_CREATE + *
      + *
    • flags = SSH_FXF_CREATE_TRUNCATE
    • + *
    + *
  • + *
+ * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: OpenFlags.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + */ +public class OpenFlags +{ + /** + * Disposition is a 3 bit field that controls how the file is opened. + * The server MUST support these bits (possible enumaration values: + * SSH_FXF_CREATE_NEW, SSH_FXF_CREATE_TRUNCATE, SSH_FXF_OPEN_EXISTING, + * SSH_FXF_OPEN_OR_CREATE or SSH_FXF_TRUNCATE_EXISTING). + */ + public static final int SSH_FXF_ACCESS_DISPOSITION = 0x00000007; + + /** + * A new file is created; if the file already exists, the server + * MUST return status SSH_FX_FILE_ALREADY_EXISTS. + */ + public static final int SSH_FXF_CREATE_NEW = 0x00000000; + + /** + * A new file is created; if the file already exists, it is opened + * and truncated. + */ + public static final int SSH_FXF_CREATE_TRUNCATE = 0x00000001; + + /** + * An existing file is opened. If the file does not exist, the + * server MUST return SSH_FX_NO_SUCH_FILE. If a directory in the + * path does not exist, the server SHOULD return + * SSH_FX_NO_SUCH_PATH. It is also acceptable if the server + * returns SSH_FX_NO_SUCH_FILE in this case. + */ + public static final int SSH_FXF_OPEN_EXISTING = 0x00000002; + + /** + * If the file exists, it is opened. If the file does not exist, + * it is created. + */ + public static final int SSH_FXF_OPEN_OR_CREATE = 0x00000003; + + /** + * An existing file is opened and truncated. If the file does not + * exist, the server MUST return the same error codes as defined + * for SSH_FXF_OPEN_EXISTING. + */ + public static final int SSH_FXF_TRUNCATE_EXISTING = 0x00000004; + + /** + * Data is always written at the end of the file. The offset field + * of the SSH_FXP_WRITE requests are ignored. + *

+ * Data is not required to be appended atomically. This means that + * if multiple writers attempt to append data simultaneously, data + * from the first may be lost. However, data MAY be appended + * atomically. + */ + public static final int SSH_FXF_ACCESS_APPEND_DATA = 0x00000008; + + /** + * Data is always written at the end of the file. The offset field + * of the SSH_FXP_WRITE requests are ignored. + *

+ * Data MUST be written atomically so that there is no chance that + * multiple appenders can collide and result in data being lost. + *

+ * If both append flags are specified, the server SHOULD use atomic + * append if it is available, but SHOULD use non-atomic appends + * otherwise. The server SHOULD NOT fail the request in this case. + */ + public static final int SSH_FXF_ACCESS_APPEND_DATA_ATOMIC = 0x00000010; + + /** + * Indicates that the server should treat the file as text and + * convert it to the canonical newline convention in use. + * (See Determining Server Newline Convention in section 5.3 in the + * SFTP standard draft). + *

+ * When a file is opened with this flag, the offset field in the read + * and write functions is ignored. + *

+ * Servers MUST process multiple, parallel reads and writes correctly + * in this mode. Naturally, it is permissible for them to do this by + * serializing the requests. + *

+ * Clients SHOULD use the SSH_FXF_ACCESS_APPEND_DATA flag to append + * data to a text file rather then using write with a calculated offset. + */ + public static final int SSH_FXF_ACCESS_TEXT_MODE = 0x00000020; + + /** + * The server MUST guarantee that no other handle has been opened + * with ACE4_READ_DATA access, and that no other handle will be + * opened with ACE4_READ_DATA access until the client closes the + * handle. (This MUST apply both to other clients and to other + * processes on the server.) + *

+ * If there is a conflicting lock the server MUST return + * SSH_FX_LOCK_CONFLICT. If the server cannot make the locking + * guarantee, it MUST return SSH_FX_OP_UNSUPPORTED. + *

+ * Other handles MAY be opened for ACE4_WRITE_DATA or any other + * combination of accesses, as long as ACE4_READ_DATA is not included + * in the mask. + */ + public static final int SSH_FXF_ACCESS_BLOCK_READ = 0x00000040; + + /** + * The server MUST guarantee that no other handle has been opened + * with ACE4_WRITE_DATA or ACE4_APPEND_DATA access, and that no other + * handle will be opened with ACE4_WRITE_DATA or ACE4_APPEND_DATA + * access until the client closes the handle. (This MUST apply both + * to other clients and to other processes on the server.) + *

+ * If there is a conflicting lock the server MUST return + * SSH_FX_LOCK_CONFLICT. If the server cannot make the locking + * guarantee, it MUST return SSH_FX_OP_UNSUPPORTED. + *

+ * Other handles MAY be opened for ACE4_READ_DATA or any other + * combination of accesses, as long as neither ACE4_WRITE_DATA nor + * ACE4_APPEND_DATA are included in the mask. + */ + public static final int SSH_FXF_ACCESS_BLOCK_WRITE = 0x00000080; + + /** + * The server MUST guarantee that no other handle has been opened + * with ACE4_DELETE access, opened with the + * SSH_FXF_ACCESS_DELETE_ON_CLOSE flag set, and that no other handle + * will be opened with ACE4_DELETE access or with the + * SSH_FXF_ACCESS_DELETE_ON_CLOSE flag set, and that the file itself + * is not deleted in any other way until the client closes the handle. + *

+ * If there is a conflicting lock the server MUST return + * SSH_FX_LOCK_CONFLICT. If the server cannot make the locking + * guarantee, it MUST return SSH_FX_OP_UNSUPPORTED. + */ + public static final int SSH_FXF_ACCESS_BLOCK_DELETE = 0x00000100; + + /** + * If this bit is set, the above BLOCK modes are advisory. In advisory + * mode, only other accesses that specify a BLOCK mode need be + * considered when determining whether the BLOCK can be granted, + * and the server need not prevent I/O operations that violate the + * block mode. + *

+ * The server MAY perform mandatory locking even if the BLOCK_ADVISORY + * bit is set. + */ + public static final int SSH_FXF_ACCESS_BLOCK_ADVISORY = 0x00000200; + + /** + * If the final component of the path is a symlink, then the open + * MUST fail, and the error SSH_FX_LINK_LOOP MUST be returned. + */ + public static final int SSH_FXF_ACCESS_NOFOLLOW = 0x00000400; + + /** + * The file should be deleted when the last handle to it is closed. + * (The last handle may not be an sftp-handle.) This MAY be emulated + * by a server if the OS doesn't support it by deleting the file when + * this handle is closed. + *

+ * It is implementation specific whether the directory entry is + * removed immediately or when the handle is closed. + */ + public static final int SSH_FXF_ACCESS_DELETE_ON_CLOSE = 0x00000800; +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/sftp/Packet.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/sftp/Packet.java new file mode 100644 index 0000000000..d9e181d53a --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/sftp/Packet.java @@ -0,0 +1,43 @@ + +package com.trilead.ssh2.sftp; + +/** + * + * SFTP Paket Types + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: Packet.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $ + * + */ +public class Packet +{ + public static final int SSH_FXP_INIT = 1; + public static final int SSH_FXP_VERSION = 2; + public static final int SSH_FXP_OPEN = 3; + public static final int SSH_FXP_CLOSE = 4; + public static final int SSH_FXP_READ = 5; + public static final int SSH_FXP_WRITE = 6; + public static final int SSH_FXP_LSTAT = 7; + public static final int SSH_FXP_FSTAT = 8; + public static final int SSH_FXP_SETSTAT = 9; + public static final int SSH_FXP_FSETSTAT = 10; + public static final int SSH_FXP_OPENDIR = 11; + public static final int SSH_FXP_READDIR = 12; + public static final int SSH_FXP_REMOVE = 13; + public static final int SSH_FXP_MKDIR = 14; + public static final int SSH_FXP_RMDIR = 15; + public static final int SSH_FXP_REALPATH = 16; + public static final int SSH_FXP_STAT = 17; + public static final int SSH_FXP_RENAME = 18; + public static final int SSH_FXP_READLINK = 19; + public static final int SSH_FXP_SYMLINK = 20; + + public static final int SSH_FXP_STATUS = 101; + public static final int SSH_FXP_HANDLE = 102; + public static final int SSH_FXP_DATA = 103; + public static final int SSH_FXP_NAME = 104; + public static final int SSH_FXP_ATTRS = 105; + + public static final int SSH_FXP_EXTENDED = 200; + public static final int SSH_FXP_EXTENDED_REPLY = 201; +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/signature/DSASHA1Verify.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/signature/DSASHA1Verify.java new file mode 100644 index 0000000000..4ec7c30d94 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/signature/DSASHA1Verify.java @@ -0,0 +1,253 @@ + +package com.trilead.ssh2.signature; + +import java.io.IOException; +import java.math.BigInteger; +import java.security.InvalidKeyException; +import java.security.KeyFactory; +import java.security.NoSuchAlgorithmException; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.SecureRandom; +import java.security.Signature; +import java.security.SignatureException; +import java.security.interfaces.DSAParams; +import java.security.interfaces.DSAPublicKey; +import java.security.spec.DSAPublicKeySpec; +import java.security.spec.InvalidKeySpecException; +import java.security.spec.KeySpec; + +import com.trilead.ssh2.log.Logger; +import com.trilead.ssh2.packets.TypesReader; +import com.trilead.ssh2.packets.TypesWriter; + + +/** + * DSASHA1Verify. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: DSASHA1Verify.java,v 1.2 2008/04/01 12:38:09 cplattne Exp $ + */ +public class DSASHA1Verify implements SSHSignature +{ + + private static final Logger log = Logger.getLogger(DSASHA1Verify.class); + public static final String ID_SSH_DSS = "ssh-dss"; + + private static class InstanceHolder { + private static DSASHA1Verify sInstance = new DSASHA1Verify(); + } + + private DSASHA1Verify() { + } + + public static DSASHA1Verify get() { + return InstanceHolder.sInstance; + } + + @Override + public String getKeyFormat() { + return ID_SSH_DSS; + } + + public PublicKey decodePublicKey(byte[] key) throws IOException + { + TypesReader tr = new TypesReader(key); + + String key_format = tr.readString(); + + if (!key_format.equals(DSASHA1Verify.ID_SSH_DSS)) + throw new IllegalArgumentException("This is not a ssh-dss public key!"); + + BigInteger p = tr.readMPINT(); + BigInteger q = tr.readMPINT(); + BigInteger g = tr.readMPINT(); + BigInteger y = tr.readMPINT(); + + if (tr.remain() != 0) + throw new IOException("Padding in DSA public key!"); + + try { + KeyFactory kf = KeyFactory.getInstance("DSA"); + + KeySpec ks = new DSAPublicKeySpec(y, p, q, g); + return (DSAPublicKey) kf.generatePublic(ks); + } catch (NoSuchAlgorithmException | InvalidKeySpecException e) { + throw new IOException(e); + } + } + + public byte[] encodePublicKey(PublicKey pk) throws IOException + { + DSAPublicKey dsaPublicKey = (DSAPublicKey) pk; + + TypesWriter tw = new TypesWriter(); + + tw.writeString(DSASHA1Verify.ID_SSH_DSS); + + DSAParams params = dsaPublicKey.getParams(); + tw.writeMPInt(params.getP()); + tw.writeMPInt(params.getQ()); + tw.writeMPInt(params.getG()); + tw.writeMPInt(dsaPublicKey.getY()); + + return tw.getBytes(); + } + + /** + * Convert from Java's signature ASN.1 encoding to the SSH spec. + *

+ * Java ASN.1 encoding: + *

+	 * SEQUENCE ::= {
+	 *    r INTEGER,
+	 *    s INTEGER
+	 * }
+	 * 
+ */ + private static byte[] encodeSignature(byte[] ds) + { + TypesWriter tw = new TypesWriter(); + + tw.writeString(ID_SSH_DSS); + + int len, index; + + index = 3; + len = ds[index++] & 0xff; + byte[] r = new byte[len]; + System.arraycopy(ds, index, r, 0, r.length); + + index = index + len + 1; + len = ds[index++] & 0xff; + byte[] s = new byte[len]; + System.arraycopy(ds, index, s, 0, s.length); + + byte[] a40 = new byte[40]; + + /* Patch (unsigned) r and s into the target array. */ + + int r_copylen = (r.length < 20) ? r.length : 20; + int s_copylen = (s.length < 20) ? s.length : 20; + + System.arraycopy(r, r.length - r_copylen, a40, 20 - r_copylen, r_copylen); + System.arraycopy(s, s.length - s_copylen, a40, 40 - s_copylen, s_copylen); + + tw.writeString(a40, 0, 40); + + return tw.getBytes(); + } + + private byte[] decodeSignature(byte[] sig) throws IOException + { + byte[] rsArray = null; + + if (sig.length == 40) + { + /* OK, another broken SSH server. */ + rsArray = sig; + } + else + { + /* Hopefully a server obeying the standard... */ + TypesReader tr = new TypesReader(sig); + + String sig_format = tr.readString(); + if (!sig_format.equals(DSASHA1Verify.ID_SSH_DSS)) + throw new IOException("Peer sent wrong signature format"); + + rsArray = tr.readByteString(); + + if (rsArray.length != 40) + throw new IOException("Peer sent corrupt signature"); + + if (tr.remain() != 0) + throw new IOException("Padding in DSA signature!"); + } + + int i = 0; + int j = 0; + byte[] tmp; + + if (rsArray[0] == 0 && rsArray[1] == 0 && rsArray[2] == 0) { + j = ((rsArray[i++] << 24) & 0xff000000) | ((rsArray[i++] << 16) & 0x00ff0000) + | ((rsArray[i++] << 8) & 0x0000ff00) | ((rsArray[i++]) & 0x000000ff); + i += j; + j = ((rsArray[i++] << 24) & 0xff000000) | ((rsArray[i++] << 16) & 0x00ff0000) + | ((rsArray[i++] << 8) & 0x0000ff00) | ((rsArray[i++]) & 0x000000ff); + tmp = new byte[j]; + System.arraycopy(rsArray, i, tmp, 0, j); + rsArray = tmp; + } + + /* ASN.1 */ + int frst = ((rsArray[0] & 0x80) != 0 ? 1 : 0); + int scnd = ((rsArray[20] & 0x80) != 0 ? 1 : 0); + + /* Calculate output length */ + int length = rsArray.length + 6 + frst + scnd; + tmp = new byte[length]; + + /* DER-encoding to match Java */ + tmp[0] = (byte) 0x30; + + if (rsArray.length != 40) + throw new IOException("Peer sent corrupt signature"); + /* Calculate length */ + tmp[1] = (byte) 0x2c; + tmp[1] += frst; + tmp[1] += scnd; + + /* First item */ + tmp[2] = (byte) 0x02; + + /* First item length */ + tmp[3] = (byte) 0x14; + tmp[3] += frst; + + /* Copy in the data for first item */ + System.arraycopy(rsArray, 0, tmp, 4 + frst, 20); + + /* Second item */ + tmp[4 + tmp[3]] = (byte) 0x02; + + /* Second item length */ + tmp[5 + tmp[3]] = (byte) 0x14; + tmp[5 + tmp[3]] += scnd; + + /* Copy in the data for the second item */ + System.arraycopy(rsArray, 20, tmp, 6 + tmp[3] + scnd, 20); + + /* Swap buffers */ + rsArray = tmp; + + return rsArray; + } + + public boolean verifySignature(byte[] message, byte[] sshSig, PublicKey dpk) throws IOException + { + byte[] javaSig = decodeSignature(sshSig); + try { + Signature s = Signature.getInstance("SHA1withDSA"); + s.initVerify(dpk); + s.update(message); + return s.verify(javaSig); + } catch (NoSuchAlgorithmException | InvalidKeyException e) { + throw new IOException("No such algorithm", e); + } catch (SignatureException e) { + throw new IOException(e); + } + } + + public byte[] generateSignature(byte[] message, PrivateKey pk, SecureRandom rnd) throws IOException + { + try { + Signature s = Signature.getInstance("SHA1withDSA"); + s.initSign(pk); + s.update(message); + return encodeSignature(s.sign()); + } catch (NoSuchAlgorithmException | SignatureException | InvalidKeyException e) { + throw new IOException(e); + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/signature/ECDSASHA2Verify.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/signature/ECDSASHA2Verify.java new file mode 100644 index 0000000000..08b6a9f225 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/signature/ECDSASHA2Verify.java @@ -0,0 +1,582 @@ +/* + * Copyright 2014 Kenny Root + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * a.) Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * b.) Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * c.) Neither the name of Trilead nor the names of its contributors may + * be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +package com.trilead.ssh2.signature; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.math.BigInteger; +import java.security.InvalidKeyException; +import java.security.KeyFactory; +import java.security.NoSuchAlgorithmException; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.SecureRandom; +import java.security.Signature; +import java.security.SignatureException; +import java.security.interfaces.ECKey; +import java.security.interfaces.ECPublicKey; +import java.security.spec.ECFieldFp; +import java.security.spec.ECParameterSpec; +import java.security.spec.ECPoint; +import java.security.spec.ECPublicKeySpec; +import java.security.spec.EllipticCurve; +import java.security.spec.InvalidKeySpecException; +import java.security.spec.KeySpec; + +import com.trilead.ssh2.crypto.SimpleDERReader; +import com.trilead.ssh2.log.Logger; +import com.trilead.ssh2.packets.TypesReader; +import com.trilead.ssh2.packets.TypesWriter; + +/** + * @author Kenny Root + * + */ +public abstract class ECDSASHA2Verify implements SSHSignature { + private static final Logger log = Logger.getLogger(ECDSASHA2Verify.class); + + public static final String ECDSA_SHA2_PREFIX = "ecdsa-sha2-"; + + @Override + public abstract String getKeyFormat(); + + @Override + public PublicKey decodePublicKey(byte[] key) throws IOException { + TypesReader tr = new TypesReader(key); + + String key_format = tr.readString(); + + if (!key_format.startsWith(ECDSA_SHA2_PREFIX)) + throw new IllegalArgumentException("This is not an ECDSA public key"); + + String curveName = tr.readString(); + byte[] groupBytes = tr.readByteString(); + + if (tr.remain() != 0) + throw new IOException("Padding in ECDSA public key!"); + + if (!key_format.equals(getKeyFormat())) { + throw new IOException("Key format is inconsistent with curve name: " + key_format + + " != " + curveName); + } + + ECParameterSpec params = getParameterSpec(); + if (params == null) { + throw new IOException("Curve is not supported: " + curveName); + } + + ECPoint group = decodeECPoint(groupBytes); + if (group == null) { + throw new IOException("Invalid ECDSA group"); + } + + KeySpec keySpec = new ECPublicKeySpec(group, params); + + try { + KeyFactory kf = KeyFactory.getInstance("EC"); + return kf.generatePublic(keySpec); + } catch (NoSuchAlgorithmException | InvalidKeySpecException nsae) { + throw new IOException("No EC KeyFactory available", nsae); + } + } + + public abstract ECParameterSpec getParameterSpec(); + + @Override + public byte[] encodePublicKey(PublicKey key) { + ECPublicKey ecPublicKey = (ECPublicKey) key; + TypesWriter tw = new TypesWriter(); + + String keyFormat = ECDSA_SHA2_PREFIX + getCurveName(); + + tw.writeString(keyFormat); + + tw.writeString(getCurveName()); + + byte[] encoded = encodeECPoint(ecPublicKey.getW(), ecPublicKey.getParams().getCurve()); + tw.writeString(encoded, 0, encoded.length); + + return tw.getBytes(); + } + + public static ECDSASHA2Verify getVerifierForKey(ECKey key) { + switch (key.getParams().getCurve().getField().getFieldSize()) { + case 256: + return ECDSASHA2NISTP256Verify.get(); + case 384: + return ECDSASHA2NISTP384Verify.get(); + case 521: + return ECDSASHA2NISTP521Verify.get(); + default: + return null; + } + } + + public static String getSshKeyType(ECKey ecKey) { + ECDSASHA2Verify verifier = getVerifierForKey(ecKey); + if (verifier == null) + return null; + return verifier.getKeyFormat(); + } + + public abstract String getCurveName(); + + public abstract String getOid(); + + public static int getCurveSize(ECParameterSpec params) { + return params.getCurve().getField().getFieldSize(); + } + + public static ECDSASHA2Verify getVerifierForOID(String oid) { + if (oid == null) { + return null; + } + + if (oid.equals(ECDSASHA2NISTP256Verify.get().getOid())) { + return ECDSASHA2NISTP256Verify.get(); + } else if (oid.equals(ECDSASHA2NISTP384Verify.get().getOid())) { + return ECDSASHA2NISTP384Verify.get(); + } else if (oid.equals(ECDSASHA2NISTP521Verify.get().getOid())) { + return ECDSASHA2NISTP521Verify.get(); + } else { + return null; + } + } + + private byte[] decodeSSHECDSASignature(byte[] sig) throws IOException { + byte[] rsArray; + + TypesReader tr = new TypesReader(sig); + + String sig_format = tr.readString(); + if (!sig_format.equals(getKeyFormat())) { + throw new IOException("Unsupported format: " + sig_format); + } + + rsArray = tr.readByteString(); + + if (tr.remain() != 0) + throw new IOException("Padding in ECDSA signature!"); + + byte[] rArray; + byte[] sArray; + { + TypesReader rsReader = new TypesReader(rsArray); + rArray = rsReader.readMPINT().toByteArray(); + sArray = rsReader.readMPINT().toByteArray(); + } + + int first = rArray.length; + int second = sArray.length; + + /* We can't have the high bit set, so add an extra zero at the beginning if so. */ + if ((rArray[0] & 0x80) != 0) { + first++; + } + if ((sArray[0] & 0x80) != 0) { + second++; + } + + /* Calculate total output length */ + ByteArrayOutputStream os = new ByteArrayOutputStream(6 + first + second); + + /* ASN.1 SEQUENCE tag */ + os.write(0x30); + + /* Size of SEQUENCE */ + writeLength(4 + first + second, os); + + /* ASN.1 INTEGER tag */ + os.write(0x02); + + /* "r" INTEGER length */ + writeLength(first, os); + + /* Copy in the "r" INTEGER */ + if (first != rArray.length) { + os.write(0x00); + } + os.write(rArray); + + /* ASN.1 INTEGER tag */ + os.write(0x02); + + /* "s" INTEGER length */ + writeLength(second, os); + + /* Copy in the "s" INTEGER */ + if (second != sArray.length) { + os.write(0x00); + } + os.write(sArray); + + return os.toByteArray(); + } + + private static void writeLength(int length, OutputStream os) throws IOException { + if (length <= 0x7F) { + os.write(length); + return; + } + + int numOctets = 0; + int lenCopy = length; + while (lenCopy != 0) { + lenCopy >>>= 8; + numOctets++; + } + + os.write(0x80 | numOctets); + + for (int i = (numOctets - 1) * 8; i >= 0; i -= 8) { + os.write((byte) (length >> i)); + } + } + + private byte[] encodeSSHECDSASignature(byte[] sig) throws IOException + { + TypesWriter tw = new TypesWriter(); + + tw.writeString(getKeyFormat()); + + /* + * This is a signature in ASN.1 DER format. It should look like: + * 0x30 + * 0x02 + * 0x02 + */ + + SimpleDERReader reader = new SimpleDERReader(sig); + reader.resetInput(reader.readSequenceAsByteArray()); + + BigInteger r = reader.readInt(); + BigInteger s = reader.readInt(); + + // Write the to its own types writer. + TypesWriter rsWriter = new TypesWriter(); + rsWriter.writeMPInt(r); + rsWriter.writeMPInt(s); + byte[] encoded = rsWriter.getBytes(); + tw.writeString(encoded, 0, encoded.length); + + return tw.getBytes(); + } + + @Override + public byte[] generateSignature(byte[] message, PrivateKey pk, SecureRandom secureRandom) throws IOException + { + final String algo = getSignatureAlgorithm(); + + try { + Signature s = Signature.getInstance(algo); + s.initSign(pk, secureRandom); + s.update(message); + return encodeSSHECDSASignature(s.sign()); + } catch (NoSuchAlgorithmException | InvalidKeyException | SignatureException e) { + throw new IOException(e); + } + } + + protected abstract String getSignatureAlgorithm(); + + @Override + public boolean verifySignature(byte[] message, byte[] sshSig, PublicKey pk) throws IOException + { + byte[] javaSig = decodeSSHECDSASignature(sshSig); + try { + Signature s = Signature.getInstance(getSignatureAlgorithm()); + s.initVerify(pk); + s.update(message); + return s.verify(javaSig); + } catch (NoSuchAlgorithmException | InvalidKeyException e) { + throw new IOException("No such algorithm", e); + } catch (SignatureException e) { + throw new IOException(e); + } + } + + public static String getDigestAlgorithmForParams(ECKey key) { + ECDSASHA2Verify verifier = getVerifierForKey(key); + if (verifier == null) + return null; + return verifier.getDigestAlgorithm(); + } + + protected abstract String getDigestAlgorithm(); + + /** + * Decode an OctetString to EllipticCurvePoint according to SECG 2.3.4 + */ + public ECPoint decodeECPoint(byte[] M) { + if (M.length == 0) { + return null; + } + + // M has len 2 ceil(log_2(q)/8) + 1 ? + EllipticCurve curve = getParameterSpec().getCurve(); + int elementSize = (curve.getField().getFieldSize() + 7) / 8; + if (M.length != 2 * elementSize + 1) { + return null; + } + + // step 3.2 + if (M[0] != 0x04) { + return null; + } + + // Step 3.3 + byte[] xp = new byte[elementSize]; + System.arraycopy(M, 1, xp, 0, elementSize); + + // Step 3.4 + byte[] yp = new byte[elementSize]; + System.arraycopy(M, 1 + elementSize, yp, 0, elementSize); + + ECPoint P = new ECPoint(new BigInteger(1, xp), new BigInteger(1, yp)); + + // TODO check point 3.5 + + // Step 3.6 + return P; + } + + /** + * Encode EllipticCurvePoint to an OctetString + */ + public static byte[] encodeECPoint(ECPoint group, EllipticCurve curve) + { + // M has len 2 ceil(log_2(q)/8) + 1 ? + int elementSize = (curve.getField().getFieldSize() + 7) / 8; + byte[] M = new byte[2 * elementSize + 1]; + + // Uncompressed format + M[0] = 0x04; + + { + byte[] affineX = removeLeadingZeroes(group.getAffineX().toByteArray()); + System.arraycopy(affineX, 0, M, 1 + elementSize - affineX.length, affineX.length); + } + + { + byte[] affineY = removeLeadingZeroes(group.getAffineY().toByteArray()); + System.arraycopy(affineY, 0, M, 1 + elementSize + elementSize - affineY.length, + affineY.length); + } + + return M; + } + + private static byte[] removeLeadingZeroes(byte[] input) { + if (input[0] != 0x00) { + return input; + } + + int pos = 1; + while (pos < input.length - 1 && input[pos] == 0x00) { + pos++; + } + + byte[] output = new byte[input.length - pos]; + System.arraycopy(input, pos, output, 0, output.length); + return output; + } + + public static class ECDSASHA2NISTP256Verify extends ECDSASHA2Verify { + private static final String NISTP256 = "nistp256"; + private static final String NISTP256_OID = "1.2.840.10045.3.1.7"; + private static final String KEY_FORMAT = ECDSA_SHA2_PREFIX + NISTP256; + + @Override + public String getCurveName() { + return NISTP256; + } + + @Override + public String getOid() { + return NISTP256_OID; + } + + @Override + protected String getSignatureAlgorithm() { + return "SHA256withECDSA"; + } + + @Override + protected String getDigestAlgorithm() { + return "SHA-256"; + } + + @Override + public String getKeyFormat() { + return KEY_FORMAT; + } + + @Override + public ECParameterSpec getParameterSpec() { + return nistp256; + } + + private static class InstanceHolder { + private static final ECDSASHA2NISTP256Verify sInstance = new ECDSASHA2NISTP256Verify(); + } + + private ECDSASHA2NISTP256Verify() { + } + + public static ECDSASHA2NISTP256Verify get() { + return ECDSASHA2NISTP256Verify.InstanceHolder.sInstance; + } + + public static ECParameterSpec nistp256 = new ECParameterSpec( + new EllipticCurve( + new ECFieldFp(new BigInteger("FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF", 16)), + new BigInteger("FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC", 16), + new BigInteger("5ac635d8aa3a93e7b3ebbd55769886bc651d06b0cc53b0f63bce3c3e27d2604b", 16)), + new ECPoint(new BigInteger("6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296", 16), + new BigInteger("4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5", 16)), + new BigInteger("FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551", 16), + 1); + } + + public static class ECDSASHA2NISTP384Verify extends ECDSASHA2Verify { + private static final String NISTP384 = "nistp384"; + private static final String NISTP384_OID = "1.3.132.0.34"; + private static final String KEY_FORMAT = ECDSA_SHA2_PREFIX + NISTP384; + + @Override + public String getKeyFormat() { + return KEY_FORMAT; + } + + private static class InstanceHolder { + private static final ECDSASHA2NISTP384Verify sInstance = new ECDSASHA2NISTP384Verify(); + } + + private ECDSASHA2NISTP384Verify() { + } + + public static ECDSASHA2NISTP384Verify get() { + return ECDSASHA2NISTP384Verify.InstanceHolder.sInstance; + } + + @Override + public ECParameterSpec getParameterSpec() { + return nistp384; + } + + @Override + public String getCurveName() { + return NISTP384; + } + + @Override + public String getOid() { + return NISTP384_OID; + } + + @Override + protected String getSignatureAlgorithm() { + return "SHA384withECDSA"; + } + + @Override + protected String getDigestAlgorithm() { + return "SHA-384"; + } + + public static ECParameterSpec nistp384 = new ECParameterSpec( + new EllipticCurve( + new ECFieldFp(new BigInteger("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFF", 16)), + new BigInteger("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFC", 16), + new BigInteger("B3312FA7E23EE7E4988E056BE3F82D19181D9C6EFE8141120314088F5013875AC656398D8A2ED19D2A85C8EDD3EC2AEF", 16)), + new ECPoint(new BigInteger("AA87CA22BE8B05378EB1C71EF320AD746E1D3B628BA79B9859F741E082542A385502F25DBF55296C3A545E3872760AB7", 16), + new BigInteger("3617DE4A96262C6F5D9E98BF9292DC29F8F41DBD289A147CE9DA3113B5F0B8C00A60B1CE1D7E819D7A431D7C90EA0E5F", 16)), + new BigInteger("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC7634D81F4372DDF581A0DB248B0A77AECEC196ACCC52973", 16), + 1); + } + + public static class ECDSASHA2NISTP521Verify extends ECDSASHA2Verify { + private static final String NISTP521 = "nistp521"; + private static final String NISTP521_OID = "1.3.132.0.35"; + private static final String KEY_FORMAT = ECDSA_SHA2_PREFIX + NISTP521; + + @Override + public String getKeyFormat() { + return KEY_FORMAT; + } + + @Override + public ECParameterSpec getParameterSpec() { + return nistp521; + } + + @Override + public String getCurveName() { + return NISTP521; + } + + @Override + public String getOid() { + return NISTP521_OID; + } + + @Override + protected String getSignatureAlgorithm() { + return "SHA512withECDSA"; + } + + @Override + protected String getDigestAlgorithm() { + return "SHA-512"; + } + + private static class InstanceHolder { + private static final ECDSASHA2NISTP521Verify sInstance = new ECDSASHA2NISTP521Verify(); + } + + private ECDSASHA2NISTP521Verify() { + } + + public static ECDSASHA2NISTP521Verify get() { + return ECDSASHA2NISTP521Verify.InstanceHolder.sInstance; + } + + public static ECParameterSpec nistp521 = new ECParameterSpec( + new EllipticCurve( + new ECFieldFp(new BigInteger("01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", 16)), + new BigInteger("01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC", 16), + new BigInteger("0051953EB9618E1C9A1F929A21A0B68540EEA2DA725B99B315F3B8B489918EF109E156193951EC7E937B1652C0BD3BB1BF073573DF883D2C34F1EF451FD46B503F00", 16)), + new ECPoint(new BigInteger("00C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5BD66", 16), + new BigInteger("011839296A789A3BC0045C8A5FB42C7D1BD998F54449579B446817AFBD17273E662C97EE72995EF42640C550B9013FAD0761353C7086A272C24088BE94769FD16650", 16)), + new BigInteger("01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409", 16), + 1); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/signature/Ed25519Verify.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/signature/Ed25519Verify.java new file mode 100644 index 0000000000..638fc961bd --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/signature/Ed25519Verify.java @@ -0,0 +1,161 @@ +/* + * Copyright 2015 Kenny Root + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * a.) Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * b.) Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * c.) Neither the name of Trilead nor the names of its contributors may + * be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +package com.trilead.ssh2.signature; + +import com.google.crypto.tink.subtle.Ed25519Sign; +import com.trilead.ssh2.crypto.keys.Ed25519PrivateKey; +import com.trilead.ssh2.crypto.keys.Ed25519PublicKey; +import com.trilead.ssh2.log.Logger; +import com.trilead.ssh2.packets.TypesReader; +import com.trilead.ssh2.packets.TypesWriter; + +import java.io.IOException; +import java.security.GeneralSecurityException; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.SecureRandom; + +/** + * @author Kenny Root + */ +public class Ed25519Verify implements SSHSignature { + private static final Logger log = Logger.getLogger(Ed25519Verify.class); + + /** Identifies this as an Ed25519 key in the protocol. */ + public static final String ED25519_ID = "ssh-ed25519"; + + private static final int ED25519_PK_SIZE_BYTES = 32; + private static final int ED25519_SIG_SIZE_BYTES = 64; + + private static class InstanceHolder { + private static final Ed25519Verify sInstance = new Ed25519Verify(); + } + + private Ed25519Verify() { + } + + public static Ed25519Verify get() { + return Ed25519Verify.InstanceHolder.sInstance; + } + + @Override + public byte[] encodePublicKey(PublicKey publicKey) { + Ed25519PublicKey ed25519PublicKey = (Ed25519PublicKey) publicKey; + + TypesWriter tw = new TypesWriter(); + + tw.writeString(ED25519_ID); + byte[] encoded = ed25519PublicKey.getAbyte(); + tw.writeString(encoded, 0, encoded.length); + + return tw.getBytes(); + } + + @Override + public PublicKey decodePublicKey(byte[] encoded) throws IOException { + TypesReader tr = new TypesReader(encoded); + + String key_format = tr.readString(); + if (!key_format.equals(ED25519_ID)) { + throw new IOException("This is not an Ed25519 key"); + } + + byte[] keyBytes = tr.readByteString(); + + if (tr.remain() != 0) { + throw new IOException("Padding in Ed25519 public key! " + tr.remain() + " bytes left."); + } + + if (keyBytes.length != ED25519_PK_SIZE_BYTES) { + throw new IOException("Ed25519 was not of correct length: " + keyBytes.length + " vs " + ED25519_PK_SIZE_BYTES); + } + + return new Ed25519PublicKey(keyBytes); + } + + @Override + public byte[] generateSignature(byte[] msg, PrivateKey privateKey, SecureRandom secureRandom) throws IOException { + Ed25519PrivateKey ed25519PrivateKey = (Ed25519PrivateKey) privateKey; + try { + return encodeSSHEd25519Signature(new Ed25519Sign(ed25519PrivateKey.getSeed()).sign(msg)); + } catch (GeneralSecurityException e) { + throw new IOException(e); + } + } + + @Override + public boolean verifySignature(byte[] message, byte[] sshSig, PublicKey publicKey) throws IOException { + Ed25519PublicKey ed25519PublicKey = (Ed25519PublicKey) publicKey; + byte[] javaSig = decodeSSHEd25519Signature(sshSig); + try { + new com.google.crypto.tink.subtle.Ed25519Verify(ed25519PublicKey.getAbyte()).verify(javaSig, message); + return true; + } catch (GeneralSecurityException e) { + return false; + } + } + + private static byte[] encodeSSHEd25519Signature(byte[] sig) { + TypesWriter tw = new TypesWriter(); + + tw.writeString(ED25519_ID); + tw.writeString(sig, 0, sig.length); + + return tw.getBytes(); + } + + private static byte[] decodeSSHEd25519Signature(byte[] sig) throws IOException { + byte[] rsArray; + + TypesReader tr = new TypesReader(sig); + + String sig_format = tr.readString(); + if (!sig_format.equals(ED25519_ID)) { + throw new IOException("Peer sent wrong signature format"); + } + + rsArray = tr.readByteString(); + + if (tr.remain() != 0) { + throw new IOException("Padding in Ed25519 signature!"); + } + + if (rsArray.length > ED25519_SIG_SIZE_BYTES) { + throw new IOException("Ed25519 signature was " + rsArray.length + " bytes (" + ED25519_PK_SIZE_BYTES + " expected)"); + } + + return rsArray; + } + + @Override + public String getKeyFormat() { + return ED25519_ID; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/signature/RSASHA1Verify.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/signature/RSASHA1Verify.java new file mode 100644 index 0000000000..8acf6e0203 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/signature/RSASHA1Verify.java @@ -0,0 +1,164 @@ + +package com.trilead.ssh2.signature; + +import java.io.IOException; +import java.math.BigInteger; +import java.security.InvalidKeyException; +import java.security.KeyFactory; +import java.security.NoSuchAlgorithmException; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.SecureRandom; +import java.security.Signature; +import java.security.SignatureException; +import java.security.interfaces.RSAPublicKey; +import java.security.spec.InvalidKeySpecException; +import java.security.spec.KeySpec; +import java.security.spec.RSAPublicKeySpec; + +import com.trilead.ssh2.log.Logger; +import com.trilead.ssh2.packets.TypesReader; +import com.trilead.ssh2.packets.TypesWriter; + + +/** + * RSASHA1Verify. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: RSASHA1Verify.java,v 1.1 2007/10/15 12:49:57 cplattne Exp $ + */ +public class RSASHA1Verify implements SSHSignature +{ + private static final Logger log = Logger.getLogger(RSASHA1Verify.class); + public static final String ID_SSH_RSA = "ssh-rsa"; + + private static class InstanceHolder { + private static RSASHA1Verify sInstance = new RSASHA1Verify(); + } + + private RSASHA1Verify() { + } + + public static RSASHA1Verify get() { + return RSASHA1Verify.InstanceHolder.sInstance; + } + + @Override + public String getKeyFormat() { + return ID_SSH_RSA; + } + + public PublicKey decodePublicKey(byte[] key) throws IOException + { + TypesReader tr = new TypesReader(key); + + String key_format = tr.readString(); + + if (!key_format.equals(ID_SSH_RSA)) + throw new IllegalArgumentException("This is not a ssh-rsa public key"); + + BigInteger e = tr.readMPINT(); + BigInteger n = tr.readMPINT(); + + if (tr.remain() != 0) + throw new IOException("Padding in RSA public key!"); + + KeySpec keySpec = new RSAPublicKeySpec(n, e); + + try { + KeyFactory kf = KeyFactory.getInstance("RSA"); + return kf.generatePublic(keySpec); + } catch (NoSuchAlgorithmException | InvalidKeySpecException nsae) { + throw new IOException("No RSA KeyFactory available", nsae); + } + } + + public byte[] encodePublicKey(PublicKey pk) throws IOException + { + RSAPublicKey rsaPublicKey = (RSAPublicKey) pk; + + TypesWriter tw = new TypesWriter(); + + tw.writeString(ID_SSH_RSA); + tw.writeMPInt(rsaPublicKey.getPublicExponent()); + tw.writeMPInt(rsaPublicKey.getModulus()); + + return tw.getBytes(); + } + + private static byte[] decodeSignature(byte[] sig) throws IOException + { + TypesReader tr = new TypesReader(sig); + + String sig_format = tr.readString(); + + if (!sig_format.equals(ID_SSH_RSA)) + throw new IOException("Peer sent wrong signature format"); + + /* S is NOT an MPINT. "The value for 'rsa_signature_blob' is encoded as a string + * containing s (which is an integer, without lengths or padding, unsigned and in + * network byte order)." See also below. + */ + + byte[] s = tr.readByteString(); + + if (s.length == 0) + throw new IOException("Error in RSA signature, S is empty."); + + if (log.isEnabled()) + { + log.log(80, "Decoding ssh-rsa signature string (length: " + s.length + ")"); + } + + if (tr.remain() != 0) + throw new IOException("Padding in RSA signature!"); + + return s; + } + + private static byte[] encodeSignature(byte[] s) throws IOException + { + TypesWriter tw = new TypesWriter(); + + tw.writeString(ID_SSH_RSA); + + /* S is NOT an MPINT. "The value for 'rsa_signature_blob' is encoded as a string + * containing s (which is an integer, without lengths or padding, unsigned and in + * network byte order)." + */ + + /* Remove first zero sign byte, if present */ + + if ((s.length > 1) && (s[0] == 0x00)) + tw.writeString(s, 1, s.length - 1); + else + tw.writeString(s, 0, s.length); + + return tw.getBytes(); + } + + public byte[] generateSignature(byte[] message, PrivateKey pk, SecureRandom secureRandom) throws IOException + { + try { + Signature s = Signature.getInstance("SHA1withRSA"); + s.initSign(pk, secureRandom); + s.update(message); + return encodeSignature(s.sign()); + } catch (NoSuchAlgorithmException | InvalidKeyException | SignatureException e) { + throw new IOException(e); + } + } + + public boolean verifySignature(byte[] message, byte[] sshSig, PublicKey dpk) throws IOException + { + byte[] javaSig = decodeSignature(sshSig); + try { + Signature s = Signature.getInstance("SHA1withRSA"); + s.initVerify(dpk); + s.update(message); + return s.verify(javaSig); + } catch (NoSuchAlgorithmException | InvalidKeyException | SignatureException e) { + throw new IOException(e); + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/signature/RSASHA256Verify.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/signature/RSASHA256Verify.java new file mode 100644 index 0000000000..01871d00e2 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/signature/RSASHA256Verify.java @@ -0,0 +1,124 @@ +package com.trilead.ssh2.signature; + +import com.trilead.ssh2.log.Logger; +import com.trilead.ssh2.packets.TypesReader; +import com.trilead.ssh2.packets.TypesWriter; +import java.io.IOException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.SecureRandom; +import java.security.Signature; +import java.security.SignatureException; + +public class RSASHA256Verify implements SSHSignature +{ + private static final Logger log = Logger.getLogger(RSASHA256Verify.class); + public static final String ID_RSA_SHA_2_256 = "rsa-sha2-256"; + + private static class InstanceHolder { + private static RSASHA256Verify sInstance = new RSASHA256Verify(); + } + + private RSASHA256Verify() { + } + + public static RSASHA256Verify get() { + return RSASHA256Verify.InstanceHolder.sInstance; + } + + private static byte[] decodeRSASHA256Signature(byte[] sig) throws IOException + { + TypesReader tr = new TypesReader(sig); + + String sig_format = tr.readString(); + + if (!sig_format.equals(ID_RSA_SHA_2_256)) + throw new IOException("Peer sent wrong signature format"); + + /* S is NOT an MPINT. "The value for 'rsa_signature_blob' is encoded as a string + * containing s (which is an integer, without lengths or padding, unsigned and in + * network byte order)." See also below. + */ + + byte[] s = tr.readByteString(); + + if (s.length == 0) + throw new IOException("Error in RSA signature, S is empty."); + + if (log.isEnabled()) + { + log.log(80, "Decoding rsa-sha2-256 signature string (length: " + s.length + ")"); + } + + if (tr.remain() != 0) + throw new IOException("Padding in RSA signature!"); + + return s; + } + + private static byte[] encodeRSASHA256Signature(byte[] s) throws IOException + { + TypesWriter tw = new TypesWriter(); + + tw.writeString(ID_RSA_SHA_2_256); + + /* S is NOT an MPINT. "The value for 'rsa_signature_blob' is encoded as a string + * containing s (which is an integer, without lengths or padding, unsigned and in + * network byte order)." + */ + + /* Remove first zero sign byte, if present */ + + if ((s.length > 1) && (s[0] == 0x00)) + tw.writeString(s, 1, s.length - 1); + else + tw.writeString(s, 0, s.length); + + return tw.getBytes(); + } + + @Override + public byte[] generateSignature(byte[] message, PrivateKey privateKey, SecureRandom secureRandom) throws IOException + { + try { + Signature s = Signature.getInstance("SHA256withRSA"); + s.initSign(privateKey, secureRandom); + s.update(message); + return encodeRSASHA256Signature(s.sign()); + } catch (NoSuchAlgorithmException | InvalidKeyException | SignatureException e) { + throw new IOException(e); + } + } + + @Override + public String getKeyFormat() { + return ID_RSA_SHA_2_256; + } + + @Override + public PublicKey decodePublicKey(byte[] encoded) throws IOException { + return RSASHA1Verify.get().decodePublicKey(encoded); + } + + @Override + public byte[] encodePublicKey(PublicKey publicKey) throws IOException { + return RSASHA1Verify.get().encodePublicKey(publicKey); + } + + @Override + public boolean verifySignature(byte[] message, byte[] sshSig, PublicKey dpk) throws IOException + { + byte[] javaSig = decodeRSASHA256Signature(sshSig); + + try { + Signature s = Signature.getInstance("SHA256withRSA"); + s.initVerify(dpk); + s.update(message); + return s.verify(javaSig); + } catch (NoSuchAlgorithmException | InvalidKeyException | SignatureException e) { + throw new IOException(e); + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/signature/RSASHA512Verify.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/signature/RSASHA512Verify.java new file mode 100644 index 0000000000..7368b3f660 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/signature/RSASHA512Verify.java @@ -0,0 +1,124 @@ +package com.trilead.ssh2.signature; + +import com.trilead.ssh2.log.Logger; +import com.trilead.ssh2.packets.TypesReader; +import com.trilead.ssh2.packets.TypesWriter; +import java.io.IOException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.SecureRandom; +import java.security.Signature; +import java.security.SignatureException; + +public class RSASHA512Verify implements SSHSignature +{ + private static final Logger log = Logger.getLogger(RSASHA512Verify.class); + public static final String ID_RSA_SHA_2_512 = "rsa-sha2-512"; + + private static class InstanceHolder { + private static final RSASHA512Verify sInstance = new RSASHA512Verify(); + } + + private RSASHA512Verify() { + } + + public static RSASHA512Verify get() { + return RSASHA512Verify.InstanceHolder.sInstance; + } + + private static byte[] decodeRSASHA512Signature(byte[] sig) throws IOException + { + TypesReader tr = new TypesReader(sig); + + String sig_format = tr.readString(); + + if (!sig_format.equals(ID_RSA_SHA_2_512)) + throw new IOException("Peer sent wrong signature format"); + + /* S is NOT an MPINT. "The value for 'rsa_signature_blob' is encoded as a string + * containing s (which is an integer, without lengths or padding, unsigned and in + * network byte order)." See also below. + */ + + byte[] s = tr.readByteString(); + + if (s.length == 0) + throw new IOException("Error in RSA signature, S is empty."); + + if (log.isEnabled()) + { + log.log(80, "Decoding rsa-sha2-512 signature string (length: " + s.length + ")"); + } + + if (tr.remain() != 0) + throw new IOException("Padding in RSA signature!"); + + return s; + } + + private static byte[] encodeRSASHA512Signature(byte[] s) + { + TypesWriter tw = new TypesWriter(); + + tw.writeString(ID_RSA_SHA_2_512); + + /* S is NOT an MPINT. "The value for 'rsa_signature_blob' is encoded as a string + * containing s (which is an integer, without lengths or padding, unsigned and in + * network byte order)." + */ + + /* Remove first zero sign byte, if present */ + + if ((s.length > 1) && (s[0] == 0x00)) + tw.writeString(s, 1, s.length - 1); + else + tw.writeString(s, 0, s.length); + + return tw.getBytes(); + } + + @Override + public byte[] generateSignature(byte[] message, PrivateKey privateKey, SecureRandom secureRandom) throws IOException + { + try { + // Android's Signature is guaranteed to support this instance + Signature s = Signature.getInstance("SHA512withRSA"); + s.initSign(privateKey, secureRandom); + s.update(message); + return encodeRSASHA512Signature(s.sign()); + } catch (NoSuchAlgorithmException | InvalidKeyException | SignatureException e) { + throw new IOException(e); + } + } + + @Override + public String getKeyFormat() { + return ID_RSA_SHA_2_512; + } + + @Override + public PublicKey decodePublicKey(byte[] encoded) throws IOException { + return RSASHA1Verify.get().decodePublicKey(encoded); + } + + @Override + public byte[] encodePublicKey(PublicKey publicKey) throws IOException { + return RSASHA1Verify.get().encodePublicKey(publicKey); + } + + @Override + public boolean verifySignature(byte[] message, byte[] sshSig, PublicKey publicKey) throws IOException + { + byte[] javaSig = decodeRSASHA512Signature(sshSig); + try { + Signature s = Signature.getInstance("SHA512withRSA"); + s.initVerify(publicKey); + s.update(message); + return s.verify(javaSig); + } catch (NoSuchAlgorithmException | InvalidKeyException | SignatureException e) { + throw new IOException(e); + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/signature/SSHSignature.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/signature/SSHSignature.java new file mode 100644 index 0000000000..f6fe58d70a --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/signature/SSHSignature.java @@ -0,0 +1,23 @@ +package com.trilead.ssh2.signature; + +import java.io.IOException; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.SecureRandom; + +public interface SSHSignature { + /** Returns the supported signature formats. */ + String getKeyFormat(); + + /** Decode from SSH specification key to Java public key. */ + PublicKey decodePublicKey(byte[] encoded) throws IOException; + + /** Encode from Java public key to SSH specification. */ + byte[] encodePublicKey(PublicKey publicKey) throws IOException; + + /** Verifies a SSH-format signature for a given key. */ + boolean verifySignature(byte[] message, byte[] signature, PublicKey publicKey) throws IOException; + + /** Generate an SSH-format signature for the message and private key. */ + byte[] generateSignature(byte[] message, PrivateKey privateKey, SecureRandom secureRandom) throws IOException; +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/ClientServerHello.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/ClientServerHello.java new file mode 100644 index 0000000000..c83dd15676 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/ClientServerHello.java @@ -0,0 +1,127 @@ + +package com.trilead.ssh2.transport; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; + +import com.trilead.ssh2.Connection; + +/** + * ClientServerHello. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: ClientServerHello.java,v 1.2 2008/04/01 12:38:09 cplattne Exp $ + */ +public class ClientServerHello +{ + String server_line; + String client_line; + + String server_versioncomment; + + public final static int readLineRN(InputStream is, byte[] buffer) throws IOException + { + int pos = 0; + boolean need10 = false; + int len = 0; + while (true) + { + int c = is.read(); + if (c == -1) + throw new IOException("Premature connection close"); + + buffer[pos++] = (byte) c; + + if (c == 13) + { + need10 = true; + continue; + } + + if (c == 10) + break; + + if (need10) + throw new IOException("Malformed line sent by the server, the line does not end correctly."); + + len++; + if (pos >= buffer.length) + throw new IOException("The server sent a too long line."); + } + + return len; + } + + public ClientServerHello(InputStream bi, OutputStream bo) throws IOException + { + client_line = "SSH-2.0-" + Connection.identification; + + try { + bo.write((client_line + "\r\n").getBytes("ISO-8859-1")); + } catch (UnsupportedEncodingException e) { + bo.write((client_line + "\r\n").getBytes()); + } + bo.flush(); + + byte[] serverVersion = new byte[512]; + + for (int i = 0; i < 50; i++) + { + int len = readLineRN(bi, serverVersion); + + try { + server_line = new String(serverVersion, 0, len, "ISO-8859-1"); + } catch (UnsupportedEncodingException e) { + server_line = new String(serverVersion, 0, len); + } + + if (server_line.startsWith("SSH-")) + break; + } + + if (!server_line.startsWith("SSH-")) + throw new IOException( + "Malformed server identification string. There was no line starting with 'SSH-' amongst the first 50 lines."); + + if (server_line.startsWith("SSH-1.99-")) + server_versioncomment = server_line.substring(9); + else if (server_line.startsWith("SSH-2.0-")) + server_versioncomment = server_line.substring(8); + else + throw new IOException("Server uses incompatible protocol, it is not SSH-2 compatible."); + } + + /** + * @return Returns the client_versioncomment. + */ + public byte[] getClientString() + { + byte[] result; + + try { + result = client_line.getBytes("ISO-8859-1"); + } catch (UnsupportedEncodingException e) { + result = client_line.getBytes(); + } + + return result; + } + + /** + * @return Returns the server_versioncomment. + */ + public byte[] getServerString() + { + byte[] result; + + try { + result = server_line.getBytes("ISO-8859-1"); + } catch (UnsupportedEncodingException e) { + result = server_line.getBytes(); + } + + return result; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/KexManager.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/KexManager.java new file mode 100644 index 0000000000..f379392dd4 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/KexManager.java @@ -0,0 +1,730 @@ + +package com.trilead.ssh2.transport; + +import com.trilead.ssh2.signature.RSASHA256Verify; +import com.trilead.ssh2.signature.RSASHA512Verify; +import java.io.IOException; +import java.security.KeyFactory; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; +import java.security.SecureRandom; +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; + +import com.trilead.ssh2.ConnectionInfo; +import com.trilead.ssh2.DHGexParameters; +import com.trilead.ssh2.ExtendedServerHostKeyVerifier; +import com.trilead.ssh2.ServerHostKeyVerifier; +import com.trilead.ssh2.compression.CompressionFactory; +import com.trilead.ssh2.compression.ICompressor; +import com.trilead.ssh2.crypto.CryptoWishList; +import com.trilead.ssh2.crypto.KeyMaterial; +import com.trilead.ssh2.crypto.cipher.BlockCipher; +import com.trilead.ssh2.crypto.cipher.BlockCipherFactory; +import com.trilead.ssh2.crypto.dh.Curve25519Exchange; +import com.trilead.ssh2.crypto.dh.DhGroupExchange; +import com.trilead.ssh2.crypto.dh.GenericDhExchange; +import com.trilead.ssh2.crypto.digest.HMAC; +import com.trilead.ssh2.crypto.digest.MAC; +import com.trilead.ssh2.crypto.digest.MACs; +import com.trilead.ssh2.log.Logger; +import com.trilead.ssh2.packets.PacketKexDHInit; +import com.trilead.ssh2.packets.PacketKexDHReply; +import com.trilead.ssh2.packets.PacketKexDhGexGroup; +import com.trilead.ssh2.packets.PacketKexDhGexInit; +import com.trilead.ssh2.packets.PacketKexDhGexReply; +import com.trilead.ssh2.packets.PacketKexDhGexRequest; +import com.trilead.ssh2.packets.PacketKexDhGexRequestOld; +import com.trilead.ssh2.packets.PacketKexInit; +import com.trilead.ssh2.packets.PacketNewKeys; +import com.trilead.ssh2.packets.Packets; +import com.trilead.ssh2.signature.DSASHA1Verify; +import com.trilead.ssh2.signature.ECDSASHA2Verify; +import com.trilead.ssh2.signature.Ed25519Verify; +import com.trilead.ssh2.signature.RSASHA1Verify; +import com.trilead.ssh2.signature.SSHSignature; + +/** + * KexManager. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: KexManager.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ +public class KexManager +{ + private static final Logger log = Logger.getLogger(KexManager.class); + + private static final boolean supportsEc; + static { + KeyFactory keyFact; + try { + keyFact = KeyFactory.getInstance("EC"); + } catch (NoSuchAlgorithmException ignored) { + keyFact = null; + log.log(10, "Disabling EC support due to lack of KeyFactory"); + } + supportsEc = keyFact != null; + } + + private static final Set HOSTKEY_ALGS = new LinkedHashSet<>(); + static { + HOSTKEY_ALGS.add(Ed25519Verify.ED25519_ID); + if (supportsEc) { + HOSTKEY_ALGS.add("ecdsa-sha2-nistp256"); + HOSTKEY_ALGS.add("ecdsa-sha2-nistp384"); + HOSTKEY_ALGS.add("ecdsa-sha2-nistp521"); + } + HOSTKEY_ALGS.add(RSASHA512Verify.ID_RSA_SHA_2_512); + HOSTKEY_ALGS.add(RSASHA256Verify.ID_RSA_SHA_2_256); + HOSTKEY_ALGS.add(RSASHA1Verify.ID_SSH_RSA); + HOSTKEY_ALGS.add(DSASHA1Verify.ID_SSH_DSS); + } + + private static final Set KEX_ALGS = new LinkedHashSet<>(); + static { + KEX_ALGS.add(Curve25519Exchange.NAME); + KEX_ALGS.add(Curve25519Exchange.ALT_NAME); + if (supportsEc) { + KEX_ALGS.add("ecdh-sha2-nistp256"); + KEX_ALGS.add("ecdh-sha2-nistp384"); + KEX_ALGS.add("ecdh-sha2-nistp521"); + } + KEX_ALGS.add("diffie-hellman-group18-sha512"); + KEX_ALGS.add("diffie-hellman-group16-sha512"); + KEX_ALGS.add("diffie-hellman-group-exchange-sha256"); + KEX_ALGS.add("diffie-hellman-group14-sha256"); + KEX_ALGS.add("diffie-hellman-group-exchange-sha1"); + KEX_ALGS.add("diffie-hellman-group14-sha1"); + KEX_ALGS.add("diffie-hellman-group1-sha1"); + + // Indicate client support for ext-info + KEX_ALGS.add("ext-info-c"); + } + + private KexState kxs; + private int kexCount = 0; + private KeyMaterial km; + byte[] sessionId; + private ClientServerHello csh; + + private final Object accessLock = new Object(); + private ConnectionInfo lastConnInfo = null; + + private boolean connectionClosed = false; + + private boolean ignore_next_kex_packet = false; + + private final TransportManager tm; + + private CryptoWishList nextKEXcryptoWishList; + private DHGexParameters nextKEXdhgexParameters; + + private ServerHostKeyVerifier verifier; + private final String hostname; + private final int port; + private final SecureRandom rnd; + + public KexManager(TransportManager tm, ClientServerHello csh, CryptoWishList initialCwl, String hostname, int port, + ServerHostKeyVerifier keyVerifier, SecureRandom rnd) + { + this.tm = tm; + this.csh = csh; + this.nextKEXcryptoWishList = initialCwl; + this.nextKEXdhgexParameters = new DHGexParameters(); + this.hostname = hostname; + this.port = port; + this.verifier = keyVerifier; + this.rnd = rnd; + } + + public ConnectionInfo getOrWaitForConnectionInfo(int minKexCount) throws IOException + { + synchronized (accessLock) + { + while (true) + { + if ((lastConnInfo != null) && (lastConnInfo.keyExchangeCounter >= minKexCount)) + return lastConnInfo; + + if (connectionClosed) + throw new IOException("Key exchange was not finished, connection is closed.", tm.getReasonClosedCause()); + + try + { + accessLock.wait(); + } + catch (InterruptedException ignore) + { + } + } + } + } + + private String getFirstMatch(String[] client, String[] server) throws NegotiateException + { + if (client == null || server == null) + throw new IllegalArgumentException(); + + if (client.length == 0) + return null; + + for (String aClient : client) { + for (String aServer : server) { + if (aClient.equals(aServer)) + return aClient; + } + } + throw new NegotiateException(); + } + + private boolean compareFirstOfNameList(String[] a, String[] b) + { + if (a == null || b == null) + throw new IllegalArgumentException(); + + if ((a.length == 0) && (b.length == 0)) + return true; + + if ((a.length == 0) || (b.length == 0)) + return false; + + return (a[0].equals(b[0])); + } + + private boolean isGuessOK(KexParameters cpar, KexParameters spar) + { + if (cpar == null || spar == null) + throw new IllegalArgumentException(); + + if (!compareFirstOfNameList(cpar.kex_algorithms, spar.kex_algorithms)) + { + return false; + } + + return compareFirstOfNameList(cpar.server_host_key_algorithms, spar.server_host_key_algorithms); + } + + private NegotiatedParameters mergeKexParameters(KexParameters client, KexParameters server) + { + NegotiatedParameters np = new NegotiatedParameters(); + + try + { + np.kex_algo = getFirstMatch(client.kex_algorithms, server.kex_algorithms); + + log.log(20, "kex_algo=" + np.kex_algo); + + np.server_host_key_algo = getFirstMatch(client.server_host_key_algorithms, + server.server_host_key_algorithms); + + log.log(20, "server_host_key_algo=" + np.server_host_key_algo); + + np.enc_algo_client_to_server = getFirstMatch(client.encryption_algorithms_client_to_server, + server.encryption_algorithms_client_to_server); + np.enc_algo_server_to_client = getFirstMatch(client.encryption_algorithms_server_to_client, + server.encryption_algorithms_server_to_client); + + log.log(20, "enc_algo_client_to_server=" + np.enc_algo_client_to_server); + log.log(20, "enc_algo_server_to_client=" + np.enc_algo_server_to_client); + + np.mac_algo_client_to_server = getFirstMatch(client.mac_algorithms_client_to_server, + server.mac_algorithms_client_to_server); + np.mac_algo_server_to_client = getFirstMatch(client.mac_algorithms_server_to_client, + server.mac_algorithms_server_to_client); + + log.log(20, "mac_algo_client_to_server=" + np.mac_algo_client_to_server); + log.log(20, "mac_algo_server_to_client=" + np.mac_algo_server_to_client); + + np.comp_algo_client_to_server = getFirstMatch(client.compression_algorithms_client_to_server, + server.compression_algorithms_client_to_server); + np.comp_algo_server_to_client = getFirstMatch(client.compression_algorithms_server_to_client, + server.compression_algorithms_server_to_client); + + log.log(20, "comp_algo_client_to_server=" + np.comp_algo_client_to_server); + log.log(20, "comp_algo_server_to_client=" + np.comp_algo_server_to_client); + + } + catch (NegotiateException e) + { + return null; + } + + try + { + np.lang_client_to_server = getFirstMatch(client.languages_client_to_server, + server.languages_client_to_server); + } + catch (NegotiateException e1) + { + np.lang_client_to_server = null; + } + + try + { + np.lang_server_to_client = getFirstMatch(client.languages_server_to_client, + server.languages_server_to_client); + } + catch (NegotiateException e2) + { + np.lang_server_to_client = null; + } + + if (isGuessOK(client, server)) + np.guessOK = true; + + return np; + } + + public synchronized void initiateKEX(CryptoWishList cwl, DHGexParameters dhgex) throws IOException + { + nextKEXcryptoWishList = cwl; + filterHostKeyTypes(nextKEXcryptoWishList); + + nextKEXdhgexParameters = dhgex; + + if (kxs == null) + { + kxs = new KexState(); + + kxs.dhgexParameters = nextKEXdhgexParameters; + PacketKexInit kp = new PacketKexInit(nextKEXcryptoWishList); + kxs.localKEX = kp; + tm.sendKexMessage(kp.getPayload()); + } + } + + /** + * If the verifier can indicate which algorithms it knows about for this host, then + * filter out our crypto wish list to only include those algorithms. Otherwise we'll + * negotiate a host key we have not previously confirmed. + * + * @param cwl crypto wish list to filter + */ + private void filterHostKeyTypes(CryptoWishList cwl) { + if (verifier instanceof ExtendedServerHostKeyVerifier) { + ExtendedServerHostKeyVerifier extendedVerifier = (ExtendedServerHostKeyVerifier) verifier; + + List knownAlgorithms = extendedVerifier.getKnownKeyAlgorithmsForHost(hostname, port); + if (knownAlgorithms != null && knownAlgorithms.size() > 0) { + ArrayList filteredAlgorithms = new ArrayList<>(knownAlgorithms.size()); + + /* + * Look at our current wish list and adjust it based on what the client already knows, but + * be careful to keep it in the order desired by the wish list. + */ + for (String capableAlgo : cwl.serverHostKeyAlgorithms) { + for (String knownAlgo : knownAlgorithms) { + if (capableAlgo.equals(knownAlgo)) { + filteredAlgorithms.add(knownAlgo); + } + } + } + + if (filteredAlgorithms.size() > 0) { + cwl.serverHostKeyAlgorithms = filteredAlgorithms.toArray(new String[0]); + } + } + } + } + + private void establishKeyMaterial() throws IOException + { + try + { + int mac_cs_key_len = MACs.getKeyLen(kxs.np.mac_algo_client_to_server); + int enc_cs_key_len = BlockCipherFactory.getKeySize(kxs.np.enc_algo_client_to_server); + int enc_cs_block_len = BlockCipherFactory.getBlockSize(kxs.np.enc_algo_client_to_server); + + int mac_sc_key_len = MACs.getKeyLen(kxs.np.mac_algo_server_to_client); + int enc_sc_key_len = BlockCipherFactory.getKeySize(kxs.np.enc_algo_server_to_client); + int enc_sc_block_len = BlockCipherFactory.getBlockSize(kxs.np.enc_algo_server_to_client); + + km = KeyMaterial.create(kxs.hashAlgo, kxs.H, kxs.K, sessionId, enc_cs_key_len, enc_cs_block_len, mac_cs_key_len, + enc_sc_key_len, enc_sc_block_len, mac_sc_key_len); + } + catch (IllegalArgumentException e) + { + throw new IOException("Could not establish key material: " + e.getMessage()); + } + } + + private void finishKex() throws IOException + { + if (sessionId == null) + sessionId = kxs.H; + + establishKeyMaterial(); + + /* Tell the other side that we start using the new material */ + + PacketNewKeys ign = new PacketNewKeys(); + tm.sendKexMessage(ign.getPayload()); + + BlockCipher cbc; + MAC mac; + ICompressor comp; + + try + { + cbc = BlockCipherFactory.createCipher(kxs.np.enc_algo_client_to_server, true, km.enc_key_client_to_server, + km.initial_iv_client_to_server); + + mac = new HMAC(kxs.np.mac_algo_client_to_server, km.integrity_key_client_to_server); + + comp = CompressionFactory.createCompressor(kxs.np.comp_algo_client_to_server); + + } + catch (IllegalArgumentException e1) + { + throw new IOException("Fatal error during MAC startup!"); + } + + tm.changeSendCipher(cbc, mac); + tm.changeSendCompression(comp); + tm.kexFinished(); + } + + public static String[] getDefaultServerHostkeyAlgorithmList() + { + return HOSTKEY_ALGS.toArray(new String[0]); + } + + public static void checkServerHostkeyAlgorithmsList(String[] algos) + { + for (String algo : algos) { + if (!HOSTKEY_ALGS.contains(algo)) + throw new IllegalArgumentException("Unknown server host key algorithm '" + algo + "'"); + } + } + + public static String[] getDefaultKexAlgorithmList() + { + return KEX_ALGS.toArray(new String[0]); + } + + public static void checkKexAlgorithmList(String[] algos) + { + for (String algo : algos) { + if (!KEX_ALGS.contains(algo)) + throw new IllegalArgumentException("Unknown kex algorithm '" + algo + "'"); + } + } + + private boolean verifySignature(byte[] sig, byte[] hostkey) throws IOException { + SSHSignature sshSignature; + if (kxs.np.server_host_key_algo.equals(Ed25519Verify.get().getKeyFormat())) { + sshSignature = Ed25519Verify.get(); + } else if (kxs.np.server_host_key_algo.equals(ECDSASHA2Verify.ECDSASHA2NISTP256Verify.get().getKeyFormat())) { + sshSignature = ECDSASHA2Verify.ECDSASHA2NISTP256Verify.get(); + } else if (kxs.np.server_host_key_algo.equals(ECDSASHA2Verify.ECDSASHA2NISTP384Verify.get().getKeyFormat())) { + sshSignature = ECDSASHA2Verify.ECDSASHA2NISTP384Verify.get(); + } else if (kxs.np.server_host_key_algo.equals(ECDSASHA2Verify.ECDSASHA2NISTP521Verify.get().getKeyFormat())) { + sshSignature = ECDSASHA2Verify.ECDSASHA2NISTP521Verify.get(); + } else if (kxs.np.server_host_key_algo.equals(RSASHA512Verify.get().getKeyFormat())) { + sshSignature = RSASHA512Verify.get(); + } else if (kxs.np.server_host_key_algo.equals(RSASHA256Verify.get().getKeyFormat())) { + sshSignature = RSASHA256Verify.get(); + } else if (kxs.np.server_host_key_algo.equals(RSASHA1Verify.get().getKeyFormat())) { + sshSignature = RSASHA1Verify.get(); + } else if (kxs.np.server_host_key_algo.equals(DSASHA1Verify.get().getKeyFormat())) { + sshSignature = DSASHA1Verify.get(); + } else { + throw new IOException("Unknown server host key algorithm '" + kxs.np.server_host_key_algo + "'"); + } + + PublicKey publicKey = sshSignature.decodePublicKey(hostkey); + log.log(50, "Verifying " + sshSignature.getKeyFormat() + " signature"); + return sshSignature.verifySignature(kxs.H, sig, publicKey); + } + + public synchronized void handleMessage(byte[] msg, int msglen) throws IOException + { + PacketKexInit kip; + + if (msg == null) + { + synchronized (accessLock) + { + connectionClosed = true; + accessLock.notifyAll(); + return; + } + } + + if ((kxs == null) && (msg[0] != Packets.SSH_MSG_KEXINIT)) + throw new IOException("Unexpected KEX message (type " + msg[0] + ")"); + + if (ignore_next_kex_packet) + { + ignore_next_kex_packet = false; + return; + } + + if (msg[0] == Packets.SSH_MSG_KEXINIT) + { + if ((kxs != null) && (kxs.state != 0)) + throw new IOException("Unexpected SSH_MSG_KEXINIT message during on-going kex exchange!"); + + if (kxs == null) + { + /* + * Ah, OK, peer wants to do KEX. Let's be nice and play + * together. + */ + kxs = new KexState(); + kxs.dhgexParameters = nextKEXdhgexParameters; + kip = new PacketKexInit(nextKEXcryptoWishList); + kxs.localKEX = kip; + tm.sendKexMessage(kip.getPayload()); + } + + kip = new PacketKexInit(msg, 0, msglen); + kxs.remoteKEX = kip; + + kxs.np = mergeKexParameters(kxs.localKEX.getKexParameters(), kxs.remoteKEX.getKexParameters()); + + if (kxs.np == null) + throw new IOException("Cannot negotiate, proposals do not match."); + + if (kxs.remoteKEX.isFirst_kex_packet_follows() && (!kxs.np.guessOK)) + { + /* + * Guess was wrong, we need to ignore the next kex packet. + */ + + ignore_next_kex_packet = true; + } + + if (kxs.np.kex_algo.equals("diffie-hellman-group-exchange-sha1") + || kxs.np.kex_algo.equals("diffie-hellman-group-exchange-sha256")) + { + if (kxs.dhgexParameters.getMin_group_len() == 0 || csh.server_versioncomment.matches("OpenSSH_2\\.([0-4]\\.|5\\.[0-2]).*")) + { + PacketKexDhGexRequestOld dhgexreq = new PacketKexDhGexRequestOld(kxs.dhgexParameters); + tm.sendKexMessage(dhgexreq.getPayload()); + } + else + { + PacketKexDhGexRequest dhgexreq = new PacketKexDhGexRequest(kxs.dhgexParameters); + tm.sendKexMessage(dhgexreq.getPayload()); + } + if (kxs.np.kex_algo.endsWith("sha1")) { + kxs.hashAlgo = "SHA1"; + } else { + kxs.hashAlgo = "SHA-256"; + } + kxs.state = 1; + return; + } + + if (kxs.np.kex_algo.equals(Curve25519Exchange.NAME) + || kxs.np.kex_algo.equals(Curve25519Exchange.ALT_NAME) + || kxs.np.kex_algo.equals("ecdh-sha2-nistp521") + || kxs.np.kex_algo.equals("ecdh-sha2-nistp384") + || kxs.np.kex_algo.equals("ecdh-sha2-nistp256") + || kxs.np.kex_algo.equals("diffie-hellman-group18-sha512") + || kxs.np.kex_algo.equals("diffie-hellman-group16-sha512") + || kxs.np.kex_algo.equals("diffie-hellman-group14-sha256") + || kxs.np.kex_algo.equals("diffie-hellman-group14-sha1") + || kxs.np.kex_algo.equals("diffie-hellman-group1-sha1")) { + kxs.dhx = GenericDhExchange.getInstance(kxs.np.kex_algo); + + kxs.dhx.init(kxs.np.kex_algo); + kxs.hashAlgo = kxs.dhx.getHashAlgo(); + + PacketKexDHInit kp = new PacketKexDHInit(kxs.dhx.getE()); + tm.sendKexMessage(kp.getPayload()); + kxs.state = 1; + return; + } + + throw new IllegalStateException("Unknown KEX method!"); + } + + if (msg[0] == Packets.SSH_MSG_NEWKEYS) + { + if (km == null) + throw new IOException("Peer sent SSH_MSG_NEWKEYS, but I have no key material ready!"); + + BlockCipher cbc; + MAC mac; + ICompressor comp; + + try + { + cbc = BlockCipherFactory.createCipher(kxs.np.enc_algo_server_to_client, false, + km.enc_key_server_to_client, km.initial_iv_server_to_client); + + mac = new HMAC(kxs.np.mac_algo_server_to_client, km.integrity_key_server_to_client); + + comp = CompressionFactory.createCompressor(kxs.np.comp_algo_server_to_client); + } + catch (IllegalArgumentException e1) + { + throw new IOException("Fatal error during MAC startup: " + e1.getMessage()); + } + + tm.changeRecvCipher(cbc, mac); + tm.changeRecvCompression(comp); + + ConnectionInfo sci = new ConnectionInfo(); + + kexCount++; + + sci.keyExchangeAlgorithm = kxs.np.kex_algo; + sci.keyExchangeCounter = kexCount; + sci.clientToServerCryptoAlgorithm = kxs.np.enc_algo_client_to_server; + sci.serverToClientCryptoAlgorithm = kxs.np.enc_algo_server_to_client; + sci.clientToServerMACAlgorithm = kxs.np.mac_algo_client_to_server; + sci.serverToClientMACAlgorithm = kxs.np.mac_algo_server_to_client; + sci.serverHostKeyAlgorithm = kxs.np.server_host_key_algo; + sci.serverHostKey = kxs.hostkey; + sci.clientToServerCompressionAlgorithm = kxs.np.comp_algo_client_to_server; + sci.serverToClientCompressionAlgorithm = kxs.np.comp_algo_server_to_client; + + synchronized (accessLock) + { + lastConnInfo = sci; + accessLock.notifyAll(); + } + + kxs = null; + return; + } + + if ((kxs == null) || (kxs.state == 0)) + throw new IOException("Unexpected Kex submessage!"); + + if (kxs.np.kex_algo.equals("diffie-hellman-group-exchange-sha1") + || kxs.np.kex_algo.equals("diffie-hellman-group-exchange-sha256")) + { + if (kxs.state == 1) + { + PacketKexDhGexGroup dhgexgrp = new PacketKexDhGexGroup(msg, 0, msglen); + kxs.dhgx = new DhGroupExchange(dhgexgrp.getP(), dhgexgrp.getG()); + kxs.dhgx.init(rnd); + PacketKexDhGexInit dhgexinit = new PacketKexDhGexInit(kxs.dhgx.getE()); + tm.sendKexMessage(dhgexinit.getPayload()); + kxs.state = 2; + return; + } + + if (kxs.state == 2) + { + PacketKexDhGexReply dhgexrpl = new PacketKexDhGexReply(msg, 0, msglen); + + kxs.hostkey = dhgexrpl.getHostKey(); + + if (verifier != null) + { + boolean vres = false; + + try + { + vres = verifier.verifyServerHostKey(hostname, port, kxs.np.server_host_key_algo, kxs.hostkey); + } + catch (Exception e) + { + throw new IOException( + "The server hostkey was not accepted by the verifier callback.", e); + } + + if (!vres) + throw new IOException("The server hostkey was not accepted by the verifier callback"); + } + + kxs.dhgx.setF(dhgexrpl.getF()); + + try + { + kxs.H = kxs.dhgx.calculateH(kxs.hashAlgo, + csh.getClientString(), csh.getServerString(), + kxs.localKEX.getPayload(), kxs.remoteKEX.getPayload(), + dhgexrpl.getHostKey(), kxs.dhgexParameters); + } + catch (IllegalArgumentException e) + { + throw new IOException("KEX error.", e); + } + + boolean res = verifySignature(dhgexrpl.getSignature(), kxs.hostkey); + + if (!res) + throw new IOException("Hostkey signature sent by remote is wrong!"); + + kxs.K = kxs.dhgx.getK(); + + finishKex(); + kxs.state = -1; + return; + } + + throw new IllegalStateException("Illegal State in KEX Exchange!"); + } + + if (kxs.np.kex_algo.equals("diffie-hellman-group1-sha1") + || kxs.np.kex_algo.equals("diffie-hellman-group14-sha1") + || kxs.np.kex_algo.equals("diffie-hellman-group14-sha256") + || kxs.np.kex_algo.equals("diffie-hellman-group16-sha512") + || kxs.np.kex_algo.equals("diffie-hellman-group18-sha512") + || kxs.np.kex_algo.equals("ecdh-sha2-nistp256") + || kxs.np.kex_algo.equals("ecdh-sha2-nistp384") + || kxs.np.kex_algo.equals("ecdh-sha2-nistp521") + || kxs.np.kex_algo.equals(Curve25519Exchange.NAME) + || kxs.np.kex_algo.equals(Curve25519Exchange.ALT_NAME)) + { + if (kxs.state == 1) + { + + PacketKexDHReply dhr = new PacketKexDHReply(msg, 0, msglen); + + kxs.hostkey = dhr.getHostKey(); + + if (verifier != null) + { + boolean vres = false; + + try + { + vres = verifier.verifyServerHostKey(hostname, port, kxs.np.server_host_key_algo, kxs.hostkey); + } + catch (Exception e) + { + throw new IOException( + "The server hostkey was not accepted by the verifier callback.", e); + } + + if (!vres) + throw new IOException("The server hostkey was not accepted by the verifier callback"); + } + + kxs.dhx.setF(dhr.getF()); + + try + { + kxs.H = kxs.dhx.calculateH(csh.getClientString(), csh.getServerString(), kxs.localKEX.getPayload(), + kxs.remoteKEX.getPayload(), dhr.getHostKey()); + } + catch (IllegalArgumentException e) + { + throw new IOException("KEX error.", e); + } + + boolean res = verifySignature(dhr.getSignature(), kxs.hostkey); + + if (!res) + throw new IOException("Hostkey signature sent by remote is wrong!"); + + kxs.K = kxs.dhx.getK(); + + finishKex(); + kxs.state = -1; + return; + } + } + + throw new IllegalStateException("Unkown KEX method! (" + kxs.np.kex_algo + ")"); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/KexParameters.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/KexParameters.java new file mode 100644 index 0000000000..c1de65c59f --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/KexParameters.java @@ -0,0 +1,24 @@ +package com.trilead.ssh2.transport; + +/** + * KexParameters. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: KexParameters.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ +public class KexParameters +{ + public byte[] cookie; + public String[] kex_algorithms; + public String[] server_host_key_algorithms; + public String[] encryption_algorithms_client_to_server; + public String[] encryption_algorithms_server_to_client; + public String[] mac_algorithms_client_to_server; + public String[] mac_algorithms_server_to_client; + public String[] compression_algorithms_client_to_server; + public String[] compression_algorithms_server_to_client; + public String[] languages_client_to_server; + public String[] languages_server_to_client; + public boolean first_kex_packet_follows; + public int reserved_field1; +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/KexState.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/KexState.java new file mode 100644 index 0000000000..337d208fe1 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/KexState.java @@ -0,0 +1,33 @@ +package com.trilead.ssh2.transport; + + +import java.math.BigInteger; + +import com.trilead.ssh2.DHGexParameters; +import com.trilead.ssh2.crypto.dh.DhGroupExchange; +import com.trilead.ssh2.crypto.dh.GenericDhExchange; +import com.trilead.ssh2.packets.PacketKexInit; + +/** + * KexState. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: KexState.java,v 1.1 2007/10/15 12:49:57 cplattne Exp $ + */ +public class KexState +{ + public PacketKexInit localKEX; + public PacketKexInit remoteKEX; + public NegotiatedParameters np; + public int state = 0; + + public BigInteger K; + public byte[] H; + + public byte[] hostkey; + + public String hashAlgo; + public GenericDhExchange dhx; + public DhGroupExchange dhgx; + public DHGexParameters dhgexParameters; +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/MessageHandler.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/MessageHandler.java new file mode 100644 index 0000000000..f74e19037c --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/MessageHandler.java @@ -0,0 +1,14 @@ +package com.trilead.ssh2.transport; + +import java.io.IOException; + +/** + * MessageHandler. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: MessageHandler.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ +public interface MessageHandler +{ + void handleMessage(byte[] msg, int msglen) throws IOException; +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/NegotiateException.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/NegotiateException.java new file mode 100644 index 0000000000..fa99bd99ef --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/NegotiateException.java @@ -0,0 +1,12 @@ +package com.trilead.ssh2.transport; + +/** + * NegotiateException. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: NegotiateException.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ +public class NegotiateException extends Exception +{ + private static final long serialVersionUID = 3689910669428143157L; +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/NegotiatedParameters.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/NegotiatedParameters.java new file mode 100644 index 0000000000..34ed34ad49 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/NegotiatedParameters.java @@ -0,0 +1,22 @@ +package com.trilead.ssh2.transport; + +/** + * NegotiatedParameters. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: NegotiatedParameters.java,v 1.1 2007/10/15 12:49:57 cplattne Exp $ + */ +public class NegotiatedParameters +{ + public boolean guessOK; + public String kex_algo; + public String server_host_key_algo; + public String enc_algo_client_to_server; + public String enc_algo_server_to_client; + public String mac_algo_client_to_server; + public String mac_algo_server_to_client; + public String comp_algo_client_to_server; + public String comp_algo_server_to_client; + public String lang_client_to_server; + public String lang_server_to_client; +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/TransportConnection.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/TransportConnection.java new file mode 100644 index 0000000000..19f9cd7ebc --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/TransportConnection.java @@ -0,0 +1,364 @@ + +package com.trilead.ssh2.transport; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.security.SecureRandom; + +import com.trilead.ssh2.compression.ICompressor; +import com.trilead.ssh2.crypto.cipher.BlockCipher; +import com.trilead.ssh2.crypto.cipher.CipherInputStream; +import com.trilead.ssh2.crypto.cipher.CipherOutputStream; +import com.trilead.ssh2.crypto.cipher.NullCipher; +import com.trilead.ssh2.crypto.digest.MAC; +import com.trilead.ssh2.log.Logger; +import com.trilead.ssh2.packets.Packets; + + +/** + * TransportConnection. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: TransportConnection.java,v 1.1 2007/10/15 12:49:56 cplattne Exp $ + */ +public class TransportConnection +{ + private static final Logger log = Logger.getLogger(TransportConnection.class); + + int send_seq_number = 0; + + int recv_seq_number = 0; + + CipherInputStream cis; + + CipherOutputStream cos; + + boolean useRandomPadding = false; + + /* Depends on current MAC and CIPHER */ + + MAC send_mac; + + byte[] send_mac_buffer; + + int send_padd_blocksize = 8; + + MAC recv_mac; + + byte[] recv_mac_buffer; + + byte[] recv_mac_buffer_cmp; + + int recv_padd_blocksize = 8; + + ICompressor recv_comp = null; + + ICompressor send_comp = null; + + boolean can_recv_compress = false; + + boolean can_send_compress = false; + + byte[] recv_comp_buffer; + + byte[] send_comp_buffer; + + /* won't change */ + + final byte[] send_padding_buffer = new byte[256]; + + final byte[] send_packet_header_buffer = new byte[5]; + + final byte[] recv_padding_buffer = new byte[256]; + + final byte[] recv_packet_header_buffer = new byte[5]; + + ClientServerHello csh; + + final SecureRandom rnd; + + public TransportConnection(InputStream is, OutputStream os, SecureRandom rnd) + { + this.cis = new CipherInputStream(new NullCipher(), is); + this.cos = new CipherOutputStream(new NullCipher(), os); + this.rnd = rnd; + } + + public void changeRecvCipher(BlockCipher bc, MAC mac) + { + cis.changeCipher(bc); + recv_mac = mac; + recv_mac_buffer = (mac != null) ? new byte[mac.size()] : null; + recv_mac_buffer_cmp = (mac != null) ? new byte[mac.size()] : null; + recv_padd_blocksize = bc.getBlockSize(); + if (recv_padd_blocksize < 8) + recv_padd_blocksize = 8; + } + + public void changeSendCipher(BlockCipher bc, MAC mac) + { + if (!(bc instanceof NullCipher)) + { + /* Only use zero byte padding for the first few packets */ + useRandomPadding = true; + /* Once we start encrypting, there is no way back */ + } + + cos.changeCipher(bc); + send_mac = mac; + send_mac_buffer = (mac != null) ? new byte[mac.size()] : null; + send_padd_blocksize = bc.getBlockSize(); + if (send_padd_blocksize < 8) + send_padd_blocksize = 8; + } + + public void changeRecvCompression(ICompressor comp) + { + recv_comp = comp; + + if (comp != null) { + recv_comp_buffer = new byte[comp.getBufferSize()]; + can_recv_compress |= recv_comp.canCompressPreauth(); + } + } + + public void changeSendCompression(ICompressor comp) + { + send_comp = comp; + + if (comp != null) { + send_comp_buffer = new byte[comp.getBufferSize()]; + can_send_compress |= send_comp.canCompressPreauth(); + } + } + + public void sendMessage(byte[] message) throws IOException + { + sendMessage(message, 0, message.length, 0); + } + + public void sendMessage(byte[] message, int off, int len) throws IOException + { + sendMessage(message, off, len, 0); + } + + public int getPacketOverheadEstimate() + { + // return an estimate for the paket overhead (for send operations) + return 5 + 4 + (send_padd_blocksize - 1) + send_mac_buffer.length; + } + + public void sendMessage(byte[] message, int off, int len, int padd) throws IOException + { + if (padd < 4) + padd = 4; + else if (padd > 64) + padd = 64; + + if (send_comp != null && can_send_compress) { + if (send_comp_buffer.length < message.length + 1024) + send_comp_buffer = new byte[message.length + 1024]; + len = send_comp.compress(message, off, len, send_comp_buffer); + message = send_comp_buffer; + } + + boolean encryptThenMac = send_mac != null && send_mac.isEncryptThenMac(); + + int encryptedPacketLength = (encryptThenMac ? 1 : 5) + len + padd; /* Minimum allowed padding is 4 */ + + int slack = encryptedPacketLength % send_padd_blocksize; + + if (slack != 0) + { + encryptedPacketLength += (send_padd_blocksize - slack); + } + + if (encryptedPacketLength < 16) + encryptedPacketLength = 16; + + int padd_len = encryptedPacketLength - ((encryptThenMac ? 1 : 5) + len); + + if (useRandomPadding) + { + for (int i = 0; i < padd_len; i = i + 4) + { + /* + * don't waste calls to rnd.nextInt() (by using only 8bit of the + * output). just believe me: even though we may write here up to 3 + * bytes which won't be used, there is no "buffer overflow" (i.e., + * arrayindexoutofbounds). the padding buffer is big enough =) (256 + * bytes, and that is bigger than any current cipher block size + 64). + */ + + int r = rnd.nextInt(); + send_padding_buffer[i] = (byte) r; + send_padding_buffer[i + 1] = (byte) (r >> 8); + send_padding_buffer[i + 2] = (byte) (r >> 16); + send_padding_buffer[i + 3] = (byte) (r >> 24); + } + } + else + { + /* use zero padding for unencrypted traffic */ + for (int i = 0; i < padd_len; i++) + send_padding_buffer[i] = 0; + /* Actually this code is paranoid: we never filled any + * bytes into the padding buffer so far, therefore it should + * consist of zeros only. + */ + } + + int payloadLength = encryptThenMac ? encryptedPacketLength : encryptedPacketLength - 4; + send_packet_header_buffer[0] = (byte) (encryptedPacketLength >> 24); + send_packet_header_buffer[1] = (byte) (payloadLength >> 16); + send_packet_header_buffer[2] = (byte) (payloadLength >> 8); + send_packet_header_buffer[3] = (byte) (payloadLength); + send_packet_header_buffer[4] = (byte) padd_len; + + if (send_mac != null && send_mac.isEncryptThenMac()) { + cos.writePlain(send_packet_header_buffer, 0, 4); + cos.startRecording(); + cos.write(send_packet_header_buffer, 4, 1); + } else { + cos.write(send_packet_header_buffer, 0, 5); + } + cos.write(message, off, len); + cos.write(send_padding_buffer, 0, padd_len); + + if (send_mac != null) + { + send_mac.initMac(send_seq_number); + + if (send_mac.isEncryptThenMac()) { + send_mac.update(send_packet_header_buffer, 0, 4); + byte[] encryptedMessage = cos.getRecordedOutput(); + send_mac.update(encryptedMessage, 0, encryptedMessage.length); + } else { + send_mac.update(send_packet_header_buffer, 0, 5); + send_mac.update(message, off, len); + send_mac.update(send_padding_buffer, 0, padd_len); + } + + send_mac.getMac(send_mac_buffer, 0); + cos.writePlain(send_mac_buffer, 0, send_mac_buffer.length); + } + + cos.flush(); + + if (log.isEnabled()) + { + log.log(90, "Sent " + Packets.getMessageName(message[off] & 0xff) + " " + len + " bytes payload"); + } + + send_seq_number++; + } + + public int receiveMessage(byte[] buffer, int off, int len) throws IOException + { + final int packetLength; + final int payloadLength; + + if (recv_mac != null && recv_mac.isEncryptThenMac()) { + cis.readPlain(recv_packet_header_buffer, 0, 4); + packetLength = getPacketLength(recv_packet_header_buffer, true); + + recv_mac.initMac(recv_seq_number); + recv_mac.update(recv_packet_header_buffer, 0, 4); + + cis.peekPlain(buffer, off, packetLength + recv_mac_buffer.length); + System.arraycopy(buffer, off + packetLength, recv_mac_buffer, 0, recv_mac_buffer.length); + + recv_mac.update(buffer, off, packetLength); + recv_mac.getMac(recv_mac_buffer_cmp, 0); + + checkMacMatches(recv_mac_buffer, recv_mac_buffer_cmp); + + cis.read(recv_packet_header_buffer, 4, 1); + } else { + cis.read(recv_packet_header_buffer, 0, 5); + packetLength = getPacketLength(recv_packet_header_buffer, false); + } + + int paddingLength = recv_packet_header_buffer[4] & 0xff; + + payloadLength = calculatePayloadLength(len, packetLength, paddingLength); + + cis.read(buffer, off, payloadLength); + cis.read(recv_padding_buffer, 0, paddingLength); + + if (recv_mac != null) { + cis.readPlain(recv_mac_buffer, 0, recv_mac_buffer.length); + + if (!recv_mac.isEncryptThenMac()) { + recv_mac.initMac(recv_seq_number); + recv_mac.update(recv_packet_header_buffer, 0, 5); + recv_mac.update(buffer, off, payloadLength); + recv_mac.update(recv_padding_buffer, 0, paddingLength); + recv_mac.getMac(recv_mac_buffer_cmp, 0); + + checkMacMatches(recv_mac_buffer, recv_mac_buffer_cmp); + } + } + + recv_seq_number++; + + if (log.isEnabled()) { + log.log(90, "Received " + Packets.getMessageName(buffer[off] & 0xff) + " " + payloadLength + + " bytes payload"); + } + + if (recv_comp != null && can_recv_compress) { + int[] uncomp_len = new int[] { payloadLength }; + buffer = recv_comp.uncompress(buffer, off, uncomp_len); + + if (buffer == null) { + throw new IOException("Error while inflating remote data"); + } else { + return uncomp_len[0]; + } + } else { + return payloadLength; + } + } + + private static int calculatePayloadLength(int bufferLength, int packetLength, int paddingLength) throws IOException { + int payloadLength = packetLength - paddingLength - 1; + + if (payloadLength < 0) + throw new IOException("Illegal padding_length in packet from remote (" + paddingLength + ")"); + + if (payloadLength >= bufferLength) + throw new IOException("Receive buffer too small (" + bufferLength + ", need " + payloadLength + ")"); + + return payloadLength; + } + + private static void checkMacMatches(byte[] buf1, byte[] buf2) throws IOException { + int difference = 0; + for (int i = 0; i < buf1.length; i++) { + difference |= buf1[i] ^ buf2[i]; + } + if (difference != 0) + throw new IOException("Remote sent corrupt MAC."); + } + + private static int getPacketLength(byte[] packetHeader, boolean isEtm) throws IOException { + int packetLength = ((packetHeader[0] & 0xff) << 24) + | ((packetHeader[1] & 0xff) << 16) | ((packetHeader[2] & 0xff) << 8) + | ((packetHeader[3] & 0xff)); + + if (packetLength > 35000 || packetLength < (isEtm ? 8 : 12)) + throw new IOException("Illegal packet size! (" + packetLength + ")"); + + return packetLength; + } + + /** + * + */ + public void startCompression() { + can_recv_compress = true; + can_send_compress = true; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/TransportManager.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/TransportManager.java new file mode 100644 index 0000000000..ce33608480 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/transport/TransportManager.java @@ -0,0 +1,647 @@ + +package com.trilead.ssh2.transport; + +import com.trilead.ssh2.ExtensionInfo; +import com.trilead.ssh2.packets.PacketExtInfo; +import java.io.IOException; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.Socket; +import java.security.SecureRandom; +import java.util.Vector; + +import com.trilead.ssh2.ConnectionInfo; +import com.trilead.ssh2.ConnectionMonitor; +import com.trilead.ssh2.DHGexParameters; +import com.trilead.ssh2.ProxyData; +import com.trilead.ssh2.ServerHostKeyVerifier; +import com.trilead.ssh2.compression.ICompressor; +import com.trilead.ssh2.crypto.CryptoWishList; +import com.trilead.ssh2.crypto.cipher.BlockCipher; +import com.trilead.ssh2.crypto.digest.MAC; +import com.trilead.ssh2.log.Logger; +import com.trilead.ssh2.packets.PacketDisconnect; +import com.trilead.ssh2.packets.Packets; +import com.trilead.ssh2.packets.TypesReader; + + +/* + * Yes, the "standard" is a big mess. On one side, the say that arbitary channel + * packets are allowed during kex exchange, on the other side we need to blindly + * ignore the next _packet_ if the KEX guess was wrong. Where do we know from that + * the next packet is not a channel data packet? Yes, we could check if it is in + * the KEX range. But the standard says nothing about this. The OpenSSH guys + * block local "normal" traffic during KEX. That's fine - however, they assume + * that the other side is doing the same. During re-key, if they receive traffic + * other than KEX, they become horribly irritated and kill the connection. Since + * we are very likely going to communicate with OpenSSH servers, we have to play + * the same game - even though we could do better. + * + * btw: having stdout and stderr on the same channel, with a shared window, is + * also a VERY good idea... =( + */ + +/** + * TransportManager. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: TransportManager.java,v 1.2 2008/04/01 12:38:09 cplattne Exp $ + */ +public class TransportManager +{ + private static final Logger log = Logger.getLogger(TransportManager.class); + + class HandlerEntry + { + MessageHandler mh; + int low; + int high; + } + + private final Vector asynchronousQueue = new Vector(); + private Thread asynchronousThread = null; + + class AsynchronousWorker extends Thread + { + public void run() + { + while (true) + { + byte[] msg; + + synchronized (asynchronousQueue) + { + if (asynchronousQueue.size() == 0) + { + /* After the queue is empty for about 2 seconds, stop this thread */ + + try + { + asynchronousQueue.wait(2000); + } + catch (InterruptedException e) + { + /* OKOK, if somebody interrupts us, then we may die earlier. */ + } + + if (asynchronousQueue.size() == 0) + { + asynchronousThread = null; + return; + } + } + + msg = asynchronousQueue.remove(0); + } + + /* The following invocation may throw an IOException. + * There is no point in handling it - it simply means + * that the connection has a problem and we should stop + * sending asynchronously messages. We do not need to signal that + * we have exited (asynchronousThread = null): further + * messages in the queue cannot be sent by this or any + * other thread. + * Other threads will sooner or later (when receiving or + * sending the next message) get the same IOException and + * get to the same conclusion. + */ + + try + { + sendMessage(msg); + } + catch (IOException e) + { + return; + } + } + } + } + + String hostname; + int port; + Socket sock; + + Object connectionSemaphore = new Object(); + + boolean flagKexOngoing = false; + boolean connectionClosed = false; + + Throwable reasonClosedCause = null; + + TransportConnection tc; + KexManager km; + + Vector messageHandlers = new Vector(); + + Thread receiveThread; + + Vector connectionMonitors = new Vector(); + boolean monitorsWereInformed = false; + + private volatile ExtensionInfo extensionInfo = ExtensionInfo.noExtInfoSeen(); + + public TransportManager(String host, int port) { + this.hostname = host; + this.port = port; + } + + public int getPacketOverheadEstimate() + { + return tc.getPacketOverheadEstimate(); + } + + public ConnectionInfo getConnectionInfo(int kexNumber) throws IOException + { + return km.getOrWaitForConnectionInfo(kexNumber); + } + + public ExtensionInfo getExtensionInfo() + { + return extensionInfo; + } + + public Throwable getReasonClosedCause() + { + synchronized (connectionSemaphore) + { + return reasonClosedCause; + } + } + + public byte[] getSessionIdentifier() + { + return km.sessionId; + } + + public void close(Throwable cause, boolean useDisconnectPacket) + { + if (!useDisconnectPacket) + { + /* OK, hard shutdown - do not aquire the semaphore, + * perhaps somebody is inside (and waits until the remote + * side is ready to accept new data). */ + + try + { + if (sock != null) + sock.close(); + } + catch (IOException ignore) + { + } + + /* OK, whoever tried to send data, should now agree that + * there is no point in further waiting =) + * It is safe now to aquire the semaphore. + */ + } + + synchronized (connectionSemaphore) + { + if (!connectionClosed) + { + if (useDisconnectPacket) + { + try + { + byte[] msg = new PacketDisconnect(Packets.SSH_DISCONNECT_BY_APPLICATION, cause.getMessage(), "") + .getPayload(); + if (tc != null) + tc.sendMessage(msg); + } + catch (IOException ignore) + { + } + + try + { + if (sock != null) + sock.close(); + } + catch (IOException ignore) + { + } + } + + connectionClosed = true; + reasonClosedCause = cause; /* may be null */ + } + connectionSemaphore.notifyAll(); + } + + /* No check if we need to inform the monitors */ + + Vector monitors = null; + + synchronized (this) + { + /* Short term lock to protect "connectionMonitors" + * and "monitorsWereInformed" + * (they may be modified concurrently) + */ + + if (!monitorsWereInformed) + { + monitorsWereInformed = true; + monitors = (Vector) connectionMonitors.clone(); + } + } + + if (monitors != null) + { + for (int i = 0; i < monitors.size(); i++) + { + try + { + ConnectionMonitor cmon = (ConnectionMonitor) monitors.elementAt(i); + cmon.connectionLost(reasonClosedCause); + } + catch (Exception ignore) + { + } + } + } + } + + private void establishConnection(ProxyData proxyData, int connectTimeout) throws IOException + { + if (proxyData == null) + sock = connectDirect(hostname, port, connectTimeout); + else + sock = proxyData.openConnection(hostname, port, connectTimeout); + } + + private static Socket connectDirect(String hostname, int port, int connectTimeout) + throws IOException + { + Socket sock = new Socket(); + InetAddress addr = InetAddress.getByName(hostname); + sock.connect(new InetSocketAddress(addr, port), connectTimeout); + sock.setSoTimeout(0); + return sock; + } + + public void initialize(CryptoWishList cwl, ServerHostKeyVerifier verifier, DHGexParameters dhgex, + int connectTimeout, SecureRandom rnd, ProxyData proxyData) throws IOException + { + /* First, establish the TCP connection to the SSH-2 server */ + + establishConnection(proxyData, connectTimeout); + + /* Parse the server line and say hello - important: this information is later needed for the + * key exchange (to stop man-in-the-middle attacks) - that is why we wrap it into an object + * for later use. + */ + + ClientServerHello csh = new ClientServerHello(sock.getInputStream(), sock.getOutputStream()); + + tc = new TransportConnection(sock.getInputStream(), sock.getOutputStream(), rnd); + + km = new KexManager(this, csh, cwl, hostname, port, verifier, rnd); + km.initiateKEX(cwl, dhgex); + + receiveThread = new Thread(new Runnable() + { + public void run() + { + try + { + receiveLoop(); + } + catch (IOException e) + { + close(e, false); + + if (log.isEnabled()) + log.log(10, "Receive thread: error in receiveLoop: " + e.getMessage()); + } + + if (log.isEnabled()) + log.log(50, "Receive thread: back from receiveLoop"); + + /* Tell all handlers that it is time to say goodbye */ + + if (km != null) + { + try + { + km.handleMessage(null, 0); + } + catch (IOException e) + { + } + } + + for (int i = 0; i < messageHandlers.size(); i++) + { + HandlerEntry he = messageHandlers.elementAt(i); + try + { + he.mh.handleMessage(null, 0); + } + catch (Exception ignore) + { + } + } + } + }); + + receiveThread.setDaemon(true); + receiveThread.start(); + } + + public void registerMessageHandler(MessageHandler mh, int low, int high) + { + HandlerEntry he = new HandlerEntry(); + he.mh = mh; + he.low = low; + he.high = high; + + synchronized (messageHandlers) + { + messageHandlers.addElement(he); + } + } + + public void removeMessageHandler(MessageHandler mh, int low, int high) + { + synchronized (messageHandlers) + { + for (int i = 0; i < messageHandlers.size(); i++) + { + HandlerEntry he = messageHandlers.elementAt(i); + if ((he.mh == mh) && (he.low == low) && (he.high == high)) + { + messageHandlers.removeElementAt(i); + break; + } + } + } + } + + public void sendKexMessage(byte[] msg) throws IOException + { + synchronized (connectionSemaphore) + { + if (connectionClosed) + { + throw new IOException("Sorry, this connection is closed.", reasonClosedCause); + } + + flagKexOngoing = true; + + try + { + tc.sendMessage(msg); + } + catch (IOException e) + { + close(e, false); + throw e; + } + } + } + + public void kexFinished() { + synchronized (connectionSemaphore) + { + flagKexOngoing = false; + connectionSemaphore.notifyAll(); + } + } + + public void forceKeyExchange(CryptoWishList cwl, DHGexParameters dhgex) throws IOException + { + km.initiateKEX(cwl, dhgex); + } + + public void changeRecvCipher(BlockCipher bc, MAC mac) + { + tc.changeRecvCipher(bc, mac); + } + + public void changeSendCipher(BlockCipher bc, MAC mac) + { + tc.changeSendCipher(bc, mac); + } + + /** + * @param comp + */ + public void changeRecvCompression(ICompressor comp) { + tc.changeRecvCompression(comp); + } + + /** + * @param comp + */ + public void changeSendCompression(ICompressor comp) { + tc.changeSendCompression(comp); + } + + /** + * + */ + public void startCompression() { + tc.startCompression(); + } + + public void sendAsynchronousMessage(byte[] msg) throws IOException + { + synchronized (asynchronousQueue) + { + asynchronousQueue.addElement(msg); + + /* This limit should be flexible enough. We need this, otherwise the peer + * can flood us with global requests (and other stuff where we have to reply + * with an asynchronous message) and (if the server just sends data and does not + * read what we send) this will probably put us in a low memory situation + * (our send queue would grow and grow and...) */ + + if (asynchronousQueue.size() > 100) + throw new IOException("Error: the peer is not consuming our asynchronous replies."); + + /* Check if we have an asynchronous sending thread */ + + if (asynchronousThread == null) + { + asynchronousThread = new AsynchronousWorker(); + asynchronousThread.setDaemon(true); + asynchronousThread.start(); + + /* The thread will stop after 2 seconds of inactivity (i.e., empty queue) */ + } + } + } + + public void setConnectionMonitors(Vector monitors) + { + synchronized (this) + { + connectionMonitors = (Vector) monitors.clone(); + } + } + + public void sendMessage(byte[] msg) throws IOException + { + if (Thread.currentThread() == receiveThread) + throw new IOException("Assertion error: sendMessage may never be invoked by the receiver thread!"); + + synchronized (connectionSemaphore) + { + while (true) + { + if (connectionClosed) + { + throw new IOException("Sorry, this connection is closed.", reasonClosedCause); + } + + if (!flagKexOngoing) + break; + + try + { + connectionSemaphore.wait(); + } + catch (InterruptedException e) + { + } + } + + try + { + tc.sendMessage(msg); + } + catch (IOException e) + { + close(e, false); + throw e; + } + } + } + + public void receiveLoop() throws IOException + { + byte[] msg = new byte[35004]; + + while (true) + { + int msglen = tc.receiveMessage(msg, 0, msg.length); + + int type = msg[0] & 0xff; + + if (type == Packets.SSH_MSG_IGNORE) + continue; + + if (type == Packets.SSH_MSG_DEBUG) + { + if (log.isEnabled()) + { + TypesReader tr = new TypesReader(msg, 0, msglen); + tr.readByte(); + tr.readBoolean(); + StringBuffer debugMessageBuffer = new StringBuffer(); + debugMessageBuffer.append(tr.readString("UTF-8")); + + for (int i = 0; i < debugMessageBuffer.length(); i++) + { + char c = debugMessageBuffer.charAt(i); + + if ((c >= 32) && (c <= 126)) + continue; + debugMessageBuffer.setCharAt(i, '\uFFFD'); + } + + log.log(50, "DEBUG Message from remote: '" + debugMessageBuffer.toString() + "'"); + } + continue; + } + + if (type == Packets.SSH_MSG_UNIMPLEMENTED) + { + throw new IOException("Peer sent UNIMPLEMENTED message, that should not happen."); + } + + if (type == Packets.SSH_MSG_DISCONNECT) + { + TypesReader tr = new TypesReader(msg, 0, msglen); + tr.readByte(); + int reason_code = tr.readUINT32(); + StringBuffer reasonBuffer = new StringBuffer(); + reasonBuffer.append(tr.readString("UTF-8")); + + /* + * Do not get fooled by servers that send abnormal long error + * messages + */ + + if (reasonBuffer.length() > 255) + { + reasonBuffer.setLength(255); + reasonBuffer.setCharAt(254, '.'); + reasonBuffer.setCharAt(253, '.'); + reasonBuffer.setCharAt(252, '.'); + } + + /* + * Also, check that the server did not send charcaters that may + * screw up the receiver -> restrict to reasonable US-ASCII + * subset -> "printable characters" (ASCII 32 - 126). Replace + * all others with 0xFFFD (UNICODE replacement character). + */ + + for (int i = 0; i < reasonBuffer.length(); i++) + { + char c = reasonBuffer.charAt(i); + + if ((c >= 32) && (c <= 126)) + continue; + reasonBuffer.setCharAt(i, '\uFFFD'); + } + + throw new IOException("Peer sent DISCONNECT message (reason code " + reason_code + "): " + + reasonBuffer.toString()); + } + + /* + * Is it a KEX Packet? + */ + + if ((type == Packets.SSH_MSG_KEXINIT) || (type == Packets.SSH_MSG_NEWKEYS) + || ((type >= 30) && (type <= 49))) + { + km.handleMessage(msg, msglen); + continue; + } + + if (type == Packets.SSH_MSG_USERAUTH_SUCCESS) { + tc.startCompression(); + } + + if (type == Packets.SSH_MSG_EXT_INFO) { + // Update most-recently seen ext info (server can send this multiple times) + extensionInfo = ExtensionInfo.fromPacketExtInfo( + new PacketExtInfo(msg, 0, msglen)); + continue; + } + + MessageHandler mh = null; + + for (int i = 0; i < messageHandlers.size(); i++) + { + HandlerEntry he = messageHandlers.elementAt(i); + if ((he.low <= type) && (type <= he.high)) + { + mh = he.mh; + break; + } + } + + if (mh == null) + throw new IOException("Unexpected SSH message (type " + type + ")"); + + mh.handleMessage(msg, msglen); + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/util/TimeoutService.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/util/TimeoutService.java new file mode 100644 index 0000000000..27bc8433c9 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/util/TimeoutService.java @@ -0,0 +1,149 @@ + +package com.trilead.ssh2.util; + +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.Collections; +import java.util.LinkedList; + +import com.trilead.ssh2.log.Logger; + + +/** + * TimeoutService (beta). Here you can register a timeout. + *

+ * Implemented having large scale programs in mind: if you open many concurrent SSH connections + * that rely on timeouts, then there will be only one timeout thread. Once all timeouts + * have expired/are cancelled, the thread will (sooner or later) exit. + * Only after new timeouts arrive a new thread (singleton) will be instantiated. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: TimeoutService.java,v 1.1 2007/10/15 12:49:57 cplattne Exp $ + */ +public class TimeoutService +{ + private static final Logger log = Logger.getLogger(TimeoutService.class); + + public static class TimeoutToken implements Comparable + { + private long runTime; + private Runnable handler; + + private TimeoutToken(long runTime, Runnable handler) + { + this.runTime = runTime; + this.handler = handler; + } + + public int compareTo(Object o) + { + TimeoutToken t = (TimeoutToken) o; + if (runTime > t.runTime) + return 1; + if (runTime == t.runTime) + return 0; + return -1; + } + } + + private static class TimeoutThread extends Thread + { + public void run() + { + synchronized (todolist) + { + while (true) + { + if (todolist.size() == 0) + { + timeoutThread = null; + return; + } + + long now = System.currentTimeMillis(); + + TimeoutToken tt = (TimeoutToken) todolist.getFirst(); + + if (tt.runTime > now) + { + /* Not ready yet, sleep a little bit */ + + try + { + todolist.wait(tt.runTime - now); + } + catch (InterruptedException e) + { + } + + /* We cannot simply go on, since it could be that the token + * was removed (cancelled) or another one has been inserted in + * the meantime. + */ + + continue; + } + + todolist.removeFirst(); + + try + { + tt.handler.run(); + } + catch (Exception e) + { + StringWriter sw = new StringWriter(); + e.printStackTrace(new PrintWriter(sw)); + log.log(20, "Exeception in Timeout handler:" + e.getMessage() + "(" + sw.toString() + ")"); + } + } + } + } + } + + /* The list object is also used for locking purposes */ + private static final LinkedList todolist = new LinkedList(); + + private static Thread timeoutThread = null; + + /** + * It is assumed that the passed handler will not execute for a long time. + * + * @param runTime + * @param handler + * @return a TimeoutToken that can be used to cancel the timeout. + */ + public static final TimeoutToken addTimeoutHandler(long runTime, Runnable handler) + { + TimeoutToken token = new TimeoutToken(runTime, handler); + + synchronized (todolist) + { + todolist.add(token); + Collections.sort(todolist); + + if (timeoutThread != null) + timeoutThread.interrupt(); + else + { + timeoutThread = new TimeoutThread(); + timeoutThread.setDaemon(true); + timeoutThread.start(); + } + } + + return token; + } + + public static final void cancelTimeoutHandler(TimeoutToken token) + { + synchronized (todolist) + { + todolist.remove(token); + + if (timeoutThread != null) + timeoutThread.interrupt(); + } + } + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/util/Tokenizer.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/util/Tokenizer.java new file mode 100644 index 0000000000..753477d1c5 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/trilead/ssh2/util/Tokenizer.java @@ -0,0 +1,49 @@ + +package com.trilead.ssh2.util; + +/** + * Tokenizer. Why? Because StringTokenizer is not available in J2ME. + * + * @author Christian Plattner, plattner@trilead.com + * @version $Id: Tokenizer.java,v 1.1 2007/10/15 12:49:57 cplattne Exp $ + */ +public class Tokenizer +{ + /** + * Exists because StringTokenizer is not available in J2ME. + * Returns an array with at least 1 entry. + * + * @param source must be non-null + * @param delimiter + * @return an array of Strings + */ + public static String[] parseTokens(String source, char delimiter) + { + if (source.length() == 0) + return new String[0]; + + int numtoken = 1; + + for (int i = 0; i < source.length(); i++) { + if (source.charAt(i) == delimiter) + numtoken++; + } + + String[] list = new String[numtoken]; + int nextfield = 0; + + for (int i = 0; i < numtoken; i++) { + if (nextfield >= source.length()) { + list[i] = ""; + } else { + int idx = source.indexOf(delimiter, nextfield); + if (idx == -1) + idx = source.length(); + list[i] = source.substring(nextfield, idx); + nextfield = idx + 1; + } + } + + return list; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/bean/TrajectoryInfoRes.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/bean/TrajectoryInfoRes.kt new file mode 100644 index 0000000000..b0a0e84f00 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/bean/TrajectoryInfoRes.kt @@ -0,0 +1,57 @@ +package com.zhjt.mogo_core_function_devatools.rviz.bean + +/*{ + "code":0, + "message":"success", + "msg":"success", + "result":{ + "trackContrail":{ + "csvFileUrl":"xxxxx.csv", + "csvFileMd5":"1018c022535df18448ab740af0b9c9a0", + "txtFileUrl":"xxxx.txt", + "txtFileMd5":"aea78906597cf97a0d61bc9918778c17", + "contrailSaveTime":1656468916000 +}, + "dbqpContrail":{ + "csvFileUrl":"xxxx.csv", + "csvFileMd5":"1018c022535df18448ab740af0b9c9a0", + "txtFileUrl":"xxxx.txt", + "txtFileMd5":"aea78906597cf97a0d61bc9918778c17", + "contrailSaveTime":1656468916000 +} +} +}*/ +data class TrajectoryInfoRes( + val code: Int, + val message: String, + val msg: String, + val result: TrajectoryInfo +) + +data class TrajectoryInfo( + val dbqpContrail: DbqpContrail, + val trackContrail: TrackContrail +) + +data class TrackContrail( + val contrailSaveTime: Long, + val csvFileMd5: String, + val csvFileUrl: String, + val txtFileMd5: String, + val txtFileUrl: String +) + +data class DbqpContrail( + val contrailSaveTime: Long, + val csvFileMd5: String, + val csvFileUrl: String, + val txtFileMd5: String, + val txtFileUrl: String +) + + +data class TrajectoryInfoReq( + val brand: String, + val carModel: String, + val lineId: Int +) \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/bean/TrajectoryLisRes.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/bean/TrajectoryLisRes.kt new file mode 100644 index 0000000000..e42955f3b5 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/bean/TrajectoryLisRes.kt @@ -0,0 +1,35 @@ +package com.zhjt.mogo_core_function_devatools.rviz.bean + +/*{ + "code":0, + "message":"success", + "msg":"success", + "result":[ + { + "lineId":89, + "lineName":"顺义Bus10KM路线" + }, + { + "lineId":90, + "lineName":"Bus鹰眼_13号路口起到终" + } + ] +}*/ +data class TrajectoryLisRes( + val code: Int, + val message: String, + val msg: String, + val result: List +) + +data class TrajectoryListInfo( + val lineId: Int, + val lineName: String +) + +class TrajectoryLisReq { + var name: String = "" + var page: Int = 0 + var pageSize: Int = 100 + var cityCode: String = "" +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/bean/TrajectorySiteLRes.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/bean/TrajectorySiteLRes.kt new file mode 100644 index 0000000000..a41d63c48d --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/bean/TrajectorySiteLRes.kt @@ -0,0 +1,46 @@ +package com.zhjt.mogo_core_function_devatools.rviz.bean + +/*{ + "code":0, + "message":"success", + "msg":"success", + "result":[ + { + "siteId":47, + "seq":1, + "name":"石家庄市", + "description":"", + "lon":114.25118147313091, + "lat":38.123641911994746, + "wgs84Lon":115.0050379087139, + "wgs84Lat":38.12405426963943 + }, + { + "siteId":48, + "seq":2, + "name":"市政府", + "description":"市政府", + "wgs84Lon":115.0050379087139, + "wgs84Lat":38.12405426963943, + "lat":38.12405426963943 + "lat":38.12405426963943 + } + ] +}*/ +data class TrajectorySiteLRes( + val code: Int, + val message: String, + val msg: String, + val result: List +) + +data class TrajectorySiteInfo( + val description: String, + val lat: Double, + val lon: Double, + val wgs84Lat: Double, + val wgs84Lon: Double, + val name: String, + val seq: Int, + val siteId: Int +) \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/bean/VehicleConfigData.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/bean/VehicleConfigData.kt new file mode 100644 index 0000000000..bad45a37a4 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/bean/VehicleConfigData.kt @@ -0,0 +1,101 @@ +package com.zhjt.mogo_core_function_devatools.rviz.bean + +/** + * 车辆配置数据 + */ +object VehicleConfigData { + // plate:JL-金旅小巴、HQ-红旗、DF-东风,车牌号信息 + var plate = "" + + // brand:HQ-红旗 DF-东风 JINLV-金旅 FT-清扫车 KW-开沃 + var brand = "" + + // 车辆子类型:M1、M2 + var subtype = "" + + // 102 镜像版本名称 + var dockerName = "未知" + + // 当前机器上配置的所有 Docker 信息 + var dockerList: Map? = null + + // MAP 加载地图版本 + var dockerMapHDVersionName = "未知" + + // StartupConfigCache.json 文件不存在时候,使用命令获取文件MD5 + var scaliBratedSensorMD5 = "" + + /** + * 获取车辆平台类型 + * -1--未定义或者没获取到车辆类型,调用者需要处理异常,并提示用户重新尝试 + * 0--taxi, + * 1--bus, + * 2--sweeper + */ + fun getCarType(): VehicleType { + // brand:HQ-红旗 DF-东风 JINLV-金旅 FT-清扫车 KW-开沃 + // 处理Taxi + return if ( + brand.startsWith("DF") + or brand.startsWith("HQ") + ) { + VehicleType.TAXI + } + // 处理BUS:B1、M1、M2、KW + else if ( + brand.startsWith("JINLV") + or brand.startsWith("KW") + ) { + VehicleType.BUS + } + // 清扫车:FT、 + else if (brand.startsWith("FT")) { + VehicleType.SWEEPER + } + // 默认使用 + else { + VehicleType.TAXI + } + } + + /** + * 获取车辆品牌 + */ + fun getCarBrand(): String { + return if (brand.startsWith("DF")) { + "东风" + } else if (brand.startsWith("HQ")) { + "红旗" + } else if (brand.startsWith("JINLV") || brand.startsWith("JV") || brand.startsWith("JL")) { + "金旅" + } else if (brand.startsWith("KW")) { + "开沃" + } else if (brand.startsWith("FT")) { + "福田" + } else { + "金旅" + } + } + + /** + * 获取车辆品牌--类型 + */ + fun getCarModel(): String { + return if (plate.startsWith("DF")) { + "E70" + } else if (plate.startsWith("HQ")) { + "H9" + } else if (plate.startsWith("JV") || plate.startsWith("JL")) { + "金旅牌XML6606JEVY0" + } else if (plate.startsWith("KW")) { + "NJL6450ICEV" + } else if (plate.startsWith("FT")) { + "清扫车" + } else if (plate.startsWith("SW")) { + "清扫车" + } else { + "金旅牌XML6606JEVY0" + } + } + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/bean/VehicleType.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/bean/VehicleType.java new file mode 100644 index 0000000000..604e1c8e40 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/bean/VehicleType.java @@ -0,0 +1,13 @@ +package com.zhjt.mogo_core_function_devatools.rviz.bean; + +/** + * 车辆类型 + */ +public enum VehicleType { + // 出租车 + TAXI, + // 公交车 + BUS, + // 清扫车 + SWEEPER, +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/base/BaseActivity.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/base/BaseActivity.java new file mode 100644 index 0000000000..7efb752be3 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/base/BaseActivity.java @@ -0,0 +1,285 @@ +package com.zhjt.mogo_core_function_devatools.rviz.common.base; + +import android.Manifest; +import android.content.DialogInterface; +import android.content.Intent; +import android.net.Uri; +import android.os.Build; +import android.os.Bundle; +import android.os.Handler; +import android.os.Message; +import android.provider.Settings; +import android.widget.Toast; + +import androidx.activity.result.ActivityResult; +import androidx.activity.result.ActivityResultCallback; +import androidx.activity.result.ActivityResultLauncher; +import androidx.activity.result.contract.ActivityResultContracts; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; + +import com.mogo.eagle.core.utilcode.util.ThreadUtils; +import com.zhjt.mogo_core_function_devatools.rviz.common.utils.PermissionUtil; +import com.zhjt.mogo_core_function_devatools.rviz.common.utils.ToastUtil; +import com.zhjt.mogo_core_function_devatools.rviz.dialog.CommonLoadingDialog; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.Set; + +public abstract class BaseActivity extends AppCompatActivity { + private CommonLoadingDialog mLoadingDialog; + private BaseHandler mBaseHandler; + private boolean isFront = false; + private ActivityResultLauncher intentActivityResultLauncher; + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + initRegisterForActivityResult(); + checkSavePermission(); + canDrawOverlays(); + } + + private void initRegisterForActivityResult() { + intentActivityResultLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), new ActivityResultCallback() { + @Override + public void onActivityResult(ActivityResult result) { + checkSavePermission(); +// Intent data = result.getData(); +// int resultCode = result.getResultCode(); + //RESULT_OK +// Log.i("dddd", "resultCode=" + resultCode); + } + }); + } + + + // 跳转到当前应用的设置界面 + private void goToAppSetting() { + Uri uri = Uri.fromParts("package", getPackageName(), null); + Intent intent = new Intent(); + intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS); + intent.setData(uri); + intentActivityResultLauncher.launch(intent); + } + + @Override + public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); + PermissionUtil.onRequestPermissionsResult(this, permissions, grantResults, permissionsListener, false); + } + + //权限申请回调 + private final PermissionUtil.OnPermissionsListener permissionsListener = new PermissionUtil.OnPermissionsListener() { + @Override + public void onPermissionsOwned() { + + } + + @Override + public void onPermissionsForbidden(String[] permissions, int[] grantResults, ArrayList pmList) { + Set nameSet = PermissionUtil.getPermissionsNameByChinese(pmList.toArray(new String[0])); + if (nameSet != null && nameSet.size() > 0) { + AlertDialog dialog = new AlertDialog.Builder(BaseActivity.this).setTitle("警告").setMessage("请前往设置中手动授予" + nameSet.toString() + "权限,否则功能无法正常运行!").setNegativeButton("返回", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + finish(); + } + }).setPositiveButton("去设置", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + goToAppSetting(); + } + }).create(); + dialog.setCancelable(false); + dialog.setCanceledOnTouchOutside(false); + dialog.show(); + } + } + + @Override + public void onPermissionsDenied(String[] permissions, int[] grantResults, ArrayList pmList) { + Set nameSet = PermissionUtil.getPermissionsNameByChinese(pmList.toArray(new String[0])); + if (nameSet != null && nameSet.size() > 0) { + //重新请求权限 + AlertDialog dialog = new AlertDialog.Builder(BaseActivity.this).setTitle("提示").setMessage(nameSet.toString() + "权限为应用必要权限,请授权").setPositiveButton("确定", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + String[] sList = pmList.toArray(new String[0]); + //重新申请权限,通过权限名的方式申请多组权限 + PermissionUtil.requestByPermissionName(BaseActivity.this, sList, 10000, permissionsListener); + } + }).create(); + dialog.setCancelable(false); + dialog.setCanceledOnTouchOutside(false); + dialog.show(); + } + } + + @Override + public void onPermissionsSucceed() { + } + }; + + /** + * 权限检查 + */ + private void checkSavePermission() { + //权限申请 + String[] pgList = new String[]{Manifest.permission_group.STORAGE}; + PermissionUtil.requestByGroupName(this, pgList, 10000, permissionsListener); + } + + + /** + * 跳转浮层权限获取页面 + */ + private void canDrawOverlays() { + if (!Settings.canDrawOverlays(this)) { + showToastCenter("当前无悬浮窗权限,请授权"); + startActivity(new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, Uri.parse("package:" + getPackageName()))); + } + } + + protected void showToastCenter(String msg) { + showToastCenter(msg, Toast.LENGTH_SHORT); + } + + protected void showToastCenter(String msg, int duration) { + runOnUiThread(new Runnable() { + @Override + public void run() { + ToastUtil.showToastCenter(BaseActivity.this, msg, duration); + } + }); + } + + /** + * 显示加载对话框 + */ + protected void showLoadingDialog() { + showLoadingDialog(null); + } + + protected void showLoadingDialog(String msg) { + ThreadUtils.runOnUiThread(new Runnable() { + @Override + public void run() { + if (isFront) { + if (mLoadingDialog == null) { + mLoadingDialog = new CommonLoadingDialog(android.R.color.black, msg); + } + if (!mLoadingDialog.isAdded()) { + mLoadingDialog.setCancelable(false); + mLoadingDialog.show(getSupportFragmentManager(), "LoadingDialog"); + } else { + mLoadingDialog.setMsg(msg); + } + } + } + }); + } + + /** + * 关闭加载对话框 + */ + public void dismissLoadingDialog() { + ThreadUtils.runOnUiThread(new Runnable() { + @Override + public void run() { + if (mLoadingDialog != null) { + if (mLoadingDialog.isAdded()) { + mLoadingDialog.dismissAllowingStateLoss(); + } + mLoadingDialog = null; //将 LoadingDialog 设置为空,释放强引用 + } + } + }); + } + + @Override + protected void onResume() { + super.onResume(); + isFront = true; + } + + @Override + protected void onPause() { + super.onPause(); + isFront = false; + } + + @Override + protected void onDestroy() { + super.onDestroy(); + ToastUtil.destroyToast(); + dismissLoadingDialog(); + if (getHandler() != null) getHandler().removeCallbacksAndMessages(null); + } + + /** + * 初始化一个Handler,如果需要使用Handler,先调用此方法, + * 然后可以使用postRunnable(Runnable runnable), + * sendMessage在handleMessage(Message msg)中接收msg + */ + public void initHandler() { + mBaseHandler = new BaseHandler(this); + } + + /** + * 返回Handler,在此之前确定已经调用initHandler() + * + * @return Handler + */ + public Handler getHandler() { + return mBaseHandler; + } + + + /** + * 同Handler 的 handleMessage, + * getHandler.sendMessage,发送的Message在此接收 + * 在此之前确定已经调用initHandler() + * + * @param msg + */ + protected void handleMessage(Message msg) { + + } + + /** + * 同Handler的postRunnable + * 在此之前确定已经调用initHandler() + */ + protected void postRunnable(Runnable runnable) { + postRunnableDelayed(runnable, 0); + } + + /** + * 同Handler的postRunnableDelayed + * 在此之前确定已经调用initHandler() + */ + protected void postRunnableDelayed(Runnable runnable, long delayMillis) { + if (mBaseHandler == null) initHandler(); + mBaseHandler.postDelayed(runnable, delayMillis); + } + + + protected static class BaseHandler extends Handler { + private final WeakReference mObjects; + + public BaseHandler(BaseActivity mPresenter) { + mObjects = new WeakReference(mPresenter); + } + + @Override + public void handleMessage(Message msg) { + BaseActivity mPresenter = mObjects.get(); + if (mPresenter != null) mPresenter.handleMessage(msg); + } + } + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/base/BaseAdapter.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/base/BaseAdapter.java new file mode 100644 index 0000000000..d2e46e8aed --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/base/BaseAdapter.java @@ -0,0 +1,115 @@ +package com.zhjt.mogo_core_function_devatools.rviz.common.base; + + +import android.content.Context; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import java.util.List; + + +/** + * RecycleView Adapter + * Created by renfeicui on 2018/10/12. + */ +public abstract class BaseAdapter extends RecyclerView.Adapter { + protected String TAG = this.getClass().getSimpleName(); + protected List mDatas; + protected Context mContext; + private OnItemClickListener mItemClick; + + public interface OnItemClickListener { + void onItemClick(int position, D data); + } + + + public BaseAdapter() { + } + + public BaseAdapter(List mDatas) { + this.mDatas = mDatas; + } + + public BaseAdapter(OnItemClickListener listener) { + mItemClick = listener; + } + + public BaseAdapter(List mDatas, OnItemClickListener listener) { + this.mDatas = mDatas; + mItemClick = listener; + } + + public void setData(List mDatas) { + this.mDatas = mDatas; + if (mDatas != null && !mDatas.isEmpty()) + notifyDataSetChanged(); + } + + public List getData() { + return mDatas; + } + + public void setOnItemClickListener(OnItemClickListener listener) { + mItemClick = listener; + } + + /*** + * 获取制定 位置的Data + * @param position 下标 + * @return Data + */ + public D getItem(int position) { + return mDatas == null ? null : mDatas.get(position); + } + + @Override + public int getItemCount() { + return mDatas == null ? 0 : mDatas.size(); + } + + @Override + public void onBindViewHolder(@NonNull VH viewHolder, int position) { + D bean = getItem(position); + onBindDataToItem(viewHolder, bean, position); + } + + + @NonNull + @Override + public VH onCreateViewHolder(@NonNull ViewGroup viewGroup, int viewType) { + mContext = viewGroup.getContext(); + return getViewHolder(getItemViewResource(viewGroup)); + } + + /*** + * 同onBindViewHolder() + * @param viewHolder viewHolder + * @param data 数据 + * @param position 下标 + */ + protected abstract void onBindDataToItem(VH viewHolder, D data, int position); + + /*** + * 获取Item布局 + * @return id + */ + protected abstract View getItemViewResource(ViewGroup viewGroup); + + /** + * 获取ViewHolder + * + * @param view + * @return + */ + protected abstract VH getViewHolder(View view); + + public void onClick(BaseViewHolder viewHolder) { + if (mItemClick != null) { + mItemClick.onItemClick(viewHolder.getAdapterPosition(), getItem(viewHolder.getAdapterPosition())); + } + } + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/base/BaseDialog.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/base/BaseDialog.java new file mode 100644 index 0000000000..d76ec14ea3 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/base/BaseDialog.java @@ -0,0 +1,172 @@ +package com.zhjt.mogo_core_function_devatools.rviz.common.base; + +import android.app.Dialog; +import android.content.Context; +import android.content.DialogInterface; +import android.os.Bundle; +import android.os.Handler; +import android.os.Message; +import android.view.View; + +import java.lang.ref.WeakReference; + + +/** + * Created by xfk on 2016/11/2. + */ +public abstract class BaseDialog extends Dialog { + protected final String TAG = this.getClass().getSimpleName(); + protected View rootView; + private BaseHandler mBaseHandler; + + public BaseDialog(Context context) { +// super(context, R.style.CustomDialog); + super(context); + } + + public BaseDialog(Context context, int style) { + super(context, style); + } + + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + onViewCreateBefore(); + onSetContentView(); + onViewInitBefore(); + onViewInit(); + onViewCreated(); + setOnListener(); + setOnDismissListener(new OnDismissListener() { + @Override + public void onDismiss(DialogInterface dialog) { + BaseDialog.this.onDismiss(); + } + }); + } + + + /** + * called by {@link # onCreate} + * 在 setContentView 方法前调用 + */ + protected void onViewCreateBefore() { + } + + + /** + * 初始化ContentView后调用,View初始化之前,setContentView之后 + */ + protected void onViewInitBefore() { + + } + + /** + * 初始化ContentView后调用,可以进行findViewById等操作onViewInit + */ + protected void onViewInit() { + } + + /** + * called by {@link # onCreate} + * 在 setContentView 方法后调用 + */ + protected void onViewCreated() { + } + + + /** + * setContentView + */ + protected void onSetContentView() { + rootView = getContentViewResource(); + setContentView(rootView); + } + + + /** + * called by {@link # onCreate} + * 进行设置监听 + */ + protected void setOnListener() { + } + + /** + * 得到 ContentView 的 Resource + * + * @return eg R.layout.main_layout + */ + protected abstract View getContentViewResource(); + + + protected void onDismiss() { + if (getHandler() != null) { + getHandler().removeCallbacksAndMessages(null); + } + } + + + /** + * 初始化一个Handler,如果需要使用Handler,先调用此方法, + * 然后可以使用postRunnable(Runnable runnable), + * sendMessage在handleMessage(Message msg)中接收msg + */ + public void initHandler() { + mBaseHandler = new BaseHandler(this); + } + + /** + * 返回Handler,在此之前确定已经调用initHandler() + * + * @return Handler + */ + public Handler getHandler() { + return mBaseHandler; + } + + /** + * 同Handler的postRunnable + * 在此之前确定已经调用initHandler() + */ + protected void postRunnable(Runnable runnable) { + postRunnableDelayed(runnable, 0); + } + + /** + * 同Handler的postRunnableDelayed + * 在此之前确定已经调用initHandler() + */ + protected void postRunnableDelayed(Runnable runnable, long delayMillis) { + if (mBaseHandler == null) initHandler(); + mBaseHandler.postDelayed(runnable, delayMillis); + } + + + /** + * 同Handler 的 handleMessage, + * getHandler.sendMessage,发送的Message在此接收 + * 在此之前确定已经调用initHandler() + * + * @param msg + */ + protected void handleMessage(Message msg) { + } + + + protected static class BaseHandler extends Handler { + private final WeakReference mObjects; + + public BaseHandler(BaseDialog mPresenter) { + mObjects = new WeakReference(mPresenter); + } + + @Override + public void handleMessage(Message msg) { + BaseDialog mPresenter = mObjects.get(); + if (mPresenter != null) mPresenter.handleMessage(msg); + } + } + + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/base/BaseFragment.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/base/BaseFragment.java new file mode 100644 index 0000000000..496358535a --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/base/BaseFragment.java @@ -0,0 +1,102 @@ +package com.zhjt.mogo_core_function_devatools.rviz.common.base; + +import android.os.Bundle; +import android.os.Handler; +import android.os.Message; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + +import java.lang.ref.WeakReference; + + +/** + * @author song kenan + * @des + * @date 2021/8/16 + */ +public abstract class BaseFragment extends Fragment { + protected final String TAG = this.getClass().getSimpleName(); + private BaseHandler mBaseHandler; + protected View view; + + @Override + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + view = getContentViewResource(inflater, container); + return view; + } + + /** + * 得到 ContentView 的 Resource + * + * @return eg R.layout.main_layout + */ + public abstract View getContentViewResource(@NonNull LayoutInflater inflater, @Nullable ViewGroup container); + + /** + * 初始化一个Handler,如果需要使用Handler,先调用此方法, + * 然后可以使用postRunnable(Runnable runnable), + * sendMessage在handleMessage(Message msg)中接收msg + */ + public void initHandler() { + mBaseHandler = new BaseHandler(this); + } + + /** + * 返回Handler,在此之前确定已经调用initHandler() + * + * @return Handler + */ + public Handler getHandler() { + return mBaseHandler; + } + + + /** + * 同Handler 的 handleMessage, + * getHandler.sendMessage,发送的Message在此接收 + * 在此之前确定已经调用initHandler() + * + * @param msg + */ + protected void handleMessage(Message msg) { + + } + + /** + * 同Handler的postRunnable + * 在此之前确定已经调用initHandler() + */ + protected void postRunnable(Runnable runnable) { + postRunnableDelayed(runnable, 0); + } + + /** + * 同Handler的postRunnableDelayed + * 在此之前确定已经调用initHandler() + */ + protected void postRunnableDelayed(Runnable runnable, long delayMillis) { + if (mBaseHandler == null) initHandler(); + mBaseHandler.postDelayed(runnable, delayMillis); + } + + + protected static class BaseHandler extends Handler { + private final WeakReference mObjects; + + public BaseHandler(BaseFragment mPresenter) { + mObjects = new WeakReference(mPresenter); + } + + @Override + public void handleMessage(Message msg) { + BaseFragment mPresenter = mObjects.get(); + if (mPresenter != null) + mPresenter.handleMessage(msg); + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/base/BaseViewHolder.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/base/BaseViewHolder.java new file mode 100644 index 0000000000..ee4248ff5b --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/base/BaseViewHolder.java @@ -0,0 +1,26 @@ +package com.zhjt.mogo_core_function_devatools.rviz.common.base; + +import android.view.View; + +import androidx.recyclerview.widget.RecyclerView; + + +public abstract class BaseViewHolder extends RecyclerView.ViewHolder { + private T adapter; + public View itemView; + + public BaseViewHolder(View itemView, final T adapter) { + super(itemView); + this.itemView = itemView; + this.adapter = adapter; + itemView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + adapter.onClick(BaseViewHolder.this); + } + }); + + } + + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/config/SSHAccountConfig.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/config/SSHAccountConfig.kt new file mode 100644 index 0000000000..2e2da935ba --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/config/SSHAccountConfig.kt @@ -0,0 +1,89 @@ +package com.zhjt.mogo_core_function_devatools.rviz.common.config + +import com.zhidao.support.adas.high.common.MMKVUtils +import com.zhjt.mogo_core_function_devatools.rviz.common.utils.AESUtil + +/** + * @author XuXinChao + * @description 持久化保存账号用户名、密码 + * @since: 2022/8/26 + */ +object SSHAccountConfig { + + private const val USER_NAME = "ros_user_name" + private const val PASSWORD = "ros_password" + + private var ssh_ip = "4JbUOUFpOo2eKdhLmFnfog==" + private var ssh_user_name = "DmIfr6unQRyOkNg7//DWgQ==" + private var ssh_password = "bXSUgtmB0mZd2mj6gaT71g==" + + + private val mmkvUtils = MMKVUtils.getInstance() + + /** + * 获取用户名 + * @return 用户名 + */ + fun getUserName(): String { + return AESUtil.decryptAES( + mmkvUtils.getString( + USER_NAME, + ssh_user_name + ) + ) + } + + /** + * 设置用户名 + * @param userName 用户名 + */ + fun setUserName(userName: String) { + mmkvUtils.put(USER_NAME, AESUtil.encryptAES(userName)) + } + + fun removeUserName() { + MMKVUtils.getInstance().removeKey(USER_NAME) + } + + /** + * 获取用户密码 + * @return 用户密码 + */ + fun getPassWord(): String { + return AESUtil.decryptAES( + mmkvUtils.getString( + PASSWORD, + ssh_password + ) + ) + } + + /** + * 设置用户密码 + * @param password 用户密码 + */ + fun setPassWord(password: String) { + mmkvUtils.put(PASSWORD, AESUtil.encryptAES(password)) + } + + fun removePassWord() { + MMKVUtils.getInstance().removeKey(PASSWORD) + } + + /** + * 设置主控制器IP + * @param rosMasterIp 主控制器IP + */ + fun setRosMasterIp(rosMasterIp: String) { + ssh_ip = AESUtil.encryptAES(rosMasterIp) + } + + + /** + * 获取主控制器IP + * @return 主控制器IP + */ + fun getRosMasterIp(): String { + return AESUtil.decryptAES(ssh_ip) + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/coroutines/FlowBus.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/coroutines/FlowBus.kt new file mode 100644 index 0000000000..7f150b54a7 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/coroutines/FlowBus.kt @@ -0,0 +1,129 @@ +package com.zhjt.mogo_core_function_devatools.rviz.common.coroutines + +import android.util.Log +import androidx.lifecycle.* +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.cancel +import kotlinx.coroutines.channels.BufferOverflow +import kotlinx.coroutines.flow.MutableSharedFlow +import kotlinx.coroutines.flow.asSharedFlow +import kotlinx.coroutines.launch + +/** + * FlowBus消息总线 + */ +object FlowBus { + private const val TAG = "FlowBus" + private val busMap = mutableMapOf>() + private val busStickMap = mutableMapOf>() + + @Synchronized + fun with(key: String): EventBus { + var eventBus = busMap[key] + if (eventBus == null) { + eventBus = EventBus(key) + busMap[key] = eventBus + } + return eventBus as EventBus + } + + @Synchronized + fun withStick(key: String): StickEventBus { + var eventBus = busStickMap[key] + if (eventBus == null) { + eventBus = StickEventBus(key) + busStickMap[key] = eventBus + } + return eventBus as StickEventBus + } + + //真正实现类 + open class EventBus(private val key: String) : LifecycleObserver { + + //私有对象用于发送消息 + private val _events: MutableSharedFlow by lazy { + obtainEvent() + } + + //暴露的公有对象用于接收消息 + val events = _events.asSharedFlow() + + //LifecycleOwner和Observer对象集合 + private val mLifecycleOwnerMap = mutableMapOf() + private val mObserverMap = mutableMapOf>() + + open fun obtainEvent(): MutableSharedFlow = + MutableSharedFlow(0, 1, BufferOverflow.DROP_OLDEST) + + //主线程接收数据 + fun register(lifecycleOwner: LifecycleOwner, observer: Observer) { + Log.d(TAG, "key==$key lifecycleOwner - :$lifecycleOwner observer=$observer") + val tag = key+lifecycleOwner + mLifecycleOwnerMap[tag] = lifecycleOwner + mObserverMap[tag] = observer + mLifecycleOwnerMap[tag]!!.lifecycle.addObserver(this) + mLifecycleOwnerMap.forEach { + val key = it.key + it.value.lifecycleScope.launch { + events.collect{ event-> + try { + mObserverMap[key]?.onChanged(event) + }catch (e: Exception){ + e.printStackTrace() + Log.e(TAG, "FlowBus - Error:$e") + } + + } + } + } + } + + fun unRegister(lifecycleOwner: LifecycleOwner) { + lifecycleOwner.lifecycleScope.cancel() + } + + //协程中发送数据 + suspend fun post(event: T) { + _events.emit(event) + } + + //主线程发送数据 + fun post(scope: CoroutineScope, event: T) { + scope.launch { + _events.emit(event) + } + } + + //自动销毁 + @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY) + fun onDestroy() { + Log.w(TAG, "FlowBus - 自动onDestroy - key=$key") + // 移除监听 + val lifeIterator = mLifecycleOwnerMap.iterator() + while(lifeIterator.hasNext()){ + val entry = lifeIterator.next() + if(entry.key.contains(key)){ + entry.value.lifecycle.removeObserver(this) + entry.value.lifecycleScope.cancel() + lifeIterator.remove() + } + } + val observerIterator = mObserverMap.iterator() + while(observerIterator.hasNext()){ + val observer = observerIterator.next() + if(observer.key.contains(key)){ + observerIterator.remove() + } + } + val subscriptCount = _events.subscriptionCount.value + if (subscriptCount <= 0) + busMap.remove(key) + } + } + + class StickEventBus(key: String) : EventBus(key) { + override fun obtainEvent(): MutableSharedFlow = + MutableSharedFlow(replay = 1, extraBufferCapacity = 16, BufferOverflow.DROP_OLDEST) + } + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/db/BaseDao.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/db/BaseDao.java new file mode 100644 index 0000000000..6b70a20036 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/db/BaseDao.java @@ -0,0 +1,21 @@ +package com.zhjt.mogo_core_function_devatools.rviz.common.db; + +import androidx.room.Delete; +import androidx.room.Insert; +import androidx.room.OnConflictStrategy; +import androidx.room.Update; + +/** + * 数据库操作接口 + */ +public interface BaseDao { + + @Insert(onConflict = OnConflictStrategy.REPLACE) + long insert(T obj); + + @Update(onConflict = OnConflictStrategy.REPLACE) + void update(T obj); + + @Delete + int delete(T obj); +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/utils/AESUtil.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/utils/AESUtil.java new file mode 100644 index 0000000000..c1391d71f1 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/utils/AESUtil.java @@ -0,0 +1,53 @@ +package com.zhjt.mogo_core_function_devatools.rviz.common.utils; + +import android.util.Base64; + +import javax.crypto.Cipher; +import javax.crypto.spec.SecretKeySpec; + +public class AESUtil { + + // AES密钥,16字节、24字节或32字节 + private static final String AES_KEY = "1234567890123456"; + + /** + * 加密 + * @param data + * @return + */ + public static String encryptAES(String data) { + try { + Cipher cipher = Cipher.getInstance("AES"); + byte[] keyBytes = new byte[16]; + System.arraycopy(AES_KEY.getBytes(), 0, keyBytes, 0, Math.min(AES_KEY.getBytes().length, keyBytes.length)); + SecretKeySpec keySpec = new SecretKeySpec(keyBytes, "AES"); + cipher.init(Cipher.ENCRYPT_MODE, keySpec); + byte[] encryptedBytes = cipher.doFinal(data.getBytes()); + return Base64.encodeToString(encryptedBytes, Base64.DEFAULT); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + /** + * 解密 + * @param encryptedData + * @return + */ + public static String decryptAES(String encryptedData) { + try { + Cipher cipher = Cipher.getInstance("AES"); + byte[] keyBytes = new byte[16]; + System.arraycopy(AES_KEY.getBytes(), 0, keyBytes, 0, Math.min(AES_KEY.getBytes().length, keyBytes.length)); + SecretKeySpec keySpec = new SecretKeySpec(keyBytes, "AES"); + cipher.init(Cipher.DECRYPT_MODE, keySpec); + byte[] decryptedBytes = cipher.doFinal(Base64.decode(encryptedData, Base64.DEFAULT)); + return new String(decryptedBytes); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/utils/DetectHtml.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/utils/DetectHtml.java new file mode 100644 index 0000000000..dd878a3f46 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/utils/DetectHtml.java @@ -0,0 +1,41 @@ +package com.zhjt.mogo_core_function_devatools.rviz.common.utils; + +/** + * Detect HTML markup in a string + * This will detect tags or entities + * + * @author dbennett455@gmail.com - David H. Bennett + */ + +import java.util.regex.Pattern; + +public class DetectHtml { + // adapted from post by Phil Haack and modified to match better + public final static String tagStart = + "\\<\\w+((\\s+\\w+(\\s*\\=\\s*(?:\".*?\"|'.*?'|[^'\"\\>\\s]+))?)+\\s*|\\s*)\\>"; + public final static String tagEnd = + "\\"; + public final static String tagSelfClosing = + "\\<\\w+((\\s+\\w+(\\s*\\=\\s*(?:\".*?\"|'.*?'|[^'\"\\>\\s]+))?)+\\s*|\\s*)/\\>"; + public final static String htmlEntity = + "&[a-zA-Z][a-zA-Z0-9]+;"; + public final static Pattern htmlPattern = Pattern.compile( + "(" + tagStart + ".*" + tagEnd + ")|(" + tagSelfClosing + ")|(" + htmlEntity + ")", + Pattern.DOTALL + ); + + /** + * Will return true if s contains HTML markup tags or entities. + * + * @param s String to test + * @return true if string contains HTML + */ + public static boolean isHtml(String s) { + boolean ret = false; + if (s != null) { + ret = htmlPattern.matcher(s).find(); + } + return ret; + } + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/utils/LambdaTask.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/utils/LambdaTask.java new file mode 100644 index 0000000000..94852c0a06 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/utils/LambdaTask.java @@ -0,0 +1,27 @@ +package com.zhjt.mogo_core_function_devatools.rviz.common.utils; + +import android.os.AsyncTask; + + +/** + */ +public class LambdaTask extends AsyncTask { + + TaskRunnable taskRunnable; + + + public LambdaTask(TaskRunnable taskRunnable) { + this.taskRunnable = taskRunnable; + } + + + @Override + protected Void doInBackground(Void... voids) { + taskRunnable.run(); + return null; + } + + public interface TaskRunnable { + void run(); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/utils/NetworkUtilsExtend.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/utils/NetworkUtilsExtend.kt new file mode 100644 index 0000000000..34203653ea --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/utils/NetworkUtilsExtend.kt @@ -0,0 +1,126 @@ +package com.zhjt.mogo_core_function_devatools.rviz.common.utils + +import android.content.Context +import android.net.ConnectivityManager +import android.net.ConnectivityManager.NetworkCallback +import android.net.LinkProperties +import android.net.Network +import android.net.NetworkCapabilities +import android.net.NetworkRequest +import android.os.Build +import android.util.Log +import androidx.annotation.RequiresApi +import com.mogo.eagle.core.utilcode.util.ThreadUtils +import com.mogo.eagle.core.utilcode.util.Utils + + +/** + * 监听网络状态 + */ +class NetworkUtilsExtend { + private val TAG = "NetworkUtilsExtend" + + interface NetworkCallbackListener { + fun onConnected(network: Network?) + fun onDisconnected() + fun onLinkChanged(network: Network?, linkProperties: LinkProperties?) + } + + class NetworkCallbackImpl : NetworkCallback() { + private val TAG = "NetworkCallbackImpl" + + object LazyHolder { + val INSTANCE = NetworkCallbackImpl() + } + + // 网络连接成功回调 + override fun onAvailable(network: Network) { + super.onAvailable(network) + Log.d(TAG, "网络连接成功回调 onAvailable: $network") + ThreadUtils.runOnUiThread { + for (networkCallbackListener in networkCallbackList) { + networkCallbackListener.onConnected(network) + } + } + } + + // 网络连接超时或网络不可达 + override fun onUnavailable() { + super.onUnavailable() + Log.e(TAG, "网络连接超时或网络不可达 onUnavailable") + } + + override fun onLost(network: Network) { + super.onLost(network) + Log.e(TAG, "网络已断开连接 onLost: $network") + ThreadUtils.runOnUiThread { + for (networkCallbackListener in networkCallbackList) { + networkCallbackListener.onDisconnected() + } + } + } + + // 网络正在丢失连接 + override fun onLosing(network: Network, maxMsToLive: Int) { + super.onLosing(network, maxMsToLive) + Log.d(TAG, "网络正在丢失连接 onLosing: $network") + } + + + // 网络状态变化 + override fun onCapabilitiesChanged(network: Network, cap: NetworkCapabilities) { + super.onCapabilitiesChanged(network, cap) + Log.d(TAG, "网络状态变化 onCapabilitiesChanged: $network, $cap") + if (cap.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)) { + if (cap.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) { + Log.d(TAG, "网络状态变化 onCapabilitiesChanged: 网络类型为wifi") + } else if (cap.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) { + Log.d(TAG, "网络状态变化 onCapabilitiesChanged: 蜂窝网络") + } else { + Log.d(TAG, "网络状态变化 onCapabilitiesChanged: 其他网络") + } + } + } + + // 网络连接属性变化 + override fun onLinkPropertiesChanged(network: Network, lp: LinkProperties) { + super.onLinkPropertiesChanged(network, lp) + Log.d(TAG, "网络连接属性变化 onLinkPropertiesChanged: $network, $lp") + ThreadUtils.runOnUiThread { + for (networkCallbackListener in networkCallbackList) { + networkCallbackListener.onLinkChanged(network, lp) + } + } + } + + // 访问的网络阻塞状态发生变化 + override fun onBlockedStatusChanged(network: Network, blocked: Boolean) { + super.onBlockedStatusChanged(network, blocked) + Log.d(TAG, "访问的网络阻塞状态发生变化 onBlockedStatusChanged: $network, $blocked") + } + } + + companion object { + private val networkCallbackList = ArrayList() + fun startRegisterNetworkCallback() { + val networkRequest = NetworkRequest.Builder().build() + val connMgr = + Utils.getApp().getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager + connMgr.registerNetworkCallback(networkRequest, NetworkCallbackImpl.LazyHolder.INSTANCE) + } + + fun stopRegisterNetworkCallback() { + val connMgr = + Utils.getApp().getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager + connMgr.unregisterNetworkCallback(NetworkCallbackImpl.LazyHolder.INSTANCE) + } + + fun addNetworkCallback(callbackListener: NetworkCallbackListener) { + networkCallbackList.add(callbackListener) + } + + fun removeNetworkCallback(callbackListener: NetworkCallbackListener) { + networkCallbackList.remove(callbackListener) + } + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/utils/PermissionUtil.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/utils/PermissionUtil.java new file mode 100644 index 0000000000..d817522805 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/utils/PermissionUtil.java @@ -0,0 +1,434 @@ +package com.zhjt.mogo_core_function_devatools.rviz.common.utils; + + +import android.Manifest; +import android.app.Activity; +import android.content.Context; +import android.content.pm.PackageManager; +import android.os.Build; +import android.util.Log; + +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +/** + * author:chenjs + */ +public class PermissionUtil { + private static final String TAG = PermissionUtil.class.getSimpleName(); + private static final boolean LOG_FLAG = true;//日志标识 + + //日历 + private static final String[] Group_Calendar = { + Manifest.permission.READ_CALENDAR, Manifest.permission.WRITE_CALENDAR + }; + //照相机 + private static final String[] Group_Camera = { + Manifest.permission.CAMERA + }; + //通讯录 + private static final String[] Group_Contacts = { + Manifest.permission.WRITE_CONTACTS, Manifest.permission.GET_ACCOUNTS, + Manifest.permission.READ_CONTACTS + }; + //定位 + private static final String[] Group_Location = { + Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION + }; + //麦克风 + private static final String[] Group_Microphone = { + Manifest.permission.RECORD_AUDIO + }; + //电话 + private static final String[] Group_Phone = { + Manifest.permission.READ_PHONE_STATE, Manifest.permission.CALL_PHONE, + Manifest.permission.READ_CALL_LOG, Manifest.permission.WRITE_CALL_LOG, + Manifest.permission.ADD_VOICEMAIL, Manifest.permission.USE_SIP, + Manifest.permission.PROCESS_OUTGOING_CALLS + }; + //传感器 + private static final String[] Group_Sensors = { + Manifest.permission.BODY_SENSORS + }; + //短信 + private static final String[] Group_Sms = { + Manifest.permission.READ_SMS, Manifest.permission.SEND_SMS, + Manifest.permission.RECEIVE_SMS, Manifest.permission.RECEIVE_MMS, + Manifest.permission.RECEIVE_WAP_PUSH + }; + //存储 + private static final String[] Group_Storage = { + Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE + }; + private static Map m_PermissionGroupList = null; + private static Map m_PermissionsMappingList = null; + + static { + initMap(); + } + + /** + * 通过权限组名来申请一组权限 + * + * @param context + * @param permissionGroupName + * @param requestCode + * @param listener + */ + public static void requestByGroupName(Activity context, String permissionGroupName, int requestCode, OnPermissionsListener listener) { + requestByGroupName(context, new String[]{permissionGroupName}, requestCode, listener); + } + + /** + * 通过权限组名来申请多组权限 + * + * @param context Activity上下文 + * @param pgNameArray 多个要申请的权限组名称 + * @param requestCode 请求码 + * @param listener 回调接口 + */ + public static void requestByGroupName(Activity context, String[] pgNameArray, int requestCode, OnPermissionsListener listener) { + showLog("requestByPermissionGroup"); + try { + //如果操作系统SDK级别在23之上(android6.0),就进行动态权限申请 + if (Build.VERSION.SDK_INT >= 23 && pgNameArray != null) { + String[] permissionsList = getAppPermissionsList(context);//应用权限列表 + ArrayList targetList = new ArrayList<>(); + if (permissionsList == null || permissionsList.length == 0) { + showLog("获得权限列表为空"); + return; + } + + for (String groupName : pgNameArray) { + ArrayList tmpPermissionList = isPermissionDeclared(permissionsList, groupName); + if (tmpPermissionList == null) {//未找到 + showLog("未找到[" + groupName + "]中的权限"); + continue; + } + + for (int i = 0; i < tmpPermissionList.size(); i++) { + //判断是否拥有权限 + int nRet = ContextCompat.checkSelfPermission(context, tmpPermissionList.get(i)); + if (nRet != PackageManager.PERMISSION_GRANTED) { + targetList.add(tmpPermissionList.get(i)); + } + } + } + + if (targetList.size() > 0) { + showLog("进行以下权限申请:" + targetList.toString()); + String[] sList = targetList.toArray(new String[0]); + ActivityCompat.requestPermissions(context, sList, requestCode); + } else { + showLog("全部权限都已授权"); + if (listener != null) { + listener.onPermissionsOwned(); + } + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 通过权限名来申请一组权限 + * + * @param context + * @param permission + * @param requestCode + * @param listener + */ + public static void requestByPermissionName(Activity context, String permission, int requestCode, OnPermissionsListener listener) { + requestByPermissionName(context, new String[]{permission}, requestCode, listener); + } + + /** + * 通过权限名来申请多组权限 + * + * @param context Activity上下文 + * @param permissionArray 多个要申请的权限名称 + * @param requestCode 请求码 + * @param listener 回调接口 + */ + public static void requestByPermissionName(Activity context, String[] permissionArray, int requestCode, OnPermissionsListener listener) { + showLog("requestPermissions"); + try { + //如果操作系统SDK级别在23之上(android6.0),就进行动态权限申请 + if (Build.VERSION.SDK_INT >= 23 && permissionArray != null) { + ArrayList targetList = new ArrayList<>(); + for (String strPermission : permissionArray) { + //判断是否拥有权限 + int nRet = ContextCompat.checkSelfPermission(context, strPermission); + if (nRet != PackageManager.PERMISSION_GRANTED) { + targetList.add(strPermission); + } + } + + if (targetList.size() > 0) { + showLog("进行以下权限申请:" + targetList.toString()); + String[] sList = targetList.toArray(new String[0]); + ActivityCompat.requestPermissions(context, sList, requestCode); + } else { + showLog("全部权限都已授权"); + if (listener != null) { + listener.onPermissionsOwned(); + } + } + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 针对申请权限时的用户操作进行处理 + * + * @param context + * @param permissions 申请的权限 + * @param grantResults 各权限的授权状态 + * @param listener 回调接口 + * @param controlFlag 控制标识,用于判断当响应禁止列表后,是否继续处理可再申请列表(避免出现同时处理禁止列表和可再申请列表,互相干扰,比如弹出两个提示框) + */ + public static void onRequestPermissionsResult(Activity context, String[] permissions, int[] grantResults, OnPermissionsListener listener, boolean controlFlag) { + try { + ArrayList requestList = new ArrayList<>();//可再申请列表 + ArrayList banList = new ArrayList<>();//禁止列表 + for (int i = 0; i < permissions.length; i++) { + if (grantResults[i] == PackageManager.PERMISSION_GRANTED) { + showLog("[" + permissions[i] + "]权限授权成功"); + } else { + boolean nRet = ActivityCompat.shouldShowRequestPermissionRationale(context, permissions[i]); + //Log.i(TAG,"shouldShowRequestPermissionRationale nRet="+nRet); + if (nRet) {//允许重新申请 + requestList.add(permissions[i]); + } else {//禁止申请 + banList.add(permissions[i]); + } + } + } + + do { + //优先对禁止列表进行判断 + if (banList.size() > 0) { + if (listener != null) { + listener.onPermissionsForbidden(permissions, grantResults, banList); + } + if (!controlFlag) {//对禁止列表处理后,且控制标识为false,则跳过对可再申请列表的处理 + break; + } + } + if (requestList.size() > 0) { + if (listener != null) { + listener.onPermissionsDenied(permissions, grantResults, requestList); + } + } + if (banList.size() == 0 && requestList.size() == 0) { + showLog("权限授权成功"); + if (listener != null) { + listener.onPermissionsSucceed(); + } + } + } while (false); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * 判断权限状态 + * + * @param context + * @param permission 权限名 + * @return + */ + public static boolean checkPermission(Context context, String permission) { + try { + //如果操作系统SDK级别在23之上(android6.0),就进行动态权限申请 + if (Build.VERSION.SDK_INT >= 23) { + int nRet = ContextCompat.checkSelfPermission(context, permission); + showLog("checkSelfPermission nRet=" + nRet); + return nRet == PackageManager.PERMISSION_GRANTED; + } + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 获得当前应用清单中的权限列表 + * + * @param context 应用上下文 + * @return + */ + public static String[] getAppPermissionsList(Context context) { + try { + PackageManager packageManager = context.getApplicationContext().getPackageManager(); + String packageName = context.getApplicationContext().getPackageName(); + String[] array = packageManager.getPackageInfo(packageName, PackageManager.GET_PERMISSIONS).requestedPermissions; + return array; + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + /** + * 判断权限列表中是否声明了指定权限组中的权限 + * + * @param permissionList 权限列表 + * @param permissionGroup 权限组名 + * @return 存在则返回找到的权限组权限,否则返回null + */ + public static ArrayList isPermissionDeclared(String[] permissionList, String permissionGroup) { + try { + if (permissionList != null && permissionGroup != null) { + String[] pmGroup = m_PermissionGroupList.get(permissionGroup); + if (pmGroup != null) { + ArrayList arrayList = new ArrayList<>(); + //遍历 + for (int i = 0; i < pmGroup.length; i++) { + String strPermission = pmGroup[i]; + for (int j = 0; j < permissionList.length; j++) { + if (strPermission.equals(permissionList[j])) {//找到指定权限组中的权限 + arrayList.add(strPermission); + break; + } + } + } + if (arrayList.size() == 0) { + return null; + } + return arrayList; + } + } + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + /** + * 获得传入的权限名列表对应的中文名称 + * + * @param permissionList 权限名列表 + * @return 集合 + */ + public static Set getPermissionsNameByChinese(String[] permissionList) { + try { + if (permissionList != null) { + HashSet nameSet = new HashSet<>();//确保集合元素不重复 + String tmpName; + for (String strPermission : permissionList) { + tmpName = m_PermissionsMappingList.get(strPermission); + if (tmpName != null) { + nameSet.add(tmpName); + } + } + return nameSet; + } + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + private static void initMap() { + if (m_PermissionGroupList == null) { + m_PermissionGroupList = new HashMap<>(); + m_PermissionGroupList.put(Manifest.permission_group.CALENDAR, Group_Calendar); + m_PermissionGroupList.put(Manifest.permission_group.CAMERA, Group_Camera); + m_PermissionGroupList.put(Manifest.permission_group.CONTACTS, Group_Contacts); + m_PermissionGroupList.put(Manifest.permission_group.LOCATION, Group_Location); + m_PermissionGroupList.put(Manifest.permission_group.MICROPHONE, Group_Microphone); + m_PermissionGroupList.put(Manifest.permission_group.PHONE, Group_Phone); + m_PermissionGroupList.put(Manifest.permission_group.SENSORS, Group_Sensors); + m_PermissionGroupList.put(Manifest.permission_group.SMS, Group_Sms); + m_PermissionGroupList.put(Manifest.permission_group.STORAGE, Group_Storage); + } + + if (m_PermissionsMappingList == null) { + m_PermissionsMappingList = new HashMap<>(); + //日历 + for (String strPermission : Group_Calendar) { + m_PermissionsMappingList.put(strPermission, "日历"); + } + //照相机 + for (String strPermission : Group_Camera) { + m_PermissionsMappingList.put(strPermission, "摄像头"); + } + //通讯录 + for (String strPermission : Group_Contacts) { + m_PermissionsMappingList.put(strPermission, "通讯录"); + } + //定位 + for (String strPermission : Group_Location) { + m_PermissionsMappingList.put(strPermission, "位置"); + } + //麦克风 + for (String strPermission : Group_Microphone) { + m_PermissionsMappingList.put(strPermission, "麦克风"); + } + //电话 + for (String strPermission : Group_Phone) { + m_PermissionsMappingList.put(strPermission, "电话"); + } + //传感器 + for (String strPermission : Group_Sensors) { + m_PermissionsMappingList.put(strPermission, "传感器"); + } + //短信 + for (String strPermission : Group_Sms) { + m_PermissionsMappingList.put(strPermission, "短信"); + } + //存储 + for (String strPermission : Group_Storage) { + m_PermissionsMappingList.put(strPermission, "存储"); + } + } + } + + private static void showLog(String str) { + if (LOG_FLAG) { + Log.i(TAG, str); + } + } + + public interface OnPermissionsListener { + /** + * 权限都已拥有时的处理 + */ + void onPermissionsOwned(); + + /** + * 权限被禁止时的处理 + * + * @param permissions 申请的全部权限 + * @param grantResults 各权限的授权状态 + * @param pmList 禁止申请的权限列表 + */ + void onPermissionsForbidden(String[] permissions, int[] grantResults, ArrayList pmList); + + /** + * 权限被拒绝时的处理 + * + * @param permissions + * @param grantResults + * @param pmList 可再申请的权限列表 + */ + void onPermissionsDenied(String[] permissions, int[] grantResults, ArrayList pmList); + + /** + * 权限申请成功时的处理 + */ + void onPermissionsSucceed(); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/utils/ToastUtil.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/utils/ToastUtil.java new file mode 100644 index 0000000000..44229462d0 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/utils/ToastUtil.java @@ -0,0 +1,38 @@ +package com.zhjt.mogo_core_function_devatools.rviz.common.utils; + +import android.content.Context; +import android.view.Gravity; +import android.widget.Toast; + +import java.lang.ref.WeakReference; + +public class ToastUtil { + private static WeakReference toastRef; + + public static void showToastCenter(Context context, String msg) { + showToastCenter(context, msg, Toast.LENGTH_SHORT); + } + + public static void showToastCenter(Context context, String msg, int duration) { + Toast toast = (toastRef != null) ? toastRef.get() : null; + if (toast == null) { + toast = Toast.makeText(context.getApplicationContext(), "", duration); //如果有居中显示需求 + toast.setGravity(Gravity.CENTER, 0, 0); + toastRef = new WeakReference<>(toast); + } + toast.setText(msg); + toast.show(); + } + + + public static void destroyToast() { + if (toastRef != null) { + Toast toast = toastRef.get(); + if (toast != null) { + toast.cancel(); + } + toastRef.clear(); + toastRef = null; + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/utils/Utils.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/utils/Utils.java new file mode 100644 index 0000000000..ff2862f886 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/common/utils/Utils.java @@ -0,0 +1,57 @@ +package com.zhjt.mogo_core_function_devatools.rviz.common.utils; + +import android.content.Context; +import android.content.res.Configuration; +import android.util.Log; + + +import com.mogo.eagle.core.utilcode.util.RegexUtils; + +import java.lang.reflect.Field; + +public class Utils { + private static int sbar = -1; + // 获取系统状态栏高度 + public static int getSysBarHeight(Context contex) { + if (sbar == -1) { + Class c; + Object obj; + Field field; + int x; + sbar = 0; + try { + c = Class.forName("com.android.internal.R$dimen"); + obj = c.newInstance(); + field = c.getField("status_bar_height"); + x = Integer.parseInt(field.get(obj).toString()); + sbar = contex.getResources().getDimensionPixelSize(x); + } catch (Exception e1) { + e1.printStackTrace(); + } + } + Log.i("dddd","dddd=sbar="+sbar); + return sbar; + } + + /** + * 判断当前设备是手机还是平板,代码来自 Google I/O App for Android + * + * @param context + * @return 平板返回 True,手机返回 False + */ + public static boolean isPad(Context context) { + return (context.getResources().getConfiguration().screenLayout + & Configuration.SCREENLAYOUT_SIZE_MASK) + >= Configuration.SCREENLAYOUT_SIZE_LARGE; + } + + public static String getIPLastSegment(String ipv4) { + if (RegexUtils.isIP(ipv4)) { + int index = ipv4.lastIndexOf("."); + if (index > -1) { + ipv4 = ipv4.substring(index + 1); + } + } + return ipv4; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/AppConfigInfo.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/AppConfigInfo.kt new file mode 100644 index 0000000000..9d6ae97ccf --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/AppConfigInfo.kt @@ -0,0 +1,23 @@ +package com.zhjt.mogo_core_function_devatools.rviz.constant + +object AppConfigInfo { + + // 工控相关信息 + //车牌号 + @Volatile + var plateNumber: String = "" + + //工控机MAC地址 + @Volatile + var iPCMacAddress: String = "" + + //工控机DockerVersion + @Volatile + var dockerVersion: String = "" + + @Volatile + var mapVersion: Int = 0//解析后的域控版本 例如3.6.0 结果为30600 + + @Volatile + var isSupportFM: Boolean = false//是否支持FM数据 +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/DiagnoseSource.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/DiagnoseSource.kt new file mode 100644 index 0000000000..1a64cf5ebc --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/DiagnoseSource.kt @@ -0,0 +1,13 @@ +package com.zhjt.mogo_core_function_devatools.rviz.constant + +enum class DiagnoseSource( + val msg: String, + val desc: String +) { + NET("NET:", "设备网络"), + PAD("PAD:", "设备"), + ADAS("ADAS:", "ADAS"), + SSH("SSH:", "远程连接"), + MC("MC:", "调试工具"); + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/DiagnoseType.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/DiagnoseType.kt new file mode 100644 index 0000000000..8f21923fc0 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/DiagnoseType.kt @@ -0,0 +1,5 @@ +package com.zhjt.mogo_core_function_devatools.rviz.constant + +enum class DiagnoseType { + NORMAL, SUCCEED, FAILED +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/EventKey.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/EventKey.kt new file mode 100644 index 0000000000..99e6eae060 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/EventKey.kt @@ -0,0 +1,23 @@ +package com.zhjt.mogo_core_function_devatools.rviz.constant; + +object EventKey { + const val QUERY_ROS_HOST_STATUS = "query_ros_host_status" //查询ros 主机状态 + const val REMOVE_ROS_HOST_ITEM = "remove_ros_host_item" //删除ros主机 + const val QUERY_DOCKER_PS = "query_docker_ps" + const val QUERY_DISK_STATUS = "query_disk_status"//查询磁盘信息 + const val DOCKER_STATUS = "docker_status"//Docker状态 + const val QUERY_STARTUP_CONFIG = "query_startup_config"//查询配置文件列表 + const val UPDATE_ADAS_CONNECT_STATE = "update_adas_connect_state" + const val UPDATE_CAR_CONFIG_STATE = "update_car_config_state" + const val QUERY_DOCKER_CONFIG_CONTENT = "query_docker_config_content"//查询配置文件内容 + const val SEND_CLOUD_MAP_VERSION = "send_cloud_map_version"//发送云端map版本 + const val SEND_ROS_MASTER_MAP_VERSION = "send_ros_master_map_version"//发送ROS Master MAP版本信息 + const val SEND_HD_MAP_VERSION = "send_hd_map_version"//发送HD地图版本信息 + const val INIT_SENSOR_CAMERA = "init_Sensor_Camera"//初始化相机个数,不同车型相机数量和位置不同 + const val UPDATE_FAULT_CODE_DATA = "update_fault_code_data"//更新故障码item + const val SEND_ROS_HOST_COUNT = "send_ros_host_count"//发送主机个数 + const val SEND_FM_INFO_TO_OVERVIEW_FRAGMENT = "send_fm_info_to_overview_fragment"//FM数据发送到预览界面 + const val SEND_IS_SUPPORT_FM = "send_is_support_fm"//FM数据是否支持 + const val UPDATE_SYSTEM_RESOURCE_RED_DOT = "update_system_resource_red_dot"//更新资源界面异常个数通知 + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/FaultLevel.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/FaultLevel.kt new file mode 100644 index 0000000000..e905fd5db5 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/FaultLevel.kt @@ -0,0 +1,123 @@ +package com.zhjt.mogo_core_function_devatools.rviz.constant + +import android.text.TextUtils +import com.zhjt.mogo_core_function_devatools.rviz.R + +/** + * 故障等级 + */ +enum class FaultLevel( + val policyCode: String, + val faultLevel: String, + val msg: String, + val colorRes: Int, + val compareLevel: Int//排序等级 +) { + LEVEL_UNKNOWN("UNKNOWN", "-1", "未知", R.color.rviz_fmd_fm_fault_level_unknown, Int.MIN_VALUE),//仅统计(认为健康) + LEVEL0("FM_DP_NO_ACTION", "0", "仅统计(认为健康)", R.color.rviz_fmd_fm_fault_level0, 0),//仅统计(认为健康) + LEVEL1("FM_DP_ONLY_WARNING", "1", "警示", R.color.rviz_fmd_fm_fault_level1, 1),//警示(仅展示) + LEVEL2("FM_DP_SPEED_LIMIT1", "2", "一级降速行驶", R.color.rviz_fmd_fm_fault_level2, 2),//一级降速行驶 + LEVEL3("FM_DP_SPEED_LIMIT2", "2", "二级降速行驶", R.color.rviz_fmd_fm_fault_level2, 3),//二级降速行驶 + LEVEL4("FM_DP_SPEED_LIMIT3", "2", "三级降速行驶", R.color.rviz_fmd_fm_fault_level2, 4),//三级降速行驶 + LEVEL5("FM_DP_PNC_CHOOSE_STOP", "3", "择机靠边停车", R.color.rviz_fmd_fm_fault_level3, 5),//择机靠边停车 + LEVEL6("FM_DP_COMFORTABLE_STOP", "3", "立刻舒适停车", R.color.rviz_fmd_fm_fault_level3, 6),//立刻舒适停车 + LEVEL7("FM_DP_EMERGENCY_STOP", "4", "就地紧急停车", R.color.rviz_fmd_fm_fault_level4, 7),//就地紧急停车 + + + SSH_CONNECT_ERROR("SSH_CONNECT_ERROR", "100", "SSH连接异常", R.color.rviz_fmd_connect_status_disconnected, 100);//就地紧急停车 + + companion object { + @JvmStatic + val ALL = values().filter { it != SSH_CONNECT_ERROR }//所有等级 不包含自定义 + private val stopPolicyCodes = setOf( + LEVEL5.policyCode, + LEVEL6.policyCode, + LEVEL7.policyCode, + ) + private val stopFaultLevels = setOf( + LEVEL5.faultLevel, + LEVEL6.faultLevel, + LEVEL7.faultLevel, + ) + + @JvmStatic + fun getOrder(policyCode: String?): Int { + if (policyCode.isNullOrEmpty()) return LEVEL_UNKNOWN.compareLevel + val levelByPolicyCode = ALL.find { it.policyCode == policyCode } + if (levelByPolicyCode != null) { + return levelByPolicyCode.compareLevel + } + return LEVEL_UNKNOWN.compareLevel + } + + @JvmStatic + fun isStopFault(policyCode: String?, faultLevel: String?): Boolean? { + if (policyCode.isNullOrEmpty() && faultLevel.isNullOrEmpty()) return null//未知故障等级 + // 检查 policyCode 是否属于需要停车的情况 + if (policyCode in stopPolicyCodes) { + return true + } + // 检查 faultLevel 是否为 "3" 或 "4" + if (faultLevel in stopFaultLevels) { + return true + } + // 如果不符合任何条件,则返回 false + return false + } + + @JvmStatic + fun getColor(policyCode: String?, faultLevel: String?): Int { + if (policyCode.isNullOrEmpty() && faultLevel.isNullOrEmpty()) return LEVEL_UNKNOWN.colorRes + // 根据 policyCode 匹配对应的 FaultLevel + val levelByPolicyCode = ALL.find { it.policyCode == policyCode } + if (levelByPolicyCode != null) { + return levelByPolicyCode.colorRes + } + // 根据 faultLevel 匹配对应的 FaultLevel + val levelByFaultLevel = ALL.find { it.faultLevel == faultLevel } + if (levelByFaultLevel != null) { + return levelByFaultLevel.colorRes + } + + // 默认返回 LEVEL_UNKNOWN 的颜色 + return LEVEL_UNKNOWN.colorRes + + } + + @JvmStatic + fun getMessageAndColor(policyCode: String?, faultLevel: String?): Pair { + if (policyCode.isNullOrEmpty() && faultLevel.isNullOrEmpty()) return Pair( + LEVEL_UNKNOWN.msg, + LEVEL_UNKNOWN.colorRes + ) + // 根据 policyCode 匹配对应的 FaultLevel + val levelByPolicyCode = ALL.find { it.policyCode == policyCode } + if (levelByPolicyCode != null) { + return Pair( + levelByPolicyCode.msg, + levelByPolicyCode.colorRes + ) + } + // 根据 faultLevel 匹配对应的 FaultLevel + val levelByFaultLevel = ALL.find { it.faultLevel == faultLevel } + if (levelByFaultLevel != null) { + var msg = levelByFaultLevel.msg + if (TextUtils.equals(faultLevel, "2")) { + msg = "降速行驶" + } else if (TextUtils.equals(faultLevel, "3")) { + msg = "择机靠边/立刻舒适停车" + } + return Pair( + msg, + levelByFaultLevel.colorRes + ) + } + + // 默认返回 LEVEL_UNKNOWN 的颜色 + return Pair( + LEVEL_UNKNOWN.msg, + LEVEL_UNKNOWN.colorRes + ) + } + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/FaultModuleId.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/FaultModuleId.kt new file mode 100644 index 0000000000..2d99db82af --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/FaultModuleId.kt @@ -0,0 +1,5 @@ +package com.zhjt.mogo_core_function_devatools.rviz.constant + +enum class FaultModuleId { + VehicleControl, HardwareDriver, Perception, Localization, Planning, Prediction, SSM, SM, FSM, OTH +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/FaultSubModuleId.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/FaultSubModuleId.kt new file mode 100644 index 0000000000..79f576ecf4 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/FaultSubModuleId.kt @@ -0,0 +1,147 @@ +package com.zhjt.mogo_core_function_devatools.rviz.constant + +/** + * 子模块名 + */ +enum class FaultSubModuleId( + val moduleId: FaultModuleId, + val subModuleId: String, + val subModuleFuzzyId: String,//模糊匹配ID + val subName: String +) { + HardwareDriver_LidarDriver(FaultModuleId.HardwareDriver, "*LidarDriver", "lidar", "激光雷达驱动"), + HardwareDriver_CameraDriver(FaultModuleId.HardwareDriver, "*CameraDriver", "camera", "摄像头驱动"), + HardwareDriver_RadarDriver(FaultModuleId.HardwareDriver, "*RadarDriver", "rada", "毫米波雷达驱动"), + + Perception_Fusion(FaultModuleId.Perception, "Fusion", "fusion", "后融合"), + Perception_MidFusion(FaultModuleId.Perception, "MidFusion", "midfusion", "中融合"), + Perception_RadarFusion(FaultModuleId.Perception, "RadarFusion", "radarfusion", "毫米波融合"), + Perception_XiaobaFusion(FaultModuleId.Perception, "XiaobaFusion", "xiaobafusion", "激光雷达点云融合"), + Perception_LidarFusion(FaultModuleId.Perception, "LidarFusion", "lidarfusion", "激光雷达点云融合"), + Perception_PerceptionCamera(FaultModuleId.Perception, "PerceptionCamera*", "perceptioncamera", "车道线相机感知"), + Perception_Camera2DFront(FaultModuleId.Perception, "Camera2DFront", "camera2dfront", "红绿灯相机感知"), + Perception_Camera2DHd(FaultModuleId.Perception, "Camera2DHd", "camera2dhd", "2D障碍物感知"), + Perception_Camera3D(FaultModuleId.Perception, "Camera3D", "camera3d", "Vidar感知"), + Perception_PerceptionLidar(FaultModuleId.Perception, "PerceptionLidar", "perceptionlidar", "激光雷达感知"), + + Localization_MSFLOC(FaultModuleId.Localization, "MSFLOC", "msfloc", "融合定位"), + Localization_SLAM(FaultModuleId.Localization, "SLAM", "slam", "slam"), + Localization_VAL(FaultModuleId.Localization, "VAL", "val", "视觉辅助定位"), + Localization_VSLAM(FaultModuleId.Localization, "VSLAM", "vslam", "vslam"), + + Prediction_DataPreProcessing(FaultModuleId.Prediction, "DataPreProcessing", "datapreprocessing", "数据预处理"), + Prediction_DataPostProcessing(FaultModuleId.Prediction, "DataPostProcessing", "datapostprocessing", "数据后处理"), + + Planning_DataPostProcessing(FaultModuleId.Planning, "DataPostProcessing", "datapostprocessing", "数据预处理"), + + VehicleControl_ElectrcFunctnAccssrs(FaultModuleId.VehicleControl, "ElectrcFunctnAccssrs", "electrcfunctnaccssrs", "电子电气功能附件"), + VehicleControl_VhclMtnCtrl(FaultModuleId.VehicleControl, "VhclMtnCtrl", "vhclmtnctrl", "车辆运动控制"), + VehicleControl_ElectrcAccssrsCntrl(FaultModuleId.VehicleControl, "ElectrcAccssrsCntrl", "electrcaccssrscntrl", "电气附件控制"), + VehicleControl_Cmm(FaultModuleId.VehicleControl, "Cmm", "cmm", "通讯"), + VehicleControl_VCU(FaultModuleId.VehicleControl, "VCU", "vcu", "整车控制器"), + VehicleControl_EMS(FaultModuleId.VehicleControl, "EMS", "ems", "发动机系统"), + VehicleControl_DMCU(FaultModuleId.VehicleControl, "DMCU", "dmcu", "驱动电机系统"), + VehicleControl_BMS(FaultModuleId.VehicleControl, "BMS", "bms", "高压电池系统"), + VehicleControl_TCU(FaultModuleId.VehicleControl, "TCU", "tcu", "变速箱系统"), + VehicleControl_EPS(FaultModuleId.VehicleControl, "EPS", "eps", "转向系统"), + VehicleControl_EBS(FaultModuleId.VehicleControl, "EBS", "ebs", "行车制动系统"), + VehicleControl_EPB(FaultModuleId.VehicleControl, "EPB", "epb", "驻车系统"), + VehicleControl_BCM(FaultModuleId.VehicleControl, "BCM", "bcm", "车身附件系统"), + VehicleControl_MCU(FaultModuleId.VehicleControl, "MCU", "mcu", "域控微控制单元"), + + SSM_NodeCheck(FaultModuleId.SSM, "NodeCheck", "nodecheck", "节点故障检查"), + SSM_AgentCheck(FaultModuleId.SSM, "AgentCheck", "agentcheck", "域控故障检查"), + SSM_NetCheck(FaultModuleId.SSM, "NetCheck", "netcheck", "网络检查"), + SSM_SsmFlt(FaultModuleId.SSM, "SsmFlt", "ssmflt", "SSM自身异常"), + + SM_Topmonito(FaultModuleId.SM, "Topmonito*", "topmonito", "系统软件-各域控性能监控"), + SM_Iotop(FaultModuleId.SM, "Iotop*", "iotop", "系统软件-各域控IO监控"), + SM_TimeSyncConfig(FaultModuleId.SM, "TimeSyncConfig*", "timesyncconfig", "系统硬件-时间同步检测"), + SM_LidarTimeSync(FaultModuleId.SM, "*LidarTimeSync", "lidartimesync", "系统硬件-各雷达授时检测"), + SM_CameraDeviceLink(FaultModuleId.SM, "CameraDeviceLink", "cameradevicelink", "系统硬件-各相机接线检测"), + SM_CanState(FaultModuleId.SM, "CanState-*", "canstate", "系统硬件-Can状态"), + SM_FpgaVersion(FaultModuleId.SM, "FpgaVersion*", "fpgaversion", "系统硬件-Fpga版本检测"), + + FSM_DataPostProcessing(FaultModuleId.FSM, "DataPostProcessing", "cmm", "数据预处理"),//FSM发出的FM数据子模块目前全部为Cmm 并没有文档中写的DataPostProcessing + + OTH_TELEMATICS(FaultModuleId.OTH, "TELEMATICS", "telematics", "通信模块"), + OTH_LED(FaultModuleId.OTH, "LED", "led", "LED屏幕管理"), + OTH_CUSTOM(FaultModuleId.OTH, "CUSTOM", "custom", "数据定制模块"), + OTH_DEPLOY(FaultModuleId.OTH, "DEPLOY", "deploy", "部署镜像模块"), + ; + + + companion object { + private val CLASSIFY = classify() + + private fun classify(): MutableMap> { + val map = mutableMapOf>() + val modules = FaultModuleId.values() + val subModules = FaultSubModuleId.values() + for (module in modules) { + var set = map[module.name] + if (set == null) { + set = mutableSetOf() + map[module.name] = set + } + for (id in subModules) { + if (module == id.moduleId) { + set.add(id) + } + } + } + return map + } + + /** + * isShowSubModule 只有 isShowTag = false 时才会生效 + */ + @JvmStatic + fun getName(faultId: String?, isShowTag: Boolean = false, isShowSubModule: Boolean = false): String { + var module = "" + var subodule = "" + if (!faultId.isNullOrEmpty()) { + val parts = faultId.split("_") + if (parts.size >= 3) { + module = parts[0] + subodule = parts[1] + } + } + return getName(module, subodule, isShowTag, isShowSubModule) + } + + @JvmStatic + fun getName(moduleId: String?, subModuleId: String?, isShowTag: Boolean = false, isShowSubModule: Boolean = false): String { + if (moduleId.isNullOrEmpty() || subModuleId.isNullOrEmpty()) return "" + val subModule = CLASSIFY[moduleId] ?: return "" + //精准匹配 + for (sub in subModule) { + if (sub.subModuleId.startsWith("*")) { + if (subModuleId.endsWith(sub.subModuleId.substring(1, sub.subModuleId.length))) { + return if (isShowTag) "【${sub.subName}】" else if (isShowSubModule) "${sub.subName}($subModuleId)" else sub.subName + } + } else if (sub.subModuleId.endsWith("*")) { + if (subModuleId.startsWith(sub.subModuleId.substring(0, sub.subModuleId.length - 1))) { + return if (isShowTag) "【${sub.subName}】" else if (isShowSubModule) "${sub.subName}($subModuleId)" else sub.subName + } + } else { + if (sub.subModuleId == subModuleId) { + return if (isShowTag) "【${sub.subName}】" else if (isShowSubModule) "${sub.subName}($subModuleId)" else sub.subName + } + } + } + //模糊匹配 + for (sub in subModule) { + if (subModuleId.lowercase().contains(sub.subModuleFuzzyId)) { + return if (isShowTag) "【${sub.subName}】" else if (isShowSubModule) "${sub.subName}($subModuleId)" else sub.subName + } + } + //匹配不到任何内容直接返回 + return if (isShowTag) "【${subModuleId}】" else subModuleId + + } + + } + + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/MsgFmData.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/MsgFmData.kt new file mode 100644 index 0000000000..2c9ed4a39d --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/MsgFmData.kt @@ -0,0 +1,164 @@ +package com.zhjt.mogo_core_function_devatools.rviz.constant + +import com.zhjt.mogo.adas.data.bean.MogoReport + +/** + * FM信息对照表 + */ +class MsgFmData{ + /** + * 当出现多个建议操作时,按照整车下电重启、请求人工驾驶接管、请求平行驾驶接管、系统重启、联系硬件工程师、联系运维工程师、联系软件工程师优先级递减的顺序,只展示最高优先级的内容 + */ + enum class FaultAction( + val faultType: String,//故障处理类别 + val faultAction: String,//故障处理行为定义 + val faultActionCode: String,//故障处理行为标识 + val faultActionDesc: String,//故障处理行为描述 + val faultLevel: Int//故障处理级别 + ){ + //请求平行驾驶接管 + FM_ACT_NEED_PARALLEL_DERVING_TAKEOVER("恢复策略","请求平行驾驶接管","FM_ACT_NEED_PARALLEL_DERVING_TAKEOVER","如planing出站时,规划失败",5), + //请求人工驾驶接管 + FM_ACT_NEED_MANNUAL_DERVING("恢复策略","请求人工驾驶接管","FM_ACT_NEED_MANNUAL_DERVING","如planing规划失败,且存在弱网判断",6), + //系统重启 + FM_ACT_NEED_RESTART_SYSTEM("恢复策略","系统重启","FM_ACT_NEED_RESTART_SYSTEM","如检测到出现多个节点奔溃",4), + //整车下电重启 + FM_ACT_MUST_VEHICLE_POWER_RESET("恢复策略","整车下电重启","FM_ACT_MUST_VEHICLE_POWER_RESET","如底盘无数据,需要下电重启",7), + //请联系硬件工程师 + FM_ACT_CONTACT_HARDWARE_ENGINEER("人工处理","请联系硬件工程师","FM_ACT_CONTACT_HARDWARE_ENGINEER","硬件接线,域控启动等故障",3), + //请联系运维工程师 + FM_ACT_CONTACT_OPERATIONS_ENGINEER("人工处理","请联系运维工程师","FM_ACT_CONTACT_OPERATIONS_ENGINEER","系统配置不对,网络等故障",2), + //请联系软件工程师 + FM_ACT_CONTACT_SOFTWARE_ENGINEER("人工处理","请联系软件工程师","FM_ACT_CONTACT_SOFTWARE_ENGINEER","节点挂掉,无法启动等故障",1); + + companion object{ + + //获取故障建议操作级别 + fun getFaultLevel(faultActionCode: String): Int{ + return when(faultActionCode){ + //请求平行驾驶接管 + FM_ACT_NEED_PARALLEL_DERVING_TAKEOVER.faultActionCode -> FM_ACT_NEED_PARALLEL_DERVING_TAKEOVER.faultLevel + //请求人工驾驶接管 + FM_ACT_NEED_MANNUAL_DERVING.faultActionCode -> FM_ACT_NEED_MANNUAL_DERVING.faultLevel + //系统重启 + FM_ACT_NEED_RESTART_SYSTEM.faultActionCode -> FM_ACT_NEED_RESTART_SYSTEM.faultLevel + //整车下电重启 + FM_ACT_MUST_VEHICLE_POWER_RESET.faultActionCode -> FM_ACT_MUST_VEHICLE_POWER_RESET.faultLevel + //请联系硬件工程师 + FM_ACT_CONTACT_HARDWARE_ENGINEER.faultActionCode -> FM_ACT_CONTACT_HARDWARE_ENGINEER.faultLevel + //请联系运维工程师 + FM_ACT_CONTACT_OPERATIONS_ENGINEER.faultActionCode ->FM_ACT_CONTACT_OPERATIONS_ENGINEER.faultLevel + //请联系软件工程师 + FM_ACT_CONTACT_SOFTWARE_ENGINEER.faultActionCode -> FM_ACT_CONTACT_SOFTWARE_ENGINEER.faultLevel + else -> 0 + } + } + + //获取故障建议操作 + fun getFaultAction(faultActionLevel: Int): String{ + return when(faultActionLevel){ + //请求平行驾驶接管 + FM_ACT_NEED_PARALLEL_DERVING_TAKEOVER.faultLevel -> FM_ACT_NEED_PARALLEL_DERVING_TAKEOVER.faultAction + //请求人工驾驶接管 + FM_ACT_NEED_MANNUAL_DERVING.faultLevel -> FM_ACT_NEED_MANNUAL_DERVING.faultAction + //系统重启 + FM_ACT_NEED_RESTART_SYSTEM.faultLevel -> FM_ACT_NEED_RESTART_SYSTEM.faultAction + //整车下电重启 + FM_ACT_MUST_VEHICLE_POWER_RESET.faultLevel -> FM_ACT_MUST_VEHICLE_POWER_RESET.faultAction + //请联系硬件工程师 + FM_ACT_CONTACT_HARDWARE_ENGINEER.faultLevel -> FM_ACT_CONTACT_HARDWARE_ENGINEER.faultAction + //请联系运维工程师 + FM_ACT_CONTACT_OPERATIONS_ENGINEER.faultLevel ->FM_ACT_CONTACT_OPERATIONS_ENGINEER.faultAction + //请联系软件工程师 + FM_ACT_CONTACT_SOFTWARE_ENGINEER.faultLevel -> FM_ACT_CONTACT_SOFTWARE_ENGINEER.faultAction + else -> "" + } + } + + //获取故障建议操作Code值 + fun getFaultActionCode(faultActionLevel: Int): String{ + return when(faultActionLevel){ + //请求平行驾驶接管 + FM_ACT_NEED_PARALLEL_DERVING_TAKEOVER.faultLevel -> FM_ACT_NEED_PARALLEL_DERVING_TAKEOVER.faultActionCode + //请求人工驾驶接管 + FM_ACT_NEED_MANNUAL_DERVING.faultLevel -> FM_ACT_NEED_MANNUAL_DERVING.faultActionCode + //系统重启 + FM_ACT_NEED_RESTART_SYSTEM.faultLevel -> FM_ACT_NEED_RESTART_SYSTEM.faultActionCode + //整车下电重启 + FM_ACT_MUST_VEHICLE_POWER_RESET.faultLevel -> FM_ACT_MUST_VEHICLE_POWER_RESET.faultActionCode + //请联系硬件工程师 + FM_ACT_CONTACT_HARDWARE_ENGINEER.faultLevel -> FM_ACT_CONTACT_HARDWARE_ENGINEER.faultActionCode + //请联系运维工程师 + FM_ACT_CONTACT_OPERATIONS_ENGINEER.faultLevel ->FM_ACT_CONTACT_OPERATIONS_ENGINEER.faultActionCode + //请联系软件工程师 + FM_ACT_CONTACT_SOFTWARE_ENGINEER.faultLevel -> FM_ACT_CONTACT_SOFTWARE_ENGINEER.faultActionCode + else -> "" + } + } + + + } + + } + + enum class FaultResult( + val resultType: String,//影响类别 + val resultDefine: String,//故障影响定义 + val resultCode: String,//故障影响的标识 + val resultDesc: String//后果对应的处理描述 + ){ + //无法作业 + FM_RST_FUNCTION_LOST("功能影响","无法作业","FM_RST_FUNCTION_LOST","需要禁止作业,如扫盘故障,清扫车无法清扫作业"), + //无法开放运营 + FM_RST_FORBID_OPEN_WORK("功能影响","无法开放运营","FM_RST_FORBID_OPEN_WORK","需要禁止运营,如安全带故障,可以自驾,不能载人"), + //无法平行驾驶 + FM_RST_FORBID_PARALLEL_DERVING("驾驶影响","无法平行驾驶","FM_RST_FORBID_PARALLEL_DERVING","需要禁止平行驾驶"), + //无法自动驾驶 + FM_RST_FORBID_AUTOPILOT_DERVING("驾驶影响","无法自动驾驶","FM_RST_FORBID_AUTOPILOT_DERVING","需要禁止自驾"), + //无法手动驾驶 + FM_RST_FORBID_MANNUAL_DERVING("驾驶影响","无法手动驾驶","FM_RST_FORBID_MANNUAL_DERVING","需要禁止行车,如底盘存在故障,需要通知出来"), + //失控,无法策略停车 + FM_RST_OUT_OF_CONTROL("安全影响","失控,无法策略停车","FM_RST_OUT_OF_CONTROL","需要立即紧急通知到人,车辆失控,如驾驶中controller挂掉,发送102重启"); + + companion object{ + //获取结果原因描述 + fun getResultDefine(resultCode: String): String{ + return when(resultCode){ + //无法作业 + FM_RST_FUNCTION_LOST.resultCode -> FM_RST_FUNCTION_LOST.resultDefine + //无法开放运营 + FM_RST_FORBID_OPEN_WORK.resultCode -> FM_RST_FORBID_OPEN_WORK.resultDefine + //无法平行驾驶 + FM_RST_FORBID_PARALLEL_DERVING.resultCode -> FM_RST_FORBID_PARALLEL_DERVING.resultDefine + //无法自动驾驶 + FM_RST_FORBID_AUTOPILOT_DERVING.resultCode -> FM_RST_FORBID_AUTOPILOT_DERVING.resultDefine + //无法手动驾驶 + FM_RST_FORBID_MANNUAL_DERVING.resultCode -> FM_RST_FORBID_MANNUAL_DERVING.resultDefine + //失控,无法策略停车 + FM_RST_OUT_OF_CONTROL.resultCode -> FM_RST_OUT_OF_CONTROL.resultDefine + else -> "" + } + } + } + + } + + companion object{ + + @JvmStatic + fun getFmPolicyName(policyCode: String?): String{ + return when(policyCode){ + "FM_DP_NO_ACTION" -> "报告" + "FM_DP_ONLY_WARNING" -> "警示" + "FM_DP_SPEED_LIMIT1" -> "一级降速" + "FM_DP_SPEED_LIMIT2" -> "二级降速" + "FM_DP_SPEED_LIMIT3" -> "三级降速" + "FM_DP_PNC_CHOOSE_STOP" -> "择机靠边停车" + "FM_DP_COMFORTABLE_STOP" -> "立刻舒适停车" + "FM_DP_EMERGENCY_STOP" -> "就地紧急停车" + else -> "暂无" + } + } + } + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/SensorCamera.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/SensorCamera.kt new file mode 100644 index 0000000000..e25426023b --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/constant/SensorCamera.kt @@ -0,0 +1,14 @@ +package com.zhjt.mogo_core_function_devatools.rviz.constant + +enum class SensorCamera(val key: String, val fileName: String, val title: String) { + DriversCameraSensing30("DriversCameraSensing30", "sensing30.launch", "前左30"), + DriversCameraSensing60("DriversCameraSensing60", "sensing60.launch", "前中60"), + DriversCameraSensing120("DriversCameraSensing120", "sensing120.launch", "前右120"), + DriversCameraSensing120Left("DriversCameraSensing120Left", "sensing120_left.launch", "左120"), + DriversCameraSensing120Back("DriversCameraSensing120Back", "sensing120_back.launch", "后120"), + DriversCameraSensing120Right( + "DriversCameraSensing120Right", + "sensing120_right.launch", + "右120" + ), +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/ChangeDefaultConfigDialog.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/ChangeDefaultConfigDialog.kt new file mode 100644 index 0000000000..c2ddfbb0b4 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/ChangeDefaultConfigDialog.kt @@ -0,0 +1,99 @@ +package com.zhjt.mogo_core_function_devatools.rviz.dialog + + +import android.app.Dialog +import android.content.Context +import android.os.Bundle +import android.text.TextUtils +import android.view.WindowManager +import android.view.inputmethod.EditorInfo +import android.view.inputmethod.InputMethodManager +import android.widget.Button +import android.widget.EditText +import android.widget.TextView.OnEditorActionListener +import com.mogo.eagle.core.utilcode.util.RegexUtils +import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.zhjt.mogo_core_function_devatools.rviz.R +import com.zhjt.mogo_core_function_devatools.rviz.common.config.SSHAccountConfig + +/** + * 修改默认配置弹窗 + */ +class ChangeDefaultConfigDialog( + context: Context +) : Dialog(context) { + private lateinit var inputIp: EditText + private lateinit var inputSshUsername: EditText + private lateinit var inputSshUserpwd: EditText + + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.rviz_common_dialog_default_config) + window?.setBackgroundDrawable(null) + window?.setLayout( + 900, + WindowManager.LayoutParams.WRAP_CONTENT + ) +// window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN) + inputIp = findViewById(R.id.input_ip) + inputSshUsername = findViewById(R.id.input_ssh_username) + inputSshUserpwd = findViewById(R.id.input_ssh_userpwd) + inputIp.setOnEditorActionListener(onEditorActionListener) + inputSshUsername.setOnEditorActionListener(onEditorActionListener) + inputSshUserpwd.setOnEditorActionListener(onEditorActionListener) + inputIp.setText(SSHAccountConfig.getRosMasterIp()) + inputSshUsername.setText(SSHAccountConfig.getUserName()) + inputSshUserpwd.setText(SSHAccountConfig.getPassWord()) + + setOnDismissListener { + val inputMethodManager = + context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager + inputMethodManager.hideSoftInputFromWindow( + this.window?.currentFocus?.windowToken, + 0 + ) + } + val btnCancel: Button = findViewById(R.id.btnCancel) + val btnConfirm: Button = findViewById(R.id.btnConfirm) + btnCancel.setOnClickListener { + dismiss() + } + btnConfirm.setOnClickListener { + onConfirm() + } + } + + private fun onConfirm() { + val enableUserName = inputSshUsername.text + if (TextUtils.isEmpty(enableUserName)) { + SSHAccountConfig.removeUserName() + } else { + val userName = enableUserName.toString().trim() + SSHAccountConfig.setUserName(userName) + } + val enableUserPwd = inputSshUserpwd.text + if (TextUtils.isEmpty(enableUserPwd)) { + SSHAccountConfig.removePassWord() + } else { + val userPwd = enableUserPwd.toString().trim() + SSHAccountConfig.setPassWord(userPwd) + } + dismiss() + } + + private val onEditorActionListener = + OnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_NEXT) { + // 获取下一个焦点的资源 ID + val nextFocusId = v.nextFocusForwardId + val editText = findViewById(nextFocusId) +// editText.setSelection(editText.text.length) + editText.selectAll(); + } else if (actionId == EditorInfo.IME_ACTION_GO) { + onConfirm() + return@OnEditorActionListener true + } + false + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/CommonLoadingDialog.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/CommonLoadingDialog.kt new file mode 100644 index 0000000000..f9a22437de --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/CommonLoadingDialog.kt @@ -0,0 +1,66 @@ +package com.zhjt.mogo_core_function_devatools.rviz.dialog + + +import android.os.Bundle +import android.text.TextUtils +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.annotation.ColorRes +import androidx.fragment.app.DialogFragment +import com.zhjt.mogo_core_function_devatools.rviz.R + +/** + * 加载Loading对话框 + */ +class CommonLoadingDialog : + DialogFragment { + + private val TAG: String = "LoadingDialog" + private val msg: String? + private var textColor = android.R.color.white + private lateinit var rootView: View + private lateinit var tvTitle: TextView + + constructor() : super() { + this.msg = null + } + + constructor(msg: String?) : super() { + this.msg = msg + } + + constructor(@ColorRes textColor: Int, msg: String?) : super() { + this.textColor = textColor + this.msg = msg + } + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + rootView = LayoutInflater.from(context) + .inflate(R.layout.rviz_fmd_dialog_common_loading, container, false) + tvTitle = rootView.findViewById(R.id.tvTitle) + return rootView + } + + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + if (!TextUtils.isEmpty(msg)) { + tvTitle.text = msg + } + tvTitle.setTextColor(resources.getColor(textColor, null)) + } + + public fun setMsg(msg: String?) { + if (!TextUtils.isEmpty(msg)) { + tvTitle.text = msg + } + } + + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/DockersDialog.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/DockersDialog.java new file mode 100644 index 0000000000..7c7c01c27f --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/DockersDialog.java @@ -0,0 +1,91 @@ +package com.zhjt.mogo_core_function_devatools.rviz.dialog; + +import android.content.Context; +import android.view.View; +import android.view.ViewGroup; +import android.view.WindowManager; +import android.widget.Button; +import android.widget.TextView; + +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import com.mogo.eagle.core.utilcode.util.SizeUtils; +import com.zhjt.mogo_core_function_devatools.rviz.R; +import com.zhjt.mogo_core_function_devatools.rviz.common.base.BaseDialog; +import com.zhjt.mogo_core_function_devatools.rviz.common.utils.Utils; +import com.zhjt.mogo_core_function_devatools.rviz.dialog.adapter.DockerListAdapter; +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.DockerBean; +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.DockerInfo; +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.SSHHostBean; +import com.zhjt.mogo_core_function_devatools.rviz.widgets.MyLinearLayoutManager; + +import java.util.List; + +/** + * Docker列表展示 + */ +public class DockersDialog extends BaseDialog { + private final List list; + private final SSHHostBean host; + private RecyclerView dockerListView; + private TextView titleView; + private Button btnCancel; + + public DockersDialog(Context context, DockerBean dockerBean) { + super(context); + this.list = dockerBean.dockers; + this.host = dockerBean.host; + } + + @Override + protected void onViewCreateBefore() { + super.onViewCreateBefore(); + getWindow().setBackgroundDrawableResource(R.drawable.rviz_common_bg_dialog); + } + + @Override + protected View getContentViewResource() { + return getLayoutInflater().inflate(R.layout.rviz_fmd_dialog_dockers, null, false); + } + + @Override + protected void onViewInitBefore() { + super.onViewInitBefore(); + WindowManager.LayoutParams layoutParams = getWindow().getAttributes(); + layoutParams.width = SizeUtils.dp2px(getContext().getResources().getDimension(R.dimen.dp_1200)); + layoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT; + getWindow().setAttributes(layoutParams); + } + + + @Override + protected void onViewInit() { + super.onViewInit(); + dockerListView = findViewById(R.id.docker_list_view); + titleView = findViewById(R.id.title_view); + btnCancel = findViewById(R.id.btn_cancel); + MyLinearLayoutManager linearLayoutManager = new MyLinearLayoutManager(getContext()); + linearLayoutManager.setOrientation(GridLayoutManager.VERTICAL); + dockerListView.setLayoutManager(linearLayoutManager); + DockerListAdapter adapter = new DockerListAdapter(); + adapter.setData(list); + dockerListView.setAdapter(adapter); + String ip = host.getHostname(); + titleView.setText(Utils.getIPLastSegment(ip) + "--Docker信息"); + } + + + @Override + protected void setOnListener() { + super.setOnListener(); + btnCancel.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dismiss(); + } + }); + } + + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/FMDataShowDialog.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/FMDataShowDialog.kt new file mode 100644 index 0000000000..f063edd6fe --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/FMDataShowDialog.kt @@ -0,0 +1,76 @@ +package com.zhjt.mogo_core_function_devatools.rviz.dialog + +import android.content.Context +import android.view.View +import android.view.View.OnClickListener +import android.widget.Button +import android.widget.TextView +import com.zhjt.mogo_core_function_devatools.rviz.R +import com.zhjt.mogo_core_function_devatools.rviz.common.base.BaseDialog + + +class FMDataShowDialog(context: Context, private val code: String?, private val data: String?) : + BaseDialog(context), OnClickListener { + private lateinit var titleView: TextView + private lateinit var dataView: TextView + private lateinit var btnCancel: Button + + init { + + } + + override fun getContentViewResource(): View { + return layoutInflater.inflate(R.layout.rviz_fmd_dialog_fm_data_show, null, false) + } + + override fun onViewInitBefore() { + super.onViewInitBefore() + window?.setBackgroundDrawableResource(android.R.color.transparent) +// window?.setLayout( +// WindowManager.LayoutParams.WRAP_CONTENT, +// WindowManager.LayoutParams.WRAP_CONTENT +// ) + } + + + override fun onViewInit() { + super.onViewInit() + titleView = findViewById(R.id.title_view) + dataView = findViewById(R.id.data) + btnCancel = findViewById(R.id.btn_cancel) + + } + + + override fun onViewCreated() { + super.onViewCreated() + if (!code.isNullOrEmpty()) { + titleView.text = "“${code}”原始数据" + titleView.setSelected(true); + } + val msg = if (!data.isNullOrEmpty()) { + data + } else { + "域控发送数据异常,无法查看" + } + dataView.text = msg + } + + + override fun onDismiss() { + super.onDismiss() + } + + override fun setOnListener() { + super.setOnListener() + btnCancel.setOnClickListener(this) + } + + override fun onClick(v: View) { + val id = v.id + if (id == R.id.btn_cancel) { + dismiss() + + } + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/FaultCodeDetailsDialog.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/FaultCodeDetailsDialog.kt new file mode 100644 index 0000000000..cdee0d99cf --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/FaultCodeDetailsDialog.kt @@ -0,0 +1,357 @@ +package com.zhjt.mogo_core_function_devatools.rviz.dialog + +import android.content.Context +import android.view.View +import android.view.View.OnClickListener +import android.widget.AdapterView +import android.widget.Button +import android.widget.ExpandableListView +import android.widget.ProgressBar +import android.widget.TextView +import com.google.protobuf.TextFormat +import com.mogo.eagle.core.utilcode.util.SizeUtils +import com.zhjt.mogo_core_function_devatools.rviz.R +import com.zhjt.mogo_core_function_devatools.rviz.common.base.BaseDialog +import com.zhjt.mogo_core_function_devatools.rviz.constant.FaultSubModuleId +import com.zhjt.mogo_core_function_devatools.rviz.constant.MsgFmData +import com.zhjt.mogo_core_function_devatools.rviz.dialog.adapter.FaultCodeDetailsAdapter +import com.zhjt.mogo_core_function_devatools.rviz.model.db.FmCodeRepository +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.FmCodeEntity +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.FmEntity +import kotlinx.coroutines.DelicateCoroutinesApi +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + + +/** + * FM详细信息展示弹窗 + + */ +class FaultCodeDetailsDialog(context: Context?, private val fmEntity: FmEntity) : + BaseDialog(context), OnClickListener { + lateinit var adapter: FaultCodeDetailsAdapter + private var isExpand = false + private val expandMap = mutableMapOf() + private lateinit var listView: ExpandableListView + private lateinit var tvModuleTitle: TextView + private lateinit var tvModuleState: TextView + private lateinit var tvMsg: TextView + private lateinit var btnExpand: Button + private lateinit var btnCancel: Button + private lateinit var layoutHint: View + private lateinit var loadingView: ProgressBar + + init { + + } + + override fun getContentViewResource(): View { + return layoutInflater.inflate(R.layout.rviz_fmd_dialog_fault_code_details, null, false) + } + + + override fun onViewInitBefore() { + super.onViewInitBefore() + val metrics2 = context.resources.displayMetrics + val widthPixels = metrics2.widthPixels + val heightPixels = metrics2.heightPixels + window?.setLayout( +// SizeUtils.dp2px(1280F), +// SizeUtils.dp2px(740F) + widthPixels, + heightPixels - SizeUtils.dp2px(60F) + ) + } + + + override fun onViewInit() { + super.onViewInit() + listView = findViewById(R.id.list_view) + tvModuleTitle = findViewById(R.id.tvModuleTitle) + tvModuleState = findViewById(R.id.tvModuleState) + btnExpand = findViewById(R.id.btn_expand) + layoutHint = findViewById(R.id.layout_hint) + loadingView = findViewById(R.id.loading_view) + tvMsg = findViewById(R.id.tv_msg) + btnCancel = findViewById(R.id.btn_cancel) + + + adapter = FaultCodeDetailsAdapter(context) + listView.setAdapter(adapter) + } + + @OptIn(DelicateCoroutinesApi::class) + override fun onViewCreated() { + super.onViewCreated() + tvModuleTitle.text = fmEntity.title + var msg = String.format("严重故障:%s个 ", fmEntity.stopFaultNum) + String.format( + "其他故障:%s个", + fmEntity.otherFaultNum + ) + if (fmEntity.unknownFaultNum != 0) { + msg += String.format(" 未知故障:%s个", fmEntity.unknownFaultNum) + } + tvModuleState.text = msg + btnExpand.setOnClickListener { + isExpand = !isExpand + btnExpand.text = if (isExpand) "折叠" else "展开" + for (index in 0 until adapter.groupCount) { + if (isExpand) { + listView.expandGroup(index) + } else { + listView.collapseGroup(index) + } + } + } + listView.setOnGroupExpandListener { groupPosition -> + // 在这里添加你想要执行的操作,当某个 Group 被展开时触发 + expandMap[groupPosition] = true + val allTrue = expandMap.all { it.value } + if (allTrue) { + isExpand = true + btnExpand.text = "折叠" + } + } + listView.setOnGroupCollapseListener { groupPosition -> + // 在这里添加你想要执行的操作,当某个 Group 被展开时触发 + expandMap[groupPosition] = false + val allFalse = expandMap.all { !it.value } + if (allFalse) { + isExpand = false + btnExpand.text = "展开" + } + } + listView.onItemLongClickListener = + AdapterView.OnItemLongClickListener { parent, view, position, id -> // 获取组或子项的信息 + val packedPosition: Long = listView.getExpandableListPosition(position) + val itemType = ExpandableListView.getPackedPositionType(packedPosition) + + if (itemType == ExpandableListView.PACKED_POSITION_TYPE_CHILD) { + // 这是子项长按事件 + val groupPosition = ExpandableListView.getPackedPositionGroup(packedPosition) + val childPosition = ExpandableListView.getPackedPositionChild(packedPosition) + val entity = adapter.getChild(groupPosition, childPosition) + FMDataShowDialog(context, entity.faultCode, entity.originalData).show() + return@OnItemLongClickListener true + } else if (itemType == ExpandableListView.PACKED_POSITION_TYPE_GROUP) { + // 这是组项长按事件 + val groupPosition = ExpandableListView.getPackedPositionGroup(packedPosition) + return@OnItemLongClickListener true + } + false + }; + layoutHint.visibility = View.VISIBLE + val data = fmEntity.data + if (data.isEmpty()) { + loadingView.visibility = View.GONE + tvMsg.text = "数据异常" + } else { + GlobalScope.launch(Dispatchers.IO) { + val list = ArrayList>>() + val iterator = data.iterator() + while (iterator.hasNext()) { + val item = iterator.next() + var fmCodeEntity: FmCodeEntity? = null + if (!item.faultId.isNullOrEmpty()) { + fmCodeEntity = FmCodeRepository.getFmCodeInfo(item.faultId) + } + if (fmCodeEntity == null) { + fmCodeEntity = FmCodeEntity() + fmCodeEntity.moduleId = "" + fmCodeEntity.subModuleId = "" + fmCodeEntity.faultId = "" + fmCodeEntity.faultCode = item.faultId + if (!item.faultId.isNullOrEmpty()) { + val parts = item.faultId.split("_") + if (parts.size >= 3) { + fmCodeEntity.moduleId = parts[0] + fmCodeEntity.subModuleId = parts[1] + fmCodeEntity.faultId = parts[2] + } + } + } + + if (!item.faultName.isNullOrEmpty()) { + fmCodeEntity.faultName = item.faultName + } + + if (!item.faultResultList.isNullOrEmpty()) { + val tem = getSystemImpact(item.faultResultList) + if (tem.isNotEmpty()) { + fmCodeEntity.systemImpact = tem + } + } + if (!item.faultActionList.isNullOrEmpty()) { + val tem = getTroubleshootingSuggestions(item.faultActionList) + if (tem.isNotEmpty()) { + fmCodeEntity.troubleshootingSuggestions = tem + } + } + if (!fmCodeEntity.faultReason.isNullOrEmpty() && fmCodeEntity.faultReason.contains( + "\n" + ) + ) { + fmCodeEntity.faultReason = fmCodeEntity.faultReason.replace("\n", " ") + } + if (!fmCodeEntity.systemImpact.isNullOrEmpty() && fmCodeEntity.systemImpact.contains( + "\n" + ) + ) { + fmCodeEntity.systemImpact = fmCodeEntity.systemImpact.replace("\n", " ") + } + if (!fmCodeEntity.troubleshootingSuggestions.isNullOrEmpty() && fmCodeEntity.troubleshootingSuggestions.contains( + "\n" + ) + ) { + fmCodeEntity.troubleshootingSuggestions = + fmCodeEntity.troubleshootingSuggestions.replace("\n", " ") + } + fmCodeEntity.faultTime = item.faultTime + fmCodeEntity.systemDegradationStrategy = item.policyCode + fmCodeEntity.faultLevel = item.faultLevel + fmCodeEntity.originalData = + TextFormat.printer().escapingNonAscii(false).printToString(item) + fmCodeEntity.subModuleName = FaultSubModuleId.getName( + fmCodeEntity.moduleId, + fmCodeEntity.subModuleId, + false, + true + ) + addList(list, fmCodeEntity) + } + val (unclassifiedPairs, otherPairs) = list.partition { it.first == "异常数据" } + if (unclassifiedPairs.isNotEmpty()) { + list.clear() + list.addAll(otherPairs) + list.addAll(unclassifiedPairs) + } + for ((index, item) in list.withIndex()) { + expandMap[index] = false + } + withContext(Dispatchers.Main) { + layoutHint.visibility = View.GONE + adapter.setData(list) + if (adapter.groupCount == 1) { + listView.expandGroup(0) + } + } + } + } + } + + + private fun addList( + list: ArrayList>>, + fmCodeEntity: FmCodeEntity + ) { + if (fmCodeEntity.subModuleId.isEmpty()) { + addDetails(list, "异常数据", fmCodeEntity) + } else { + addDetails(list, fmCodeEntity.subModuleId, fmCodeEntity) + } + } + + private fun addDetails( + list: ArrayList>>, + key: String, + fmCodeEntity: FmCodeEntity + ) { + val existingPair = list.find { it.first == key } + if (existingPair != null) { + existingPair.second.add(fmCodeEntity) + } else { + val newList = ArrayList() + newList.add(fmCodeEntity) + val newPair = Pair(key, newList) + list.add(newPair) + // 执行其他操作 + } + } + + private fun getTroubleshootingSuggestions(faultActionList: List): String { + return if (faultActionList.isEmpty()) { + "" + } else { + val receiveFaultLevel = ArrayList() + faultActionList.forEach { action -> + //如果不包含此故障Level,则进行添加 + if (!receiveFaultLevel.contains(MsgFmData.FaultAction.getFaultLevel(action)) && MsgFmData.FaultAction.getFaultLevel( + action + ) != 0 + ) { + receiveFaultLevel.add(MsgFmData.FaultAction.getFaultLevel(action)) + } + } + //对faultLevel集合进行排序,按照顺序输出建议操作 + if (receiveFaultLevel.size > 0) { + val faultActionStr: StringBuilder = StringBuilder() + receiveFaultLevel.sort() + receiveFaultLevel.reverse() + receiveFaultLevel.forEach { level -> + if (MsgFmData.FaultAction.getFaultAction(level).isNotBlank()) { + faultActionStr.append(MsgFmData.FaultAction.getFaultAction(level)) + } + if (MsgFmData.FaultAction.getFaultActionCode(level).isNotBlank()) { + faultActionStr.append("(") + faultActionStr.append(MsgFmData.FaultAction.getFaultActionCode(level)) + faultActionStr.append(")") + } + if (MsgFmData.FaultAction.getFaultAction(level) + .isNotBlank() || MsgFmData.FaultAction.getFaultActionCode(level) + .isNotBlank() + ) { + faultActionStr.append(" ") + } + } + faultActionStr.toString() + } else { + "暂无" + } + } + } + + private fun getSystemImpact(faultResultList: List): String { + return if (faultResultList.isEmpty()) { + "" + } else { + val fmFaultResult = StringBuilder() + faultResultList.forEach { result -> + if (MsgFmData.FaultResult.getResultDefine(result).isNotBlank()) { + fmFaultResult.append(MsgFmData.FaultResult.getResultDefine(result)) + } + if (result.isNotBlank()) { + fmFaultResult.append("(") + fmFaultResult.append(result) + fmFaultResult.append(")") + } + if (MsgFmData.FaultResult.getResultDefine(result) + .isNotBlank() || result.isNotBlank() + ) { + fmFaultResult.append(" ") + } + } + fmFaultResult.toString() + } + } + + + override fun onDismiss() { + super.onDismiss() + } + + override fun setOnListener() { + super.setOnListener() + btnCancel.setOnClickListener(this) + } + + override fun onClick(v: View) { + val id = v.id + if (id == R.id.btn_cancel) { + dismiss() + } + } + + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/InputUserPwdDialog.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/InputUserPwdDialog.kt new file mode 100644 index 0000000000..e537a7f080 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/InputUserPwdDialog.kt @@ -0,0 +1,100 @@ +package com.zhjt.mogo_core_function_devatools.rviz.dialog + +import android.app.Dialog +import android.content.Context +import android.os.Bundle +import android.text.TextUtils +import android.view.inputmethod.EditorInfo +import android.view.inputmethod.InputMethodManager +import android.widget.Button +import android.widget.EditText +import android.widget.TextView +import android.widget.TextView.OnEditorActionListener +import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.zhjt.mogo_core_function_devatools.rviz.R +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.SSHHostBean + +/** + * 密码输入弹窗 + */ +class InputUserPwdDialog( + context: Context, + private val host: SSHHostBean, + private val mOnClickListener: OnClickListener +) : Dialog(context) { + + + private val TAG: String = "DisconnectDialog" + private lateinit var inputRosUserName: EditText + private lateinit var inputRosPassword: EditText + + public interface OnClickListener { + fun onConfirm() + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.rviz_fmd_dialog_fmd_user_pwd) + val titleView: TextView = findViewById(R.id.title) + inputRosUserName = findViewById(R.id.input_ros_user_name) + inputRosPassword= findViewById(R.id.input_ros_password) + val btnCancel: Button = findViewById(R.id.btnCancel) + val btnConfirm: Button = findViewById(R.id.btnConfirm) + window?.setBackgroundDrawable(null) + titleView.text = host.hostname + inputRosUserName.setOnEditorActionListener(onEditorActionListener) + inputRosPassword.setOnEditorActionListener(onEditorActionListener) + if (!TextUtils.isEmpty(host.username)) { + inputRosUserName.setText(host.username) + } + if (!TextUtils.isEmpty(host.userPwd)) { + inputRosPassword.setText(host.userPwd) + } + setOnDismissListener { + val inputMethodManager = + context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager + inputMethodManager.hideSoftInputFromWindow( + this.window?.currentFocus?.windowToken, + 0 + ) + } + btnCancel.setOnClickListener { + dismiss() + } + btnConfirm.setOnClickListener { + onConfirm() + } + } + + private fun onConfirm() { + val enableUser = inputRosUserName.text + if (TextUtils.isEmpty(enableUser)) { + ToastUtils.showShort("请输入用户名") + return@onConfirm + } + val enablePwd = inputRosPassword.text + if (TextUtils.isEmpty(enablePwd)) { + ToastUtils.showShort("请输入密码") + return@onConfirm + } + host.username = enableUser.toString().trim() + host.userPwd = enablePwd.toString().trim() + mOnClickListener.onConfirm() + dismiss() + } + + private val onEditorActionListener = + OnEditorActionListener { v, actionId, event -> + if (actionId == EditorInfo.IME_ACTION_NEXT) { + // 获取下一个焦点的资源 ID + val nextFocusId = v.nextFocusForwardId + val editText = findViewById(nextFocusId) + editText.setSelection(editText.text.length) + // editText.selectAll(); + } else if (actionId == EditorInfo.IME_ACTION_GO) { + onConfirm() + return@OnEditorActionListener true + } + false + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/SelectAutopilotLineDialog.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/SelectAutopilotLineDialog.kt new file mode 100644 index 0000000000..6407cbcabd --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/SelectAutopilotLineDialog.kt @@ -0,0 +1,206 @@ +package com.zhjt.mogo_core_function_devatools.rviz.dialog + +import android.app.Activity +import android.app.Dialog +import android.content.Context +import android.os.Bundle +import android.text.Editable +import android.text.TextWatcher +import android.view.WindowManager +import android.widget.EditText +import android.widget.ImageView +import android.widget.TextView +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.LifecycleOwner +import androidx.lifecycle.LifecycleRegistry +import androidx.recyclerview.widget.DividerItemDecoration +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView +import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager +import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.eagle.core.utilcode.util.Utils +import com.mogo.eagle.core.utilcode.util.WindowUtils +import com.zhjt.mogo_core_function_devatools.rviz.net.TrajectoryApiClient +import com.zhjt.mogo_core_function_devatools.rviz.R +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectoryListInfo +import com.zhjt.mogo_core_function_devatools.rviz.bean.VehicleConfigData +import com.zhjt.mogo_core_function_devatools.rviz.dialog.adapter.AutopilotLineAdapter +import com.zhjt.mogo_core_function_devatools.rviz.net.NetworkCallback +import com.zhjt.mogo_core_function_devatools.rviz.ui.views.MoGoLoadingView +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.cancel + +/** + * 自动驾驶路线选择提示窗 + */ +class SelectAutopilotLineDialog(context: Context) : Dialog(context), LifecycleOwner { + private val scopeQueryTrajectoryList = CoroutineScope(Dispatchers.Main) + private val mLifecycleRegistry = LifecycleRegistry(this) + + private var mActivity: Activity? = null + private var autopilotLineAdapter: AutopilotLineAdapter? = null + private var clickListener: ClickListener? = null + private var searchStr: String? = null + private var allLineList: ArrayList = ArrayList() //所有的路线 + private var selectLineList: ArrayList = ArrayList() //选择的路线 + + private lateinit var etSearch: EditText + private lateinit var rvLineList: RecyclerView + private lateinit var tvLoading: MoGoLoadingView + private lateinit var tvCancel: TextView + private lateinit var ivSearch: ImageView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.dialog_select_autopilot_line) + setCanceledOnTouchOutside(false) + etSearch = findViewById(R.id.etSearch) + rvLineList = findViewById(R.id.rvLineList) + tvLoading = findViewById(R.id.tvLoading) + tvCancel = findViewById(R.id.tvCancel) + ivSearch = findViewById(R.id.ivSearch) + + autopilotLineAdapter = AutopilotLineAdapter() + autopilotLineAdapter?.setListener(object : AutopilotLineAdapter.SubClickListener { + override fun onClick(trajectoryListInfo: TrajectoryListInfo) { + etSearch.setText("") + clickListener?.onClick(trajectoryListInfo) + dismiss() + } + }) + val linearLayoutManager = LinearLayoutManager(Utils.getApp()) + rvLineList.layoutManager = linearLayoutManager + rvLineList.adapter = autopilotLineAdapter + val divider = DividerItemDecoration(context, linearLayoutManager.orientation) + rvLineList.addItemDecoration(divider) + val params: WindowManager.LayoutParams = window!!.attributes + params.width = WindowUtils.dip2px(context,context.resources.getDimension(R.dimen.dp_1200)) + params.height = WindowUtils.dip2px(context,context.resources.getDimension(R.dimen.dp_1000)) + window?.attributes = params + window?.setBackgroundDrawable(null) + initEvent() + } + + fun showSelectLineDialog(activity: Activity) { + mActivity = activity +// if (activity.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) { +// AutoSize.autoConvertDensity(activity, 1660f, true) +// } else { +// AutoSize.autoConvertDensity(activity, 960f, true) +// } + show() + } + + fun setSelectLineData(list: ArrayList) { + if (list.isNotEmpty()) { + autopilotLineAdapter?.setData(list) + allLineList = list + } + } + + private fun initEvent() { + setOnShowListener { + mLifecycleRegistry.currentState = Lifecycle.State.CREATED + mLifecycleRegistry.currentState = Lifecycle.State.STARTED + + tvLoading.show("数据加载中……") + + // 处理Taxi + // 处理BUS包含:JV、KW、FT、SW + CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84().cityCode?.let { + TrajectoryApiClient.queryTrajectoryList( + this, + VehicleConfigData.getCarType().name, + it, + object : + NetworkCallback> { + override fun onSuccess(data: ArrayList) { + setSelectLineData(data) + tvLoading.hide() + } + + override fun onError(msg: String) { + ToastUtils.showLong("获取 Bus 站点列表异常,异常原因:${msg}") + tvLoading.show("获取 Bus 站点列表异常") + } + } + ) + } ?: let { + ToastUtils.showLong("获取 Bus 站点列表异常,获取当前未知失败,请开启定位权限") + tvLoading.show("获取 Bus 站点列表异常,请开启定位权限") + } + + } + //取消 + tvCancel.setOnClickListener { + etSearch.setText("") + dismiss() + } + //搜索 + etSearch.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { + + } + + override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { + + } + + override fun afterTextChanged(str: Editable?) { + searchStr = str.toString() + if (searchStr.isNullOrBlank()) { + ivSearch.setImageResource(R.drawable.icon_line_search) + autopilotLineAdapter?.setData(allLineList) + } else { + ivSearch.setImageResource(R.drawable.icon_line_delect) + selectLineList.clear() + for (info in allLineList) { + if (info.lineName.contains(searchStr!!) || info.lineId.toString() + .contains(searchStr!!) + ) { + selectLineList.add(info) + } + } + autopilotLineAdapter?.setData(selectLineList) + } + + } + + }) + ivSearch.setOnClickListener { + if (searchStr != null && searchStr!!.isNotEmpty()) { + etSearch.setText("") + ivSearch.setImageResource(R.drawable.icon_line_search) + autopilotLineAdapter?.setData(allLineList) + } + } + } + + fun setListener(listener: ClickListener) { + clickListener = listener + } + + interface ClickListener { + fun onClick(info: TrajectoryListInfo) + } + + override fun dismiss() { + mLifecycleRegistry.currentState = Lifecycle.State.DESTROYED + scopeQueryTrajectoryList.cancel() + mActivity = null + super.dismiss() + } + + override fun onDetachedFromWindow() { + mLifecycleRegistry.currentState = Lifecycle.State.DESTROYED + scopeQueryTrajectoryList.cancel() + super.onDetachedFromWindow() + } + + override fun getLifecycle(): Lifecycle { + return mLifecycleRegistry + } + + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/ShowConfigDialog.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/ShowConfigDialog.java new file mode 100644 index 0000000000..077f2928d3 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/ShowConfigDialog.java @@ -0,0 +1,84 @@ +package com.zhjt.mogo_core_function_devatools.rviz.dialog; + +import android.content.Context; +import android.graphics.Typeface; +import android.view.View; +import android.view.Window; +import android.view.WindowManager; +import android.widget.Button; +import android.widget.TextView; + +import com.mogo.eagle.core.utilcode.util.SizeUtils; +import com.zhjt.mogo_core_function_devatools.rviz.R; +import com.zhjt.mogo_core_function_devatools.rviz.common.base.BaseDialog; + + +/** + * 配置展示 + */ +public class ShowConfigDialog extends BaseDialog { + private String data; + private final String title; + private TextView dataView; + private TextView titleView; + private Button btnCancel; + + public ShowConfigDialog(Context context, String title, String data) { + super(context); + this.title = title; + this.data = data; + } + + @Override + protected void onViewCreateBefore() { + super.onViewCreateBefore(); + getWindow().setBackgroundDrawableResource(R.drawable.rviz_common_bg_dialog); + } + + @Override + protected View getContentViewResource() { + return getLayoutInflater().inflate(R.layout.rviz_fmd_dialog_show_config, null, false); + } + + @Override + protected void onViewInitBefore() { + super.onViewInitBefore(); + Window window = getWindow(); + if (window != null) { + window.setLayout(SizeUtils.dp2px(getContext().getResources().getDimension(R.dimen.dp_1200)), WindowManager.LayoutParams.WRAP_CONTENT); + // 可以尝试设置其他窗口属性 + } +// WindowManager.LayoutParams layoutParams = getWindow().getAttributes(); +// layoutParams.width = 1550; +//// layoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT; +// getWindow().setAttributes(layoutParams); + } + + @Override + protected void onViewInit() { + super.onViewInit(); + dataView = findViewById(R.id.data); + titleView = findViewById(R.id.title_view); + btnCancel = findViewById(R.id.btn_cancel); + Typeface typeface = Typeface.createFromAsset(getContext().getAssets(), "courbd.ttf");//等宽的字体,避免显示混乱(微软字体,目前查到的是免费试用) + dataView.setTypeface(typeface); + if (data.endsWith("\n")) { + data = data.trim(); + } + dataView.setText(data); + titleView.setText(title); + } + + @Override + protected void setOnListener() { + super.setOnListener(); + btnCancel.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dismiss(); + } + }); + } + + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/StartupConfigDialog.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/StartupConfigDialog.java new file mode 100644 index 0000000000..e3c220053d --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/StartupConfigDialog.java @@ -0,0 +1,157 @@ +package com.zhjt.mogo_core_function_devatools.rviz.dialog; + +import android.content.Context; +import android.text.TextUtils; +import android.view.Gravity; +import android.view.View; +import android.view.ViewGroup; +import android.view.WindowManager; +import android.widget.Button; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleRegistry; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.SimpleItemAnimator; + +import com.mogo.eagle.core.utilcode.util.SizeUtils; +import com.mogo.eagle.core.utilcode.util.ToastUtils; +import com.zhjt.mogo_core_function_devatools.rviz.R; +import com.zhjt.mogo_core_function_devatools.rviz.common.base.BaseDialog; +import com.zhjt.mogo_core_function_devatools.rviz.common.coroutines.FlowBus; +import com.zhjt.mogo_core_function_devatools.rviz.common.utils.Utils; +import com.zhjt.mogo_core_function_devatools.rviz.constant.EventKey; +import com.zhjt.mogo_core_function_devatools.rviz.dialog.adapter.StartupConfigAdapter; +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.DockerConfigContent; +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.StartupConfig; +import com.zhjt.mogo_core_function_devatools.rviz.ssh.constant.MogoCommand; +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.SSHHostBean; +import com.zhjt.mogo_core_function_devatools.rviz.widgets.MyLinearLayoutManager; + +/** + * 配置文件展示 + */ +public class StartupConfigDialog extends BaseDialog implements LifecycleOwner { + private final StartupConfig config; + private final String title; + private OnStartupConfigListener listener; + private final LifecycleRegistry lifecycle = new LifecycleRegistry(this); + private StartupConfigAdapter adapter; + private RecyclerView dockerListView; + private TextView headerStart; + private TextView headerEnd; + private TextView titleView; + private Button btnCancel; + + @NonNull + @Override + public Lifecycle getLifecycle() { + return lifecycle; + } + + public interface OnStartupConfigListener { + void onQuery(SSHHostBean host, String path); + + void onDismiss(SSHHostBean host); + } + + public StartupConfigDialog(Context context, String title, StartupConfig config, OnStartupConfigListener listener) { + super(context); + this.title = title; + this.config = config; + this.listener = listener; + } + + @Override + protected View getContentViewResource() { + return getLayoutInflater().inflate(R.layout.rviz_fmd_dialog_dockers, null, false); + } + + @Override + protected void onViewInitBefore() { + super.onViewInitBefore(); + lifecycle.setCurrentState(Lifecycle.State.CREATED); + getWindow().setBackgroundDrawableResource(R.drawable.rviz_common_bg_dialog); + WindowManager.LayoutParams layoutParams = getWindow().getAttributes(); + layoutParams.width = SizeUtils.dp2px(getContext().getResources().getDimension(R.dimen.dp_1200)); + layoutParams.height = ViewGroup.LayoutParams.WRAP_CONTENT; + getWindow().setAttributes(layoutParams); + } + + @Override + protected void onViewInit() { + super.onViewInit(); + dockerListView = findViewById(R.id.docker_list_view); + headerStart = findViewById(R.id.header_start); + headerEnd = findViewById(R.id.header_end); + titleView = findViewById(R.id.title_view); + btnCancel = findViewById(R.id.btn_cancel); + + titleView.setText(title); + headerStart.setGravity(Gravity.CENTER_VERTICAL); + headerStart.setText("配置路径"); + headerEnd.setVisibility(View.INVISIBLE); + RecyclerView.ItemAnimator animator = dockerListView.getItemAnimator(); + if (animator instanceof SimpleItemAnimator) { + ((SimpleItemAnimator) animator).setSupportsChangeAnimations(false); + } + MyLinearLayoutManager linearLayoutManager = new MyLinearLayoutManager(getContext()); + linearLayoutManager.setOrientation(GridLayoutManager.VERTICAL); + dockerListView.setLayoutManager(linearLayoutManager); + adapter = new StartupConfigAdapter(config.configs, new StartupConfigAdapter.OnStartupConfigListener() { + @Override + public void onQuery(String path) { + if (listener != null) { + listener.onQuery(config.host, path); + } + } + }); + dockerListView.setAdapter(adapter); + } + + + @Override + protected void onViewCreated() { + super.onViewCreated(); + lifecycle.setCurrentState(Lifecycle.State.STARTED); + FlowBus.INSTANCE.with(EventKey.QUERY_DOCKER_CONFIG_CONTENT).register(this, it -> { + String path = it.cmd.replace(MogoCommand.QUERY_DOCKER_CONFIG_CONTENT, ""); + if (TextUtils.isEmpty(it.content) || it.content.contains("No such file or directory")) { + adapter.updateLoading(path, 2); + ToastUtils.showShort("文件不存在或打开失败"); + } else { + adapter.updateLoading(path, 1); + new ShowConfigDialog( + getContext(), + Utils.getIPLastSegment(it.host.getHostname()) + "--" + path, + it.content + ).show(); + } + }); + + } + + @Override + protected void setOnListener() { + super.setOnListener(); + btnCancel.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + dismiss(); + } + }); + } + + @Override + protected void onDismiss() { + super.onDismiss(); + lifecycle.setCurrentState(Lifecycle.State.DESTROYED); + if (listener != null) { + listener.onDismiss(config.host); + } + listener = null; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/adapter/AutopilotLineAdapter.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/adapter/AutopilotLineAdapter.kt new file mode 100644 index 0000000000..a358b82882 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/adapter/AutopilotLineAdapter.kt @@ -0,0 +1,54 @@ +package com.zhjt.mogo_core_function_devatools.rviz.dialog.adapter + +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import com.zhjt.mogo_core_function_devatools.rviz.R +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectoryListInfo + +/** + * 自动驾驶路线适配器 + */ +class AutopilotLineAdapter : RecyclerView.Adapter() { + + private var data: ArrayList? = null + private var subClickListener: SubClickListener? = null + + fun setData(list: ArrayList) { + data = list + notifyDataSetChanged() + } + + fun setListener(listener: SubClickListener) { + subClickListener = listener + } + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): AutopilotLineHolder { + val view = LayoutInflater.from(parent.context) + .inflate(R.layout.item_autopilot_line, parent, false) + return AutopilotLineHolder(view) + } + + override fun getItemCount() = data?.size ?: 0 + + override fun onBindViewHolder(holder: AutopilotLineHolder, position: Int) { + data?.let { + val info = it[position] + holder.tvAutopilotLine.text = "${info.lineId}-${info.lineName}" + holder.tvAutopilotLine.setOnClickListener { + subClickListener?.onClick(info) + } + } + } + + class AutopilotLineHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + var tvAutopilotLine: TextView = itemView.findViewById(R.id.tvAutopilotLine) + } + + interface SubClickListener { + fun onClick(trajectoryListInfo: TrajectoryListInfo) + } + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/adapter/ConsoleAdapter.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/adapter/ConsoleAdapter.java new file mode 100644 index 0000000000..3c96846e38 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/adapter/ConsoleAdapter.java @@ -0,0 +1,76 @@ +package com.zhjt.mogo_core_function_devatools.rviz.dialog.adapter; + +import android.annotation.SuppressLint; +import android.graphics.Color; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.mogo.eagle.core.data.deva.report.ReportEntity; +import com.zhjt.mogo_core_function_devatools.rviz.R; + +import java.util.List; + + +/** + * @author XuXinChao + * @description 状态监控-控制台适配器 + * @since: 2022/7/26 + */ +public class ConsoleAdapter extends RecyclerView.Adapter { + + private List data; + + private static final String RESULT_AUTOPILOT_DISABLE = "RESULT_AUTOPILOT_DISABLE"; + private static final String RESULT_AUTOPILOT_SYSTEM_UNSTARTED = "RESULT_AUTOPILOT_SYSTEM_UNSTARTED"; + private static final String RESULT_REMOTEPILOT_DISABLE = "RESULT_REMOTEPILOT_DISABLE"; + + public void setData(List data) { + if (data != null && data.size() > 0) { + this.data = data; + notifyDataSetChanged(); + } + } + + @NonNull + @Override + public ConsoleHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { +// AutoSizeCompat.autoConvertDensityOfGlobal(parent.getContext().getResources()); + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_console, parent, false); + return new ConsoleHolder(view); + } + + @SuppressLint("SetTextI18n") + @Override + public void onBindViewHolder(@NonNull ConsoleHolder holder, int position) { + ReportEntity reportEntity = data.get(position); + holder.tvConsoleContent.setText("Time:" + reportEntity.getTime() + "\nCode:" + reportEntity.getCode() + "\nMsg:" + reportEntity.getMsg()); + if (RESULT_AUTOPILOT_DISABLE.equals(reportEntity.getCode()) + || RESULT_AUTOPILOT_SYSTEM_UNSTARTED.equals(reportEntity.getCode()) + || RESULT_REMOTEPILOT_DISABLE.equals(reportEntity.getCode())) { + holder.tvConsoleContent.setTextColor(Color.RED); + } else { + holder.tvConsoleContent.setTextColor(Color.WHITE); + } + } + + @Override + public int getItemCount() { + return data != null ? data.size() : 0; + } + + public static class ConsoleHolder extends RecyclerView.ViewHolder { + + private TextView tvConsoleContent; + + public ConsoleHolder(@NonNull View itemView) { + super(itemView); + tvConsoleContent = itemView.findViewById(R.id.tvConsoleContent); + } + } + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/adapter/DockerListAdapter.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/adapter/DockerListAdapter.java new file mode 100644 index 0000000000..8c009ad8c6 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/adapter/DockerListAdapter.java @@ -0,0 +1,79 @@ +package com.zhjt.mogo_core_function_devatools.rviz.dialog.adapter; + +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import com.zhjt.mogo_core_function_devatools.rviz.R; +import com.zhjt.mogo_core_function_devatools.rviz.common.base.BaseAdapter; +import com.zhjt.mogo_core_function_devatools.rviz.common.base.BaseViewHolder; +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.DockerInfo; + +public class DockerListAdapter extends BaseAdapter { + + + @Override + protected void onBindDataToItem(MyViewHolder viewHolder, DockerInfo data, int position) { + viewHolder.itemView.setBackgroundResource(position % 2 == 0 ? R.drawable.rviz_fmd_bg_item_dockers_even : R.drawable.rviz_fmd_bg_item_dockers_odd); + viewHolder.nameView.setText(data.getNames()); + viewHolder.imageView.setText(data.getImage()); + String status = data.getStatus(); + int color = R.color.rviz_fmd_docker_status_not_running; + String temStatus = status; + if (TextUtils.isEmpty(status)) { + temStatus = "未知"; + } else { + status = status.toLowerCase(); + if (status.startsWith("created")) { + temStatus = "已创建"; + } else if (status.startsWith("exited")) { + temStatus = "已停止"; + } else if (status.startsWith("paused")) { + temStatus = "已暂停"; + } else if (status.startsWith("restarting")) { + temStatus = "正在重启"; + } else if (status.startsWith("dead")) { + temStatus = "已停止(未清理)"; + } else if (status.startsWith("removing")) { + temStatus = "正在删除"; + } else if (status.startsWith("up") || status.startsWith("running")) { +// temStatus = temStatus.replace("Up", "正在运行"); + color = android.R.color.black; + } else { + temStatus = "未知"; + } + } + viewHolder.statusView.setText(temStatus); + int c = mContext.getColor(color); + viewHolder.statusView.setTextColor(c); + viewHolder.nameView.setTextColor(c); + viewHolder.imageView.setTextColor(c); + } + + @Override + protected View getItemViewResource(ViewGroup viewGroup) { + return LayoutInflater.from(mContext).inflate(R.layout.rviz_fmd_item_dockers, viewGroup, false); + } + + @Override + protected MyViewHolder getViewHolder(View view) { + return new MyViewHolder(view, this); + } + + //继承RecyclerView.ViewHolder抽象类的自定义ViewHolder + static class MyViewHolder extends BaseViewHolder { + TextView nameView; + TextView imageView; + TextView statusView; + + public MyViewHolder(View itemView, DockerListAdapter adapter) { + super(itemView, adapter); + nameView = itemView.findViewById(R.id.name_view); + imageView = itemView.findViewById(R.id.image_view); + statusView = itemView.findViewById(R.id.status_view); + } + } + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/adapter/FaultCodeDetailsAdapter.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/adapter/FaultCodeDetailsAdapter.kt new file mode 100644 index 0000000000..7809a5af30 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/adapter/FaultCodeDetailsAdapter.kt @@ -0,0 +1,153 @@ +package com.zhjt.mogo_core_function_devatools.rviz.dialog.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.BaseExpandableListAdapter +import android.widget.TextView +import com.zhjt.mogo_core_function_devatools.rviz.R +import com.zhjt.mogo_core_function_devatools.rviz.constant.FaultLevel +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.FmCodeEntity +import java.text.SimpleDateFormat +import java.util.Date +import java.util.Locale + +/** + * FM详细信息展示 + */ +class FaultCodeDetailsAdapter(val context: Context) : BaseExpandableListAdapter() { + val dataFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS", Locale.getDefault()) + private var detailsInfos: ArrayList>>? = null + private var mContext: Context? = null + + init { + mContext = context + } + + fun setData(list: ArrayList>>) { + detailsInfos = list + notifyDataSetChanged() + } + + override fun getGroupCount(): Int { + return if (detailsInfos != null) detailsInfos!!.size else 0 + } + + override fun getChildrenCount(groupPosition: Int): Int { + return if (detailsInfos != null) detailsInfos!![groupPosition].second.size else 0 + } + + override fun getGroup(groupPosition: Int): Pair> { + return detailsInfos!![groupPosition] + } + + override fun getChild(groupPosition: Int, childPosition: Int): FmCodeEntity { + return detailsInfos!![groupPosition].second[childPosition] + } + + override fun getGroupId(groupPosition: Int): Long { + return groupPosition.toLong() + } + + override fun getChildId(groupPosition: Int, childPosition: Int): Long { + return childPosition.toLong() + } + + override fun hasStableIds(): Boolean { + return false + } + + override fun getGroupView( + groupPosition: Int, + isExpanded: Boolean, + convertView: View?, + parent: ViewGroup? + ): View { + val view = convertView ?: LayoutInflater.from(context) + .inflate(R.layout.rviz_fmd_item_group_fault_code_details, parent, false) + val tvGroupTitle = view.findViewById(R.id.tvGroupTitle) + val tvGroupSize = view.findViewById(R.id.tvGroupSize) + val data = getGroup(groupPosition) + tvGroupTitle.text = data.first + tvGroupSize.text = String.format("%d个故障", data.second.size) + return view + } + + override fun getChildView( + groupPosition: Int, + childPosition: Int, + isLastChild: Boolean, + convertView: View?, + parent: ViewGroup? + ): View { + val view = convertView ?: LayoutInflater.from(context) + .inflate(R.layout.rviz_fmd_item_child_fault_code_details, parent, false) + val tvTimeValue = view.findViewById(R.id.tvTimeValue) + val tvCodeValue = view.findViewById(R.id.tvCodeValue) + val tvSubModuleValue = view.findViewById(R.id.tvSubModuleValue) + val tvNameValue = view.findViewById(R.id.tvNameValue) + val tvLevelValue = view.findViewById(R.id.tvLevelValue) + val tvCauseValue = view.findViewById(R.id.tvCauseValue) + val tvInfluenceValue = view.findViewById(R.id.tvInfluenceValue) + val tvSuggestValue = view.findViewById(R.id.tvSuggestValue) + val data = getChild(groupPosition, childPosition) + val p = FaultLevel.getMessageAndColor(data.systemDegradationStrategy, data.faultLevel) + val color = context.getColor(p.second) + tvTimeValue.setTextColor(color) + tvCodeValue.setTextColor(color) + tvSubModuleValue.setTextColor(color) + tvNameValue.setTextColor(color) + tvLevelValue.setTextColor(color) + tvCauseValue.setTextColor(color) + tvInfluenceValue.setTextColor(color) + tvSuggestValue.setTextColor(color) + //上报时间 + tvTimeValue.text = dataFormat.format(Date(data.faultTime)) + //降级策略 + tvLevelValue.text = p.first + + //故障码 + tvCodeValue.text = data.faultCode.ifEmpty { + "未知" + } + tvSubModuleValue.text = if (data.subModuleName.isNullOrEmpty()) { + "未知" + } else { + data.subModuleName + } + //故障名称 + tvNameValue.text = if (data.faultName.isNullOrEmpty()) { + "未知" + } else { + data.faultName + } + + //故障原因 + tvCauseValue.text = if (data.faultReason.isNullOrEmpty()) { + "暂无" + } else { + data.faultReason + } + //系统影响 + tvInfluenceValue.text = if (data.systemImpact.isNullOrEmpty()) { + "暂无" + } else { + data.systemImpact + } + //处理建议 + tvSuggestValue.text = if (data.troubleshootingSuggestions.isNullOrEmpty()) { + "暂无" + } else { + data.troubleshootingSuggestions + } + return view + } + + + override fun isChildSelectable(p0: Int, p1: Int): Boolean { + return true + } + + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/adapter/StartupConfigAdapter.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/adapter/StartupConfigAdapter.java new file mode 100644 index 0000000000..d193537ed0 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/dialog/adapter/StartupConfigAdapter.java @@ -0,0 +1,119 @@ +package com.zhjt.mogo_core_function_devatools.rviz.dialog.adapter; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ProgressBar; +import android.widget.TextView; + +import com.zhjt.mogo_core_function_devatools.rviz.R; +import com.zhjt.mogo_core_function_devatools.rviz.common.base.BaseAdapter; +import com.zhjt.mogo_core_function_devatools.rviz.common.base.BaseViewHolder; +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.StartupConfig; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; +import java.util.Locale; + +public class StartupConfigAdapter extends BaseAdapter { + private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()); + private final OnStartupConfigListener listener; + + public StartupConfigAdapter(List configs, OnStartupConfigListener listener) { + super(configs); + this.listener = listener; + } + + + public interface OnStartupConfigListener { + void onQuery(String path); + } + + public void updateLoading(String path, int catState) { + int index = mDatas.indexOf(new StartupConfig.Config(path, null)); + if (index > -1) { + StartupConfig.Config config = mDatas.get(index); + config.isShowLoading = false; + config.catState = catState; + notifyItemChanged(index); + } + } + + + @Override + protected void onBindDataToItem(MyViewHolder viewHolder, StartupConfig.Config config, int position) { + viewHolder.itemView.setBackgroundResource(position % 2 == 0 ? R.drawable.rviz_fmd_bg_item_dockers_even : R.drawable.rviz_fmd_bg_item_dockers_odd); + viewHolder.nameView.setText(config.path); + viewHolder.publishTimeView.setText("发布时间:" + sdf.format(new Date(config.attribute.getPublish_timestamp() * 1000L))); + viewHolder.updateTimeView.setText("本地更新时间:" + sdf.format(new Date(config.attribute.getModify_timestamp() * 1000L))); + viewHolder.loading.setVisibility(config.isShowLoading ? View.VISIBLE : View.GONE); + viewHolder.btnLook.setVisibility(!config.isShowLoading ? View.VISIBLE : View.INVISIBLE); + viewHolder.updateTextColor(config.catState); + } + + @Override + protected View getItemViewResource(ViewGroup viewGroup) { + return LayoutInflater.from(mContext).inflate(R.layout.rviz_fmd_item_startup_config, viewGroup, false); + } + + @Override + protected MyViewHolder getViewHolder(View view) { + return new MyViewHolder(view, this); + } + + //继承RecyclerView.ViewHolder抽象类的自定义ViewHolder + class MyViewHolder extends BaseViewHolder { + TextView nameView; + TextView publishTimeView; + TextView updateTimeView; + TextView btnLook; + ProgressBar loading; + + public MyViewHolder(View itemView, StartupConfigAdapter adapter) { + super(itemView, adapter); + nameView = itemView.findViewById(R.id.name_view); + publishTimeView = itemView.findViewById(R.id.publish_time_view); + updateTimeView = itemView.findViewById(R.id.update_time_view); + btnLook = itemView.findViewById(R.id.btn_look); + loading = itemView.findViewById(R.id.loading); + nameView.setSelected(true); + btnLook.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + if (listener != null) { + int pos = getBindingAdapterPosition(); + StartupConfig.Config config = mDatas.get(pos); + config.isShowLoading = true; + if (config.catState == 0) { + config.catState = 1; + updateTextColor(config.catState); + } + notifyItemChanged(pos); + listener.onQuery(config.path); + } + } + }); + } + + /** + * 更新文字颜色 + */ + public void updateTextColor(int catState) { + int tem; + if (catState == 1) { + tem = R.color.rviz_fmd_clock_look; + } else if (catState == 2) { + tem = R.color.rviz_fmd_docker_status_not_running; + } else { + tem = android.R.color.black; + } + int color = mContext.getColor(tem); + nameView.setTextColor(color); + publishTimeView.setTextColor(color); + updateTimeView.setTextColor(color); + } + } + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/db/CarStatusDao.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/db/CarStatusDao.java new file mode 100644 index 0000000000..20db70f3dc --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/db/CarStatusDao.java @@ -0,0 +1,15 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.db; + +import androidx.room.Dao; + +import com.zhjt.mogo_core_function_devatools.rviz.common.db.BaseDao; +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.CarStatusEntity; + +@Dao +public abstract class CarStatusDao implements BaseDao { + + static final String TAG = CarStatusDao.class.getCanonicalName(); + + + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/db/DataStorage.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/db/DataStorage.java new file mode 100644 index 0000000000..65f616dfe7 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/db/DataStorage.java @@ -0,0 +1,63 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.db; + +import android.content.Context; +import android.util.Log; + +import androidx.room.Database; +import androidx.room.Room; +import androidx.room.RoomDatabase; + +import com.zhjt.mogo_core_function_devatools.rviz.common.utils.LambdaTask; +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.FmCodeEntity; + +import java.util.List; + + +@Database(entities = {FmCodeEntity.class}, + version = 1, exportSchema = false) +public abstract class DataStorage extends RoomDatabase { + + private static String DB_NAME = "AutoPilotVisualDB.db"; + + private static final String TAG = DataStorage.class.getCanonicalName(); + private static DataStorage instance; + + public static synchronized DataStorage getInstance(final Context context) { + if (instance == null) { + instance = Room.databaseBuilder(context.getApplicationContext(), DataStorage.class, DB_NAME) + .allowMainThreadQueries() + .build(); + } + return instance; + } + + + // DAO Methods --------------------------------------------------------------------------------- + + public abstract FmCodeDao fmCodeDao(); + + + // Config methods ------------------------------------------------------------------------------ + public void addFmCode(FmCodeEntity fmCode) { + new LambdaTask(() -> { + long result = fmCodeDao().insert(fmCode); + Log.d("DataStorage", "插入数据result=" + result); + }).execute(); + } + + public void updateFmCode(FmCodeEntity fmCode) { + new LambdaTask(() -> fmCodeDao().update(fmCode)).execute(); + } + + public void deleteFmCode(FmCodeEntity config) { + new LambdaTask(() -> fmCodeDao().delete(config)).execute(); + } + + public List getAllFmCode() { + return fmCodeDao().getAllFmCode(); + } + + public FmCodeEntity getFmCodeInfo(String faultCode) { + return fmCodeDao().getFmCodeInfo(faultCode); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/db/FmCodeDao.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/db/FmCodeDao.java new file mode 100644 index 0000000000..a1df2abc10 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/db/FmCodeDao.java @@ -0,0 +1,33 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.db; + +import androidx.room.Dao; +import androidx.room.Query; + +import com.zhjt.mogo_core_function_devatools.rviz.common.db.BaseDao; +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.FmCodeEntity; + +import java.util.List; + +/** + * 故障码数据路操作 + */ +@Dao +public abstract class FmCodeDao implements BaseDao { + + static final String TAG = FmCodeDao.class.getCanonicalName(); + + @Query("SELECT * FROM fm_code_table") + abstract List getAllFmCode(); + + + /** + * 查询指定的 faultCode 对应的故障信息 + * + * @param faultCode 故障码 + * @return 故障信息 + */ + @Query("SELECT * FROM fm_code_table WHERE faultCode = :faultCode") + abstract FmCodeEntity getFmCodeInfo(String faultCode); + + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/db/FmCodeRepository.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/db/FmCodeRepository.java new file mode 100644 index 0000000000..f8478593bc --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/db/FmCodeRepository.java @@ -0,0 +1,30 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.db; + +import com.mogo.commons.AbsMogoApplication; +import com.mogo.eagle.core.utilcode.util.ActivityUtils; +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.FmCodeEntity; + +import java.util.List; + +/** + * 故障码数据库操作 + */ +public class FmCodeRepository { + + static DataStorage mDataStorage; + + public static List getAllList() { + if (mDataStorage == null) { + mDataStorage = DataStorage.getInstance(AbsMogoApplication.getApp()); + } + return mDataStorage.getAllFmCode(); + } + + public static FmCodeEntity getFmCodeInfo(String faultCode) { + if (mDataStorage == null) { + mDataStorage = DataStorage.getInstance(AbsMogoApplication.getApp()); + } + return mDataStorage.getFmCodeInfo(faultCode); + } + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/AdasConnectionStatus.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/AdasConnectionStatus.kt new file mode 100644 index 0000000000..d62b042520 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/AdasConnectionStatus.kt @@ -0,0 +1,5 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.entities + +import com.zhjt.mogo.adas.data.AdasConstants + +data class AdasConnectionStatus(val ipcConnectionStatus: AdasConstants.IpcConnectionStatus, val reason: String?) diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/CarStatusEntity.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/CarStatusEntity.java new file mode 100644 index 0000000000..e7e49b0427 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/CarStatusEntity.java @@ -0,0 +1,28 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.entities; + +import androidx.room.Entity; +import androidx.room.PrimaryKey; + +import java.util.ArrayList; +import java.util.HashMap; + +/** + * 聚合车辆状态,数据库操作 + */ +@Entity(tableName = "car_status_table") +public class CarStatusEntity { + + // 数据库主键 + @PrimaryKey(autoGenerate = true) + public long id; + + public long time; + + public String mapVersion; + public String hdMapVersion; + public String eagleEyeVersionName; + public int eagleEyeVersionCode; + + public HashMap> sensorStatusEntities = new HashMap<>(); + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/DiagnoseInfo.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/DiagnoseInfo.kt new file mode 100644 index 0000000000..b4a2f9be2e --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/DiagnoseInfo.kt @@ -0,0 +1,24 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.entities + +import com.zhjt.mogo_core_function_devatools.rviz.constant.DiagnoseSource +import com.zhjt.mogo_core_function_devatools.rviz.constant.DiagnoseType + +data class DiagnoseInfo( + val time: Long,//时间 + val source: DiagnoseSource,//来源 + val msg: String?,//消息 + val type: DiagnoseType = DiagnoseType.NORMAL,//消息类型 + val isAdd: Boolean = true// true:新增 false:刷新原有的数据 +) { + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (javaClass != other?.javaClass) return false + other as DiagnoseInfo + if (msg != other.msg) return false + return true + } + + override fun hashCode(): Int { + return msg?.hashCode() ?: 0 + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/DiskInfo.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/DiskInfo.java new file mode 100644 index 0000000000..591d3244f3 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/DiskInfo.java @@ -0,0 +1,13 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.entities; + +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.SSHHostBean; + +public class DiskInfo { + public final SSHHostBean host; + public final String data; + + public DiskInfo(SSHHostBean host, String data) { + this.host = host; + this.data = data; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/DockerBean.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/DockerBean.java new file mode 100644 index 0000000000..7344671393 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/DockerBean.java @@ -0,0 +1,15 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.entities; + +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.SSHHostBean; + +import java.util.ArrayList; + +public class DockerBean { + public final SSHHostBean host; + public final ArrayList dockers; + + public DockerBean(SSHHostBean host, ArrayList dockers) { + this.host = host; + this.dockers = dockers; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/DockerConfigContent.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/DockerConfigContent.java new file mode 100644 index 0000000000..8c52f72801 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/DockerConfigContent.java @@ -0,0 +1,15 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.entities; + +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.SSHHostBean; + +public class DockerConfigContent { + public final SSHHostBean host; + public final String cmd; + public final String content; + + public DockerConfigContent(SSHHostBean host, String cmd, String content) { + this.host = host; + this.cmd = cmd; + this.content = content; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/DockerInfo.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/DockerInfo.java new file mode 100644 index 0000000000..fcd7ae4535 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/DockerInfo.java @@ -0,0 +1,184 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.entities; + +import com.google.gson.annotations.SerializedName; + +public class DockerInfo { + + /** + * Command : "/bin/sh /entrypoint…" + * CreatedAt : 2023-07-28 12:38:04 +0800 CST + * ID : 3dae431f0704 + * Image : ghcr.io/foxglove/studio:latest + * Labels : org.opencontainers.image.vendor=Light Code Labs,org.opencontainers.image.created=2023-07-25T19:09:10.689Z,org.opencontainers.image.description=Robotics visualization and debugging,org.opencontainers.image.source=https://github.com/foxglove/studio,org.opencontainers.image.title=studio,org.opencontainers.image.version=1.63.0,org.opencontainers.image.documentation=https://caddyserver.com/docs,org.opencontainers.image.licenses=MPL-2.0,org.opencontainers.image.revision=235048670f5f61254bbdfa623534e0ff366feb09,org.opencontainers.image.url=https://github.com/foxglove/studio + * LocalVolumes : 0 + * Mounts : /data/autocar,/dev + * Names : foxglove_studio + * Networks : host + * Ports : + * RunningFor : 3 months ago + * Size : 10.4kB (virtual 159MB) + * State : running + * Status : Up 20 minutes + */ + + @SerializedName("Command") + private String command; + @SerializedName("CreatedAt") + private String createdAt; + @SerializedName("ID") + private String id; + @SerializedName("Image") + private String image; + @SerializedName("Labels") + private String labels; + @SerializedName("LocalVolumes") + private String localVolumes; + @SerializedName("Mounts") + private String mounts; + @SerializedName("Names") + private String names; + @SerializedName("Networks") + private String networks; + @SerializedName("Ports") + private String ports; + @SerializedName("RunningFor") + private String runningFor; + @SerializedName("Size") + private String size; + @SerializedName("State") + private String state; + @SerializedName("Status") + private String status; + + public String getCommand() { + return command; + } + + public void setCommand(String command) { + this.command = command; + } + + public String getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(String createdAt) { + this.createdAt = createdAt; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getImage() { + return image; + } + + public void setImage(String image) { + this.image = image; + } + + public String getLabels() { + return labels; + } + + public void setLabels(String labels) { + this.labels = labels; + } + + public String getLocalVolumes() { + return localVolumes; + } + + public void setLocalVolumes(String localVolumes) { + this.localVolumes = localVolumes; + } + + public String getMounts() { + return mounts; + } + + public void setMounts(String mounts) { + this.mounts = mounts; + } + + public String getNames() { + return names; + } + + public void setNames(String names) { + this.names = names; + } + + public String getNetworks() { + return networks; + } + + public void setNetworks(String networks) { + this.networks = networks; + } + + public String getPorts() { + return ports; + } + + public void setPorts(String ports) { + this.ports = ports; + } + + public String getRunningFor() { + return runningFor; + } + + public void setRunningFor(String runningFor) { + this.runningFor = runningFor; + } + + public String getSize() { + return size; + } + + public void setSize(String size) { + this.size = size; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + @Override + public String toString() { + return "DockerInfo{" + + "command='" + command + '\'' + + ", createdAt='" + createdAt + '\'' + + ", id='" + id + '\'' + + ", image='" + image + '\'' + + ", labels='" + labels + '\'' + + ", localVolumes='" + localVolumes + '\'' + + ", mounts='" + mounts + '\'' + + ", names='" + names + '\'' + + ", networks='" + networks + '\'' + + ", ports='" + ports + '\'' + + ", runningFor='" + runningFor + '\'' + + ", size='" + size + '\'' + + ", state='" + state + '\'' + + ", status='" + status + '\'' + + '}'; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/DockerStatus.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/DockerStatus.java new file mode 100644 index 0000000000..fe120353e6 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/DockerStatus.java @@ -0,0 +1,13 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.entities; + +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.SSHHostBean; + +public class DockerStatus { + public final SSHHostBean host; + public final int status; + + public DockerStatus(SSHHostBean host, int status) { + this.host = host; + this.status = status; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/FMInfoMsg.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/FMInfoMsg.kt new file mode 100644 index 0000000000..e8e6926ae6 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/FMInfoMsg.kt @@ -0,0 +1,22 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.entities + +import fault_management.FmInfo +import java.io.Serializable + +/** + * FM数据的类型 + */ +data class FMInfoMsg( + var fmInfoList: List?, + var policyCode: String?, + var policyTime: Long? +) : Serializable + +/** + * 数据中心使用,用于过滤变更数据 + */ +data class FMFilterInfoMsg( + var fmInfoList: List?, + var policyCode: String?, + var cacheFilterList: MutableList? +) \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/FaultCodeDetailsInfo.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/FaultCodeDetailsInfo.kt new file mode 100644 index 0000000000..cc27b92136 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/FaultCodeDetailsInfo.kt @@ -0,0 +1,5 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.entities + +import fault_management.FmInfo + +data class FaultCodeDetailsInfo(val name: String, val data: ArrayList) diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/FaultCodeEntity.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/FaultCodeEntity.java new file mode 100644 index 0000000000..2a145ab5b9 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/FaultCodeEntity.java @@ -0,0 +1,28 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.entities; + +import androidx.room.Entity; +import androidx.room.PrimaryKey; + +/** + * 数据库操作 + * 节点健康 + */ +@Entity(tableName = "fault_code_table") +public class FaultCodeEntity { + + // 数据库主键 + @PrimaryKey(autoGenerate = true) + public long id; + + public long time;//存入时间 + + public String fault_id; //故障标识,每个告警有一个全域唯一的标识 + public long fault_time; //故障确认上报时间,毫秒单位 + public String fault_desc; //故障的补充描述,由模块补充上报信息,上报段自定义 + public String fault_level; //原有预留字段,故障上报不需要填,故障状态发布时由fm根据配置填入 故障健康等级 + public String fault_action; //新增故障处理方法,故障上报不需要填,故障状态发布时由fm根据配置填入, 用于故障上报给pad 云控处理, 需要和产品,pad端沟通定义,罗列定义值 + public String fault_result; //新增故障后果,故障上报不需要填,故障状态发布时由fm根据配置表填入, 用于行为上层的禁止 + public String policy_code; //新增故障策略,故障上报不需要填,故障表中所定义的故障策略 + public String fault_name; //新增故障名称,故障上报不需要填,故障表中定义的故障中文名称 + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/FmCodeEntity.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/FmCodeEntity.java new file mode 100644 index 0000000000..acb40303de --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/FmCodeEntity.java @@ -0,0 +1,51 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.entities; + +import androidx.annotation.NonNull; +import androidx.room.Entity; +import androidx.room.Ignore; +import androidx.room.Index; +import androidx.room.PrimaryKey; + + +/** + * 对应的 + */ +@Entity(tableName = "fm_code_table", indices = {@Index(value = {"faultCode"}, unique = true)}) +public class FmCodeEntity { + + @Ignore + public long faultTime; + @Ignore + public String faultLevel; + @Ignore + public String originalData; + @Ignore + public String subModuleName; + + @PrimaryKey(autoGenerate = true) + public int id; + @NonNull + public String moduleId;//模块标识 + @NonNull + public String subModuleId;//子模块标识 + @NonNull + public String faultId;//故障标识 + @NonNull + public String faultCode;//故障码 + public String faultName;//故障名称 + public String faultConsequenceEffect;//故障后果影响 + public String faultHandlingBehavior;//故障处理行为 + public String systemDegradationStrategy;//系统降级策略 FM PB字段对应 policyCode + public String preFault;//前置故障 + public String faultReason;//故障可能原因 + public String subSystemLoss;//子系统功能损失 + public String systemImpact;//系统影响 + public String vehicleOperationScenario;//车辆运行场景 + public String troubleshootingSuggestions;//故障后处理措施建议 + public String faultDetectionConditions;//故障检测条件/策略 + public String faultRecoveryConditions;//故障恢复条件/策略 + public String faultLock;//故障锁存机制 + public String dataRecording;//数据录制需求 + public String dataSnapshot;//数据快照需求 + public String applicableVehicleType;//适用车型 +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/FmEntity.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/FmEntity.kt new file mode 100644 index 0000000000..47fab214ab --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/FmEntity.kt @@ -0,0 +1,12 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.entities + +import com.zhjt.mogo_core_function_devatools.rviz.constant.FaultModuleId +import fault_management.FmInfo + +data class FmEntity( + val title: String, + var stopFaultNum: Int = 0,//停车故障 等级3和4的和 + var otherFaultNum: Int = 0,//其他故障 其他等级的和 + var unknownFaultNum: Int = 0,//未知故障 未知故障等级的和(域控未赋值) + val data: ArrayList = arrayListOf(), +) diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/HdMapVersion.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/HdMapVersion.kt new file mode 100644 index 0000000000..00f3d62f01 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/HdMapVersion.kt @@ -0,0 +1,8 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.entities + +/** + * 高精地图版本 + */ +data class HdMapVersion(var ip: String = "192.168.1.10X", var version: String = "未知") { + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/ModuleStatusEntity.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/ModuleStatusEntity.kt new file mode 100644 index 0000000000..73bd1d991f --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/ModuleStatusEntity.kt @@ -0,0 +1,22 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.entities + +import com.zhjt.mogo_core_function_devatools.rviz.R + + +/** + * 传感器状态 + */ +data class ModuleStatusEntity( + // 模块标题 + var title: String, + + // 模块图标 + var sensorBg: Int = R.drawable.rviz_fmd_icon_ipc, + + // 是否是日志信息,true--是日志,false--不是日志 + // 如果是日志信息按照垂直列表的展示,如果不是日志,则按照3列的网格排布 + var isLog: Boolean = false, + + // 当前模块传感器列表 + var sensorList: ArrayList = arrayListOf() +) \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/NodeHealthEntity.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/NodeHealthEntity.java new file mode 100644 index 0000000000..163d62daa0 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/NodeHealthEntity.java @@ -0,0 +1,25 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.entities; + +import androidx.room.Entity; +import androidx.room.PrimaryKey; + +/** + * 数据库操作 + * 节点健康 + */ +@Entity(tableName = "node_health_table") +public class NodeHealthEntity { + + // 数据库主键 + @PrimaryKey(autoGenerate = true) + public long id; + + public long time;//存入时间 + + public String agent_ip;//主机ip + public String launch_name;//启动 node 的 launch 服务名称 + public String node_path;//node 名称 + + public int state;//运行状态,备注:节点状态有:0-未启动,1-等待前置条件,2-启动中,3-运行态,4-停止态 5-无法启动 6-人为启动中,7-人为关闭中 + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/RosHostArgument.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/RosHostArgument.java new file mode 100644 index 0000000000..d48679d1f9 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/RosHostArgument.java @@ -0,0 +1,276 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.entities; + +import android.graphics.Color; +import android.text.SpannableString; +import android.text.Spanned; +import android.text.TextUtils; +import android.text.style.ForegroundColorSpan; + +import androidx.annotation.NonNull; + +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.SSHHostBean; + +import java.util.Objects; + +import kotlin.Pair; + +public class RosHostArgument { + private final String regex = "[^0-9.]+"; + private final ForegroundColorSpan span_gray = new ForegroundColorSpan(Color.GRAY); + private final ForegroundColorSpan span_black = new ForegroundColorSpan(Color.BLACK); + public final SSHHostBean host;//主机地址 + + private String dockerVersion = "未知"; + public boolean isConnectFailure = false;// true 连接失败 + public String connectFailureReason = "设备连接失败"; + private double cpuUsageRate = -1;//CPU使用率 + private String load = "未知";//负载 + + + private String memTotal = "未知";//查询总内存 + private String memUsed = "未知";//查询已用内存 + private String swapTotal = "未知";//查询总的交换分区容量 + private String swapUsed = "未知";//查询用户使用的交换分区容量 + private String diskData = "未知";//查询磁盘总大小 + private String diskDataUsed = "未知";//查询磁盘使用大小 + private String runTime = "未知";//查询运行时间 + + private boolean isRosMaster = false;//是不是 ROS Master + + + public RosHostArgument(SSHHostBean host) { + this.host = host; + } + + public String getDockerVersion() { + return dockerVersion; + } + + public void setDockerVersion(String dockerVersion) { + this.dockerVersion = dockerVersion; + } + + /** + * 内存使用率 + * + * @return + */ + public Pair getMemUsageRate() { + return getCharSequence(memUsed, memTotal); + } + + /** + * 交换使用率 + * + * @return + */ + public Pair getSwapUsageRate() { + return getCharSequence(swapUsed, swapTotal); + } + + /** + * CPU使用率 + * + * @return + */ + public double getCpuUsageRate() { + return cpuUsageRate; + } + + + public void setCpuUsageRate(String cpuUsageRate) { + if (!TextUtils.isEmpty(cpuUsageRate)) { + try { + this.cpuUsageRate = Double.parseDouble(cpuUsageRate); + } catch (Exception e) { + e.printStackTrace(); + this.cpuUsageRate = -1; + } + } + if (this.cpuUsageRate < 0) + this.cpuUsageRate = -1; + } + + /** + * 磁盘使用率 + * + * @return + */ + public Pair getDiskUsageRate() { + return getCharSequence(diskDataUsed, diskData); + } + + + public String getRunningTime() { + return runTime; + } + + + public String getLoad() { + return load; + } + + //使用HTML原因:SpannableString setSpan无法连续设置一个span + public void setLoad(String load) { + if (!TextUtils.isEmpty(load)) { + load = load.replace(", ", " | ").replace("\n", "").trim(); + this.load = load; + } else { + this.load = "未知"; + } + } + + public void setMemTotal(String memTotal) { + if (!TextUtils.isEmpty(memTotal)) { + this.memTotal = memTotal; + } else { + this.memTotal = "未知"; + } + } + + public void setMemUsed(String memUsed) { + if (!TextUtils.isEmpty(memUsed)) { + this.memUsed = memUsed; + } else { + this.memUsed = "未知"; + } + } + + public void setSwapTotal(String swapTotal) { + if (!TextUtils.isEmpty(swapTotal)) { + this.swapTotal = swapTotal; + } else { + this.swapTotal = "未知"; + } + } + + public void setSwapUsed(String swapUsed) { + if (!TextUtils.isEmpty(swapUsed)) { + this.swapUsed = swapUsed; + } else { + this.swapUsed = "未知"; + } + } + + public void setDiskData(String diskData) { + if (!TextUtils.isEmpty(diskData)) { + this.diskData = diskData; + } else { + this.diskData = "未知"; + } + } + + public void setDiskDataUsed(String diskDataUsed) { + if (!TextUtils.isEmpty(diskDataUsed)) { + this.diskDataUsed = diskDataUsed; + } else { + this.diskDataUsed = "未知"; + } + } + + public void setRunTime(String runTime) { + if (!TextUtils.isEmpty(runTime)) { + this.runTime = runTime; + } else { + this.runTime = "未知"; + } + } + + public boolean isRosMaster() { + return isRosMaster; + } + + public void setRosMaster(boolean rosMaster) { + isRosMaster = rosMaster; + } + + public void resetConnectFailureCode() { + isConnectFailure = false; + connectFailureReason = "设备连接失败"; + } + + public void initData() { + dockerVersion = "未知"; + cpuUsageRate = -1;//CPU使用率 + load = "未知";//负载 + memTotal = "未知";//查询总内存 + memUsed = "未知";//查询已用内存 + swapTotal = "未知";//查询总的交换分区容量 + swapUsed = "未知";//查询用户使用的交换分区容量 + diskData = "未知";//查询磁盘总大小 + diskDataUsed = "未知";//查询磁盘使用大小 + runTime = "未知";//查询运行时间 + isRosMaster = false; + } + + + private Pair getCharSequence(String used, String total) { + String str = used + "/" + total; + SpannableString spannableString = new SpannableString(str); + try { + if (!TextUtils.isEmpty(used) && !used.equals("未知") && !TextUtils.isEmpty(total) && !total.equals("未知")) { +// String temT = total.replaceAll(regex, ""); +// String temU = used.replaceAll(regex, ""); +// String unitT = total.replace(temT, ""); +// String unitU = used.replace(temU, ""); +// int t = 1; +// int u = 1; +// if (!TextUtils.equals(unitT, unitU)) { +// if (unitT.startsWith("T")) { +// t = 1024; +// } +// if (unitU.startsWith("T")) { +// u = 1024; +// } +// } +// double temTotal = Double.parseDouble(temT) * t; +// double temUsed = Double.parseDouble(temU) * u; + double temTotal = parseCapacity(total); + double temUsed = parseCapacity(used); + double percent = temUsed / temTotal * 100.0; + int index = str.indexOf('/'); + if (index != -1) { + spannableString.setSpan(span_gray, index, index + 1, Spanned.SPAN_INCLUSIVE_EXCLUSIVE); + return new Pair(percent, spannableString); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + spannableString.setSpan(span_black, 0, str.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE); + return new Pair(-1.0, spannableString); + } + + private double parseCapacity(String capacityString) { + int multiplier = 1; + if (capacityString.contains("M")) { + multiplier = 1024; // MB to KB + } else if (capacityString.contains("G")) { + multiplier = 1024 * 1024; // GB to KB + } else if (capacityString.contains("T")) { + multiplier = 1024 * 1024 * 1024; // TB to KB + } + return Double.parseDouble(capacityString.replaceAll(regex, "")) * multiplier; + } + + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + RosHostArgument that = (RosHostArgument) o; + return Objects.equals(host, that.host); + } + + @NonNull + @Override + public String toString() { + return "主机:" + host + + " 内存使用率:" + getMemUsageRate() + + " 交换使用率:" + getSwapUsageRate() + + " CPU使用率:" + getCpuUsageRate() + + " 磁盘使用率:" + getDiskUsageRate() + + " 运行时长:" + getRunningTime() + + " 负载:" + getLoad(); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/SensorStatusEntity.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/SensorStatusEntity.kt new file mode 100644 index 0000000000..b20a35876d --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/SensorStatusEntity.kt @@ -0,0 +1,13 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.entities + +/** + * 传感器状态 + */ +data class SensorStatusEntity( + // 传感器名称 + var sensorName: String = "", + + // 传感器是否正常,true--正常,false--不正常 + var sensorIsOk: Boolean = true, + var notOkColorRes: Int = -1 +) \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/StartupConfig.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/StartupConfig.java new file mode 100644 index 0000000000..866f381427 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/StartupConfig.java @@ -0,0 +1,75 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.entities; + +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.SSHHostBean; + +import java.util.List; +import java.util.Objects; + +public class StartupConfig { + public final SSHHostBean host; + public final List configs; + + + public StartupConfig(SSHHostBean host, List configs) { + this.host = host; + this.configs = configs; + } + + + public static class Config { + public boolean isShowLoading = false;//是否显示loading + public int catState = 0;//0:未查看,未点击 1:已查看,并且数据加载成功 2:已查看,并且数据加载失败 + public final String path;//配置所在路径 + public final Attribute attribute; + + public Config(String path, Attribute attribute) { + this.path = path; + this.attribute = attribute; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Config config = (Config) o; + return Objects.equals(path, config.path); + } + } + + public static class Attribute { + + /** + * url : https://map-algorithm-huadong-1255510688.cos.ap-beijing.myqcloud.com/data/HQHYD81J31/perception/radar/perception_radar.launch_1652244003428 + * modify_timestamp : 1683256531 + * id : /HQ/HQHYD1857L/perception/radar/perception_radar.launch + * publish_timestamp : 1660492800 + * md5 : 1103797f787680882c03fe1a243cde0a + */ + + private String url; + private int modify_timestamp; + private String id; + private int publish_timestamp; + private String md5; + + public String getUrl() { + return url; + } + + public int getModify_timestamp() { + return modify_timestamp; + } + + public String getId() { + return id; + } + + public int getPublish_timestamp() { + return publish_timestamp; + } + + public String getMd5() { + return md5; + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/SystemLogEntity.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/SystemLogEntity.java new file mode 100644 index 0000000000..bf304d1e3a --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/SystemLogEntity.java @@ -0,0 +1,26 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.entities; + +import androidx.room.Entity; +import androidx.room.PrimaryKey; + +/** + * 数据库操作 + * 节点健康 + */ +@Entity(tableName = "system_log_table") +public class SystemLogEntity { + + // 数据库主键 + @PrimaryKey(autoGenerate = true) + public long id; + + public long time;//存入时间 + + public String src; //消息来源 + public String level; //error info + public String msg; //研发自己看的信息;对标准日志来说就是日志内容 + public String code; //error日志中的错误原因,这是一个类似宏的受约束字段,用字符串的目的是便于排查问题时查看 + public String result; //带来的后果;例如pad无法启动驾驶,远程驾驶无法启动等;可供监控后台做错误分类;pad无法理解code时也可参考此字段 + public String actions;//试验性字段。消息发出者希望触发的动作,例如:触发短信报警,自动创建工单,要求pad弹框等 + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/SystemResourceEntity.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/SystemResourceEntity.java new file mode 100644 index 0000000000..4c985d51b1 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/SystemResourceEntity.java @@ -0,0 +1,28 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.entities; + +import androidx.room.Entity; +import androidx.room.PrimaryKey; + +/** + * 数据库操作 + * 系统资源记录 + */ +@Entity(tableName = "system_resource_table") +public class SystemResourceEntity { + + // 数据库主键 + @PrimaryKey(autoGenerate = true) + public long id; + + public long time;//存入时间 + + public String ip;//主机ip + public String dockerMapVersion;//自动驾驶map版本 + public long runTime;//运行时间 + public long avg;//负载 + public long cpuUsage;//CPU占用 + public long memUsage;//内存占用 + public long swapUsage;//交换内存占用 + public long disksUsage;//磁盘占用 + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/TabEntity.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/TabEntity.java new file mode 100644 index 0000000000..ea0631daab --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/TabEntity.java @@ -0,0 +1,30 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.entities; + +import com.flyco.tablayout.listener.CustomTabEntity; + +public class TabEntity implements CustomTabEntity { + public String title; + public int selectedIcon; + public int unSelectedIcon; + + public TabEntity(String title, int selectedIcon, int unSelectedIcon) { + this.title = title; + this.selectedIcon = selectedIcon; + this.unSelectedIcon = unSelectedIcon; + } + + @Override + public String getTabTitle() { + return title; + } + + @Override + public int getTabSelectedIcon() { + return selectedIcon; + } + + @Override + public int getTabUnselectedIcon() { + return unSelectedIcon; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/VehicleConfig.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/VehicleConfig.java new file mode 100644 index 0000000000..763a3dbc7d --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/model/entities/VehicleConfig.java @@ -0,0 +1,86 @@ +package com.zhjt.mogo_core_function_devatools.rviz.model.entities; + +import android.text.TextUtils; + +public class VehicleConfig { + private String plate = "未连接";//车牌 + private String brand = "未连接";//品牌 + private String model = "未连接";//类型 + + public VehicleConfig(String result) { + String[] lines = result.split("\n"); + for (String line : lines) { + if (!TextUtils.isEmpty(line)) { + String[] parts = line.trim().split(":"); + if (parts.length >= 2) { + String key = parts[0].trim(); + String value = parts[1].replace("\"", "").trim(); + if ("plate".equals(key)) { + plate = value; + model = getCarModel(value); + } else if ("brand".equals(key)) { + brand = getCarBrand(value); + } + + } + } + } + + } + + public String getPlate() { + return plate; + } + + public String getBrand() { + return brand; + } + + public String getModel() { + return model; + } + + /** + * 获取车辆品牌 + */ + private String getCarBrand(String brand) { + String data; + if (brand.startsWith("DF")) { + data = "东风"; + } else if (brand.startsWith("HQ")) { + data = "红旗"; + } else if (brand.startsWith("JINLV") || brand.startsWith("JV") || brand.startsWith("JL")) { + data = "金旅"; + } else if (brand.startsWith("KW")) { + data = "开沃"; + } else if (brand.startsWith("FT")) { + data = "福田"; + } else { + data = "金旅"; + } + + return data; + } + + /** + * 获取车辆品牌--类型 + */ + private String getCarModel(String plate) { + String data; + if (plate.startsWith("DF")) { + data = "E70"; + } else if (plate.startsWith("HQ")) { + data = "H9"; + } else if (plate.startsWith("JV") || plate.startsWith("JL")) { + data = "金旅牌XML6606JEVY0"; + } else if (plate.startsWith("KW")) { + data = "NJL6450ICEV"; + } else if (plate.startsWith("SW") || plate.startsWith("FT")) { + data = "清扫车"; + } else { + data = "金旅牌XML6606JEVY0"; + } + return data; + } + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/BaseResponse.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/BaseResponse.kt new file mode 100644 index 0000000000..5ec1478a9f --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/BaseResponse.kt @@ -0,0 +1,5 @@ +package com.zhjt.mogo_core_function_devatools.rviz.net + +data class BaseResponse(val code: Int, val msg: String, val result: T?) + +data class Response(val code: Int, val msg: String, val data: T?) \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/FmdNetManager.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/FmdNetManager.kt new file mode 100644 index 0000000000..8a55c9dc55 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/FmdNetManager.kt @@ -0,0 +1,47 @@ +package com.zhjt.mogo_core_function_devatools.rviz.net + +import com.zhjt.mogo_core_function_devatools.rviz.net.api.FMdNetModel +import com.zhjt.mogo_core_function_devatools.rviz.net.api.callback.CarInfoByParamCallback +import com.zhjt.mogo_core_function_devatools.rviz.net.api.entity.CarInfoByParamResponse +import kotlinx.coroutines.CoroutineScope + +class FmdNetManager private constructor() { + + private val fMdNetModel = FMdNetModel() + + /** + * 单利模式 + */ + companion object { + private val TAG = "LoginManager" + + val INSTANCE by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { + FmdNetManager() + } + } + + /** + * 根据车牌获取城市获取地图信息 + */ + fun getCarInfoByParam( + scope: CoroutineScope, + carNum: String, + callback: CarInfoByParamCallback + ) { + fMdNetModel.getCarInfoByParam( + scope, + carNum, + object : NetworkCallback { + override fun onSuccess(data: CarInfoByParamResponse) { + callback.onSuccess(data) + } + + override fun onError(msg: String) { + callback.onError(msg) + } + } + ) + } + + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/HostConst.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/HostConst.kt new file mode 100644 index 0000000000..431ccb94af --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/HostConst.kt @@ -0,0 +1,22 @@ +package com.zhjt.mogo_core_function_devatools.rviz.net + +import com.mogo.commons.debug.DebugConfig + + +class HostConst { + + companion object { + private const val BI_HOST = "http://gateway.ee-private-dev1.myghost.zhidaoauto.com" + private const val BI_HOST_RELEASE = "https://mygateway.zhidaozhixing.com" + + + fun getBaseBiUrl(): String { + return if (DebugConfig.getNetMode() == DebugConfig.NET_MODE_QA) { + BI_HOST + } else { + BI_HOST_RELEASE + } + } + } + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/MisHost.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/MisHost.kt new file mode 100644 index 0000000000..51f2142473 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/MisHost.kt @@ -0,0 +1,31 @@ +package com.zhjt.mogo_core_function_devatools.rviz.net + +import com.mogo.commons.debug.DebugConfig +import com.mogo.eagle.core.data.EnvConfig + +object MisHost { + private const val HOST_QA = "https://eagle-qa.zhidaozhixing.com/" + private const val HOST_RELEASE = "https://eagle-mis.zhidaozhixing.com/" + + private const val LOGIN_HOST_QA = + "https://carlife-test.zhidaohulian.com/qa/eagle/login/index.html?deviceId=" + private const val LOGIN_HOST_RELEASE = + "https://carlife-test.zhidaohulian.com/eagle/login/index.html?deviceId=" + + fun getHost(): String { + return if (DebugConfig.getNetMode() == DebugConfig.NET_MODE_DEV || DebugConfig.getNetMode() == DebugConfig.NET_MODE_QA) { + HOST_QA + } else { + HOST_RELEASE + } + } + + fun getLoginURL(): String { + return if (DebugConfig.getNetMode() == DebugConfig.NET_MODE_DEV || DebugConfig.getNetMode() == DebugConfig.NET_MODE_QA) { + LOGIN_HOST_QA + } else { + LOGIN_HOST_RELEASE + } + } + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/MoGoRetrofitFactory.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/MoGoRetrofitFactory.java new file mode 100644 index 0000000000..1eb0376065 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/MoGoRetrofitFactory.java @@ -0,0 +1,19 @@ +package com.zhjt.mogo_core_function_devatools.rviz.net; + +import retrofit2.Retrofit; +import retrofit2.converter.gson.GsonConverterFactory; + +public final class MoGoRetrofitFactory { + + private MoGoRetrofitFactory() { + } + + public static synchronized Retrofit getInstanceNoCallAdapter(String baseUrl) { + return new Retrofit.Builder().baseUrl(baseUrl) + .addConverterFactory(GsonConverterFactory.create()) + .build(); + + } + + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/NetworkCallback.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/NetworkCallback.kt new file mode 100644 index 0000000000..2682e45552 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/NetworkCallback.kt @@ -0,0 +1,6 @@ +package com.zhjt.mogo_core_function_devatools.rviz.net + +interface NetworkCallback { + fun onSuccess(data: T) + fun onError(msg:String) +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/NetworkManager.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/NetworkManager.java new file mode 100644 index 0000000000..16ba24c9ec --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/NetworkManager.java @@ -0,0 +1,149 @@ +package com.zhjt.mogo_core_function_devatools.rviz.net; + +import android.util.Log; + +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.LifecycleObserver; +import androidx.lifecycle.LifecycleOwner; +import androidx.lifecycle.OnLifecycleEvent; + +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.TimeUnit; + +import io.reactivex.Observable; +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.disposables.CompositeDisposable; +import io.reactivex.disposables.Disposable; +import io.reactivex.functions.Consumer; +import io.reactivex.schedulers.Schedulers; +import okhttp3.OkHttpClient; +import retrofit2.Retrofit; +import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory; +import retrofit2.converter.gson.GsonConverterFactory; +import retrofit2.converter.scalars.ScalarsConverterFactory; + +/** + * 网络请求工具 + */ +public class NetworkManager implements LifecycleObserver { + private static final String TAG = "NetworkManager"; + private static final int DEFAULT_TIMEOUT = 10; + + private static NetworkManager instance; + private final Retrofit.Builder retrofit; + private final Map serviceMap; + private final Map ownerDisposableMap; + private final CompositeDisposable compositeDisposable; + + private NetworkManager() { + OkHttpClient.Builder builder = new OkHttpClient.Builder(); + builder.connectTimeout(DEFAULT_TIMEOUT, TimeUnit.SECONDS); + + retrofit = new Retrofit.Builder() + .client(builder.build()) + .addConverterFactory(GsonConverterFactory.create()) + .addConverterFactory(ScalarsConverterFactory.create()) + .addCallAdapterFactory(RxJava2CallAdapterFactory.create()); + + serviceMap = new HashMap<>(); + ownerDisposableMap = new HashMap<>(); + compositeDisposable = new CompositeDisposable(); + } + + public static synchronized NetworkManager getInstance() { + if (instance == null) { + instance = new NetworkManager(); + } + return instance; + } + + /** + * 创建网络请求 + * + * @param serviceClass API服务 + * @param baseUrl 请求地址 + * @param + * @return + */ + public T createService(Class serviceClass, String baseUrl) { + if (serviceMap.containsKey(baseUrl)) { + return (T) serviceMap.get(baseUrl); + } else { + T service = retrofit.baseUrl(baseUrl).build().create(serviceClass); + serviceMap.put(baseUrl, service); + return service; + } + } + + /** + * 发送网络请求 + * + * @param observable + * @param owner 发送网络请求的 LifecycleOwner + * @param callback 回调 + * @param + */ + public void sendRequest(Observable observable, + final LifecycleOwner owner, + final NetworkCallback callback) { + // 在工作线程执行网络请求 + Disposable disposable = observable.subscribeOn(Schedulers.io()) + // 切换到主线程回调 + .observeOn(AndroidSchedulers.mainThread()) + // 回调 + .subscribe(new Consumer() { + @Override + public void accept(T t) { + if (callback != null) { + callback.onSuccess(t); + } + } + }, new Consumer() { + @Override + public void accept(Throwable throwable) { + if (callback != null) { + callback.onError(throwable.getMessage()); + } + } + }); + + if (owner != null) { + owner.getLifecycle().addObserver(this); + ownerDisposableMap.put(owner, disposable); + compositeDisposable.add(disposable); + } + } + + /** + * 取消所有网络请求 + */ + public void cancelAllRequests() { + compositeDisposable.clear(); + } + + // 绑定生命周期,跟随发起网络请求的地方生命周期自动销毁 + @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY) + public void onDestroy(LifecycleOwner owner) { + Log.d(TAG, "onDestroy: owner=" + owner); + owner.getLifecycle().removeObserver(this); + ownerDisposableMap.remove(owner); + } + + /** + * 网络请求回调 + * + * @param + */ + public interface NetworkCallback { + // 请求成功回调 + void onSuccess(T response); + + /** + * 异常回调 + * + * @param throwable 异常信息 + */ + void onError(String throwable); + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/TrajectoryApiClient.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/TrajectoryApiClient.kt new file mode 100644 index 0000000000..38e9079bf7 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/TrajectoryApiClient.kt @@ -0,0 +1,135 @@ +package com.zhjt.mogo_core_function_devatools.rviz.net + +import android.util.Log +import androidx.lifecycle.LifecycleOwner +import com.mogo.module.common.net.mis.trajectory.net.TrajectoryApiService +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectoryInfo +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectoryInfoReq +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectoryLisReq +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectoryListInfo +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectorySiteInfo + + +object TrajectoryApiClient { + private val TAG = "TrajectoryApiClient" + + private val baseUrl = MisHost.getHost() + private val apiService: TrajectoryApiService = + NetworkManager.getInstance().createService(TrajectoryApiService::class.java, baseUrl) + + /** + * 查询 Bus&Taxi 有轨迹的QA线路列表 + */ + fun queryTrajectoryList( + owner: LifecycleOwner, + carType: String, + cityCode: String, + callback: NetworkCallback> + ) { + val reqBody = TrajectoryLisReq() + reqBody.page = 1 + reqBody.pageSize = 1000 + reqBody.cityCode = cityCode + + val observable = if (carType == "TAXI") { + apiService.queryTaxiTrajectoryList(reqBody) + } else { + apiService.queryBusTrajectoryList(reqBody) + } + + NetworkManager.getInstance() + .sendRequest( + observable, + owner, + object : + NetworkManager.NetworkCallback>> { + override fun onSuccess(response: BaseResponse>?) { + Log.d(TAG, "查询 $carType 有轨迹的QA线路列表:$response") + // 处理网络请求成功的响应 + response?.result?.let { callback.onSuccess(it) } + } + + override fun onError(throwable: String) { + Log.e(TAG, "查询 $carType 有轨迹的QA线路列表:$throwable") + // 处理网络请求失败的情况 + callback.onError(throwable) + } + } + ) + } + + + /** + * 查询 Bus&Taxi 线路对应的站点 + */ + fun querySiteList( + owner: LifecycleOwner, + carType: String, + lineId: Int, + callback: NetworkCallback> + ) { + val observable = if (carType == "TAXI") { + apiService.queryTaxiSiteList(lineId) + } else { + apiService.queryBusSiteList(lineId) + } + + NetworkManager.getInstance() + .sendRequest( + observable, + owner, + object : + NetworkManager.NetworkCallback>> { + override fun onSuccess(response: BaseResponse>?) { + Log.d(TAG, "查询 $carType 线路对应的站点:$response") + // 处理网络请求成功的响应 + response?.result?.let { callback.onSuccess(it) } + } + + override fun onError(throwable: String) { + Log.e(TAG, "查询 $carType 线路对应的站点:$throwable") + // 处理网络请求失败的情况 + callback.onError(throwable) + } + } + ) + } + + /** + * 查询 Bus&Taxi 线路对应的轨迹 + */ + fun queryTrajectoryInfo( + owner: LifecycleOwner, + carType: String, + reqBody: TrajectoryInfoReq, + callback: NetworkCallback + ) { + + val observable = if (carType == "TAXI") { + apiService.queryTaxiTrajectoryInfo(reqBody) + } else { + apiService.queryBusTrajectoryInfo(reqBody) + } + + NetworkManager.getInstance() + .sendRequest( + observable, + owner, + object : + NetworkManager.NetworkCallback> { + override fun onSuccess(response: BaseResponse?) { + Log.d(TAG, "查询 $carType 线路对应的轨迹:$response") + // 处理网络请求成功的响应 + response?.result?.let { callback.onSuccess(it) } + } + + override fun onError(throwable: String) { + Log.e(TAG, "查询 $carType 线路对应的轨迹:$throwable") + // 处理网络请求失败的情况 + callback.onError(throwable) + } + } + ) + } + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/TrajectoryApiService.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/TrajectoryApiService.kt new file mode 100644 index 0000000000..51ab7c1cd3 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/TrajectoryApiService.kt @@ -0,0 +1,57 @@ +package com.mogo.module.common.net.mis.trajectory.net + +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectoryInfo +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectoryInfoReq +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectoryLisReq +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectoryListInfo +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectorySiteInfo +import com.zhjt.mogo_core_function_devatools.rviz.net.BaseResponse +import io.reactivex.Observable +import retrofit2.http.Body +import retrofit2.http.GET +import retrofit2.http.POST +import retrofit2.http.Query + +interface TrajectoryApiService { + /** + * 查询 Bus 有轨迹的QA线路列表 + * @param deviceId deviceId + */ + @POST("/eagleEye-mis/line/qa/bus/list") + fun queryBusTrajectoryList(@Body reqBody: TrajectoryLisReq): Observable>> + + /** + * 查询 Taxi 有轨迹的QA线路列表 + * @param deviceId deviceId + */ + @POST("/eagleEye-mis/line/qa/taxi/list") + fun queryTaxiTrajectoryList(@Body reqBody: TrajectoryLisReq): Observable>> + + /** + * 查询 Bus 线路对应的站点 + * @param lineId 线路ID + */ + @GET("/eagleEye-mis/line/query/bus/site") + fun queryBusSiteList(@Query("lineId") lineId: Int): Observable>> + + /** + * 查询 Taxi 线路对应的站点 + * @param lineId 线路ID + */ + @GET("/eagleEye-mis/line/query/taxi/site") + fun queryTaxiSiteList(@Query("lineId") lineId: Int): Observable>> + + + /** + * 查询 Bus 线路对应的轨迹 + */ + @POST("/eagleEye-mis/line/query/bus/contrail") + fun queryBusTrajectoryInfo(@Body reqBody: TrajectoryInfoReq): Observable> + + + /** + * 查询 Taxi 线路对应的轨迹 + */ + @POST("/eagleEye-mis/line/query/taxi/contrail") + fun queryTaxiTrajectoryInfo(@Body reqBody: TrajectoryInfoReq): Observable> +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/TrajectoryNetModel.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/TrajectoryNetModel.kt new file mode 100644 index 0000000000..ec70db80e3 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/TrajectoryNetModel.kt @@ -0,0 +1,350 @@ +package com.mogo.module.common.net.mis.trajectory.net + +import android.util.Log +import com.mogo.eagle.core.data.BaseResponse +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectoryInfo +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectoryInfoReq +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectoryLisReq +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectoryListInfo +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectorySiteInfo +import com.zhjt.mogo_core_function_devatools.rviz.net.MisHost +import com.zhjt.mogo_core_function_devatools.rviz.net.MoGoRetrofitFactory +import com.zhjt.mogo_core_function_devatools.rviz.net.NetworkCallback +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Job +import kotlinx.coroutines.async +import kotlinx.coroutines.launch +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +object TrajectoryNetModel { + private val TAG = "TrajectoryNetModel" + private val coroutineScopeMap = HashMap() + + private fun getNetWorkApi(baseUrl: String = MisHost.getHost()): TrajectoryApi { + return MoGoRetrofitFactory.getInstanceNoCallAdapter(baseUrl) + .create(TrajectoryApi::class.java) + } + + + /** + * 查询 Bus 有轨迹的QA线路列表 + */ + fun queryBusTrajectoryList( + scope: CoroutineScope, + cityCode: String, + callback: NetworkCallback> + ) { + + val reqBody = TrajectoryLisReq() + reqBody.page = 1 + reqBody.pageSize = 1000 + reqBody.cityCode = cityCode + + val call = getNetWorkApi().queryBusTrajectoryList(reqBody) + + coroutineScopeMap[scope]?.cancel() + val newJob = scope.async { + call.enqueue(object : Callback>> { + override fun onResponse( + call: Call>>, + response: Response>> + ) { + Log.d(TAG, "查询 Bus 有轨迹的QA线路列表:" + response.body().toString()) + scope.launch { + response.body()?.let { responseBody -> + if (responseBody.code == 0) { + responseBody.result?.let { result -> + callback.onSuccess(result) + } ?: let { + callback.onError("msg=${responseBody.msg},code=${responseBody.code}") + } + } else { + callback.onError("msg=${responseBody.msg},code=${responseBody.code}") + } + } ?: let { + callback.onError("网络异常") + } + } + } + + override fun onFailure( + call: Call>>, + t: Throwable + ) { + Log.e(TAG, "网络异常") + scope.launch { callback.onError("网络异常") } + } + }) + } + coroutineScopeMap[scope] = newJob + + scope.coroutineContext[Job]?.invokeOnCompletion { + coroutineScopeMap.remove(scope) + } + + } + + /** + * 查询 Taxi 有轨迹的QA线路列表 + */ + fun queryTaxiTrajectoryList( + scope: CoroutineScope, + cityCode: String, + callback: NetworkCallback> + ) { + + val reqBody = TrajectoryLisReq() + reqBody.page = 1 + reqBody.pageSize = 1000 + reqBody.cityCode = cityCode + + val call = getNetWorkApi().queryTaxiTrajectoryList(reqBody) + + coroutineScopeMap[scope]?.cancel() + val newJob = scope.async { + call.enqueue(object : Callback>> { + override fun onResponse( + call: Call>>, + response: Response>> + ) { + Log.d(TAG, "查询 Taxi 有轨迹的QA线路列表:" + response.body().toString()) + scope.launch { + response.body()?.let { responseBody -> + if (responseBody.code == 0) { + responseBody.result?.let { result -> + callback.onSuccess(result) + } ?: let { + callback.onError("msg=${responseBody.msg},code=${responseBody.code}") + } + } else { + callback.onError("msg=${responseBody.msg},code=${responseBody.code}") + } + } ?: let { + callback.onError("网络异常") + } + } + } + + override fun onFailure( + call: Call>>, + t: Throwable + ) { + Log.e(TAG, "网络异常:") + scope.launch { callback.onError("网络异常") } + } + }) + } + coroutineScopeMap[scope] = newJob + + scope.coroutineContext[Job]?.invokeOnCompletion { + coroutineScopeMap.remove(scope) + } + } + + /** + * 查询 Bus 线路对应的站点 + */ + fun queryBusSiteList( + scope: CoroutineScope, + lineId: Int, + callback: NetworkCallback> + ) { + val call = getNetWorkApi().queryBusSiteList(lineId) + + coroutineScopeMap[scope]?.cancel() + val newJob = scope.async { + call.enqueue(object : Callback>> { + override fun onResponse( + call: Call>>, + response: Response>> + ) { + Log.d(TAG, "查询 Bus 有轨迹的QA线路列表:" + response.body().toString()) + scope.launch { + response.body()?.let { responseBody -> + if (responseBody.code == 0) { + responseBody.result?.let { result -> + callback.onSuccess(result) + } ?: let { + callback.onError("msg=${responseBody.msg},code=${responseBody.code}") + } + } else { + callback.onError("msg=${responseBody.msg},code=${responseBody.code}") + } + } ?: let { + callback.onError("网络异常") + } + } + } + + override fun onFailure( + call: Call>>, + t: Throwable + ) { + Log.e(TAG, "网络异常:") + scope.launch { callback.onError("网络异常") } + } + }) + } + coroutineScopeMap[scope] = newJob + + scope.coroutineContext[Job]?.invokeOnCompletion { + coroutineScopeMap.remove(scope) + } + } + + /** + * 查询 Taxi 线路对应的站点 + */ + fun queryTaxiSiteList( + scope: CoroutineScope, + lineId: Int, + callback: NetworkCallback> + ) { + + val call = getNetWorkApi().queryTaxiSiteList(lineId) + + coroutineScopeMap[scope]?.cancel() + val newJob = scope.async { + call.enqueue(object : Callback>> { + override fun onResponse( + call: Call>>, + response: Response>> + ) { + Log.d(TAG, "查询 Taxi 有轨迹的QA线路列表:" + response.body().toString()) + scope.launch { + response.body()?.let { responseBody -> + if (responseBody.code == 0) { + responseBody.result?.let { result -> + callback.onSuccess(result) + } ?: let { + callback.onError("msg=${responseBody.msg},code=${responseBody.code}") + } + } else { + callback.onError("msg=${responseBody.msg},code=${responseBody.code}") + } + } ?: let { + callback.onError("网络异常") + } + } + } + + override fun onFailure( + call: Call>>, + t: Throwable + ) { + Log.e(TAG, "网络异常:") + scope.launch { callback.onError("网络异常") } + } + }) + } + coroutineScopeMap[scope] = newJob + + scope.coroutineContext[Job]?.invokeOnCompletion { + coroutineScopeMap.remove(scope) + } + } + + /** + * 查询 Bus 线路对应的轨迹 + */ + fun queryBusTrajectoryInfo( + scope: CoroutineScope, + reqBody: TrajectoryInfoReq, + callback: NetworkCallback + ) { + + val call = getNetWorkApi().queryBusTrajectoryInfo(reqBody) + + coroutineScopeMap[scope]?.cancel() + val newJob = scope.async { + call.enqueue(object : Callback> { + override fun onResponse( + call: Call>, + response: Response> + ) { + Log.d(TAG, "查询 Bus 有轨迹的QA线路列表:" + response.body().toString()) + scope.launch { + response.body()?.let { responseBody -> + if (responseBody.code == 0) { + responseBody.result?.let { result -> + callback.onSuccess(result) + } ?: let { + callback.onError("msg=${responseBody.msg},code=${responseBody.code}") + } + } else { + callback.onError("msg=${responseBody.msg},code=${responseBody.code}") + } + } ?: let { + callback.onError("网络异常") + } + } + } + + override fun onFailure( + call: Call>, + t: Throwable + ) { + Log.e(TAG, "网络异常:") + scope.launch { callback.onError("网络异常") } + } + }) + } + coroutineScopeMap[scope] = newJob + + scope.coroutineContext[Job]?.invokeOnCompletion { + coroutineScopeMap.remove(scope) + } + } + + /** + * 查询 Taxi 线路对应的轨迹 + */ + fun queryTaxiTrajectoryInfo( + scope: CoroutineScope, + reqBody: TrajectoryInfoReq, + callback: NetworkCallback + ) { + val call = getNetWorkApi().queryTaxiTrajectoryInfo(reqBody) + + coroutineScopeMap[scope]?.cancel() + val newJob = scope.async { + call.enqueue(object : Callback> { + override fun onResponse( + call: Call>, + response: Response> + ) { + Log.d(TAG, "查询 Taxi 有轨迹的QA线路列表:" + response.body().toString()) + response.body()?.let { responseBody -> + if (responseBody.code == 0) { + responseBody.result?.let { result -> + callback.onSuccess(result) + } ?: let { + callback.onError("msg=${responseBody.msg},code=${responseBody.code}") + } + } else { + callback.onError("msg=${responseBody.msg},code=${responseBody.code}") + } + } ?: let { + callback.onError("网络异常") + } + } + + override fun onFailure( + call: Call>, + t: Throwable + ) { + Log.e(TAG, "网络异常:") + scope.launch { callback.onError("网络异常") } + } + }) + } + coroutineScopeMap[scope] = newJob + + scope.coroutineContext[Job]?.invokeOnCompletion { + coroutineScopeMap.remove(scope) + } + } + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/api/FMdNetModel.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/api/FMdNetModel.kt new file mode 100644 index 0000000000..9369e1b0f5 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/api/FMdNetModel.kt @@ -0,0 +1,73 @@ +package com.zhjt.mogo_core_function_devatools.rviz.net.api + + +import android.util.Log +import com.zhjt.mogo_core_function_devatools.rviz.net.HostConst +import com.zhjt.mogo_core_function_devatools.rviz.net.MoGoRetrofitFactory +import com.zhjt.mogo_core_function_devatools.rviz.net.NetworkCallback +import com.zhjt.mogo_core_function_devatools.rviz.net.Response +import com.zhjt.mogo_core_function_devatools.rviz.net.api.entity.CarInfoByParamResponse +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Job +import kotlinx.coroutines.async +import kotlinx.coroutines.launch +import retrofit2.Call +import retrofit2.Callback + +class FMdNetModel { + private val TAG="FMdNetModel" + private val coroutineScopeMap = HashMap() + + private fun getNetWorkApi(baseUrl: String = HostConst.getBaseBiUrl()): FmdApi { + return MoGoRetrofitFactory.getInstanceNoCallAdapter(baseUrl) + .create(FmdApi::class.java) + } + + + + /** + * 根据车牌获取城市获取地图信息 + */ + fun getCarInfoByParam( + scope: CoroutineScope, + carNum: String, + callback: NetworkCallback + ) { + val call = getNetWorkApi().getCarInfoByParam(carNum, 1) + + coroutineScopeMap[scope]?.cancel() + val newJob = scope.async { + call.enqueue(object : Callback> { + override fun onResponse( + call: Call>, + response: retrofit2.Response> + ) { + Log.i(TAG,"根据车牌获取城市获取地图信息:" + response.body().toString()) + scope.launch { + response.body()?.let { responseBody -> + responseBody.data?.let { data -> + callback.onSuccess(data) + } ?: let { + callback.onError("msg=${responseBody.msg},code=${responseBody.code}") + } + } ?: let { + callback.onError("网络异常") + } + } + } + + override fun onFailure(call: Call>, t: Throwable) { + Log.e(TAG, "网络异常", t) + scope.launch { callback.onError("网络异常") } + } + }) + } + coroutineScopeMap[scope] = newJob + + scope.coroutineContext[Job]?.invokeOnCompletion { + coroutineScopeMap.remove(scope) + } + } + + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/api/FmdApi.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/api/FmdApi.kt new file mode 100644 index 0000000000..1baeb603f4 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/api/FmdApi.kt @@ -0,0 +1,23 @@ +package com.zhjt.mogo_core_function_devatools.rviz.net.api + +import com.zhjt.mogo_core_function_devatools.rviz.net.Response +import com.zhjt.mogo_core_function_devatools.rviz.net.api.entity.CarInfoByParamResponse +import retrofit2.Call +import retrofit2.http.* + + +interface FmdApi { + + /** + * 根据车牌获取城市获取地图信息 + * @param carNum 车牌 + * @param mapType 传1 + */ + @GET("/api/artifact/openApi/getCarInfoByParam") + fun getCarInfoByParam( + @Query("carNum") carNum: String, + @Query("mapType") mapType: Int + ): Call> + + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/api/TrajectoryApi.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/api/TrajectoryApi.kt new file mode 100644 index 0000000000..d7487fc19c --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/api/TrajectoryApi.kt @@ -0,0 +1,57 @@ +package com.mogo.module.common.net.mis.trajectory.net + +import com.mogo.eagle.core.data.BaseResponse +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectoryInfo +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectoryInfoReq +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectoryLisReq +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectoryListInfo +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectorySiteInfo +import retrofit2.Call +import retrofit2.http.* + +interface TrajectoryApi { + + /** + * 查询 Bus 有轨迹的QA线路列表 + * @param deviceId deviceId + */ + @POST("/eagleEye-mis/line/qa/bus/list") + fun queryBusTrajectoryList(@Body reqBody: TrajectoryLisReq): Call>> + + /** + * 查询 Taxi 有轨迹的QA线路列表 + * @param deviceId deviceId + */ + @POST("/eagleEye-mis/line/qa/taxi/list") + fun queryTaxiTrajectoryList(@Body reqBody: TrajectoryLisReq): Call>> + + /** + * 查询 Bus 线路对应的站点 + * @param lineId 线路ID + */ + @GET("/eagleEye-mis/line/query/bus/site") + fun queryBusSiteList(@Query("lineId") lineId: Int): Call>> + + /** + * 查询 Taxi 线路对应的站点 + * @param lineId 线路ID + */ + @GET("/eagleEye-mis/line/query/taxi/site") + fun queryTaxiSiteList(@Query("lineId") lineId: Int): Call>> + + + /** + * 查询 Bus 线路对应的轨迹 + */ + @POST("/eagleEye-mis/line/query/bus/contrail") + fun queryBusTrajectoryInfo(@Body reqBody: TrajectoryInfoReq): Call> + + + /** + * 查询 Taxi 线路对应的轨迹 + */ + @POST("/eagleEye-mis/line/query/taxi/contrail") + fun queryTaxiTrajectoryInfo(@Body reqBody: TrajectoryInfoReq): Call> + + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/api/callback/CarInfoByParamCallback.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/api/callback/CarInfoByParamCallback.kt new file mode 100644 index 0000000000..662149d4ee --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/api/callback/CarInfoByParamCallback.kt @@ -0,0 +1,14 @@ +package com.zhjt.mogo_core_function_devatools.rviz.net.api.callback + +import com.zhjt.mogo_core_function_devatools.rviz.net.api.entity.CarInfoByParamResponse + +/** + * 云端MAP版本 + */ +interface CarInfoByParamCallback { + + fun onSuccess(response: CarInfoByParamResponse) + + fun onError(error: String) + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/api/entity/CarInfoByParamResponse.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/api/entity/CarInfoByParamResponse.kt new file mode 100644 index 0000000000..36d548cad8 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/api/entity/CarInfoByParamResponse.kt @@ -0,0 +1,38 @@ +package com.zhjt.mogo_core_function_devatools.rviz.net.api.entity + +/** + * 获取鹰眼扫码登陆状态返回实体类 + */ +data class CarInfoByParamResponse( + val carMapDownloadUrl: String?, + val carMapName: String?, + val carNum: String?, + val cityMapDownloadUrl: String?, + val cityMapName: String?, + val imageArtifactDto: ImageArtifactDto?, + val productId: Int +) + +data class ImageArtifactDto( + val bizType: String?, + val createTime: String?, + val createUser: String?, + val env: String?, + val extend: String?, + val fileAddr: String?, + val hashType: String?, + val hashValue: String?, + val id: Int?, + val iterationId: Int?, + val modelName: String?, + val packageType: Int?, + val pipelineArtifactId: Int?, + val pipelineResultId: Int?, + val product: String?, + val productName: String?, + val publishStage: String?, + val publishTime: String?, + val systemId: Int?, + val vehicleType: String?, + val versionNo: String? +) diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/api/entity/Result.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/api/entity/Result.kt new file mode 100644 index 0000000000..1af0be8d8e --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/net/api/entity/Result.kt @@ -0,0 +1,21 @@ +package com.zhjt.mogo_core_function_devatools.rviz.net.api.entity + +data class Result( + val applicationId: Int, + val applicationName: String, + val approvalId: Int, + val approvalStatus: Int, + val approvalTemplateId: Int, + val approvalTemplateName: String, + val approver: String, + val approverType: Int, + val createTime: String, + val createUser: String, + val currentNode: Int, + val custom: String, + val nodeName: String, + val previousNode: String, + val returnOut: String, + val submitMsg: Any, + val updateTime: String +) \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/service/FaultManagementDiagnosisService.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/service/FaultManagementDiagnosisService.kt new file mode 100644 index 0000000000..3b3b973b92 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/service/FaultManagementDiagnosisService.kt @@ -0,0 +1,1108 @@ +package com.zhjt.mogo_core_function_devatools.rviz.service + +import android.app.Service +import android.content.Intent +import android.os.Binder +import android.os.Handler +import android.os.HandlerThread +import android.os.IBinder +import android.os.Looper +import android.os.Message +import android.text.TextUtils +import android.util.Log +import android.util.Pair +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener +import com.mogo.eagle.core.function.api.autopilot.IMoGoFaultManagementStateListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager +import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager +import com.mogo.eagle.core.function.call.autopilot.CallerFaultManagementStateListenerManager +import com.mogo.eagle.core.utilcode.util.GsonUtils +import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.zhidao.support.adas.high.AdasManager +import com.zhjt.mogo.adas.data.AdasConstants +import com.zhjt.mogo_core_function_devatools.rviz.R +import com.zhjt.mogo_core_function_devatools.rviz.common.config.SSHAccountConfig +import com.zhjt.mogo_core_function_devatools.rviz.common.coroutines.FlowBus +import com.zhjt.mogo_core_function_devatools.rviz.constant.AppConfigInfo +import com.zhjt.mogo_core_function_devatools.rviz.constant.EventKey +import com.zhjt.mogo_core_function_devatools.rviz.constant.FaultLevel +import com.zhjt.mogo_core_function_devatools.rviz.constant.FaultModuleId +import com.zhjt.mogo_core_function_devatools.rviz.constant.SensorCamera +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.AdasConnectionStatus +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.DiskInfo +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.DockerBean +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.DockerConfigContent +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.DockerInfo +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.DockerStatus +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.FMFilterInfoMsg +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.FMInfoMsg +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.FmEntity +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.HdMapVersion +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.RosHostArgument +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.SensorStatusEntity +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.StartupConfig +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.VehicleConfig +import com.zhjt.mogo_core_function_devatools.rviz.net.FmdNetManager +import com.zhjt.mogo_core_function_devatools.rviz.net.api.callback.CarInfoByParamCallback +import com.zhjt.mogo_core_function_devatools.rviz.net.api.entity.CarInfoByParamResponse +import com.zhjt.mogo_core_function_devatools.rviz.ssh.SSH +import com.zhjt.mogo_core_function_devatools.rviz.ssh.constant.MogoCommand +import com.zhjt.mogo_core_function_devatools.rviz.ssh.function.call.CallerSshConnectionListenerManager +import com.zhjt.mogo_core_function_devatools.rviz.ssh.function.listener.OnDockerExecCommandListener +import com.zhjt.mogo_core_function_devatools.rviz.ssh.function.listener.OnExecCommandListener +import com.zhjt.mogo_core_function_devatools.rviz.ssh.function.listener.OnSshConnectionListener +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.SSHHostBean +import fault_management.FmInfo +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.DelicateCoroutinesApi +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch +import mogo.telematics.pad.MessagePad +import java.lang.ref.WeakReference +import java.util.Locale +import java.util.Timer +import java.util.TimerTask +import java.util.concurrent.ConcurrentHashMap +import java.util.concurrent.atomic.AtomicBoolean +import java.util.concurrent.atomic.AtomicReference + +/** + * 故障管理诊断服务 + */ +class FaultManagementDiagnosisService : Service(), OnSshConnectionListener, + IMoGoAutopilotCarConfigListener, + IMoGoFaultManagementStateListener, OnExecCommandListener, + OnDockerExecCommandListener { + private val TAG: String = FaultManagementDiagnosisService::class.java.simpleName + private val WHAT_FM_INFO_TIMEOUT = 0//FM数据超时消息 + private val scopeSubscriber = CoroutineScope(Dispatchers.Main) + private val getCarInfoByParamScopeSubscriber = CoroutineScope(Dispatchers.IO) + private val binder: IBinder = FaultManagementDiagnosisBinder() + + + private val sshMap = ConcurrentHashMap()//已连接的SSH + private var defaultSSH: SSH? = null//默认SSH 一般是102 + private var vehicleConfig: VehicleConfig? = null//车辆信息 + public val rosHostArguments: ArrayList = + ArrayList() //每个ROS主机的配置信息 + private var rosHostArgumentTimer: AtomicReference = AtomicReference(null)//定时查询 + private val dockerInfoMap = mutableMapOf>() + private var cloudMapVersion = "未知"//云端MAP版本 + private var hdMapVersion = HdMapVersion()//高精度版本 + private val isReceiveFMData = AtomicBoolean(false)//是否接收到了FM数据 + + private val queryRosHostArgumentMap = + ConcurrentHashMap()//当前参与查询主机参数的主机 + public val fmDataMap = mutableMapOf()//FM分类数据源 + private val cachePolicyMap = hashMapOf() + + fun getVehicleConfig(): VehicleConfig? { + return vehicleConfig + } + + fun getCloudMapVersion(): String { + return cloudMapVersion + } + + /** + * 获取102 MAP版本号 + */ + fun getRosMasterMapVersion(): String { + if (defaultSSH != null) { + val index = rosHostArguments.indexOf(RosHostArgument(defaultSSH!!.host)) + if (index > -1) { + val argument = rosHostArguments[index] + return argument.dockerVersion + } + } + return getString(R.string.rviz_fmd_unknown) + } + + /** + * 获取高精度图版本 + */ + fun getHdMapVersion(): HdMapVersion { + return hdMapVersion + + } + + override fun onCreate() { + super.onCreate() + initFMData() + CallerAutoPilotStatusListenerManager.addListener(TAG, adasConnectionStatusListener) + CallerAutopilotCarConfigListenerManager.addListener(TAG, this) + CallerFaultManagementStateListenerManager.addListener(TAG, this) + AdasManager.getInstance().carConfig?.let { + onAutopilotCarConfig(it) + } + Log.i(TAG, "故障管理诊断服务已启动") + } + + + override fun onBind(intent: Intent?): IBinder { + Log.i(TAG, "故障管理诊断服务已绑定") + return binder + } + + inner class FaultManagementDiagnosisBinder : Binder() { + val service: FaultManagementDiagnosisService + get() = this@FaultManagementDiagnosisService + } + + override fun onUnbind(intent: Intent?): Boolean { + Log.i(TAG, "故障管理诊断服务已解绑") + return true + } + + override fun onDestroy() { + super.onDestroy() + handler.removeCallbacksAndMessages(null) + CallerFaultManagementStateListenerManager.removeListener(TAG) + CallerAutopilotCarConfigListenerManager.removeListener(TAG) + CallerAutoPilotStatusListenerManager.removeListener(TAG) + disconnectAllSSH() + defaultSSH = null + Log.i(TAG, "故障管理诊断服务已停止") + } + + private fun initFMData() { + fmDataMap.clear() + fmDataMap[FaultModuleId.HardwareDriver.name] = + FmEntity("硬件驱动(HardwareDriver)") + fmDataMap[FaultModuleId.Perception.name] = + FmEntity("感知(Perception)") + fmDataMap[FaultModuleId.Localization.name] = + FmEntity("定位(Localization)") + fmDataMap[FaultModuleId.Prediction.name] = + FmEntity("预测(Prediction)") + fmDataMap[FaultModuleId.Planning.name] = + FmEntity("决策规划(Planning)") + fmDataMap[FaultModuleId.VehicleControl.name] = + FmEntity("车辆控制(VehicleControl)") + fmDataMap[FaultModuleId.SSM.name] = + FmEntity("系统管理(SSM)") + fmDataMap[FaultModuleId.SM.name] = FmEntity("系统监控(SM)") + fmDataMap[FaultModuleId.FSM.name + FaultModuleId.OTH.name] = + FmEntity("功能状态机&其他(FSM&OTH)") + } + + @OptIn(DelicateCoroutinesApi::class) + private val adasConnectionStatusListener = object : IMoGoAutopilotStatusListener { + + override fun onAutopilotIpcConnectStatusChanged( + status: AdasConstants.IpcConnectionStatus, + reason: String? + ) { + super.onAutopilotIpcConnectStatusChanged(status, reason) + val adasConnectStatus = AdasConnectionStatus(status, reason) + when (status) { + AdasConstants.IpcConnectionStatus.CONNECTED -> { + if (AdasManager.getInstance().carConfig == null) { + AdasManager.getInstance().sendCarConfigReq() + } + GlobalScope.launch(Dispatchers.IO) { + delay(6000) + updateFaultManagementStop(FMInfoMsg(null, null, null)) + } + } + + else -> { + isReceiveFMData.set(false) + } + } + FlowBus.with(EventKey.UPDATE_ADAS_CONNECT_STATE) + .post(scopeSubscriber, adasConnectStatus) + handler.sendEmptyMessage(WHAT_FM_INFO_TIMEOUT) + } + } + + + //连接SSH + fun connectSSH() { + openConnection( + SSH.createHost( + SSHAccountConfig.getUserName(), + SSHAccountConfig.getPassWord(), + SSHAccountConfig.getRosMasterIp() + ) + ) + } + + private fun disconnectAllSSH() { + stopRosHostArgumentTimer() + rosHostArguments.clear() + hdMapVersion = HdMapVersion() + synchronized(sshMap) { + for (ssh in sshMap.values) { + ssh.close() + } + } + } + + + private fun updateFaultManagementStop(fmInfo: FMInfoMsg) { + if (isReceiveFMData.get()) { + return + } + isReceiveFMData.set(true) + if (fmInfo.fmInfoList == null) { + //证明未收到FM数据,存在两种情况,一个是没有发数据,一个是版本不支持 + FlowBus.with(EventKey.SEND_IS_SUPPORT_FM) + .post(scopeSubscriber, AppConfigInfo.isSupportFM) + } + } + + + //车辆基础信息 + @OptIn(DelicateCoroutinesApi::class) + override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) { + Log.i(TAG, "当前域控版本=${carConfigResp.mapVersion}") + AppConfigInfo.dockerVersion = carConfigResp.dockVersion //工控机Docker版本 + AppConfigInfo.mapVersion = carConfigResp.mapVersion //工控机Docker版本 + AppConfigInfo.plateNumber = carConfigResp.plateNumber//车牌号 + AppConfigInfo.iPCMacAddress = carConfigResp.macAddress//工控机MAC地址 + AppConfigInfo.isSupportFM = carConfigResp.mapVersion >= 30600//支持FM + GlobalScope.launch(Dispatchers.IO) { + delay(100) + FlowBus.with(EventKey.UPDATE_CAR_CONFIG_STATE) + .post(scopeSubscriber, carConfigResp) + } + } + + private fun handleMessage(msg: Message) { + when (msg.what) { + WHAT_FM_INFO_TIMEOUT -> { + //接收消息超时,域控没有发FM数据认为是无异常 + FlowBus.with(EventKey.SEND_FM_INFO_TO_OVERVIEW_FRAGMENT) + .post(scopeSubscriber, FMInfoMsg(null, null, null)) + for (value in fmDataMap.values) { + value.stopFaultNum = 0; + value.otherFaultNum = 0; + value.unknownFaultNum = 0; + value.data.clear() + } + FlowBus.with(EventKey.UPDATE_FAULT_CODE_DATA) + .post(scopeSubscriber, -1) + } + } + } + + override fun onFaultManagementState(fmInfo: FmInfo.FaultResultMsg) { + Log.i(TAG, "FM原始数据个数=${fmInfo.infosList?.size}") + if (handler.hasMessages(WHAT_FM_INFO_TIMEOUT)) { + handler.removeMessages(WHAT_FM_INFO_TIMEOUT) + } + handler.sendEmptyMessageDelayed(WHAT_FM_INFO_TIMEOUT, 5000) + + val policyCode = fmInfo.downgradePolicyCode + if (policyCode == null || policyCode.isEmpty()) { + return + } + val list = fmInfo.infosList ?: return + //报告类数据不下发 + if ("FM_DP_NO_ACTION" == policyCode) { + // 故障清除 + if (cachePolicyMap.isNotEmpty()) { + cachePolicyMap.clear() + } + return + } + val fmFilterInfoMsg = cachePolicyMap[policyCode] + val cacheFaultList = ArrayList() + val policyTime = fmInfo.time + if (fmFilterInfoMsg?.cacheFilterList != null) { + if (fmFilterInfoMsg.cacheFilterList?.size == list.size) { + //判断两个集合重复 true:return + var sameResult = false + list.forEach { + sameResult = fmFilterInfoMsg.cacheFilterList?.contains(it.faultId) == true + } + if (sameResult) { + return + } + } + // 更新数据内容 + list.forEach { + cacheFaultList.add(it.faultId) + } + fmFilterInfoMsg.cacheFilterList?.clear() + fmFilterInfoMsg.cacheFilterList = cacheFaultList + fmFilterInfoMsg.fmInfoList = list + cachePolicyMap[policyCode] = fmFilterInfoMsg + onFaultManagementState(FMInfoMsg(list, policyCode, policyTime)) + } else { + // 首次添加 listener + cachePolicyMap.clear() + list.forEach { + cacheFaultList.add(it.faultId) + } + cachePolicyMap[policyCode] = FMFilterInfoMsg(list, policyCode, cacheFaultList) + onFaultManagementState(FMInfoMsg(list, policyCode, policyTime)) + } + } + + //相同数据过滤 + private fun onFaultManagementState(fmInfo: FMInfoMsg) { + if (fmInfo != null) { + Log.i(TAG, "FM数据变动个数=${fmInfo.fmInfoList?.size}") + updateFaultManagementStop(fmInfo) + FlowBus.with(EventKey.SEND_FM_INFO_TO_OVERVIEW_FRAGMENT) + .post(scopeSubscriber, fmInfo) + val fmInfoList = fmInfo.fmInfoList + for (value in fmDataMap.values) { + value.stopFaultNum = 0; + value.otherFaultNum = 0; + value.unknownFaultNum = 0; + value.data.clear() + } + if (!fmInfoList.isNullOrEmpty()) { + val set = mutableSetOf() + for (info in fmInfoList) { + var moduleId = info.faultId.substringBefore("_") + if (moduleId == "OTH" || moduleId == "FSM") { + moduleId = FaultModuleId.FSM.name + FaultModuleId.OTH.name + } + if (fmDataMap.containsKey(moduleId)) { + val tem = fmDataMap[moduleId]!! + if (!set.contains(moduleId)) { + set.add(moduleId) + tem.stopFaultNum = 0 + tem.otherFaultNum = 0 + tem.unknownFaultNum = 0 + tem.data.clear() + } + val isStop = FaultLevel.isStopFault(info.policyCode, info.faultLevel) + if (isStop != null) { + if (isStop) { + tem.stopFaultNum = + ++tem.stopFaultNum + } else { + tem.otherFaultNum = + ++tem.otherFaultNum + } + } + tem.data.add(info) + tem.unknownFaultNum = tem.data.size - tem.stopFaultNum - tem.otherFaultNum; + tem.data.sortWith(compareByDescending { FaultLevel.getOrder(it.policyCode) })//排序,等级高的显示在最上方 + } + } + } + FlowBus.with(EventKey.UPDATE_FAULT_CODE_DATA) + .post(scopeSubscriber, -1) + } + } + + + /** + * 获取云端车辆信息 + */ + private fun getCarInfoByParam(carNum: String) { + FmdNetManager.INSTANCE.getCarInfoByParam( + getCarInfoByParamScopeSubscriber, + carNum, + object : CarInfoByParamCallback { + override fun onSuccess(response: CarInfoByParamResponse) { + cloudMapVersion = + resources.getString(R.string.rviz_fmd_cloud_map_version_unknown) + val fileAddr = response.imageArtifactDto?.fileAddr + if (!fileAddr.isNullOrEmpty()) { + cloudMapVersion = if (fileAddr.contains(":")) { + val versionArray = fileAddr.split(":") + versionArray[1] + } else { + fileAddr + } + } + FlowBus.with(EventKey.SEND_CLOUD_MAP_VERSION) + .post(scopeSubscriber, cloudMapVersion) + Log.i(TAG, "云端MAP版本=${cloudMapVersion}") + } + + override fun onError(error: String) { + ToastUtils.showLong("云端版本号获取失败:${error}") + } + }) + } + + /**************************** SSH***************************************/ + + fun openConnection(host: SSHHostBean) { + // throw exception if terminal already open + val tem = getConnectedSSH(host) + if (tem != null && tem.isConnected) { + Log.i(TAG, "${host}连接已存在/建立") + return + } + val ssh = SSH(host) + ssh.setOnSshConnectionListener(this) + ssh.setExecCommandListener(this) + ssh.setExecDockerCommandListener(this) + ssh.connect() + } + + fun getConnectedSSH(host: SSHHostBean?): SSH? { + if (host == null) { + return null + } + return sshMap[host] + } + + /*********************SSH连接状态***************************/ + @OptIn(DelicateCoroutinesApi::class) + override fun onSshConnecting( + host: SSHHostBean, + rosHostArgumentPosition: Int, + isInserted: Boolean + ) { + synchronized(rosHostArguments) { + val p = getRosHostArgument(host) + val argument = p.second + val isInsert = p.first < 0 + if (isInsert) {//不存在 + rosHostArguments.add(argument) + //根据IP排序,主动连接的主机(一般是rosMaster)置顶 + rosHostArguments.sortWith(Comparator { rosHostArgument1, rosHostArgument2 -> + if (defaultSSH != null) { + if (rosHostArgument1.host == defaultSSH!!.host) { + return@Comparator -1 + } + if (rosHostArgument2.host == defaultSSH!!.host) { + return@Comparator 1 + } + } + rosHostArgument1.host.hostname + .compareTo(rosHostArgument2.host.hostname) + }) + } else { + //已存在 + argument.resetConnectFailureCode() + } + if (TextUtils.equals(SSHAccountConfig.getRosMasterIp(), argument.host.hostname)) { + argument.isRosMaster = true; + } + val index = rosHostArguments.indexOf(argument) + GlobalScope.launch(Dispatchers.Main) { + CallerSshConnectionListenerManager.invokeConnecting( + argument.host, index, isInsert + ) + } + } + Log.i(TAG, "${host.toString()} 连接中") + } + + @OptIn(DelicateCoroutinesApi::class) + override fun onSshConnected(ssh: SSH) { + synchronized(sshMap) { + sshMap.put(ssh.host, ssh) + } + GlobalScope.launch(Dispatchers.Main) { + CallerSshConnectionListenerManager.invokeConnected(ssh) + } + getRosMasterConfig(ssh) + startRosHostArgumentTimer();//启动定时查询所有主机系统参数 + if (ssh.host.isHaveHadMapVersion) { + queryHadMapVersionBackup(ssh);//查询地图版本 + } + Log.i(TAG, "${ssh.host.toString()} 连接成功") + } + + @OptIn(DelicateCoroutinesApi::class) + override fun onSshDisconnected(host: SSHHostBean) { + synchronized(sshMap) { + if (sshMap.containsKey(host)) + sshMap.remove(host) + } + GlobalScope.launch(Dispatchers.Main) { + CallerSshConnectionListenerManager.invokeDisconnected(host) + } + + Log.i(TAG, "${host.toString()} 断开连接") + } + + @OptIn(DelicateCoroutinesApi::class) + override fun onSshConnectFailure(host: SSHHostBean, msg: String) { + Thread.sleep(20) + synchronized(sshMap) { + if (sshMap.containsKey(host)) + sshMap.remove(host) + } + val tem: Pair = getRosHostArgument(host) + if (tem.first > -1) { + tem.second!!.isConnectFailure = true + tem.second!!.connectFailureReason = msg + tem.second!!.initData() + tem.second!!.host.isHaveHadMapVersion = false + } + if (TextUtils.equals(SSHAccountConfig.getRosMasterIp(), host.hostname)) { + defaultSSH = null + } + GlobalScope.launch(Dispatchers.Main) { + CallerSshConnectionListenerManager.invokeConnectFailure(host, msg) + } + Log.i(TAG, "${host.toString()} 连接失败=${msg}") + } + + /*********************SSH连接状态***************************/ + private fun updateDockerInfoMap( + host: SSHHostBean, + list: ArrayList, + isNotify: Boolean + ) { + if (list.isNotEmpty()) { + dockerInfoMap[host] = list + val mapDocker: DockerInfo? = + list.find { it.names == "autocar_default_1" || it.names == "autocar-default-1" } + if (mapDocker != null) { + val tem: Pair = getRosHostArgument(host) + if (tem.first > -1 && !mapDocker.image.isNullOrEmpty() && mapDocker.image.contains( + ":" + ) + ) { + val versionArray = mapDocker.image.split(":") + val v = versionArray[1] + tem.second!!.dockerVersion = v + if (host === defaultSSH?.host) { + FlowBus.with(EventKey.SEND_ROS_MASTER_MAP_VERSION) + .post(scopeSubscriber, v) + } + } + } + } else { + if (dockerInfoMap.containsKey(host)) + dockerInfoMap.remove(host) + } + if (isNotify) FlowBus.with(EventKey.QUERY_DOCKER_PS).post( + scopeSubscriber, + DockerBean(host, list) + ) + } + + //根据index 是否等于-1判断rosHostArguments中是否存在此查找数据 + @Synchronized + private fun getRosHostArgument(key: SSHHostBean): Pair { + val tem = RosHostArgument(key) + var index = rosHostArguments.indexOf(tem) + val rosHostConfig: RosHostArgument + if (index > -1) { + rosHostConfig = rosHostArguments[index] + } else { + index = -1 + rosHostConfig = tem + } + return Pair(index, rosHostConfig) + } + + @Synchronized + private fun startRosHostArgumentTimer() { + if (rosHostArgumentTimer.get() == null) { + val timer = Timer() + rosHostArgumentTimer.set(timer) + timer.schedule(object : TimerTask() { + override fun run() { + queryRosHostArgumentMap.clear() + for (ssh in sshMap.values) { + if (ssh.isConnected) { + synchronized(queryRosHostArgumentMap) { + queryRosHostArgumentMap[ssh.host] = false + } + queryRosHostArgument(ssh) + } + } + } + }, 8000L, 5000L) //延时 + } + } + + @Synchronized + fun stopRosHostArgumentTimer() { + if (rosHostArgumentTimer.get() != null) { + rosHostArgumentTimer.get()?.cancel() + rosHostArgumentTimer.set(null) + } + } + + + //SSH命令执行结果 + override fun onExecResult( + host: SSHHostBean, + cmd: String, + isNotify: Boolean, + result: String? + ) { + if (MogoCommand.QUERY_ROS_SLAVE == cmd) { + if (defaultSSH != null && host == defaultSSH?.host) { + val remoteHost = HashMap() + try { + val lines = result!!.split("\n".toRegex()).dropLastWhile { it.isEmpty() } + .toTypedArray() + val hosts: MutableList = ArrayList() + for (line in lines) { + if (!line.startsWith("#") && (line.contains("rosmaster") || line.contains( + "rosslave" + )) + ) { + val parts = line.trim { it <= ' ' }.split("\\s+".toRegex()) + .dropLastWhile { it.isEmpty() } + .toTypedArray() + if (parts.size >= 2) { + val ip = parts[0] + for (i in 1 until parts.size) { + val host = parts[i].trim { it <= ' ' } + remoteHost[host] = ip.trim { it <= ' ' } + if (host.contains("rosslave") && defaultSSH != null && ip != defaultSSH!!.host.hostname) { + val userName: String = defaultSSH!!.host.username + val hostPwd: String = defaultSSH!!.host.userPwd + hosts.add( + SSH.createHost( + userName, + hostPwd, + ip.trim { it <= ' ' }) + ) + } + } + } + } + } +// hosts.add( +// SSH.createHost( +// "mogo", +// "1", +// "192.168.1.107" +// ) +// ) + var rosHostCount = 2 + if (hosts.isNotEmpty()) { + rosHostCount = 1 + hosts.size + hosts.sortWith { host1, host2 -> + host1.hostname.compareTo(host2.hostname) + } + val host107 = hosts.find { it.hostname.endsWith("107") } + host107?.run { + isHaveHadMapVersion = true + setHdMapVer(this, null) + } ?: run { + val host103 = hosts.find { it.hostname.endsWith("103") } + host103?.run { + isHaveHadMapVersion = true + setHdMapVer(this, null) + } + } + for (h in hosts) { + openConnection(h) + } + } else { + rosHostCount = 1 + } + FlowBus.with(EventKey.SEND_ROS_HOST_COUNT) + .post(scopeSubscriber, rosHostCount) + } catch (e: Exception) { + e.printStackTrace() + } + + } + } else if (MogoCommand.QUERY_VEHICLE_CONFIG == cmd) { + vehicleConfig = VehicleConfig(result) +// updateDiagnoseUIStateInUIThread( +// DiagnoseSource.SSH, +// "车辆信息,车牌:${vehicleConfig!!.plate} 品牌:${vehicleConfig!!.brand} 类型:${vehicleConfig!!.model}", +// DiagnoseType.SUCCEED +// ) + if (!vehicleConfig!!.plate.isNullOrEmpty()) { + getCarInfoByParam(vehicleConfig!!.plate) + findDrivers() + } + + } else if (MogoCommand.QUERY_DOCKER_PS_A == cmd) { + if (result.isNullOrEmpty()) { + // -a命令获取失败 是用 docker ps命令重新查询 + sshMap[host]?.execCommand(MogoCommand.QUERY_DOCKER_PS, isNotify); + } else { + val list = ArrayList() + try { + val lines = + result.trim { it <= ' ' }.split("\n".toRegex()) + .dropLastWhile { it.isEmpty() } + .toTypedArray() + for (line in lines) { + val dockerInfo = + GsonUtils.fromJson(line, DockerInfo::class.java) + list.add(dockerInfo) + } + } catch (e: Exception) { + e.printStackTrace() + } + updateDockerInfoMap(host, list, isNotify) + } + } else if (MogoCommand.QUERY_DOCKER_PS == cmd) { + val list = ArrayList() + try { + val lines = + result!!.trim { it <= ' ' }.split("\n".toRegex()).dropLastWhile { it.isEmpty() } + .toTypedArray() + for (line in lines) { + if (!line.startsWith("CONTAINER")) { + val parts = line.split("\\s+".toRegex()).dropLastWhile { it.isEmpty() } + .toTypedArray() + val image = parts[1].trim { it <= ' ' } + val name = parts[parts.size - 1].trim { it <= ' ' } + var status = "" + val stringBuilder = StringBuilder() + for (i in parts.indices) { + val part = parts[i].lowercase(Locale.getDefault()) + if ("created" == part || "exited" == part || "paused" == part || "restarting" == part || "dead" == part || "removing" == part || "up" == part || "running" == part) { + for (j in i until parts.size - 1) { + stringBuilder.append(parts[j]).append(" ") + } + break + } + } + status = stringBuilder.toString().trim { it <= ' ' } + val dockerInfo = DockerInfo() + dockerInfo.image = image + dockerInfo.names = name + if (status.contains("0.")) { + status = status.substring(0, status.indexOf("0.")) + } + dockerInfo.status = status + list.add(dockerInfo) + } + } + } catch (e: java.lang.Exception) { + e.printStackTrace() + } + updateDockerInfoMap(host, list, isNotify) + } else if (MogoCommand.QUERY_DF_H == cmd) { + FlowBus.with(EventKey.QUERY_DISK_STATUS).post( + scopeSubscriber, DiskInfo(host, result) + ) + } else if (MogoCommand.QUERY_STARTUP_CONFIG == cmd) { + var configs: MutableList? = null + if (!result.isNullOrEmpty()) { + val gson = Gson() + configs = mutableListOf() + val type = object : TypeToken>() {}.type + val data: Map = gson.fromJson(result, type) + for ((key, value) in data) { + if (vehicleConfig != null && !vehicleConfig!!.plate.isNullOrEmpty() && vehicleConfig!!.plate != "未连接") { + if (key.contains(vehicleConfig!!.plate)) { + configs.add(StartupConfig.Config(key, value)) + } + } + } + } + FlowBus.with(EventKey.QUERY_STARTUP_CONFIG).post( + scopeSubscriber, + StartupConfig(host, configs) + ) + } else { + val pair: Pair = getRosHostArgument(host) + if (pair.first > -1) { + val config: RosHostArgument = pair.second!! + when (cmd) { + MogoCommand.QUERY_MEM_TOTAL -> { + //查询总内存 + config.setMemTotal(result) + } + + MogoCommand.QUERY_MEM_USED -> { + //查询已用内存 + config.setMemUsed(result) + } + + MogoCommand.QUERY_SWAP_TOTAL -> + //查询总的交换分区容量 + config.setSwapTotal(result) + + MogoCommand.QUERY_SWAP_USED -> + //查询用户使用的交换分区容量 + config.setSwapUsed(result) + + MogoCommand.QUERY_CPU_USAGE_RATE -> { + //查询CPU使用率 + config.setCpuUsageRate(result) + } + + MogoCommand.QUERY_DISK_DATA -> { + //查询磁盘总大小 + config.setDiskData(result) + } + + MogoCommand.QUERY_DISK_DATA_USED -> { + //查询磁盘使用大小 + config.setDiskDataUsed(result) + } + + MogoCommand.QUERY_RUN_TIME -> { + //查询运行小时数 + config.setRunTime(result) + } + + MogoCommand.QUERY_LOGON_COUNT -> { + //获取登录用户数量 + } + + MogoCommand.QUERY_CPU_CORE -> { + //CPU内核数量 + } + + MogoCommand.QUERY_LOAD_1_5_15 -> { + //查询负载 + config.load = result + //更新Ros Host 参数列表 + FlowBus.with(EventKey.QUERY_ROS_HOST_STATUS) + .post( + scopeSubscriber, pair.first + ) + updateSystemResourceRedDot(host) + } + } + } + } +// Log.i(TAG,"${host.toString()} 执行命令=${cmd} 结果=${result} 是否需要通知=${isNotify}") + } + + //更新梓潼资源页面异常数据数量 + private fun updateSystemResourceRedDot(host: SSHHostBean) { + if (queryRosHostArgumentMap.isNotEmpty()) { + if (queryRosHostArgumentMap.containsKey(host)) + queryRosHostArgumentMap[host] = true + if (queryRosHostArgumentMap.values.all { it }) { + FlowBus.with(EventKey.UPDATE_SYSTEM_RESOURCE_RED_DOT) + .post( + scopeSubscriber, + "" + ) + } + } + } + + //Docker连接状态 + override fun onDockerStatus(host: SSHHostBean, status: Int, isNotify: Boolean) { + if (isNotify) + FlowBus.with(EventKey.DOCKER_STATUS) + .post(scopeSubscriber, DockerStatus(host, status)) + } + + //Docker命令执行结果 + override fun onDockerExecResult( + host: SSHHostBean, + cmd: String, + result: String?, + isNotify: Boolean + ) { + if (cmd.startsWith(MogoCommand.QUERY_DOCKER_CONFIG_CONTENT) && isNotify) { + FlowBus.with(EventKey.QUERY_DOCKER_CONFIG_CONTENT).post( + scopeSubscriber, + DockerConfigContent(host, cmd, result) + ) + } else if (cmd == MogoCommand.QUERY_HADMAP_ENGINE_VERSION_BACKUP) { + val ssh = getConnectedSSH(host) + if (ssh != null) { + if (TextUtils.isEmpty(result)) { + queryHadMapVersion(ssh) + } else { + ssh.systemDisconnectDocker() + setHdMapVer(host, result) + } + } + } else if (cmd == MogoCommand.QUERY_HADMAP_ENGINE_VERSION) { + val ssh = getConnectedSSH(host) + ssh?.systemDisconnectDocker() + val msg = if (result.isNullOrEmpty()) { + getString(R.string.rviz_fmd_get_fail_hd_map_version) + } else { + result + } + setHdMapVer(host, msg) + } else if (cmd == String.format( + MogoCommand.FIND_DRIVER_CAMERA, + vehicleConfig!!.plate + ) + ) { + val sensorStatus = ArrayList() + try { + + val lines = + result!!.trim { it <= ' ' }.split("\n".toRegex()) + .dropLastWhile { it.isEmpty() } + .toTypedArray() + for (line in lines) { + + for (sensor in SensorCamera.values()) { + if (sensor.fileName == line) { + sensorStatus.add(SensorStatusEntity(sensor.title, true)) + } + } + } + } catch (e: Exception) { + e.printStackTrace() + sensorStatus.clear() + } + if (sensorStatus.isEmpty()) { + sensorStatus.add( + SensorStatusEntity( + SensorCamera.DriversCameraSensing30.title, + true + ) + ) + sensorStatus.add( + SensorStatusEntity( + SensorCamera.DriversCameraSensing60.title, + true + ) + ) + sensorStatus.add( + SensorStatusEntity( + SensorCamera.DriversCameraSensing120.title, + true + ) + ) + sensorStatus.add( + SensorStatusEntity( + SensorCamera.DriversCameraSensing120Left.title, + true + ) + ) + sensorStatus.add( + SensorStatusEntity( + SensorCamera.DriversCameraSensing120Back.title, + true + ) + ) + sensorStatus.add( + SensorStatusEntity( + SensorCamera.DriversCameraSensing120Right.title, + true + ) + ) + } + FlowBus.with>(EventKey.INIT_SENSOR_CAMERA).post( + scopeSubscriber, + ArrayList(sensorStatus.sortedBy { it.sensorName }) + ) + + Log.i(TAG, "查询摄像头信息=${result}") + } /*else if (cmd == String.format(MogoCommand.FIND_DRIVER_LIDAR, vehicleConfig!!.plate)) { + Log.i(TAG,"激光雷达信息=${result}") + } else if (cmd == String.format(MogoCommand.FIND_DRIVER_RADAR, vehicleConfig!!.plate)) { + Log.i(TAG,"毫米波雷达信息=${result}") + }*/ + } + + private fun setHdMapVer(host: SSHHostBean, ver: String?) { + Log.i(TAG, "高精地图版本=${host.hostname} ver:$ver ") + hdMapVersion.ip = host.hostname + if (!ver.isNullOrEmpty()) + hdMapVersion.version = ver + FlowBus.with(EventKey.SEND_HD_MAP_VERSION).post( + scopeSubscriber, + hdMapVersion + ) + } + + /****************************************自动查询命令 */ //获取ROS MASTER 相关配置 + @OptIn(DelicateCoroutinesApi::class) + private fun getRosMasterConfig(ssh: SSH) { + if (TextUtils.equals(SSHAccountConfig.getRosMasterIp(), ssh.host?.hostname)) { + defaultSSH = ssh + rosHostArguments.isNotEmpty().let { + val iterator = rosHostArguments.iterator() + while (iterator.hasNext()) { + val data = iterator.next() + if (data.isConnectFailure) { + val position = rosHostArguments.indexOf(data) // 获取删除的位置 + iterator.remove() // 从数据列表中删除元素 + FlowBus.with(EventKey.REMOVE_ROS_HOST_ITEM) + .post( + scopeSubscriber, position + ) + } + } + } + ssh.execCommand(MogoCommand.QUERY_VEHICLE_CONFIG, false) //获取车牌等信息 + ssh.execCommand(MogoCommand.QUERY_ROS_SLAVE, false) //获取从ros主机 + } + ssh.execCommand(MogoCommand.QUERY_DOCKER_PS_A, false) + } + + private fun queryRosHostArgument(ssh: SSH) { + ssh.execCommand(MogoCommand.QUERY_MEM_TOTAL, false);//查询总内存 + ssh.execCommand(MogoCommand.QUERY_MEM_USED, false);//查询已用内存 + ssh.execCommand(MogoCommand.QUERY_SWAP_TOTAL, false);//查询总的交换分区容量 + ssh.execCommand(MogoCommand.QUERY_SWAP_USED, false);//查询用户使用的交换分区容量 + ssh.execCommand(MogoCommand.QUERY_CPU_USAGE_RATE, false);//查询CPU使用率 + ssh.execCommand(MogoCommand.QUERY_DISK_DATA, false);//查询磁盘总大小,主要查/data目录 + ssh.execCommand(MogoCommand.QUERY_DISK_DATA_USED, false);//查询磁盘使用大小,主要查/data目录 + ssh.execCommand(MogoCommand.QUERY_RUN_TIME, false);//查询运行时间 + ssh.execCommand(MogoCommand.QUERY_LOGON_COUNT, false);//获取登录用户数量 + ssh.execCommand(MogoCommand.QUERY_CPU_CORE, false);//CPU内核数量 + ssh.execCommand(MogoCommand.QUERY_LOAD_1_5_15, false);//查询负载 + } + + + private fun queryHadMapVersionBackup(ssh: SSH) { + setHdMapVer(ssh.host, "获取中") + if (!ssh.isDockerOpened) { + ssh.systemConnectDocker() + } + ssh.systemExecDockerCommand(MogoCommand.QUERY_HADMAP_ENGINE_VERSION_BACKUP) + } + + private fun queryHadMapVersion(ssh: SSH) { + setHdMapVer(ssh.host, "获取中") + if (!ssh.isDockerOpened) { + ssh.systemConnectDocker() + } + ssh.systemExecDockerCommand(MogoCommand.QUERY_HADMAP_ENGINE_VERSION) + } + + //查找驱动 + private fun findDrivers() { + if (defaultSSH != null && vehicleConfig != null && !vehicleConfig!!.plate.isNullOrEmpty()) { + if (!defaultSSH!!.isDockerOpened) { + defaultSSH!!.systemConnectDocker() + } + defaultSSH!!.systemExecDockerCommand( + String.format( + MogoCommand.FIND_DRIVER_CAMERA, + vehicleConfig!!.plate + ) + ) +// defaultSSH!!.systemExecDockerCommand( +// String.format( +// MogoCommand.FIND_DRIVER_LIDAR, +// vehicleConfig!!.plate +// ) +// ) +// defaultSSH!!.systemExecDockerCommand( +// String.format( +// MogoCommand.FIND_DRIVER_RADAR, +// vehicleConfig!!.plate +// ) +// ) + } + + } + + // 子线程 Handler,线程安全地延迟初始化 + private val handler: Handler by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { + val handlerThread = HandlerThread("FMDThread").apply { start() } + ChildThreadHandler(this, handlerThread.looper) + } + + /** + * 子线程 Handler,持有 service 的弱引用防止内存泄漏 + */ + private class ChildThreadHandler(service: FaultManagementDiagnosisService, looper: Looper) : + Handler(looper) { + private val serviceRef = WeakReference(service) + override fun handleMessage(msg: Message) { + serviceRef.get()?.handleMessage(msg) + } + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/service/FmCodeUpdateService.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/service/FmCodeUpdateService.kt new file mode 100644 index 0000000000..8467cc4ad0 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/service/FmCodeUpdateService.kt @@ -0,0 +1,104 @@ +package com.zhjt.mogo_core_function_devatools.rviz.service + +import android.app.Service +import android.content.Intent +import android.os.Build +import android.os.IBinder +import android.util.Log +import com.mogo.eagle.core.utilcode.util.FileIOUtils +import com.mogo.eagle.core.utilcode.util.PathUtils +import com.mogo.eagle.core.utilcode.util.ServiceUtils +import com.mogo.eagle.core.utilcode.util.Utils +import com.zhjt.mogo_core_function_devatools.rviz.common.utils.LambdaTask + + +/** + * 故障码更新服务 + * 这里的逻辑是从服务器获取最新的故障码db文件,判断版本是否需要更新本地文件,如果需要更新则从网络下载文件存储到 + * /data/data/com.mogo.rviz/databases/ 替换已有的 AutoPilotVisualDB.db、AutoPilotVisualDB.db-shm、AutoPilotVisualDB.db-wal + * + * + * /data/data/com.mogo.rviz/databases/AutoPilotVisualDB.db + * /data/data/com.mogo.rviz/databases/AutoPilotVisualDB.db-shm + * /data/data/com.mogo.rviz/databases/AutoPilotVisualDB.db-wal + */ +class FmCodeUpdateService : Service() { + private val TAG = "FmCodeUpdateService" + override fun onCreate() { + super.onCreate() + // 在这里调用startForeground()方法 +// startForeground(NOTIFICATION_ID, notification); + Log.d(TAG, "启动 故障码数据库更新服务……") + } + + override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { + copyDbFileToDatabases() + return super.onStartCommand(intent, flags, startId) + } + + override fun onBind(intent: Intent?): IBinder? { + return null + } + + override fun onDestroy() { + super.onDestroy() + // 在这里调用stopForeground()方法 + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + stopForeground(STOP_FOREGROUND_DETACH); // 或 STOP_FOREGROUND_REMOVE + } else { + stopForeground(true); // true = remove notification + } + Log.d(TAG, "关闭 故障码数据库更新服务……") + } + + // 1、 请求网络接口获取最新的 db 文件版本及下载地址 + private fun checkVersion() {} + + // 2、 将接口返回的数据库版本对比本地数据库版本对比,如果大于本地版本则进行文件下载 + private fun downloadDbFile() {} + + // 3、 下载进度对外展示Loading,下载成功、失败结果展示, + private fun onDownLoadFinish() {} + private fun onDownLoadFault() {} + private fun onDownLoadProgress(progress: Int) {} + + // 如果下载失败不可阻塞主要流程 + // 4、 下载成功后直接替 /data/data/com.mogo.rviz/databases/ 路径下的文件,每次替换 3 个文件,缺少一个都会导致数据丢失 + private fun copyDbFileToDatabases() { + LambdaTask { + Log.d(TAG, "开始替换 /data/data/com.mogo.rviz/databases/ 下的数据库……") + val assetManager = Utils.getApp().assets + + val pathAutoPilotVisualDB = + PathUtils.getInternalAppDbsPath() + "/AutoPilotVisualDB.db" + val pathAutoPilotVisualDBShm = + PathUtils.getInternalAppDbsPath() + "/AutoPilotVisualDB.db-shm" + val pathAutoPilotVisualDBWal = + PathUtils.getInternalAppDbsPath() + "/AutoPilotVisualDB.db-wal" + + // 这里暂时不做是否存在判断,直接替换 + var inputStream = assetManager.open("AutoPilotVisualDB.db"); + FileIOUtils.writeFileFromIS(pathAutoPilotVisualDB, inputStream) + Log.d(TAG, "替换 $pathAutoPilotVisualDB 成功") + inputStream = assetManager.open("AutoPilotVisualDB.db-shm"); + FileIOUtils.writeFileFromIS(pathAutoPilotVisualDBShm, inputStream) + Log.d(TAG, "替换 $pathAutoPilotVisualDBShm 成功") + inputStream = assetManager.open("AutoPilotVisualDB.db-wal"); + FileIOUtils.writeFileFromIS(pathAutoPilotVisualDBWal, inputStream) + Log.d(TAG, "替换 $pathAutoPilotVisualDBWal 成功") + + Log.d(TAG, "完成数据库替换操作……") + +// 这里是生成 DB 文件,如果 「故障分析列表」更新,需要对DB文件进行更新,并将更新后的数据库给到 后台 青龙 进行升级操作 +// https://doc.weixin.qq.com/sheet/e3_AT0ANQaoAPsbcirKpQFSxuL1csc3B?scode=AEwAGwfJAA4Pa1cAYOAIsARAY7ALY +// FmCodeEntity.csvToBeanByNameAnnotation(context)已经删除 改用tool_fm_file_to_db 工具进行数据库更新 +// FmCodeEntity.getAllList(context).forEach { +// println("查询到错误信息:${it.faultCode}") +// } + + ServiceUtils.stopService(this.javaClass.name) + }.execute() + + } + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/SSH.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/SSH.java new file mode 100644 index 0000000000..8da21cfb70 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/SSH.java @@ -0,0 +1,399 @@ +/* + * ConnectBot: simple, powerful, open-source SSH client for Android + * Copyright 2007 Kenny Root, Jeffrey Sharkey + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.zhjt.mogo_core_function_devatools.rviz.ssh; + +import android.net.Uri; +import android.util.Log; + +import androidx.annotation.NonNull; + +import com.trilead.ssh2.Connection; +import com.trilead.ssh2.ConnectionMonitor; +import com.trilead.ssh2.crypto.keys.Ed25519Provider; +import com.zhjt.mogo_core_function_devatools.rviz.ssh.function.listener.OnDockerExecCommandListener; +import com.zhjt.mogo_core_function_devatools.rviz.ssh.function.listener.OnExecCommandListener; +import com.zhjt.mogo_core_function_devatools.rviz.ssh.function.listener.OnSshConnectionListener; +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.DockerCommandHandler; +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.ExecCommandHandler; +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.SSHHostBean; + +import java.io.IOException; +import java.net.NoRouteToHostException; +import java.net.SocketException; +import java.net.SocketTimeoutException; +import java.net.UnknownHostException; +import java.util.Locale; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import javax.net.ssl.SSLException; + + +/** + * @author Kenny Root + */ +public class SSH implements ConnectionMonitor, OnExecCommandListener, OnDockerExecCommandListener { + static { + // Since this class deals with Ed25519 keys, we need to make sure this is available. + Ed25519Provider.insertIfNeeded(); + } + + public final SSHHostBean host; + + + public SSH(SSHHostBean host) { + this.host = host; + } + + + private static final String PROTOCOL = "ssh"; + private static final String TAG = SSH.class.getSimpleName(); + private static final int DEFAULT_PORT = 22; + + + private static final Pattern hostmask = Pattern.compile( + "^(.+)@(([0-9a-z.-]+)|(\\[[a-f:0-9]+\\]))(:(\\d+))?$", Pattern.CASE_INSENSITIVE); + + private volatile boolean authenticated = false; + private volatile boolean connected = false; + private Connection connection; + + private OnExecCommandListener onExecCommandListener; + private OnDockerExecCommandListener onDockerExecCommandListener; + private OnSshConnectionListener onSshConnectionListener; + private ExecCommandHandler execCommandHandler; + private DockerCommandHandler dockerCommandHandler; + + + /** + * Internal method to request actual PTY terminal once we've finished + * authentication. If called before authenticated, it will just fail. + */ + private void finishConnection() throws IOException { + authenticated = true; + if (!host.getWantSession()) { + Log.e("SSH", "由于主机设置不能起动该会话"); + if (onSshConnectionListener != null) { + onSshConnectionListener.onSshConnectFailure(host, "由于主机设置不能起动该会话"); + } + return; + } + if (execCommandHandler == null) { + execCommandHandler = new ExecCommandHandler(host, connection, this); + execCommandHandler.start(); + } + if (dockerCommandHandler == null) { + dockerCommandHandler = new DockerCommandHandler(host, connection, this); + } + if (onSshConnectionListener != null) { + onSshConnectionListener.onSshConnected(this); + } + } + + @Override + public void onExecResult(@NonNull SSHHostBean host, @NonNull String cmd, boolean isNotify, String result) { + if (onExecCommandListener != null) { + onExecCommandListener.onExecResult(host, cmd, isNotify, result); + } + } + + + @Override + public void onDockerStatus(@NonNull SSHHostBean host, int status, boolean isNotify) { + if (onDockerExecCommandListener != null) { + onDockerExecCommandListener.onDockerStatus(host, status, isNotify); + } + } + + + @Override + public void onDockerExecResult(@NonNull SSHHostBean host, @NonNull String cmd, String result, boolean isNotify) { + if (onDockerExecCommandListener != null) { + onDockerExecCommandListener.onDockerExecResult(host, cmd, result, isNotify); + } + } + + public void connect() { + Thread connectionThread = new Thread(new Runnable() { + @Override + public void run() { + if (onSshConnectionListener != null) { + onSshConnectionListener.onSshConnecting(host, -1, true);//正在连接 在此的 -1和true不使用 + } + connection = new Connection(host.getHostname(), host.getPort()); + connection.addConnectionMonitor(SSH.this); + try { + connection.connect(); + connected = true; + } catch (IOException e) { + Log.e(TAG, "Problem in SSH connection thread during authentication", e); + callConnectFailure(e.getCause()); + return; + } + authenticate(); + } + }); + connectionThread.setName("Connection"); + connectionThread.setDaemon(true); + connectionThread.start(); + } + + private void authenticate() { + try { + //尝试在 SSH 连接中使用“无身份验证”方式进行连接,也就是不进行密码或密钥的身份验证。 + if (connection.authenticateWithNone(host.getUsername())) { + finishConnection(); + return; + } + if (connection.authenticateWithPassword(host.getUsername(), host.getUserPwd())) { + finishConnection(); + } else { + callConnectFailure("用户名或密码错误,请重试"); + } + + } catch (IllegalStateException e) { + Log.e(TAG, "Connection went away while we were trying to authenticate", e); + callConnectFailure("连接被中断,请检查网络"); + } catch (Exception e) { + Log.e(TAG, "Problem during handleAuthentication()", e); + callConnectFailure(e.getCause()); + } + } + + private void callConnectFailure(String msg) { + if (onSshConnectionListener != null) { + onSshConnectionListener.onSshConnectFailure(host, msg); + } + close(true); + } + + private void callConnectFailure(Throwable rootCause) { + String msg; + if (rootCause instanceof SocketTimeoutException) { + msg = "连接超时,请检查网络"; + } else if (rootCause instanceof UnknownHostException) { + msg = "无法解析此IP,请检查输入是否有误"; + } else if (rootCause instanceof NoRouteToHostException) { + msg = "无法找到目标主机,请检查网络或主机地址"; + } else if (rootCause instanceof SSLException) { + msg = "SSL异常,请重试"; + } else if (rootCause instanceof SocketException) {//ConnectException和SocketException均为网络异常 例如没有网络,强行断网 + msg = "网络连接异常,请检查网络或主机"; + } else if (rootCause instanceof IOException) { + msg = "连接丢失或通道异常,请检查主机"; + } else { + msg = "连接失败,请重试"; + } + callConnectFailure(msg); + } + + + public void close() { + Thread disconnectThread = new Thread(new Runnable() { + @Override + public void run() { + if (isConnected()) + close(false); + } + }); + disconnectThread.setName("Disconnect"); + disconnectThread.start(); + } + + private void close(boolean isFailure) { + connected = false; + if (execCommandHandler != null) { + execCommandHandler.stop(); + execCommandHandler = null; + } + disconnectDocker(false); + if (connection != null) { + connection.close(); + connection = null; + } + if (!isFailure) { + if (onSshConnectionListener != null) { + onSshConnectionListener.onSshDisconnected(host); + } + } + } + + + public static String getProtocolName() { + return PROTOCOL; + } + + + public boolean isConnected() { + return connected; + } + + @Override + public void connectionLost(Throwable reason) { + Log.i(TAG, host.getHostname() + " 连接丢失 " + reason); + //主动关闭Closed due to user request. 其他为异常关闭 + //There was a problem during connect. 没有给出具体原因,可以根据其他方式获取到所以屏蔽掉 + if (!"Closed due to user request.".equals(reason.getMessage()) && !"There was a problem during connect.".equals(reason.getMessage())) { + callConnectFailure(reason); + } + } + + + public int getDefaultPort() { + return DEFAULT_PORT; + } + + public static String getDefaultNickname(String username, String hostname, int port) { + if (port == DEFAULT_PORT) { + return String.format(Locale.US, "%s@%s", username, hostname); + } else { + return String.format(Locale.US, "%s@%s:%d", username, hostname, port); + } + } + + public static Uri getUri(String input) { + Matcher matcher = hostmask.matcher(input); + if (!matcher.matches()) + return null; + StringBuilder sb = new StringBuilder(); + sb.append(PROTOCOL) + .append("://") + .append(Uri.encode(matcher.group(1))) + .append('@') + .append(Uri.encode(matcher.group(2))); + String portString = matcher.group(6); + int port = DEFAULT_PORT; + if (portString != null) { + try { + port = Integer.parseInt(portString); + if (port < 1 || port > 65535) { + port = DEFAULT_PORT; + } + } catch (NumberFormatException nfe) { + // Keep the default port + } + } + if (port != DEFAULT_PORT) { + sb.append(':').append(port); + } + sb.append("/#").append(Uri.encode(input)); + return Uri.parse(sb.toString()); + } + + + public static SSHHostBean createHost(String username, String userPwd, String hostname) { + SSHHostBean host = new SSHHostBean(); + host.setHostname(hostname); + host.setPort(DEFAULT_PORT); + host.setUsername(username); + host.setUserPwd(userPwd); + host.setNickname(getDefaultNickname(host.getUsername(), host.getHostname(), host.getPort())); + return host; + } + + public static SSHHostBean createHost(Uri uri) { + SSHHostBean host = new SSHHostBean(); + host.setHostname(uri.getHost()); + int port = uri.getPort(); + if (port < 0) + port = DEFAULT_PORT; + host.setPort(port); + host.setUsername(uri.getUserInfo()); + String nickname = uri.getFragment(); + if (nickname == null || nickname.length() == 0) { + host.setNickname(getDefaultNickname(host.getUsername(), + host.getHostname(), host.getPort())); + } else { + host.setNickname(uri.getFragment()); + } + return host; + } + + + public void setOnSshConnectionListener(OnSshConnectionListener onSshConnectionListener) { + this.onSshConnectionListener = onSshConnectionListener; + } + + public void setExecCommandListener(OnExecCommandListener listener) { + onExecCommandListener = listener; + } + + public void setExecDockerCommandListener(OnDockerExecCommandListener listener) { + onDockerExecCommandListener = listener; + } + + public void execCommand(String cmd, boolean isNotify) { + if (execCommandHandler != null) + execCommandHandler.execCommand(cmd, isNotify); + } + + + public void startDockerDisconnectTimer(boolean isNotify) { + if (dockerCommandHandler != null) { + dockerCommandHandler.startDisconnectTimer(isNotify); + } + } + + public void stopDockerDisconnectTimer() { + if (dockerCommandHandler != null) { + dockerCommandHandler.stopDisconnectTimer(); + } + } + + public void systemConnectDocker() { + if (dockerCommandHandler != null) { + dockerCommandHandler.systemConnectDocker(); + } + } + + public void connectDocker() { + if (dockerCommandHandler != null) { + dockerCommandHandler.userConnectDocker(); + } + } + + public void systemDisconnectDocker() { + if (dockerCommandHandler != null) { + dockerCommandHandler.systemDisconnectDocker(); + } + } + + public void disconnectDocker(boolean isNotify) { + if (dockerCommandHandler != null) { + dockerCommandHandler.disconnectDocker(isNotify); + } + } + + public boolean isDockerOpened() { + return dockerCommandHandler != null && dockerCommandHandler.isDockerOpened(); + } + + public void systemExecDockerCommand(String cmd) { + if (dockerCommandHandler != null) { + dockerCommandHandler.systemExecDockerCommand(cmd); + } + } + + public void execDockerCommand(String cmd, boolean isNotify) { + if (dockerCommandHandler != null) { + dockerCommandHandler.execDockerCommand(cmd, isNotify); + } + } + + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/constant/MogoCommand.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/constant/MogoCommand.java new file mode 100644 index 0000000000..09a27aeed8 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/constant/MogoCommand.java @@ -0,0 +1,50 @@ +package com.zhjt.mogo_core_function_devatools.rviz.ssh.constant; + +/** + * MOGO 相关命令 + */ +public final class MogoCommand { + public static final String QUERY_ROS_SLAVE = "cat /etc/hosts";//查询主从ROS主机 + public static final String QUERY_VEHICLE_CONFIG = "cat /data/autocar/vehicle_monitor/vehicle_config.txt";//查询车配车辆信息 + public static final String QUERY_CPU_CORE = "awk '/processor/{core++} END{print core}' /proc/cpuinfo";//CPU内核数量 + public static final String QUERY_CPU_USAGE_RATE = "top -b -n 1 | grep \"Cpu(s)\" | awk '{print $2 + $4}' | tr -d '\n'";//CPU使用率 + + + public static final String QUERY_LOGON_COUNT = "who | wc -l | tr -d '\n'";//获取登录用户数量 + + public static final String QUERY_MEM_TOTAL = "free -m | awk '/Mem/{printf \"%.2fG\", $2/1024}'";//总内存容量 + public static final String QUERY_MEM_USED = "free -m | awk 'NR==2{printf \"%.1fG\",($2-$NF)/1024}'";//用户已用内存容量 + public static final String QUERY_MEM_AVAILABLE = "free -m | awk 'NR==2{printf \"%.2fG\",$NF/1024}'";//剩余可用内存容量 + public static final String QUERY_MEM_PERCENTAGE = "free -m | awk '/Mem/{printf \"%.0f%\", ($2-$NF)/$2*100}'";//内存使用占比 + + public static final String QUERY_SWAP_TOTAL = "free -m | awk '/Swap/{printf \"%.2fG\", $2/1024}'";//总的交换分区容量 + public static final String QUERY_SWAP_USED = "free -m | awk '/Swap/{printf \"%.2fG\",$3/1024}'";//用户使用的交换分区容量 + public static final String QUERY_SWAP_FREE = "free -m | awk '/Swap/{printf \"%.2fG\",$4/1024}'";//剩余交换分区容量 + public static final String QUERY_SWAP_PERCENTAGE = "free -m | awk '/Swap/{printf \"%.2f\",$4/$2*100}'";//可用交换分区占比 + + public static final String QUERY_RUN_TIME = "top -b -n 1 | awk -F 'up | user' 'NR==1 {gsub(/, [^,]*$/, \"\", $2); print $2}'";//运行时间截取 + public static final String QUERY_LOAD_1_5_15 = "top -b -n 1 | grep -oP 'load average: \\d+\\.\\d+, \\d+\\.\\d+, \\d+\\.\\d+' | awk '{print $3, $4, $5}'";//负载截取 + + public static final String QUERY_DISK_DATA = "df -h /data/ | awk 'NR==2{print}' | awk '{printf $2}'";//磁盘总大小,主要查/data目录(单位存在KB MB GB TB PB EB 正常情况只有GB和TB) + public static final String QUERY_DISK_DATA_USED = "df -h /data/ | awk 'NR==2{print}' | awk '{printf $3}'";//磁盘使用大小,主要查/data目录(单位存在KB MB GB TB PB EB 正常情况只有GB和TB) + public static final String QUERY_DISK_DATA_AVAIL = "df -h /data/ | awk 'NR==2{print}' | awk '{printf $4}'";// 磁盘剩余大小,主要查/data目录(单位存在KB MB GB TB PB EB 正常情况只有GB和TB) + + + public static final String QUERY_DOCKER_PS_A = "sudo docker ps -a --format '{{json .}}'"; + public static final String QUERY_DOCKER_PS = "sudo docker ps"; + public static final String QUERY_STARTUP_CONFIG = "cat /data/autocar/StartupConfigCache.json";//查询配置文件列表 + public static final String QUERY_DF_H = "df -h"; + public static final String DOCKER_BASH = "sudo docker exec -it autocar_default_1 bash"; + // public static final String QUERY_DOCKER_CONFIG_CONTENT = "sudo docker exec autocar_default_1 cat ";//查询配置文件内容 + public static final String QUERY_DOCKER_CONFIG_CONTENT = "cat ";//查询配置文件内容 + //查询当前运行 Docker 高精地图版本,2x:103 6x:107,读的时候有逻辑,db.sqlite.backup 有就以这个为准,没 db.sqlite.backup 再读dab.sqlite + public static final String QUERY_HADMAP_ENGINE_VERSION_BACKUP = "readlink /home/mogo/autopilot/share/hadmap_engine/data/hadmap_data/db.sqlite.backup | awk -F/ '{print $NF}'"; + public static final String QUERY_HADMAP_ENGINE_VERSION = "readlink /home/mogo/autopilot/share/hadmap_engine/data/hadmap_data/db.sqlite | awk -F/ '{print $NF}'"; + + public static final String QUERY_TOP = "top -b -n 1 | head -n 5";//top 命令 自行一次 只返回前5行的数据 + public static final String FIND_DRIVER_CAMERA = "find /home/mogo/data/vehicle_monitor/%s/drivers/camera/ -maxdepth 1 -type f -name \"*.launch\" -exec basename {} \\;"; + public static final String FIND_DRIVER_LIDAR = "find /home/mogo/data/vehicle_monitor/%s/drivers/lidar/ -maxdepth 1 -type f -name \"*.launch\" -exec basename {} \\;"; + public static final String FIND_DRIVER_RADAR = "find /home/mogo/data/vehicle_monitor/%s/drivers/radar/ -maxdepth 1 -type f -name \"*.launch\" -exec basename {} \\;"; + + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/constant/SSHConstant.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/constant/SSHConstant.java new file mode 100644 index 0000000000..160b64b14b --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/constant/SSHConstant.java @@ -0,0 +1,9 @@ +package com.zhjt.mogo_core_function_devatools.rviz.ssh.constant; + +import java.nio.charset.Charset; + +public class SSHConstant { + public final static String AUTHAGENT_NO = "no"; + public final static String DELKEY_DEL = "del"; + public final static String ENCODING_DEFAULT = Charset.defaultCharset().name(); +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/function/call/CallerSshConnectionListenerManager.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/function/call/CallerSshConnectionListenerManager.kt new file mode 100644 index 0000000000..8f5d228198 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/function/call/CallerSshConnectionListenerManager.kt @@ -0,0 +1,62 @@ +package com.zhjt.mogo_core_function_devatools.rviz.ssh.function.call + +import com.mogo.eagle.core.function.call.base.CallerBase +import com.zhjt.mogo_core_function_devatools.rviz.ssh.SSH +import com.zhjt.mogo_core_function_devatools.rviz.ssh.function.listener.OnSshConnectionListener +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.SSHHostBean + + +/** + * ADAS连接 回调监听 + */ +object CallerSshConnectionListenerManager : CallerBase() { + + + @Synchronized + fun invokeConnecting(host: SSHHostBean, rosHostArgumentPosition: Int, isInserted: Boolean) { + M_LISTENERS.forEach { + val listener = it.value + try { + listener.onSshConnecting(host, rosHostArgumentPosition, isInserted) + } catch (t: Throwable) { + t.printStackTrace() + } + } + } + + @Synchronized + fun invokeConnected(ssh: SSH) { + M_LISTENERS.forEach { + val listener = it.value + try { + listener.onSshConnected(ssh) + } catch (t: Throwable) { + t.printStackTrace() + } + } + } + + @Synchronized + fun invokeDisconnected(host: SSHHostBean) { + M_LISTENERS.forEach { + val listener = it.value + try { + listener.onSshDisconnected(host) + } catch (t: Throwable) { + t.printStackTrace() + } + } + } + + @Synchronized + fun invokeConnectFailure(host: SSHHostBean, msg: String) { + M_LISTENERS.forEach { + val listener = it.value + try { + listener.onSshConnectFailure(host, msg) + } catch (t: Throwable) { + t.printStackTrace() + } + } + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/function/listener/OnDockerExecCommandListener.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/function/listener/OnDockerExecCommandListener.java new file mode 100644 index 0000000000..26333384b7 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/function/listener/OnDockerExecCommandListener.java @@ -0,0 +1,20 @@ +package com.zhjt.mogo_core_function_devatools.rviz.ssh.function.listener; + +import androidx.annotation.NonNull; + +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.SSHHostBean; + +public interface OnDockerExecCommandListener { + /** + * Docker连接状态 + * + * @param host Docker宿主机 + * @param status 连接状态 + * @param isNotify 是否需要通知UI更新 + */ + + void onDockerStatus(@NonNull SSHHostBean host, int status, boolean isNotify); + + + void onDockerExecResult(@NonNull SSHHostBean host, @NonNull String cmd, String result, boolean isNotify); +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/function/listener/OnExecCommandListener.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/function/listener/OnExecCommandListener.java new file mode 100644 index 0000000000..5efcd0dbb3 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/function/listener/OnExecCommandListener.java @@ -0,0 +1,9 @@ +package com.zhjt.mogo_core_function_devatools.rviz.ssh.function.listener; + +import androidx.annotation.NonNull; + +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.SSHHostBean; + +public interface OnExecCommandListener { + void onExecResult(@NonNull SSHHostBean host,@NonNull String cmd, boolean isNotify, String result); +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/function/listener/OnSshConnectionListener.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/function/listener/OnSshConnectionListener.java new file mode 100644 index 0000000000..45b2136bda --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/function/listener/OnSshConnectionListener.java @@ -0,0 +1,43 @@ +/* + * ConnectBot: simple, powerful, open-source SSH client for Android + * Copyright 2007 Kenny Root, Jeffrey Sharkey + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.zhjt.mogo_core_function_devatools.rviz.ssh.function.listener; + +import androidx.annotation.NonNull; + +import com.zhjt.mogo_core_function_devatools.rviz.ssh.SSH; +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.SSHHostBean; + +/** + * 连接状态回调 + */ +public interface OnSshConnectionListener { + /** + * 正在连接 + * + * @param host 主机 + * @param rosHostArgumentPosition 主机列表中的ROS HOST 参数 的下标 + * @param isInserted 主是插入还是更新 + */ + void onSshConnecting(@NonNull SSHHostBean host, int rosHostArgumentPosition, boolean isInserted); + + void onSshConnected(@NonNull SSH ssh);//已连接 + + void onSshDisconnected(@NonNull SSHHostBean host);//断开连接 + + void onSshConnectFailure(@NonNull SSHHostBean host, @NonNull String msg);//连接失败 +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/module/DockerCommandHandler.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/module/DockerCommandHandler.java new file mode 100644 index 0000000000..76b2db9af0 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/module/DockerCommandHandler.java @@ -0,0 +1,408 @@ +package com.zhjt.mogo_core_function_devatools.rviz.ssh.module; + +import android.os.Handler; +import android.os.HandlerThread; +import android.os.Looper; +import android.os.Message; +import android.text.TextUtils; +import android.util.Log; + +import androidx.annotation.NonNull; + +import com.zhjt.mogo_core_function_devatools.rviz.ssh.function.listener.OnDockerExecCommandListener; +import com.trilead.ssh2.Connection; +import com.trilead.ssh2.Session; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.lang.ref.WeakReference; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; + + +/** + * 命令Docker执行线程 + */ +public class DockerCommandHandler { + private static final String TAG = DockerCommandHandler.class.getSimpleName(); + + private static final long DEFAULT_CLOSE_TIME = 5 * 60 * 1000L; + private static final int WHAT_OPEN = 0; + private static final int WHAT_CLOSE = 1; + private static final int WHAT_EXEC_COMMAND = 2; + private static final int WHAT_CLOSE_DELAYED = 3; + + private final static String changeLine = "\n"; + private final OnDockerExecCommandListener listener; + private HandlerThread mThread; + private BaseHandler mBaseHandler; + private final SSHHostBean host; + private final Connection connection; + private Session session; + private final AtomicInteger connectStatus = new AtomicInteger(CONNECT_STATUS.CLOSE); + private final AtomicBoolean isUserAction = new AtomicBoolean(false);//是否是用户操作,如果当前存在用户操作 + + public interface CONNECT_STATUS { + + /** + * 已连接 + */ + int CONNECTED = 1; + /** + * 连接失败 + */ + int FAILED = 2; + /** + * 关闭 未连接(正常关闭) + */ + int CLOSE = 3; + /** + * 关闭 未连接(延时关闭,定时关闭) + */ + int CLOSE_DELAYED = 4; + } + + public DockerCommandHandler(@NonNull SSHHostBean host, @NonNull Connection connection, @NonNull OnDockerExecCommandListener listener) { + this.host = host; + this.connection = connection; + this.listener = listener; + + } + + //系统启动Docker + public void systemConnectDocker() { + connectDocker(false); + } + + //用户启动Docker + public void userConnectDocker() { + this.isUserAction.set(true); + connectDocker(true); + } + + private synchronized void connectDocker(boolean isNotify) { + startThread(); + Message msg = Message.obtain(); + msg.what = WHAT_OPEN; + msg.arg1 = isNotify ? 1 : 0; + mBaseHandler.sendMessage(msg); + } + + public void systemDisconnectDocker() { + Log.i(TAG, "是否存在用户操作=" + isUserAction); + //判断当前是否存在用户操作,如果存在用户操作将不做断开Docker 任务 + if (!isUserAction.get()) + disconnectDocker(false); + } + + public synchronized void disconnectDocker(boolean isNotify) {//需要判断是否是用户打开的Docker 如果是用户打开的将不关闭 + if (mBaseHandler != null) { + Message msg = Message.obtain(); + msg.what = WHAT_CLOSE; + msg.arg1 = isNotify ? 1 : 0; + mBaseHandler.sendMessage(msg); + } else { + stopThread(); + } + } + + + /** + * 开始定时关闭Docker连接 + */ + + public void stopDisconnectTimer() { + if (mBaseHandler != null) { + if (mBaseHandler.hasMessages(WHAT_CLOSE_DELAYED)) + mBaseHandler.removeMessages(WHAT_CLOSE_DELAYED); + } + } + + public void startDisconnectTimer(boolean isNotify) { + stopDisconnectTimer(); + if (mBaseHandler != null) { + Message msg = Message.obtain(); + msg.what = WHAT_CLOSE_DELAYED; + msg.arg1 = isNotify ? 1 : 0; + mBaseHandler.sendMessageDelayed(msg, DEFAULT_CLOSE_TIME); + } + } + + public boolean isDockerOpened() { + return connectStatus.get() == CONNECT_STATUS.CONNECTED; + } + + private void startThread() { + if (mThread == null) { + String[] parts = host.getHostname().split("\\."); + String name = "DockerCmd-" + parts[parts.length - 1]; + mThread = new HandlerThread(name); + mThread.start(); + initHandler(mThread.getLooper()); + + } + } + + private void stopThread() { + isUserAction.set(false); + connectStatus.set(CONNECT_STATUS.CLOSE); + if (mThread != null) { + mThread.quit(); + mThread = null; + } + } + + public void systemExecDockerCommand(String cmd) { + execCommand(cmd, false); + } + + public void execDockerCommand(String cmd, boolean isNotify) { + this.isUserAction.set(true); + execCommand(cmd, isNotify); + } + + private void execCommand(String cmd, boolean isNotify) { + if (mBaseHandler != null) { + Message msg = Message.obtain(); + msg.what = WHAT_EXEC_COMMAND; + msg.arg1 = isNotify ? 1 : 0; + msg.obj = cmd; + mBaseHandler.sendMessage(msg); + } + } + + + /** + * 同Handler 的 handleMessage, + * getHandler.sendMessage,发送的Message在此接收 + * 在此之前确定已经调用initHandler() + * + * @param msg + */ + protected void handleMessage(Message msg) throws IOException { + boolean isNotify = msg.arg1 == 1; + switch (msg.what) { + case WHAT_OPEN: + if (!connection.isAuthenticationComplete()) { + updateConnected(false, isNotify); + } else { + if (session == null) { + session = connection.openSession(); + session.requestDumbPTY(); + session.startShell(); + String command = host.getUsername().equals("dev") ? "linkdocker 2222" : "sudo docker exec -it autocar_default_1 bash"; + // 远端界面返回 + InputStream stdout = session.getStdout(); + // 本地内容推送到远端 + OutputStream stdin = session.getStdin(); + // 写入执行命令 + stdin.write((command + changeLine).getBytes(StandardCharsets.UTF_8)); + // 清空缓存区,开始执行 + stdin.flush(); +// session.waitForCondition(ChannelCondition.EXIT_STATUS, 2000);//session.waitForCondition(ChannelCondition.EXIT_STATUS, 1000);并不会返回执行结果,只会等待超时 + String endResult = readCommandResult(stdout, command);//读取接收到的数据 + Log.i(TAG, host.getHostname() + " 登录Docker,返回的结果为:" + changeLine + endResult); + if (endResult.contains("password")) { + Log.i(TAG, "登录Docker 指令需要密码权限,已自动填充密码"); + // 写入执行命令 + stdin.write((host.getUserPwd() + changeLine).getBytes(StandardCharsets.UTF_8)); + // 清空缓存区,开始执行 + stdin.flush(); + stdin.write(("echo $?" + changeLine).getBytes(StandardCharsets.UTF_8)); + // 清空缓存区,开始执行 + stdin.flush(); + endResult = readCommandResult(stdout, command); + boolean isConnected = TextUtils.equals(endResult, "0"); + updateConnected(isConnected, isNotify); + if (isConnected) { + stdin.write(("export TERM=dumb" + changeLine).getBytes(StandardCharsets.UTF_8));//进入Docker后 修改终端类型 + // 清空缓存区,开始执行 + stdin.flush(); + } + Log.i(TAG, "执行 shell command=" + command + " 输入密码后,返回的结果为:" + changeLine + endResult); + } else { + stdin.write(("echo $?" + changeLine).getBytes(StandardCharsets.UTF_8));//查询命令执行结果 一般非0即失败。session.getExitStatus()这个不生效 + // 清空缓存区,开始执行 + stdin.flush(); + endResult = readCommandResult(stdout, command); + boolean isConnected = TextUtils.equals(endResult, "0"); + updateConnected(isConnected, isNotify); + if (isConnected) { + stdin.write(("export TERM=dumb" + changeLine).getBytes(StandardCharsets.UTF_8));//进入Docker后 修改终端类型 + // 清空缓存区,开始执行 + stdin.flush(); + } + Log.i(TAG, "执行返回值=" + endResult); + } + } + } + break; + case WHAT_CLOSE: + case WHAT_CLOSE_DELAYED: + if (session != null) { + if (isDockerOpened()) { + session.getStdin().write(("exit" + changeLine).getBytes(StandardCharsets.UTF_8)); + } + session.close(); + session = null; + } + if (mBaseHandler != null) { + mBaseHandler.removeCallbacksAndMessages(null); + mBaseHandler = null; + } + stopThread(); + if (connectStatus.get() != CONNECT_STATUS.FAILED) { + connectStatus.set(msg.what == WHAT_CLOSE ? CONNECT_STATUS.CLOSE : CONNECT_STATUS.CLOSE_DELAYED); + listener.onDockerStatus(host, connectStatus.get(), isNotify); + } + break; + case WHAT_EXEC_COMMAND: + String cmd = (String) msg.obj; + String result = null; + if (isDockerOpened() && session != null) { + result = executeCommandInDocker(cmd); + } + listener.onDockerExecResult(host, (String) msg.obj, result, isNotify); + break; + } + } + + private void updateConnected(boolean isConnected, boolean isNotify) { + connectStatus.set(isConnected ? CONNECT_STATUS.CONNECTED : CONNECT_STATUS.FAILED); + if (isUserAction.get()) + isNotify = true; + listener.onDockerStatus(host, connectStatus.get(), isNotify); + if (!isDockerOpened()) { + disconnectDocker(isNotify); + } + } + + private String executeCommandInDocker(String command) throws IOException { + // 远端界面返回 + InputStream stdout = session.getStdout(); + // 本地内容推送到远端 + OutputStream stdin = session.getStdin(); + + // 使用skip()方法跳过所有剩余字节:防止读取到脏数据 + stdout.skip(stdout.available()); + + // 写入执行命令 + stdin.write((command + changeLine).getBytes(StandardCharsets.UTF_8)); + // 清空缓存区,开始执行 + stdin.flush(); + String endResult = readCommandResult(stdout, command); + Log.i(TAG, "执行 shell command=" + command + " 返回的结果为:" + changeLine + endResult); + if (endResult.contains("password")) { + Log.i(TAG, "指令需要密码权限,已自动填充密码"); + return executeCommandInDocker(host.getUserPwd()); + } + if (endResult.isEmpty()) { + return ""; + } + return endResult.trim(); + } + + private String readCommandResult(InputStream inputStream, String command) throws IOException { + StringBuilder builder = new StringBuilder(); + StringBuilder endResult = new StringBuilder(); + String res = ""; + while (!res.endsWith(":~$") && !res.endsWith(":~/") && !res.endsWith(":/#") && !res.endsWith("password for " + host.getUsername() + ":")) { + try { + Thread.sleep(500L); + } catch (InterruptedException e) { + e.printStackTrace(); + } + if (inputStream.available() > 0) { + //InputStream按位读取,并保存在stringbuffer中 + byte[] bs = new byte[inputStream.available()]; + inputStream.read(bs); + res = new String(bs).trim(); + builder.append(res); + } + } + // 将StringBuff读取的InputStream数据,转换成特定编码格式的字符串,一般为UTF-8格式 + String result = new String(builder.toString().getBytes(StandardCharsets.UTF_8)); + // 将返回结果,按行截取并放进数组里面 + String[] strings = result.split(changeLine); + strings = Arrays.stream(strings) + .filter(s -> !s.isEmpty()) + .toArray(String[]::new); + + // 通过遍历,筛选无意义的字符 + for (int i = 1; i < strings.length; i++) { + String string = strings[i]; + if (!string.contains(command) && + !string.contains(":~$") && + !string.contains(":~/") && + !string.contains(":/#") //&& !strings[i].contains("Last login") + ) { + //获取筛选后的字符 + endResult.append(string.trim()).append(changeLine); + } + } + String temp = endResult.toString(); + // 判断结尾是否是换行符 + if (!TextUtils.isEmpty(temp) && temp.endsWith(changeLine)) { + // 去掉结尾的换行符 + temp = temp.substring(0, temp.length() - 1); + } + return temp; + } + + + /** + * 初始化一个Handler,如果需要使用Handler,先调用此方法, + * 然后可以使用postRunnable(Runnable runnable), + * sendMessage在handleMessage(Message msg)中接收msg + */ + private void initHandler(@NonNull Looper looper) { + mBaseHandler = new BaseHandler(looper, this); + } + + + /** + * 同Handler的postRunnable + * 在此之前确定已经调用initHandler() + */ + public void postRunnable(Runnable runnable) { + postRunnableDelayed(runnable, 0); + } + + /** + * 同Handler的postRunnableDelayed + * 在此之前确定已经调用initHandler() + */ + public void postRunnableDelayed(Runnable runnable, long delayMillis) { + if (mBaseHandler != null) + mBaseHandler.postDelayed(runnable, delayMillis); + } + + + protected static class BaseHandler extends Handler { + private final WeakReference mObjects; + + public BaseHandler(@NonNull Looper looper, DockerCommandHandler mPresenter) { + super(looper); + mObjects = new WeakReference(mPresenter); + } + + + @Override + public void handleMessage(Message msg) { + DockerCommandHandler mPresenter = mObjects.get(); + if (mPresenter != null) { + try { + mPresenter.handleMessage(msg); + } catch (IOException e) { + e.printStackTrace(); + } + } + + } + } + + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/module/ExecCommandHandler.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/module/ExecCommandHandler.java new file mode 100644 index 0000000000..c5c33cd034 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/module/ExecCommandHandler.java @@ -0,0 +1,147 @@ +package com.zhjt.mogo_core_function_devatools.rviz.ssh.module; + +import android.os.Handler; +import android.os.HandlerThread; +import android.os.Looper; +import android.os.Message; +import android.util.Log; + +import androidx.annotation.NonNull; + +import com.zhjt.mogo_core_function_devatools.rviz.ssh.function.listener.OnExecCommandListener; +import com.trilead.ssh2.Connection; +import com.trilead.ssh2.Session; + +import java.io.IOException; +import java.io.InputStream; +import java.lang.ref.WeakReference; + + +/** + * 命令执行线程 + */ +public class ExecCommandHandler { + private static final String TAG = ExecCommandHandler.class.getSimpleName(); + private static final int BUFFER_SIZE = 1024; + private final OnExecCommandListener listener; + private HandlerThread mThread; + private BaseHandler mBaseHandler; + private final SSHHostBean host; + private Connection connection; + + + public ExecCommandHandler(@NonNull SSHHostBean host, @NonNull Connection connection, @NonNull OnExecCommandListener listener) { + this.host = host; + this.connection = connection; + this.listener = listener; + + } + + public void start() { + if (mThread == null) { + String[] parts = host.getHostname().split("\\."); + String name = "ExecCommand-" + parts[parts.length - 1]; + mThread = new HandlerThread(name); + mThread.start(); + initHandler(mThread.getLooper()); + } + } + + public void stop() { + if (mBaseHandler != null) { + mBaseHandler.removeCallbacksAndMessages(null); + mBaseHandler = null; + } + if (mThread != null) { + mThread.quit(); + mThread = null; + } + } + + public void execCommand(String cmd, boolean isNotify) { + Message msg = Message.obtain(); + msg.obj = cmd; + msg.arg1 = isNotify ? 1 : 0; + mBaseHandler.sendMessage(msg); + } + + + /** + * 同Handler 的 handleMessage, + * getHandler.sendMessage,发送的Message在此接收 + * 在此之前确定已经调用initHandler() + * + * @param msg + */ + protected void handleMessage(Message msg) { + String cmd = (String) msg.obj; + StringBuilder data = new StringBuilder(); + try { + Session session = connection.openSession(); + if (cmd.contains("sudo")) { + cmd = cmd.replace("sudo", "echo " + host.getUserPwd() + " | sudo -S"); + } + InputStream stdout = session.getStdout(); + InputStream stderr = session.getStderr(); + session.execCommand(cmd); + byte[] buffer = new byte[BUFFER_SIZE]; + int bytesRead; + while ((bytesRead = stdout.read(buffer)) != -1) { + String output = new String(buffer, 0, bytesRead); + data.append(output); + } + session.close(); + } catch (IOException e) { + e.printStackTrace(); + Log.e("SSH", "接收异常", e); + } + listener.onExecResult(host, (String) msg.obj, msg.arg1 == 1, data.toString()); + } + + /** + * 初始化一个Handler,如果需要使用Handler,先调用此方法, + * 然后可以使用postRunnable(Runnable runnable), + * sendMessage在handleMessage(Message msg)中接收msg + */ + private void initHandler(@NonNull Looper looper) { + mBaseHandler = new BaseHandler(looper, this); + } + + + /** + * 同Handler的postRunnable + * 在此之前确定已经调用initHandler() + */ + public void postRunnable(Runnable runnable) { + postRunnableDelayed(runnable, 0); + } + + /** + * 同Handler的postRunnableDelayed + * 在此之前确定已经调用initHandler() + */ + public void postRunnableDelayed(Runnable runnable, long delayMillis) { + if (mBaseHandler != null) + mBaseHandler.postDelayed(runnable, delayMillis); + } + + + protected static class BaseHandler extends Handler { + private final WeakReference mObjects; + + public BaseHandler(@NonNull Looper looper, ExecCommandHandler mPresenter) { + super(looper); + mObjects = new WeakReference(mPresenter); + } + + + @Override + public void handleMessage(Message msg) { + ExecCommandHandler mPresenter = mObjects.get(); + if (mPresenter != null) + mPresenter.handleMessage(msg); + } + } + + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/module/SSHHostBean.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/module/SSHHostBean.java new file mode 100644 index 0000000000..6cc08b91f5 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ssh/module/SSHHostBean.java @@ -0,0 +1,304 @@ +/* + * ConnectBot: simple, powerful, open-source SSH client for Android + * Copyright 2007 Kenny Root, Jeffrey Sharkey + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.zhjt.mogo_core_function_devatools.rviz.ssh.module; + +import android.annotation.SuppressLint; +import android.net.Uri; + +import com.zhjt.mogo_core_function_devatools.rviz.ssh.constant.SSHConstant; + + +/** + * @author Kenny Root + */ +public class SSHHostBean { + + public static final int DEFAULT_FONT_SIZE = 10; + + /* Database fields */ + private long id = -1; + private String nickname = null; + private String username = null; + private String userPwd = null; + private String hostname = null; + private int port = 22; + private long lastConnect = -1; + private String color; + private boolean useKeys = true; + private String useAuthAgent = SSHConstant.AUTHAGENT_NO; + private String postLogin = null; + private boolean wantSession = true; + private String delKey = SSHConstant.DELKEY_DEL; + private int fontSize = DEFAULT_FONT_SIZE; + private boolean compression = false; + private String encoding = SSHConstant.ENCODING_DEFAULT; + private boolean stayConnected = false; + private boolean quickDisconnect = false; + + private boolean isHaveHadMapVersion = false;//此主机是否有地图版本 + + public SSHHostBean() { + + } + + + public SSHHostBean(String nickname, String username, String hostname, int port) { + this.nickname = nickname; + this.username = username; + this.hostname = hostname; + this.port = port; + } + + public void setId(long id) { + this.id = id; + } + + public long getId() { + return id; + } + + public void setNickname(String nickname) { + this.nickname = nickname; + } + + public String getNickname() { + return nickname; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getUsername() { + return username; + } + + public String getUserPwd() { + return userPwd; + } + + public void setUserPwd(String userPwd) { + this.userPwd = userPwd; + } + + public void setHostname(String hostname) { + this.hostname = hostname; + } + + public String getHostname() { + return hostname; + } + + public void setPort(int port) { + this.port = port; + } + + public int getPort() { + return port; + } + + + public void setLastConnect(long lastConnect) { + this.lastConnect = lastConnect; + } + + public long getLastConnect() { + return lastConnect; + } + + public void setColor(String color) { + this.color = color; + } + + public String getColor() { + return color; + } + + public void setUseKeys(boolean useKeys) { + this.useKeys = useKeys; + } + + public boolean getUseKeys() { + return useKeys; + } + + public void setUseAuthAgent(String useAuthAgent) { + this.useAuthAgent = useAuthAgent; + } + + public String getUseAuthAgent() { + return useAuthAgent; + } + + public void setPostLogin(String postLogin) { + this.postLogin = postLogin; + } + + public String getPostLogin() { + return postLogin; + } + + public void setWantSession(boolean wantSession) { + this.wantSession = wantSession; + } + + public boolean getWantSession() { + return wantSession; + } + + public void setDelKey(String delKey) { + this.delKey = delKey; + } + + public String getDelKey() { + return delKey; + } + + public void setFontSize(int fontSize) { + this.fontSize = fontSize; + } + + public int getFontSize() { + return fontSize; + } + + public void setCompression(boolean compression) { + this.compression = compression; + } + + public boolean getCompression() { + return compression; + } + + public void setEncoding(String encoding) { + this.encoding = encoding; + } + + public String getEncoding() { + return this.encoding; + } + + public void setStayConnected(boolean stayConnected) { + this.stayConnected = stayConnected; + } + + public boolean getStayConnected() { + return stayConnected; + } + + public void setQuickDisconnect(boolean quickDisconnect) { + this.quickDisconnect = quickDisconnect; + } + + public boolean getQuickDisconnect() { + return quickDisconnect; + } + + public boolean isHaveHadMapVersion() { + return isHaveHadMapVersion; + } + + public void setHaveHadMapVersion(boolean haveHadMapVersion) { + isHaveHadMapVersion = haveHadMapVersion; + } + + @SuppressLint("DefaultLocale") + public String getDescription() { + String description = String.format("%s@%s", username, hostname); + + if (port != 22) + description += String.format(":%d", port); + + return description; + } + + + @Override + public boolean equals(Object o) { + if (o == null || !(o instanceof SSHHostBean)) + return false; + + SSHHostBean host = (SSHHostBean) o; + + if (nickname == null) { + if (host.getNickname() != null) + return false; + } else if (!nickname.equals(host.getNickname())) + return false; + if (username == null) { + if (host.getUsername() != null) + return false; + } else if (!username.equals(host.getUsername())) + return false; + + if (hostname == null) { + if (host.getHostname() != null) + return false; + } else if (!hostname.equals(host.getHostname())) + return false; + + return port == host.getPort(); + } + + @Override + public int hashCode() { + int hash = 7; + + if (id != -1) + return (int) id; + + hash = 31 * hash + (null == nickname ? 0 : nickname.hashCode()); + hash = 31 * hash + (null == username ? 0 : username.hashCode()); + hash = 31 * hash + (null == hostname ? 0 : hostname.hashCode()); + hash = 31 * hash + port; + + return hash; + } + + /** + * @return URI identifying this HostBean + */ + public Uri getUri() { + StringBuilder sb = new StringBuilder(); + sb.append("ssh://"); + if (username != null) + sb.append(Uri.encode(username)) + .append('@'); + + sb.append(Uri.encode(hostname)) + .append(':') + .append(port) + .append("/#") + .append(nickname); + return Uri.parse(sb.toString()); + } + + /** + * Generates a "pretty" string to be used in the quick-connect host edit view. + */ + @Override + public String toString() { + if (username == null || hostname == null || + username.equals("") || hostname.equals("")) + return ""; + if (port == 22) + return username + "@" + hostname; + else + return username + "@" + hostname + ":" + port; + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/activity/AutopilotCheckAct.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/activity/AutopilotCheckAct.kt new file mode 100644 index 0000000000..fd67ac96d6 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/activity/AutopilotCheckAct.kt @@ -0,0 +1,16 @@ +package com.zhjt.mogo_core_function_devatools.rviz.ui.activity + +import android.os.Bundle +import com.zhjt.mogo_core_function_devatools.rviz.R +import com.zhjt.mogo_core_function_devatools.rviz.common.base.BaseActivity +import kotlinx.android.synthetic.main.layout_autopilot_check.viewCheckAutopilot + +class AutopilotCheckAct: BaseActivity() { + + override fun onCreate(savedInstanceState: Bundle?){ + super.onCreate(savedInstanceState) + setContentView(R.layout.layout_autopilot_check) + viewCheckAutopilot.setActivity(this) + } + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/activity/FmdAct.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/activity/FmdAct.kt new file mode 100644 index 0000000000..8e7edc4e91 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/activity/FmdAct.kt @@ -0,0 +1,335 @@ +package com.zhjt.mogo_core_function_devatools.rviz.ui.activity + +import android.content.ComponentName +import android.content.Intent +import android.content.ServiceConnection +import android.os.Bundle +import android.os.IBinder +import android.os.Looper +import android.text.TextUtils +import android.view.ContextMenu +import android.view.Menu +import android.view.View +import android.widget.Button +import androidx.fragment.app.Fragment +import com.flyco.tablayout.CommonTabLayout +import com.flyco.tablayout.listener.CustomTabEntity +import com.flyco.tablayout.listener.OnTabSelectListener +import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.mogo.eagle.core.utilcode.util.Utils +import com.zhidao.support.adas.high.common.MMKVUtils +import com.zhjt.mogo_core_function_devatools.rviz.R +import com.zhjt.mogo_core_function_devatools.rviz.common.base.BaseActivity +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.FmEntity +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.HdMapVersion +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.RosHostArgument +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.TabEntity +import com.zhjt.mogo_core_function_devatools.rviz.service.FaultManagementDiagnosisService +import com.zhjt.mogo_core_function_devatools.rviz.service.FmCodeUpdateService +import com.zhjt.mogo_core_function_devatools.rviz.ssh.SSH +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.SSHHostBean +import com.zhjt.mogo_core_function_devatools.rviz.ui.fragments.fault.FaultCodeFrag +import com.zhjt.mogo_core_function_devatools.rviz.ui.fragments.overview.OverviewFrag +import com.zhjt.mogo_core_function_devatools.rviz.ui.fragments.resource.SystemResourceFrag +import com.zhjt.mogo_core_function_devatools.rviz.ui.views.ColorHintFloatWindowManager +import com.zhjt.mogo_core_function_devatools.rviz.ui.views.StateBarView + +/** + * 故障诊断管理页面 + * 需求来源:http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=121685065 + * + */ + +class FmdAct : BaseActivity() { + private val TAG = "FmdAct" + + private val mFragments = java.util.ArrayList() + + private val mTitles = + arrayOf("车况概览", "系统资源", "故障码") + + private lateinit var overviewFrag: OverviewFrag + private lateinit var systemResourceFrag: SystemResourceFrag + private lateinit var faultCodeFrag: FaultCodeFrag + private val mIconUnselectIds = intArrayOf( + R.drawable.rviz_fmd_tab_car_status_unselect, + R.drawable.rviz_fmd_tab_system_resource_unselect, + R.drawable.rviz_fmd_tab_fault_code_unselect, + ) + private val mIconSelectIds = intArrayOf( + R.drawable.rviz_fmd_tab_car_status_select, + R.drawable.rviz_fmd_tab_system_resource_select, + R.drawable.rviz_fmd_tab_fault_code_select, + ) + + private val mTabEntities = ArrayList() + + private var serviceIsBind = false + private var fmdBound: FaultManagementDiagnosisService? = null//FMD服务 + + private var colorHintFloatWindowManager: ColorHintFloatWindowManager? = null + + private lateinit var clConnectStatusBarView: StateBarView + private lateinit var tbCheckTypeView: CommonTabLayout + private lateinit var btnColorHint: Button + private lateinit var btnClose: Button + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.rviz_fmd_act_home) + clConnectStatusBarView = findViewById(R.id.clConnectStatusBarView) + tbCheckTypeView = findViewById(R.id.tbCheckTypeView) + btnColorHint = findViewById(R.id.btnColorHint) + btnClose = findViewById(R.id.btnClose) + + MMKVUtils.getInstance().init(applicationContext) + // 启动数据库更新服务 + Utils.getApp().startService(Intent(Utils.getApp(), FmCodeUpdateService::class.java)) + registerForContextMenu(clConnectStatusBarView.vehicleNumberView) + overviewFrag = OverviewFrag() + systemResourceFrag = SystemResourceFrag() + faultCodeFrag = FaultCodeFrag() + mFragments.add(overviewFrag) + mFragments.add(systemResourceFrag) + mFragments.add(faultCodeFrag) + + for (i in mTitles.indices) { + mTabEntities.add(TabEntity(mTitles[i], mIconSelectIds[i], mIconUnselectIds[i])) + } + tbCheckTypeView.setTabData( + mTabEntities, + this, + R.id.frameContainerLayout, + mFragments + ) + tbCheckTypeView.setOnTabSelectListener(object : OnTabSelectListener { + override fun onTabSelect(position: Int) { + btnColorHint.visibility = + if (mFragments[position] is OverviewFrag || mFragments[position] is FaultCodeFrag) { + if (colorHintFloatWindowManager != null) { + colorHintFloatWindowManager!!.updateSshConnectErrorView(mFragments[position] is OverviewFrag) + } + View.VISIBLE + } else { + removeColorHintFloatWindow() + View.GONE + } + } + + override fun onTabReselect(position: Int) { + + } + }) + + btnColorHint.setOnClickListener { + if (colorHintFloatWindowManager == null) { + colorHintFloatWindowManager = ColorHintFloatWindowManager() + colorHintFloatWindowManager!!.show(this, !overviewFrag.isHidden) + btnColorHint.isSelected = true + } else { + removeColorHintFloatWindow() + } + } + + btnClose.setOnClickListener { + // TODO 这里需要对已经开启的后台检测任务及线程做关闭操作 + + finish() + } + if (!serviceIsBind) { + // 绑定连接服务 + bindService( + Intent(this, FaultManagementDiagnosisService::class.java), + fmdConnection, + BIND_AUTO_CREATE + ) + serviceIsBind = true + } + } + + fun updateRedDot(tag: String, num: Int) { + var pos = -1 + when (tag) { + OverviewFrag::class.java.simpleName -> { + pos = 0 + } + + SystemResourceFrag::class.java.simpleName -> { + pos = 1 + } + + FaultCodeFrag::class.java.simpleName -> { + pos = 2 + } + } + if (pos != -1) { + if (Looper.myLooper() != Looper.getMainLooper()) { + runOnUiThread { + redDot(pos, num) + } + } else { + redDot(pos, num) + } + } + } + + private fun redDot(pos: Int, num: Int) { + if (num <= 0) { + tbCheckTypeView.hideMsg(pos) + } else { + tbCheckTypeView.showMsg(pos, num); + } + } + + override fun onCreateContextMenu( + menu: ContextMenu?, + v: View?, + menuInfo: ContextMenu.ContextMenuInfo? + ) { + super.onCreateContextMenu(menu, v, menuInfo) + if (v?.id == R.id.vehicle_number_view) { + if (fmdBound != null && fmdBound!!.getVehicleConfig() != null) { + menu?.setHeaderTitle("车辆基础信息") + val config = fmdBound!!.getVehicleConfig() + menu?.add(Menu.NONE, 3, Menu.NONE, "车牌号码:${config!!.plate}") + menu?.add(Menu.NONE, 2, Menu.NONE, "车辆品牌:${config!!.brand}") + menu?.add(Menu.NONE, 1, Menu.NONE, "车辆类型:${config!!.model}") + } + } + } + + private val fmdConnection: ServiceConnection = object : ServiceConnection { + override fun onServiceConnected(className: ComponentName, service: IBinder) { + fmdBound = + (service as FaultManagementDiagnosisService.FaultManagementDiagnosisBinder).service + faultCodeFrag.setData(fmdBound!!.fmDataMap) + systemResourceFrag.initData() + overviewFrag.setData(fmdBound!!.fmDataMap) + fmdBound!!.connectSSH() + } + + override fun onServiceDisconnected(className: ComponentName) { + fmdBound = null + } + } + + fun getRosHostArguments(): ArrayList? { + return if (fmdBound == null) { + ToastUtils.showLong("服务绑定失败,请退出页面重试") + null + } else { + fmdBound!!.rosHostArguments + } + } + + fun getFmEntityData(): MutableMap? { + return if (fmdBound == null) { + null + } else { + fmdBound!!.fmDataMap + } + } + + /** + * 获取102 MAP 版本号 + */ + fun getRosMasterMapVersion(): String { + return if (fmdBound == null) { + "未知" + } else { + fmdBound!!.getRosMasterMapVersion() + } + } + + /** + * 获取高精地图版本 + */ + fun getHdMapVersion(): HdMapVersion? { + return if (fmdBound == null) { + null + } else { + fmdBound!!.getHdMapVersion() + } + } + + /** + * 获取云端MAP版本号 + */ + fun getCloudMapVersion(): String { + return if (fmdBound == null) { + "未知" + } else { + fmdBound!!.getCloudMapVersion() + } + } + + public fun getSSH(hostBean: SSHHostBean): SSH? { + if (fmdBound != null) { + val bridge = fmdBound!!.getConnectedSSH(hostBean) + if (bridge != null) { + return bridge + } + } + ToastUtils.showLong("终端服务未绑定或绑定失败") + return null + } + + public fun openConnection(hostBean: SSHHostBean) { + if (fmdBound != null) { + fmdBound!!.openConnection(hostBean) + return + } + ToastUtils.showLong("终端服务未绑定或绑定失败") + } + + public fun execCmd(hostBean: SSHHostBean, cmd: String, msg: String?) { + val bridge = getSSH(hostBean); + if (bridge != null) { + execCmd(bridge, cmd, msg); + } + } + + public fun execCmd(ssh: SSH, cmd: String, msg: String?) { + if (TextUtils.isEmpty(msg)) { + showLoadingDialog() + } else { + showLoadingDialog(msg) + } + ssh.execCommand(cmd, true) + } + + public fun execDockerCmd(hostBean: SSHHostBean, cmd: String) { + getSSH(hostBean)?.execDockerCommand(cmd, true) + } + + public fun connectDocker(ssh: SSH) { + showLoadingDialog("正在连接Docker") + ssh.connectDocker() + } + + public fun disconnectDocker(ssh: SSH) { + ssh.disconnectDocker(true) + } + + private fun removeColorHintFloatWindow() { + colorHintFloatWindowManager?.remove() + colorHintFloatWindowManager = null + btnColorHint.isSelected = false + } + + override fun onPause() { + super.onPause() + removeColorHintFloatWindow() + } + + override fun onDestroy() { + super.onDestroy() + if (serviceIsBind) { + unbindService(fmdConnection) + serviceIsBind = false + } + + } + + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/fragments/FmdBaseFragment.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/fragments/FmdBaseFragment.kt new file mode 100644 index 0000000000..affc7febcd --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/fragments/FmdBaseFragment.kt @@ -0,0 +1,21 @@ +package com.zhjt.mogo_core_function_devatools.rviz.ui.fragments + +import android.os.Bundle +import android.view.View +import com.zhjt.mogo_core_function_devatools.rviz.common.base.BaseFragment +import com.zhjt.mogo_core_function_devatools.rviz.ui.activity.FmdAct + +abstract class FmdBaseFragment : BaseFragment() { + protected lateinit var fmdAct: FmdAct + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + if (requireActivity() is FmdAct) { + fmdAct = requireActivity() as FmdAct + } + } + + public fun getTAG(): String { + return TAG + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/fragments/fault/FaultCodeAdapter.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/fragments/fault/FaultCodeAdapter.kt new file mode 100644 index 0000000000..9446ada06c --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/fragments/fault/FaultCodeAdapter.kt @@ -0,0 +1,136 @@ +package com.zhjt.mogo_core_function_devatools.rviz.ui.fragments.fault + +import android.text.Spannable +import android.text.SpannableStringBuilder +import android.text.style.ForegroundColorSpan +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.TextView +import androidx.core.content.ContextCompat +import com.mogo.eagle.core.utilcode.util.ActivityUtils +import com.zhjt.mogo_core_function_devatools.rviz.R +import com.zhjt.mogo_core_function_devatools.rviz.common.base.BaseAdapter +import com.zhjt.mogo_core_function_devatools.rviz.common.base.BaseViewHolder +import com.zhjt.mogo_core_function_devatools.rviz.constant.FaultLevel +import com.zhjt.mogo_core_function_devatools.rviz.constant.FaultSubModuleId +import com.zhjt.mogo_core_function_devatools.rviz.dialog.FaultCodeDetailsDialog +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.FmEntity + + +class FaultCodeAdapter : BaseAdapter() { + var isConnected: Boolean = false//域控是否连接成功 + + + override fun onBindDataToItem(viewHolder: ViewHolder, data: FmEntity, position: Int) { + viewHolder.tvModuleTitle.text = data.title + if (isConnected) { + val isNormal = data.stopFaultNum + data.otherFaultNum + data.unknownFaultNum == 0 + viewHolder.ivNormal.isSelected = false + viewHolder.ivNormal.visibility = if (isNormal) View.VISIBLE else View.GONE + viewHolder.btn.visibility = if (isNormal) View.GONE else View.VISIBLE + viewHolder.tvModuleMsg.visibility = if (isNormal) View.GONE else View.VISIBLE + viewHolder.tvModuleStateNormal.visibility = + if (isNormal) View.VISIBLE else View.GONE + viewHolder.tvStopFaultNum.visibility = + if (isNormal) View.GONE else View.VISIBLE + viewHolder.tvOtherFaultNum.visibility = + if (isNormal) View.GONE else View.VISIBLE + viewHolder.tvUnknownFaultNum.visibility = + if (isNormal) View.GONE else if (data.unknownFaultNum == 0) View.GONE else View.VISIBLE + if (isNormal) { + viewHolder.tvModuleMsg.text = "" + } else { + viewHolder.tvStopFaultNum.text = + String.format("严重故障:%s个", data.stopFaultNum) + viewHolder.tvOtherFaultNum.text = + String.format("其他故障:%s个", data.otherFaultNum) + viewHolder.tvUnknownFaultNum.text = + String.format("未知故障:%s个", data.unknownFaultNum) + + val list = data.data.take(4) + val builder = SpannableStringBuilder() + for (i in list.indices) { + val info = list[i] + val start = builder.length // 当前文本的起始位置 + val subName = FaultSubModuleId.getName(info.faultId, true) +// builder.append("${i + 1}、${subName}${info.faultName}\n") + builder.append("${subName}${info.faultName}\n") + val end = builder.length // 当前文本的结束位置 + builder.setSpan( + ForegroundColorSpan( + ContextCompat.getColor( + mContext, + FaultLevel.getColor(info.policyCode, info.faultLevel) + ) + ), + start, end, + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE + ) + } + if (data.data.size > 4) { + val start = builder.length + builder.append("......") + builder.setSpan( + ForegroundColorSpan( + ContextCompat.getColor( + mContext, + R.color.rviz_fmd_fm_fault_level_unknown + ) + ), // 设置省略号的颜色 + start, builder.length, + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE + ) + } + if (builder.endsWith("\n")) { + builder.delete(builder.length - 1, builder.length) + } + viewHolder.tvModuleMsg.text = builder + } + } else { + viewHolder.tvModuleMsg.text = "" + viewHolder.ivNormal.isSelected = true + viewHolder.ivNormal.visibility = View.VISIBLE + viewHolder.tvModuleStateNormal.visibility = View.GONE + viewHolder.btn.visibility = View.GONE + viewHolder.tvStopFaultNum.visibility = View.GONE + viewHolder.tvOtherFaultNum.visibility = View.GONE + viewHolder.tvUnknownFaultNum.visibility = View.GONE + + } + } + + override fun getItemViewResource(viewGroup: ViewGroup?): View { + return LayoutInflater.from(mContext) + .inflate(R.layout.rviz_fmd_item_fault_code, viewGroup, false); + } + + override fun getViewHolder(view: View): ViewHolder { + return ViewHolder(view, this) + } + + + inner class ViewHolder(itemView: View, adapter: FaultCodeAdapter) : + BaseViewHolder(itemView, adapter) { + var btn: TextView = itemView.findViewById(R.id.btn) + var tvModuleTitle: TextView = itemView.findViewById(R.id.tvModuleTitle) + var ivNormal: ImageView = itemView.findViewById(R.id.ivNormal) + var tvModuleMsg: TextView = itemView.findViewById(R.id.tvModuleMsg) + var tvModuleStateNormal: TextView = itemView.findViewById(R.id.tvModuleStateNormal) + var tvStopFaultNum: TextView = itemView.findViewById(R.id.tvStopFaultNum) + var tvOtherFaultNum: TextView = itemView.findViewById(R.id.tvOtherFaultNum) + var tvUnknownFaultNum: TextView = itemView.findViewById(R.id.tvUnknownFaultNum) + + init { + btn.setOnClickListener { + ActivityUtils.getTopActivity()?.let { + FaultCodeDetailsDialog( + it, + mDatas[bindingAdapterPosition] + ).show() + } + } + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/fragments/fault/FaultCodeFrag.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/fragments/fault/FaultCodeFrag.kt new file mode 100644 index 0000000000..bc0ce780b3 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/fragments/fault/FaultCodeFrag.kt @@ -0,0 +1,138 @@ +package com.zhjt.mogo_core_function_devatools.rviz.ui.fragments.fault + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.GridLayoutManager +import androidx.recyclerview.widget.RecyclerView +import androidx.recyclerview.widget.SimpleItemAnimator +import com.zhjt.mogo.adas.data.AdasConstants.IpcConnectionStatus +import com.zhjt.mogo_core_function_devatools.rviz.R +import com.zhjt.mogo_core_function_devatools.rviz.common.coroutines.FlowBus +import com.zhjt.mogo_core_function_devatools.rviz.constant.AppConfigInfo +import com.zhjt.mogo_core_function_devatools.rviz.constant.EventKey +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.AdasConnectionStatus +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.FmEntity +import com.zhjt.mogo_core_function_devatools.rviz.ui.fragments.FmdBaseFragment + +/** + * 故障码 UI及业务逻辑 + */ +class FaultCodeFrag : FmdBaseFragment() { + private var isInit = false + private var faultCodeAdapter: FaultCodeAdapter? = null + private lateinit var recyclerView: RecyclerView + private lateinit var hintView: TextView + private lateinit var hint1View: TextView + + override fun getContentViewResource( + inflater: LayoutInflater, + container: ViewGroup? + ): View { + return inflater.inflate(R.layout.rviz_fmd_frag_fault_code, container, false) + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + recyclerView = view.findViewById(R.id.recyclerView) + hintView = view.findViewById(R.id.hint) + hint1View = view.findViewById(R.id.hint1) + val animator = recyclerView.itemAnimator + if (animator is SimpleItemAnimator) { + animator.supportsChangeAnimations = + false + } + val linearLayoutManager = GridLayoutManager(context, 3) + linearLayoutManager.orientation = GridLayoutManager.VERTICAL + recyclerView.layoutManager = linearLayoutManager + faultCodeAdapter = FaultCodeAdapter() + recyclerView.adapter = faultCodeAdapter + initFlowBusEvent() + } + + private fun initFlowBusEvent() { + FlowBus.with(EventKey.UPDATE_FAULT_CODE_DATA) + .register(this) { + if (it < 0) { + faultCodeAdapter?.notifyDataSetChanged() + } else { + faultCodeAdapter?.notifyItemChanged(it) + } + updateRedDot() + } + FlowBus.with(EventKey.SEND_IS_SUPPORT_FM) + .register(this) { + if (!it) { + notSupportFM() + } + } + FlowBus.with(EventKey.UPDATE_ADAS_CONNECT_STATE) + .register(this) { it: AdasConnectionStatus -> + val status = it.ipcConnectionStatus + if (status == IpcConnectionStatus.CONNECTED) { + faultCodeAdapter?.isConnected = true + } else if (status == IpcConnectionStatus.DISCONNECTED || + status == IpcConnectionStatus.CONNECT_EXCEPTION || + status == IpcConnectionStatus.ILLEGAL_ADDRESS || + status == IpcConnectionStatus.NOT_FOUND_ADDRESS || + status == IpcConnectionStatus.CERTIFICATION_FAILED || + status == IpcConnectionStatus.HEARTBEAT_TIMEOUT || + status == IpcConnectionStatus.PROTOCOL_MISMATCH || + status == IpcConnectionStatus.SERVER_DISCONNECTED + ) { + faultCodeAdapter?.isConnected = false + } + + } + } + + public fun setData(data: MutableMap?) { + if (!isInit) { + isInit = true + if (data == null) { + hintView.visibility = View.VISIBLE + } else { + faultCodeAdapter?.data = data.values.toList() + updateRedDot() + } + } + } + + private fun initData() { + if (!isInit) { + isInit = true + val data = fmdAct.getFmEntityData() + if (data == null) { + hintView.visibility = View.VISIBLE + } else { + faultCodeAdapter?.data = data.values.toList() + updateRedDot() + } + } + } + + private fun notSupportFM() { + recyclerView.visibility = View.GONE + hintView.text = "FM相关功能要求至少MAP版本3.6.0或更高版本的支持" + context?.getColor(R.color.rviz_fmd_status_error)?.let { hintView.setTextColor(it) } + hintView.visibility = View.VISIBLE + hint1View.text = AppConfigInfo.dockerVersion + "\n" + AppConfigInfo.mapVersion + hint1View.visibility = View.VISIBLE + } + + private fun updateRedDot() { + val totalSum = faultCodeAdapter?.data?.sumOf { + it.data.size + } ?: 0 + fmdAct.updateRedDot(TAG, totalSum) + } + + override fun onHiddenChanged(hidden: Boolean) { + super.onHiddenChanged(hidden) + if (!hidden) { + initData() + } + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/fragments/overview/ModuleStatusAdapter.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/fragments/overview/ModuleStatusAdapter.java new file mode 100644 index 0000000000..c257f54077 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/fragments/overview/ModuleStatusAdapter.java @@ -0,0 +1,61 @@ +package com.zhjt.mogo_core_function_devatools.rviz.ui.fragments.overview; + +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.ModuleStatusEntity; +import com.zhjt.mogo_core_function_devatools.rviz.ui.views.SensorStatusView; + +import java.util.ArrayList; + +/** + * 车辆模块检测结果列表 + */ +public class ModuleStatusAdapter extends RecyclerView.Adapter { + + private ArrayList mModuleStatusEntity = null; + + public void updateModuleStatus(ArrayList moduleStatusEntity) { + if (mModuleStatusEntity != null) { + mModuleStatusEntity.clear(); + mModuleStatusEntity = null; + } + mModuleStatusEntity = moduleStatusEntity; + notifyDataSetChanged(); + } + + @NonNull + @Override + public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + SensorStatusView itemView = new SensorStatusView(parent.getContext()); + //添加LayoutParams,避免崩溃 + ViewGroup.LayoutParams params = new ViewGroup.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.WRAP_CONTENT); + itemView.setLayoutParams(params); + + return new MyViewHolder(itemView); + } + + @Override + public void onBindViewHolder(@NonNull MyViewHolder holder, int position) { + ModuleStatusEntity moduleStatus = mModuleStatusEntity.get(position); + holder.sensorStatusView.updateSensors(moduleStatus); + } + + @Override + public int getItemCount() { + return mModuleStatusEntity.size(); + } + + public static class MyViewHolder extends RecyclerView.ViewHolder { + public SensorStatusView sensorStatusView; + + public MyViewHolder(SensorStatusView view) { + super(view); + sensorStatusView = view; + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/fragments/overview/OverviewFrag.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/fragments/overview/OverviewFrag.kt new file mode 100644 index 0000000000..bddca3285f --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/fragments/overview/OverviewFrag.kt @@ -0,0 +1,885 @@ +package com.zhjt.mogo_core_function_devatools.rviz.ui.fragments.overview + +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.content.IntentFilter +import android.os.Bundle +import android.text.SpannableString +import android.text.Spanned +import android.text.TextUtils +import android.text.method.ScrollingMovementMethod +import android.text.style.ForegroundColorSpan +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import androidx.recyclerview.widget.RecyclerView +import androidx.recyclerview.widget.SimpleItemAnimator +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotActionsListener +import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotActionsListenerManager +import com.mogo.eagle.core.utilcode.util.AppUtils +import com.zhjt.mogo.adas.data.AdasConstants.IpcConnectionStatus +import com.zhjt.mogo.adas.data.bean.LaunchConditionData +import com.zhjt.mogo.adas.data.bean.UnableLaunchReason +import com.zhjt.mogo_core_function_devatools.rviz.R +import com.zhjt.mogo_core_function_devatools.rviz.common.coroutines.FlowBus +import com.zhjt.mogo_core_function_devatools.rviz.common.utils.Utils +import com.zhjt.mogo_core_function_devatools.rviz.constant.EventKey +import com.zhjt.mogo_core_function_devatools.rviz.constant.FaultLevel +import com.zhjt.mogo_core_function_devatools.rviz.constant.FaultModuleId +import com.zhjt.mogo_core_function_devatools.rviz.constant.SensorCamera +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.AdasConnectionStatus +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.FMInfoMsg +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.FmEntity +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.HdMapVersion +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.ModuleStatusEntity +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.SensorStatusEntity +import com.zhjt.mogo_core_function_devatools.rviz.ssh.SSH +import com.zhjt.mogo_core_function_devatools.rviz.ssh.function.call.CallerSshConnectionListenerManager +import com.zhjt.mogo_core_function_devatools.rviz.ssh.function.listener.OnSshConnectionListener +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.SSHHostBean +import com.zhjt.mogo_core_function_devatools.rviz.ui.fragments.FmdBaseFragment +import fault_management.FmInfo +import kotlinx.android.synthetic.main.rviz_fmd_frag_overview.tvHdMapVersion +import kotlinx.coroutines.DelicateCoroutinesApi +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import java.util.Locale + + +/** + * 车况概览 UI及业务逻辑 + */ +class OverviewFrag : FmdBaseFragment(), OnSshConnectionListener, + IMoGoAutopilotActionsListener { + private var lastOpenedAdapter: ModuleStatusAdapter? = null + private lateinit var spanError: ForegroundColorSpan + private val mModuleStatusEntity = ArrayList() + private var fmDataMap: MutableMap? = null//FM分类数据源 + private val sensorStatusNormalLog = + arrayListOf(SensorStatusEntity("无异常", true)) + + @Volatile + private var fmInfoMsg: FMInfoMsg? = null + private lateinit var packageManagerReceiver: PackageManagerReceiver + private lateinit var tvAutoDriveMsg: TextView + private lateinit var tvMapVersion: TextView + private lateinit var tvEagleVersion: TextView + private lateinit var tvAutoDriveStatus: TextView + private lateinit var rvModuleStatus: RecyclerView + + + override fun getContentViewResource( + inflater: LayoutInflater, + container: ViewGroup? + ): View { + return inflater.inflate(R.layout.rviz_fmd_frag_overview, container, false) + } + + override fun onDestroyView() { + super.onDestroyView() + CallerSshConnectionListenerManager.removeListener(TAG) + CallerAutopilotActionsListenerManager.removeListener(TAG) + context?.unregisterReceiver(packageManagerReceiver) + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + tvAutoDriveMsg = view.findViewById(R.id.tvAutoDriveMsg) + rvModuleStatus = view.findViewById(R.id.rvModuleStatus) + tvMapVersion = view.findViewById(R.id.tvMapVersion) + tvEagleVersion = view.findViewById(R.id.tvEagleVersion) + tvAutoDriveStatus = view.findViewById(R.id.tvAutoDriveStatus) + tvAutoDriveMsg.movementMethod = ScrollingMovementMethod.getInstance(); + CallerSshConnectionListenerManager.addListener(TAG, this) + CallerAutopilotActionsListenerManager.addListener(TAG, this) + spanError = ForegroundColorSpan(resources.getColor(R.color.rviz_fmd_status_error, null)) + // 取消动画 + val animator = rvModuleStatus.itemAnimator + if (animator is SimpleItemAnimator) { + animator.supportsChangeAnimations = + false + } + initFlowBusEvent() +// // TODO 模拟传感器错误 +// val sensorStatus = ArrayList() +// sensorStatus.add(SensorStatusEntity("102", true)) +// sensorStatus.add(SensorStatusEntity("103", true)) +// sensorStatus.add(SensorStatusEntity("104", false)) +// sensorStatus.add(SensorStatusEntity("105", true)) +// sensorStatus.add(SensorStatusEntity("106", true)) +// sensorStatus.add(SensorStatusEntity("107", true)) +// val carSensorStatusEntity = +// ModuleStatusEntity("域控主机", R.drawable.icon_camera, sensorStatus, false) +// +// +// // 模拟日志错误 +// val sensorStatusLog = ArrayList() +// sensorStatusLog.add(SensorStatusEntity("惯导初始化失败", false)) +// sensorStatusLog.add(SensorStatusEntity("惯导数据延迟超过阈值", false)) +// val carSensorStatusEntityLog = +// ModuleStatusEntity("底盘状态", R.drawable.icon_camera, sensorStatusLog, true) + mModuleStatusEntity.add( + ModuleStatusEntity( + getString(R.string.rviz_fmd_module_host), + R.drawable.rviz_fmd_icon_ipc, + false + ) + ) + mModuleStatusEntity.add( + ModuleStatusEntity( + getString(R.string.rviz_fmd_module_chassis), + R.drawable.rviz_fmd_icon_car_chassis, + true + ) + ) + mModuleStatusEntity.add( + ModuleStatusEntity( + getString(R.string.rviz_fmd_module_rtk), + R.drawable.rviz_fmd_icon_rtk, + true + ) + ) + mModuleStatusEntity.add( + ModuleStatusEntity( + getString(R.string.rviz_fmd_module_camera), + R.drawable.rviz_fmd_icon_camera, + false + ) + ) + mModuleStatusEntity.add( + ModuleStatusEntity( + getString(R.string.rviz_fmd_module_laser_radar), + R.drawable.rviz_fmd_icon_laser_radar, + true + ) + ) + mModuleStatusEntity.add( + ModuleStatusEntity( + getString(R.string.rviz_fmd_module_millimeter_wave_radar), + R.drawable.rviz_fmd_icon_millimeter_wave_radar, + true + ) + ) + + lastOpenedAdapter = ModuleStatusAdapter() + lastOpenedAdapter?.updateModuleStatus(mModuleStatusEntity) + rvModuleStatus.adapter = lastOpenedAdapter + setText( + tvMapVersion, + String.format("102 MAP版本:%s", fmdAct.getRosMasterMapVersion()) + ) + val argument = fmdAct.getHdMapVersion() + if (argument != null) { + setText( + tvHdMapVersion, String.format( + "%s 高精地图版本:%s", + Utils.getIPLastSegment(argument.ip), + argument.version + ) + ) + } else { + setText( + tvHdMapVersion, + "10X 高精地图版本:未知", + ) + } + updateAutopilotAbility() + getMoGoEagleEyeVersion() + packageManagerReceiver = PackageManagerReceiver() + val filter = IntentFilter() + filter.addAction(Intent.ACTION_PACKAGE_ADDED) + filter.addAction(Intent.ACTION_PACKAGE_REPLACED) + filter.addAction(Intent.ACTION_PACKAGE_REMOVED) + filter.addDataScheme("package") + context?.registerReceiver(packageManagerReceiver, filter) + } + + override fun onResume() { + super.onResume() + getMoGoEagleEyeVersion() + } + + //获取鹰眼版本 + @OptIn(DelicateCoroutinesApi::class) + private fun getMoGoEagleEyeVersion() { + GlobalScope.launch(Dispatchers.IO) { +// val verName = AppUtils.getAppVersionName("com.mogo.launcher.f") + val verName = AppUtils.getAppVersionName() + val msg = if (!TextUtils.isEmpty(verName)) { + String.format("当前设备鹰眼版本:%s", verName) + } else { + "当前设备鹰眼版本:未安装" + } + withContext(Dispatchers.Main) { + setText(tvEagleVersion, msg) + } + } + } + + + inner class PackageManagerReceiver : BroadcastReceiver() { + override fun onReceive(context: Context?, intent: Intent?) { + intent?.action?.let { + when (it) { + Intent.ACTION_PACKAGE_ADDED, Intent.ACTION_PACKAGE_REPLACED, Intent.ACTION_PACKAGE_REMOVED -> { + val data = intent.data + if (data != null) { + val packageName = data.encodedSchemeSpecificPart ?: return + if ("com.mogo.launcher.f" == packageName) { + getMoGoEagleEyeVersion() + } + } + } + + else -> {} + } + } + } + } + + @OptIn(DelicateCoroutinesApi::class) + private fun updateAutopilotAbility() { + val color: Int + val msg = if (CallerAutopilotActionsListenerManager.isAutopilotAbility()) { + color = R.color.rvizFmdColorBlock + "可以启动「鹰眼」进行运营" + } else { + color = R.color.rviz_fmd_status_error + val resultString = StringBuilder() + CallerAutopilotActionsListenerManager.getUnableAutopilotReasons() + ?.mapIndexed { index, reason -> + resultString.append("${index + 1}. ${reason.unableLaunchReason} ") + } + resultString.toString() + } + GlobalScope.launch(Dispatchers.Main) { + tvAutoDriveStatus.isSelected = + CallerAutopilotActionsListenerManager.isAutopilotAbility() + tvAutoDriveStatus.text = + if (CallerAutopilotActionsListenerManager.isAutopilotAbility()) "可自动驾驶" else "不可自动驾驶" + tvAutoDriveMsg.text = msg + tvAutoDriveMsg.setTextColor(resources.getColor(color, null)) + tvAutoDriveStatus.setTextColor(resources.getColor(color, null)) + } + } + + private fun initFlowBusEvent() { + FlowBus.with(EventKey.SEND_ROS_MASTER_MAP_VERSION) + .register(this) { + setText(tvMapVersion, String.format("102 MAP版本:%s", it)) + } + FlowBus.with(EventKey.SEND_HD_MAP_VERSION) + .register(this) { + setText( + tvHdMapVersion, String.format( + "%s 高精地图版本:%s", + Utils.getIPLastSegment(it.ip), + it.version + ) + ) + } + + FlowBus.with>(EventKey.INIT_SENSOR_CAMERA) + .register(this) { + updateCamera(it) + } + FlowBus.with(EventKey.SEND_IS_SUPPORT_FM) + .register(this) { + if (!it) { + val moduleChassis = + mModuleStatusEntity.indexOfFirst { mt -> + mt.title == getString(R.string.rviz_fmd_module_chassis) + } + if (moduleChassis != -1) { + mModuleStatusEntity.removeAt(moduleChassis) + lastOpenedAdapter?.notifyItemRemoved(moduleChassis) + } + + val moduleRtk = + mModuleStatusEntity.indexOfFirst { mt -> + mt.title == getString(R.string.rviz_fmd_module_rtk) + } + if (moduleRtk != -1) { + mModuleStatusEntity.removeAt(moduleRtk) + lastOpenedAdapter?.notifyItemRemoved(moduleRtk) + } + + val moduleCamera = + mModuleStatusEntity.indexOfFirst { mt -> + mt.title == getString(R.string.rviz_fmd_module_camera) + } + if (moduleCamera != -1) { + mModuleStatusEntity.removeAt(moduleCamera) + lastOpenedAdapter?.notifyItemRemoved(moduleCamera) + } + + val moduleLaserRadar = + mModuleStatusEntity.indexOfFirst { mt -> + mt.title == getString(R.string.rviz_fmd_module_laser_radar) + } + if (moduleLaserRadar != -1) { + mModuleStatusEntity.removeAt(moduleLaserRadar) + lastOpenedAdapter?.notifyItemRemoved(moduleLaserRadar) + } + + val moduleMillimeterWaveRadar = + mModuleStatusEntity.indexOfFirst { mt -> + mt.title == getString(R.string.rviz_fmd_module_millimeter_wave_radar) + } + if (moduleMillimeterWaveRadar != -1) { + mModuleStatusEntity.removeAt(moduleMillimeterWaveRadar) + lastOpenedAdapter?.notifyItemRemoved(moduleMillimeterWaveRadar) + } + } + } + FlowBus.with(EventKey.UPDATE_ADAS_CONNECT_STATE) + .register(this) { + fmInfoMsg = null + val ipcConnectionStatus: IpcConnectionStatus = it.ipcConnectionStatus + if (ipcConnectionStatus == IpcConnectionStatus.CONNECTED) { + //底盘无异常 + updateItem(getString(R.string.rviz_fmd_module_chassis), sensorStatusNormalLog) + //RTK无异常 + updateItem(getString(R.string.rviz_fmd_module_rtk), sensorStatusNormalLog) + //激光雷达无异常 + updateItem( + getString(R.string.rviz_fmd_module_laser_radar), + sensorStatusNormalLog + ) + //毫米波雷达无异常 + updateItem( + getString(R.string.rviz_fmd_module_millimeter_wave_radar), + sensorStatusNormalLog + ) + } else if (ipcConnectionStatus == IpcConnectionStatus.DISCONNECTED) { + updateItem(getString(R.string.rviz_fmd_module_chassis), arrayListOf()) + updateItem(getString(R.string.rviz_fmd_module_rtk), arrayListOf()) + updateItem(getString(R.string.rviz_fmd_module_laser_radar), arrayListOf()) + updateItem( + getString(R.string.rviz_fmd_module_millimeter_wave_radar), + arrayListOf() + ) + } + } + FlowBus.with(EventKey.SEND_FM_INFO_TO_OVERVIEW_FRAGMENT) + .register(this) { + fmInfoMsg = it + //判断是否有相机异常 + updateCamera(null) + if (it.fmInfoList.isNullOrEmpty()) { + //证明FM没有任何异常数据,所有鱼FM相关的全部正常 + //底盘无异常 + updateItem(getString(R.string.rviz_fmd_module_chassis), sensorStatusNormalLog) + //RTK无异常 + updateItem(getString(R.string.rviz_fmd_module_rtk), sensorStatusNormalLog) + + //激光雷达无异常 + updateItem( + getString(R.string.rviz_fmd_module_laser_radar), + sensorStatusNormalLog + ) + //毫米波雷达无异常 + updateItem( + getString(R.string.rviz_fmd_module_millimeter_wave_radar), + sensorStatusNormalLog, + true + ) + } else { + //判断是否有底盘异常 + val vehicleControlList = it.fmInfoList!!.filter { t -> + t.faultId.lowercase(Locale.getDefault()) + .startsWith(FaultModuleId.VehicleControl.name.lowercase(Locale.getDefault())) + }.take(2) + if (vehicleControlList.isEmpty()) { + //无异常 + updateItem( + getString(R.string.rviz_fmd_module_chassis), + sensorStatusNormalLog + ) + } else { + //有异常 + val sensorError = ArrayList(vehicleControlList.map { vcl -> + SensorStatusEntity( + vcl.faultName, + false, + FaultLevel.getColor(vcl.policyCode, vcl.faultLevel) + ) + }) + updateItem(getString(R.string.rviz_fmd_module_chassis), sensorError) + } + + //判断是否有RTK异常 + val rtkList = it.fmInfoList!!.filter { t -> +// t.faultId.lowercase(Locale.getDefault()) +// .startsWith( +// (FaultModuleId.Localization.name + "_MSFLOC").lowercase( +// Locale.getDefault() +// ) +// ) + //只要包含 宽泛匹配 + t.faultId.contains(("MSFLOC")) + }.take(2) + if (rtkList.isEmpty()) { + //无异常 + updateItem(getString(R.string.rviz_fmd_module_rtk), sensorStatusNormalLog) + } else { + //有异常 + val sensorError = ArrayList(rtkList.map { vcl -> + SensorStatusEntity( + vcl.faultName, + false, + FaultLevel.getColor(vcl.policyCode, vcl.faultLevel) + ) + }) + updateItem(getString(R.string.rviz_fmd_module_rtk), sensorError) + } + + + //判断是否有激光雷达异常 + val laserRadarList = it.fmInfoList!!.filter { t -> + //只要包含 宽泛匹配 + t.faultId.contains(("Lidar")) + }.take(2) + if (laserRadarList.isEmpty()) { + //无异常 + updateItem( + getString(R.string.rviz_fmd_module_laser_radar), + sensorStatusNormalLog + ) + } else { + //有异常 + val sensorError = ArrayList(laserRadarList.map { vcl -> + SensorStatusEntity( + vcl.faultName, + false, + FaultLevel.getColor(vcl.policyCode, vcl.faultLevel) + ) + }) + updateItem(getString(R.string.rviz_fmd_module_laser_radar), sensorError) + } + + //判断是否有毫米波雷达异常 + val millimeterWaveRadarList = it.fmInfoList!!.filter { t -> + //只要包含 宽泛匹配 + t.faultId.contains(("Radar")) + }.take(2) + if (millimeterWaveRadarList.isEmpty()) { + //无异常 + updateItem( + getString(R.string.rviz_fmd_module_millimeter_wave_radar), + sensorStatusNormalLog + ) + } else { + //有异常 + val sensorError = ArrayList(millimeterWaveRadarList.map { vcl -> + SensorStatusEntity( + vcl.faultName, + false, + FaultLevel.getColor(vcl.policyCode, vcl.faultLevel) + ) + }) + updateItem( + getString(R.string.rviz_fmd_module_millimeter_wave_radar), + sensorError + ) + } + } + updateRedDot() + } + } + + //判断是否有相机异常 + private fun updateCamera(it: ArrayList?) { + val moduleCamera = getString(R.string.rviz_fmd_module_camera) + val index = mModuleStatusEntity.indexOfFirst { it.title == moduleCamera } + if (index != -1) { + val moduleStatusEntity = mModuleStatusEntity[index] + if (moduleStatusEntity.sensorList.isEmpty()) { + if (it != null) { + moduleStatusEntity.sensorList = it + } + } + if (moduleStatusEntity.sensorList.isNotEmpty()) { + if (fmInfoMsg == null || fmInfoMsg!!.fmInfoList == null) { + //FM无异常数据 + moduleStatusEntity.sensorList.forEach { + it.sensorIsOk = true + it.notOkColorRes = -1 + } + } else { + var cameraFaultList = fmInfoMsg!!.fmInfoList!!.filter { t -> + t.faultId.lowercase(Locale.getDefault()) + .startsWith( + (FaultModuleId.HardwareDriver.name + "_DriversCamera").lowercase( + Locale.getDefault() + ) + ) + } + if (cameraFaultList.isEmpty()) { + //FM存在异常,但是无相机相关异常 + moduleStatusEntity.sensorList.forEach { + it.sensorIsOk = true + it.notOkColorRes = -1 + } + } else { + cameraFaultList = + cameraFaultList.sortedWith(compareByDescending { FaultLevel.getOrder(it.policyCode) })//排序,等级高的显示在最上方 + //判断哪个相机有异常 + updateCameraItemData( + moduleStatusEntity, + cameraFaultList, + SensorCamera.DriversCameraSensing30 + )// 前左30 + updateCameraItemData( + moduleStatusEntity, + cameraFaultList, + SensorCamera.DriversCameraSensing60 + )// 前中60 + updateCameraItemData( + moduleStatusEntity, + cameraFaultList, + SensorCamera.DriversCameraSensing120 + )// 前右120 + updateCameraItemData( + moduleStatusEntity, + cameraFaultList, + SensorCamera.DriversCameraSensing120Left + )// 左120 + updateCameraItemData( + moduleStatusEntity, + cameraFaultList, + SensorCamera.DriversCameraSensing120Back + )// 后120 + updateCameraItemData( + moduleStatusEntity, + cameraFaultList, + SensorCamera.DriversCameraSensing120Right + )// 右120 + } + } + } + lastOpenedAdapter?.notifyItemChanged(index) + updateRedDot() + } + } + + private fun updateCameraItemData( + moduleStatusEntity: ModuleStatusEntity, + cameraFaultList: List, + sensorCamera: SensorCamera + ) { + val sensorStatusEntity = + moduleStatusEntity.sensorList.find { mt -> mt.sensorName == sensorCamera.title } + sensorStatusEntity?.let { + val cameraFault = + cameraFaultList.firstOrNull { cl -> cl.faultId.contains(sensorCamera.key) }//如果查找到 相关的则代表否有异常 + it.sensorIsOk = cameraFault == null + it.notOkColorRes = + cameraFault?.let { cf -> FaultLevel.getColor(cf.policyCode, cf.faultLevel) } ?: -1 + } + } + + override fun onHiddenChanged(hidden: Boolean) { + super.onHiddenChanged(hidden) + if (!hidden) { + initData() + } + } + +// //更新FM 底盘相关传感器 +// private fun updateModuleVehicleControl() { +// //检测底盘 +// val fmEntity = fmDataMap?.get(FaultModuleId.VehicleControl) +// val sensorVehicleControl = ArrayList() +// if (fmEntity != null) { +// if (fmEntity.data != null) { +// val list = fmEntity.data!!.take(2) +// for (i in list.indices) { +// sensorVehicleControl.add(SensorStatusEntity(list[i].faultName, false)) +// } +// } +// } +// val moduleName = getString(R.string.module_chassis) +// val moduleStatusEntity = +// mModuleStatusEntity.find { mt -> +// mt.title == moduleName +// } +// if (moduleStatusEntity != null) { +// if (sensorVehicleControl.isEmpty()) { +// moduleStatusEntity.sensorList = sensorStatusNormalLog +// } else { +// moduleStatusEntity.sensorList = sensorVehicleControl +// } +// val overallStatus = moduleStatusEntity.sensorList.any { !it.sensorIsOk } +// moduleStatusEntity.sensorBg = +// if (overallStatus) R.drawable.rviz_fmd_icon_ipc else R.drawable.icon_ipc_error +// lastOpenedAdapter?.notifyItemChanged(mModuleStatusEntity.indexOfFirst { it.title == moduleName }) +// updateRedDot() +// } +// +// } +// +// //更新FM RTK相关传感器 +// private fun updateModuleRTK() { +// //检测底盘 +// val fmEntity = fmDataMap?.get(FaultModuleId.Localization) +// val sensorVehicleControl = ArrayList() +// if (fmEntity != null) { +// if (fmEntity.data != null) { +// for ((index, item) in fmEntity.data!!.withIndex()) { +// if (item.faultId.contains("MSFLOC")) { +// if (sensorVehicleControl.size > 2) { +// break +// } +// sensorVehicleControl.add(SensorStatusEntity(item.faultName, false)) +// } +// } +// +// } +// } +// val moduleName = getString(R.string.module_rtk) +// val moduleStatusEntity = +// mModuleStatusEntity.find { mt -> +// mt.title == moduleName +// } +// if (moduleStatusEntity != null) { +// if (sensorVehicleControl.isEmpty()) { +// moduleStatusEntity.sensorList = sensorStatusNormalLog +// } else { +// moduleStatusEntity.sensorList = sensorVehicleControl +// } +// val overallStatus = moduleStatusEntity.sensorList.any { !it.sensorIsOk } +// moduleStatusEntity.sensorBg = +// if (overallStatus) R.drawable.icon_ipc else R.drawable.icon_ipc_error +// lastOpenedAdapter?.notifyItemChanged(mModuleStatusEntity.indexOfFirst { it.title == moduleName }) +// updateRedDot() +// } +// +// } +// +// //更新FM 激光雷达相关传感器 +// private fun updateModuleLaserRadar() { +// //检测底盘 +// val fmEntity = fmDataMap?.get(FaultModuleId.HardwareDriver) +// val sensorVehicleControl = ArrayList() +// if (fmEntity != null) { +// if (fmEntity.data != null) { +// for ((index, item) in fmEntity.data!!.withIndex()) { +// if (item.faultId.contains("MSFLOC")) { +// if (sensorVehicleControl.size > 2) { +// break +// } +// sensorVehicleControl.add(SensorStatusEntity(item.faultName, false)) +// } +// } +// +// } +// } +// val moduleName = getString(R.string.module_laser_radar) +// val moduleStatusEntity = +// mModuleStatusEntity.find { mt -> +// mt.title == moduleName +// } +// if (moduleStatusEntity != null) { +// if (sensorVehicleControl.isEmpty()) { +// moduleStatusEntity.sensorList = sensorStatusNormalLog +// } else { +// moduleStatusEntity.sensorList = sensorVehicleControl +// } +// val overallStatus = moduleStatusEntity.sensorList.any { !it.sensorIsOk } +// moduleStatusEntity.sensorBg = +// if (overallStatus) R.drawable.rviz_fmd_icon_ipc else R.drawable.icon_ipc_error +// lastOpenedAdapter?.notifyItemChanged(mModuleStatusEntity.indexOfFirst { it.title == moduleName }) +// updateRedDot() +// } +// +// } +// +// //更新FM模块 包括 底盘、RTK、相机、激光雷达、毫米波雷达 +// @OptIn(DelicateCoroutinesApi::class) +// private fun updateModuleFM() { +// GlobalScope.launch(Dispatchers.IO) { +// if (fmDataMap != null) { +// for ((index, item) in fmDataMap!!.values.withIndex()) { +// if (item.data.isNullOrEmpty()) { +// if (item.tag == FaultModuleId.VehicleControl) {//底盘无异常 +// updateItem(getString(R.string.module_chassis), sensorStatusNormalLog) +// } else if (item.tag == FaultModuleId.Localization) {//RTK无异常 Localization下的MSFLOC +// updateItem(getString(R.string.module_rtk), sensorStatusNormalLog) +// } else if (item.tag == FaultModuleId.HardwareDriver) { +// //相机无异常 HardwareDriver下的Camera相关的 +// val moduleName = getString(R.string.module_camera) +// val moduleStatusEntity = +// mModuleStatusEntity.find { mt -> +// mt.title == moduleName +// } +// if (moduleStatusEntity != null && moduleStatusEntity.sensorList.isNotEmpty()) { +// moduleStatusEntity.sensorList.map { it.copy(sensorIsOk = true) } +// lastOpenedAdapter?.notifyItemChanged(mModuleStatusEntity.indexOfFirst { et -> et.title == moduleName }) +// updateRedDot() +// } +// //激光雷达无异常 HardwareDriver下的LidarDriver相关的 +// updateItem( +// getString(R.string.module_laser_radar), +// sensorStatusNormalLog +// ) +// } else if (item.tag == FaultModuleId.Perception) {//毫米波雷达无异常 Perception下的RadarFusion +// updateItem( +// getString(R.string.module_millimeter_wave_radar), +// sensorStatusNormalLog +// ) +// } +// } else { +// for ((i, t) in item.data!!.withIndex()) { +// if (t.faultId.lowercase(Locale.getDefault()) +// .contains(FaultModuleId.VehicleControl.name.lowercase(Locale.getDefault())) +// ) {//底盘故障 +// +// } else if (t.faultId.lowercase(Locale.getDefault()) +// .contains( +// (FaultModuleId.Localization.name + "_MSFLOC").lowercase( +// Locale.getDefault() +// ) +// ) +// ) {//RTK故障 +// +// } +// } +// } +// } +// } +// } +// +// } + + private fun updateItem( + moduleName: String, + sensorList: ArrayList, + isUpdateRedDot: Boolean = false + ) { + val moduleStatusEntity = + mModuleStatusEntity.find { mt -> + mt.title == moduleName + } + if (moduleStatusEntity != null) { + moduleStatusEntity.sensorList = sensorList + val overallStatus = moduleStatusEntity.sensorList.any { !it.sensorIsOk } + moduleStatusEntity.sensorBg = + if (overallStatus) R.drawable.rviz_fmd_icon_ipc else R.drawable.rviz_fmd_icon_ipc_error + lastOpenedAdapter?.notifyItemChanged(mModuleStatusEntity.indexOfFirst { it.title == moduleName }) + if (isUpdateRedDot) + updateRedDot() + } + } + + public fun setData(data: MutableMap?) { + if (fmDataMap == null) { + if (data != null) { + fmDataMap = data + } + } + } + + private fun initData() { + if (fmDataMap == null) { + val data = fmdAct.getFmEntityData() + if (data != null) { + fmDataMap = data + } + } + } + + private fun setText(textView: TextView, str: String) { + if (str.endsWith(getString(R.string.rviz_fmd_unknown)) || str.endsWith("未安装") || str == getString( + R.string.rviz_fmd_get_fail_hd_map_version + ) + ) { + val index = str.indexOf(':'); + if (index != -1) { + val spannableString = SpannableString(str) + spannableString.setSpan( + spanError, + index + 1, + str.length, + Spanned.SPAN_INCLUSIVE_EXCLUSIVE + ) + textView.text = spannableString + return + } + } + textView.text = str + } + + //更新域控模块状态 + private fun updateModuleHost(sensorName: String, sensorIsOk: Boolean) { + val name = Utils.getIPLastSegment(sensorName) + val moduleName = getString(R.string.rviz_fmd_module_host) + val moduleStatusEntity = + mModuleStatusEntity.find { mt -> + mt.title == moduleName + } + if (moduleStatusEntity != null) { + val sensorStatus = moduleStatusEntity.sensorList.find { st -> st.sensorName == name } + if (sensorStatus == null) { + moduleStatusEntity.sensorList.add(SensorStatusEntity(name, sensorIsOk)) + if (moduleStatusEntity.sensorList.isNotEmpty()) { + moduleStatusEntity.sensorList.sortWith { s1, s2 -> + s1.sensorName.compareTo(s2.sensorName) + } + + } + } else { + sensorStatus.sensorIsOk = sensorIsOk + } + val overallStatus = moduleStatusEntity.sensorList.any { !it.sensorIsOk } + moduleStatusEntity.sensorBg = + if (overallStatus) R.drawable.rviz_fmd_icon_ipc else R.drawable.rviz_fmd_icon_ipc_error + lastOpenedAdapter?.notifyItemChanged(mModuleStatusEntity.indexOfFirst { it.title == moduleName }) + updateRedDot() + } + } + + + //更新红点 + private fun updateRedDot() { + val countOfFailedSensors = mModuleStatusEntity.sumOf { module -> + module.sensorList.count { sensor -> + !sensor.sensorIsOk + } + } + fmdAct.updateRedDot(TAG, countOfFailedSensors) + } + + /******************SSH 连接状态*********************/ + override fun onSshConnecting( + host: SSHHostBean, + rosHostArgumentPosition: Int, + isInserted: Boolean + ) { + updateModuleHost(host.hostname, false) + } + + override fun onSshConnected(ssh: SSH) { + updateModuleHost(ssh.host.hostname, true) + } + + override fun onSshDisconnected(host: SSHHostBean) { + updateModuleHost(host.hostname, false) + } + + override fun onSshConnectFailure(host: SSHHostBean, msg: String) { + updateModuleHost(host.hostname, false) + } + + override fun onAutopilotAbility( + isAutopilotAbility: Boolean, + launchConditionData: LaunchConditionData?, + unableAutopilotReasons: ArrayList? + ) { + updateAutopilotAbility() + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/fragments/resource/SystemResourceFrag.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/fragments/resource/SystemResourceFrag.kt new file mode 100644 index 0000000000..5e87b122b1 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/fragments/resource/SystemResourceFrag.kt @@ -0,0 +1,249 @@ +package com.zhjt.mogo_core_function_devatools.rviz.ui.fragments.resource + +import android.os.Bundle +import android.text.TextUtils +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.zhjt.mogo_core_function_devatools.rviz.R +import com.zhjt.mogo_core_function_devatools.rviz.common.coroutines.FlowBus +import com.zhjt.mogo_core_function_devatools.rviz.common.utils.Utils +import com.zhjt.mogo_core_function_devatools.rviz.constant.EventKey +import com.zhjt.mogo_core_function_devatools.rviz.dialog.DockersDialog +import com.zhjt.mogo_core_function_devatools.rviz.dialog.InputUserPwdDialog +import com.zhjt.mogo_core_function_devatools.rviz.dialog.ShowConfigDialog +import com.zhjt.mogo_core_function_devatools.rviz.dialog.StartupConfigDialog +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.DiskInfo +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.DockerBean +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.DockerStatus +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.RosHostArgument +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.StartupConfig +import com.zhjt.mogo_core_function_devatools.rviz.ssh.SSH +import com.zhjt.mogo_core_function_devatools.rviz.ssh.constant.MogoCommand +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.DockerCommandHandler +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.SSHHostBean +import com.zhjt.mogo_core_function_devatools.rviz.ui.fragments.FmdBaseFragment +import com.zhjt.mogo_core_function_devatools.rviz.widgets.ros.host.OnRosHostClickListener +import com.zhjt.mogo_core_function_devatools.rviz.widgets.ros.host.RosHostView +import com.zhjt.mogo_core_function_devatools.rviz.widgets.ros.host.RosHostView.OnRosHostViewListener + +/** + * 系统资源 UI及业务逻辑 + */ +class SystemResourceFrag : FmdBaseFragment(), OnRosHostClickListener, + OnRosHostViewListener { + private var isInit = false + private lateinit var rosHostsView: RosHostView + + override fun onHiddenChanged(hidden: Boolean) { + super.onHiddenChanged(hidden) + if (!hidden) { + initData() + } + } + + fun initData() { + if (!isInit) { + isInit = true + rosHostsView.setDatas( + fmdAct.getRosHostArguments(), + fmdAct.getCloudMapVersion() + ) + } + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + rosHostsView = view.findViewById(R.id.ros_hosts_view) + rosHostsView.setOnRosHostClickListener(this) + rosHostsView.addListener(this) + initFlowBusEvent() + } + + override fun onDestroyView() { + super.onDestroyView() + rosHostsView.removeListener() + } + + override fun getContentViewResource(inflater: LayoutInflater, container: ViewGroup?): View { + return inflater.inflate(R.layout.rviz_fmd_frag_system_resource, container, false) + } + + //更新红点 + private fun updateRedDot() { + val list = fmdAct.getRosHostArguments() + val cloudMapVersion = fmdAct.getCloudMapVersion() + var count: Int = 0 + if (!list.isNullOrEmpty()) { + for (it in list) { + if (it.isConnectFailure) { + count++ + } else { + if (it.cpuUsageRate >= 90) { + count++ + } + if (it.diskUsageRate.first >= 90) { + count++ + } + if (it.memUsageRate.first >= 90) { + count++ + } + if (it.swapUsageRate.first >= 90) { + count++ + } + val localMapVersion: String = it.dockerVersion + if (TextUtils.isEmpty(cloudMapVersion) || + TextUtils.equals(cloudMapVersion, "未知") || + TextUtils.equals( + cloudMapVersion, + getString(R.string.rviz_fmd_cloud_map_version_unknown) + ) + ) { + if (TextUtils.isEmpty(localMapVersion) || + TextUtils.equals(localMapVersion, "未知") + ) { + count++ + } + } else { + if (!TextUtils.equals(localMapVersion, cloudMapVersion)) { + count++ + } + } + } + } + } + + fmdAct.updateRedDot(TAG, count) + } + + private fun initFlowBusEvent() { + FlowBus.with(EventKey.QUERY_DOCKER_PS) + .register(this) { + if (it.dockers.isEmpty()) { + ToastUtils.showLong("Docker列表查询失败") + } else { + DockersDialog(fmdAct, it).show() + } + fmdAct.dismissLoadingDialog() + } + FlowBus.with(EventKey.QUERY_DISK_STATUS) + .register(this) { + if (TextUtils.isEmpty(it.data)) { + ToastUtils.showLong("磁盘信息查询失败") + } else { + ShowConfigDialog( + fmdAct, + Utils.getIPLastSegment(it.host.hostname) + "--磁盘概览", + it.data + ).show() + } + fmdAct.dismissLoadingDialog() + } + FlowBus.with(EventKey.DOCKER_STATUS) + .register(this) { + if (it.status == DockerCommandHandler.CONNECT_STATUS.CONNECTED) { + val ssh = fmdAct.getSSH(it.host) + if (ssh != null) { + queryStartupConfig(ssh) + } + } else { + when (it.status) { + DockerCommandHandler.CONNECT_STATUS.FAILED -> { + ToastUtils.showLong("无法与主机“" + it.host.hostname + "”中的Docker建立连接") + } + + DockerCommandHandler.CONNECT_STATUS.CLOSE -> { + ToastUtils.showLong("已断开主机“" + it.host.hostname + "”中的Docker连接") + } + + DockerCommandHandler.CONNECT_STATUS.CLOSE_DELAYED -> { + ToastUtils.showLong("已自动断开主机“" + it.host.hostname + "”中的Docker连接") + } + } + fmdAct.dismissLoadingDialog() + } + } + FlowBus.with(EventKey.QUERY_STARTUP_CONFIG) + .register(this) { + if (it.configs == null || it.configs.isEmpty()) { + ToastUtils.showLong("启动配置查询失败") + } else { + StartupConfigDialog( + fmdAct, + Utils.getIPLastSegment(it.host.hostname) + "--StartupConfigCache.json", + it, + object : StartupConfigDialog.OnStartupConfigListener { + override fun onQuery(host: SSHHostBean, path: String) { + fmdAct.execDockerCmd( + host, + MogoCommand.QUERY_DOCKER_CONFIG_CONTENT + path + ) + } + + override fun onDismiss(host: SSHHostBean) { + val ssh = fmdAct.getSSH(host) + if (ssh != null) { + //延迟几分钟后自动关闭Docker连接 + ssh.startDockerDisconnectTimer(true) + //直接关闭Docker连接 +// bridge.disconnectDocker(bridge) + } + } + }).show() + } + fmdAct.dismissLoadingDialog() + } + } + + override fun onDockerClick(hostBean: SSHHostBean) { + fmdAct.execCmd(hostBean, MogoCommand.QUERY_DOCKER_PS_A, "正在查询Docker信息") + } + + override fun onConfigClick(hostBean: SSHHostBean) { + val ssh = fmdAct.getSSH(hostBean) + if (ssh != null) { + ssh.stopDockerDisconnectTimer();//停止自动断开Docker连接定时器 + if (ssh.isDockerOpened) { + queryStartupConfig(ssh) + } else { + fmdAct.connectDocker(ssh) + } + } + } + + override fun onDiskClick(hostBean: SSHHostBean) { + fmdAct.execCmd(hostBean, MogoCommand.QUERY_DF_H, "正在查询磁盘信息") + } + + override fun onReconnect(argument: RosHostArgument) { + if (TextUtils.equals( + "用户名或密码错误,请重试", + argument.connectFailureReason + ) + ) { + //密码错误 + InputUserPwdDialog( + fmdAct, + argument.host, + object : InputUserPwdDialog.OnClickListener { + override fun onConfirm() { + argument.resetConnectFailureCode() + fmdAct.openConnection(argument.host) + } + }).show() + } else { + argument.resetConnectFailureCode() + fmdAct.openConnection(argument.host) + } + + } + + private fun queryStartupConfig(ssh: SSH) { + fmdAct.execCmd(ssh, MogoCommand.QUERY_STARTUP_CONFIG, "正在查询启动配置") + } + + override fun onUpdateNotify() { + updateRedDot() + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/views/CheckAutopilotView.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/views/CheckAutopilotView.kt new file mode 100644 index 0000000000..cbee28f7a8 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/views/CheckAutopilotView.kt @@ -0,0 +1,709 @@ +package com.zhjt.mogo_core_function_devatools.rviz.ui.views + +import android.annotation.SuppressLint +import android.app.Activity +import android.content.Context +import android.util.AttributeSet +import android.util.Log +import android.view.LayoutInflater +import android.widget.Button +import android.widget.ImageView +import android.widget.TextView +import android.widget.ToggleButton +import androidx.appcompat.widget.AppCompatEditText +import androidx.appcompat.widget.AppCompatTextView +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.content.ContextCompat +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.LifecycleOwner +import androidx.lifecycle.LifecycleRegistry +import androidx.lifecycle.Observer +import androidx.recyclerview.widget.RecyclerView +import chassis.Chassis +import chassis.VehicleStateOuterClass +import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters +import com.mogo.eagle.core.data.deva.report.ReportEntity +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager +import com.mogo.eagle.core.utilcode.util.ThreadUtils +import com.mogo.eagle.core.utilcode.util.TimeUtils +import com.mogo.eagle.core.utilcode.util.ToastUtils +import com.zhjt.mogo_core_function_devatools.rviz.R +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrackContrail +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectoryInfo +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectoryInfoReq +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectoryListInfo +import com.zhjt.mogo_core_function_devatools.rviz.bean.TrajectorySiteInfo +import com.zhjt.mogo_core_function_devatools.rviz.bean.VehicleConfigData +import com.zhjt.mogo_core_function_devatools.rviz.bean.VehicleType +import com.zhjt.mogo_core_function_devatools.rviz.common.coroutines.FlowBus +import com.zhjt.mogo_core_function_devatools.rviz.dialog.SelectAutopilotLineDialog +import com.zhjt.mogo_core_function_devatools.rviz.dialog.adapter.ConsoleAdapter +import com.zhjt.mogo_core_function_devatools.rviz.net.NetworkCallback +import com.zhjt.mogo_core_function_devatools.rviz.net.TrajectoryApiClient +import com.zhjt.mogo_core_function_devatools.rviz.utils.PinYinUtil +import com.zhjt.mogo_core_function_devatools.rviz.widgets.ros.TelematicsSubscriberEventKey +import com.zhjt.mogo_core_function_devatools.rviz.widgets.ros.TopicSubscriberEventKey +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.cancel +import mogo.telematics.pad.MessagePad +import mogo_msg.MogoReportMsg +import java.util.LinkedList + +class CheckAutopilotView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : ConstraintLayout(context, attrs, defStyleAttr), LifecycleOwner { + + companion object { + const val TAG = "CheckAutopilotView" + } + + + private val scopeUploadReportInfo = CoroutineScope(Dispatchers.Main) + + private val mLifecycleRegistry = LifecycleRegistry(this) + + + // 当前选择的自动驾驶路线信息 + var mTrajectoryListInfo: TrajectoryListInfo? = null + var mTrajectorySiteInfo: List? = null + var mTrajectoryInfo: TrajectoryInfo? = null + + private var selectAutopilotLineDialog: SelectAutopilotLineDialog? = null + private var mActivity: Activity? = null + + + /** + * 传给自动驾驶 + * 1、先下载轨迹信息 + * @see TelematicsControlApi.sendTrajectoryDownloadReq + * 2、再启动自动驾驶 + * @see TelematicsControlApi.requestEnterAutoPilot + */ + val mTrajectoryLine = MessagePad.Line.newBuilder() + + private val consoleAdapter = + ConsoleAdapter()//控制台适配器 + private val consoleList = LinkedList() + + private var trajectoryListInfo: TrajectoryListInfo? = null + + private var currentAutopilotStatus: Int = 0 //自动驾驶状态 0代表不可自动驾驶,1代表可自动驾驶,2代表自动驾驶中,7:平行驾驶中 + + @Volatile + private var speedLimit: Int = 1 + + //Warning + // 自动驾驶效果受影响: + // 自动驾驶部分功能受严重影响,演示模式可以考虑强行启动,非演示模式下建议停止自动驾驶,联系人员排查问题。 + //例如定位偏移,camera无数据,算法非常严重的丢帧,属于自动驾驶可以启动,但是效果受影响。 + private val RESULT_AUTOPILOT_INFERIOR = "RESULT_AUTOPILOT_INFERIOR" + + // 存在不确定因素 + // 一般为过渡状态,存在不确定因素,有可能对自动驾驶有微弱影响,需要在pad端显示为黄色告警。 + //如果偶尔上报该result可忽略,如果频繁上报需联系人员进行排查。 目前仅有RTK无法确认状态事件 + private val RESULT_SHOW_WARNING = "RESULT_SHOW_WARNING" + + // 远程驾驶效果受影响 + // 远程驾驶部分功能受影响。例如网络高延迟 + private val RESULT_REMOTEPILOT_INFERIOR = "RESULT_REMOTEPILOT_INFERIOR" + + //Error + // 无法启动自动驾驶 + private val RESULT_AUTOPILOT_DISABLE = "RESULT_AUTOPILOT_DISABLE" + + // 自动驾驶系统启动失败 + // 自动驾驶系统启动过程中出错,pad可能无法连接,云端监控可能无法上报 + private val RESULT_AUTOPILOT_SYSTEM_UNSTARTED = "RESULT_AUTOPILOT_SYSTEM_UNSTARTED" + + // 自动驾驶效果受影响 + //自动驾驶部分功能受严重影响,演示模式可以考虑强行启动,非演示模式下建议停止自动驾驶,联系人员排查问题。 + //例如定位偏移,camera无数据,算法非常严重的丢帧,属于自动驾驶可以启动,但是效果受影响。 + private val RESULT_REMOTEPILOT_DISABLE = "RESULT_REMOTEPILOT_DISABLE" + + /** + * 获取控制台上报数据列表 + */ + fun getConsoleList(): List { + return consoleList + } + + fun getTrajectoryListInfo(): TrajectoryListInfo? { + return trajectoryListInfo + } + + fun getTrackContrail(): TrackContrail? { + return mTrajectoryInfo?.trackContrail + } + + fun setActivity(activity: Activity) { + mActivity = activity + } + + // 订阅工控机日志 + private val consoleObserver: Observer = + Observer { mogoReportMessage: MogoReportMsg.MogoReportMessage -> + if (consoleList.size > 1000) { + consoleList.removeLast() + } + if (mogoReportMessage.resultList.contains(RESULT_AUTOPILOT_INFERIOR) + || mogoReportMessage.resultList.contains(RESULT_SHOW_WARNING) + || mogoReportMessage.resultList.contains(RESULT_REMOTEPILOT_INFERIOR) + || mogoReportMessage.resultList.contains(RESULT_AUTOPILOT_DISABLE) + || mogoReportMessage.resultList.contains(RESULT_AUTOPILOT_SYSTEM_UNSTARTED) + || mogoReportMessage.resultList.contains(RESULT_REMOTEPILOT_DISABLE) + ) { + // 处理底盘超时 +// if ( +// !mogoReportMessage.resultList.equals(RESULT_AUTOPILOT_DISABLE) +// || !mogoReportMessage.resultList.equals(RESULT_REMOTEPILOT_INFERIOR) +// || !mogoReportMessage.resultList.equals(RESULT_AUTOPILOT_INFERIOR) +// ) { +// btnControlAutoPilot.isChecked = false +// Log.e(TAG, "进入自动驾驶--失败") +// } + + consoleList.addFirst( + ReportEntity( + TimeUtils.getNowString(), + mogoReportMessage.src, + mogoReportMessage.level, + mogoReportMessage.msg, + mogoReportMessage.code, + mogoReportMessage.resultList, + mogoReportMessage.actionsList, + true + ) + ) + } + if (consoleList.size > 0) { + consoleAdapter.setData(consoleList) + } + } + + //订阅到站 + private val arrivalObserver: Observer = Observer { + it.let { + Log.i("arrivalObserver", "CheckAuto页面收到到站回调") + Log.i("arrivalObserver", "latitude=" + it.endLocation.latitude) + Log.i("arrivalObserver", "longitude=" + it.endLocation.longitude) + //取消自动驾驶 + CallerAutoPilotControlManager.cancelAutoPilot() + //吐司提示 + ToastUtils.showShort("您已到达站点") + } + } + + //订阅工控机日志监控 + private val reportObserver: Observer = Observer { + it.let { + //掉自驾 + when (it.code) { + "EMAP_EXIT_AUTOPILOT_FOR_PLANNING",//因planning掉帧强退自动驾驶 + "EMAP_EXIT_AUTOPILOT_FOR_LOCATION",//因location掉帧强退自动驾驶 + "EMAP_EXIT_AUTOPILOT_FOR_CHASSIS",//因底盘消息掉帧强退自动驾驶 + "EXIT_AUTOPILOT_FOR_DISTANCE",//因planning起点距离当前过远强退自动驾驶 + "EXIT_AUTOPILOT_FOR_BRAKE",//制动踏板干预而强退自动驾驶 + "EXIT_AUTOPILOT_FOR_ACCEL",//加速踏板干预而强退自动驾驶 + "EXIT_AUTOPILOT_FOR_STEER",//方向盘干预而强退自动驾驶 + "EXIT_AUTOPILOT_FOR_GEAR_SWITCH",//档位切换干预而强退自动驾驶 + "EMAP_EXIT_AUTOPILOT_FOR_CHASSIS_NO_RESPONSE",//底盘不响应请求而强退自动驾驶 + "EMAP_EXIT_AUTOPILOT_FOR_CHASSIS_UNKNOWN",//底盘退出原因未知而强退自动驾驶 + "IRECORDER_TASK_AUTO"//自动录包任务创建 + -> { + //当司机或外界原因导致自动驾驶退出,需要在页面将状态同步显示出来,并将按钮设置为「启动自动驾驶」 + ThreadUtils.runOnUiThread { + ToastUtils.showShort("自动驾驶退出") + btnControlAutoPilot.isEnabled = true + btnControlAutoPilot.isChecked = false + } + } + } + } + } + + //自动驾驶状态 + private val autopilotStateObserver: Observer = Observer { + it.let { + if (currentAutopilotStatus != it.state) { + currentAutopilotStatus = it.state + ThreadUtils.runOnUiThread { + when (it.state) { + 0 -> { + btnAutoPilotStatus.text = "不可自驾" + } + + 1 -> { + btnAutoPilotStatus.text = "可自动驾驶" + } + + 2 -> { + btnAutoPilotStatus.text = "自动驾驶中" + } + + 7 -> { + btnAutoPilotStatus.text = "平行驾驶中" + } + } + } + } + } + } + + //车机基础信息应答 + private val carConfigObserver: Observer = Observer { + it.let { + ThreadUtils.runOnUiThread { + speedLimit = (it.speedLimit * 3.6).toInt() + etInputSpeed.setText(speedLimit.toString()) + } + } + } + + //自车状态(底盘),车灯、转向灯等 + private val vehicleStateObserver: Observer = Observer { + ThreadUtils.runOnUiThread { + when (it.gear) { + Chassis.GearPosition.GEAR_P -> { + tvGearP.setTextColor(ContextCompat.getColor(context, R.color.white)) + tvGearR.setTextColor( + ContextCompat.getColor( + context, + R.color.p_default_txt_color + ) + ) + tvGearN.setTextColor( + ContextCompat.getColor( + context, + R.color.p_default_txt_color + ) + ) + tvGearD.setTextColor( + ContextCompat.getColor( + context, + R.color.p_default_txt_color + ) + ) + } + + Chassis.GearPosition.GEAR_R -> { + tvGearP.setTextColor( + ContextCompat.getColor( + context, + R.color.p_default_txt_color + ) + ) + tvGearR.setTextColor(ContextCompat.getColor(context, R.color.white)) + tvGearN.setTextColor( + ContextCompat.getColor( + context, + R.color.p_default_txt_color + ) + ) + tvGearD.setTextColor( + ContextCompat.getColor( + context, + R.color.p_default_txt_color + ) + ) + } + + Chassis.GearPosition.GEAR_N -> { + tvGearP.setTextColor( + ContextCompat.getColor( + context, + R.color.p_default_txt_color + ) + ) + tvGearR.setTextColor( + ContextCompat.getColor( + context, + R.color.p_default_txt_color + ) + ) + tvGearN.setTextColor(ContextCompat.getColor(context, R.color.white)) + tvGearD.setTextColor( + ContextCompat.getColor( + context, + R.color.p_default_txt_color + ) + ) + } + + Chassis.GearPosition.GEAR_D -> { + tvGearP.setTextColor( + ContextCompat.getColor( + context, + R.color.p_default_txt_color + ) + ) + tvGearR.setTextColor( + ContextCompat.getColor( + context, + R.color.p_default_txt_color + ) + ) + tvGearN.setTextColor( + ContextCompat.getColor( + context, + R.color.p_default_txt_color + ) + ) + tvGearD.setTextColor(ContextCompat.getColor(context, R.color.white)) + } + + else -> { + tvGearP.setTextColor( + ContextCompat.getColor( + context, + R.color.p_default_txt_color + ) + ) + tvGearR.setTextColor( + ContextCompat.getColor( + context, + R.color.p_default_txt_color + ) + ) + tvGearN.setTextColor( + ContextCompat.getColor( + context, + R.color.p_default_txt_color + ) + ) + tvGearD.setTextColor( + ContextCompat.getColor( + context, + R.color.p_default_txt_color + ) + ) + } + } + } + } + + init { + LayoutInflater.from(context).inflate(R.layout.view_check_autopilot, this, true) + initView(context, attrs!!) + mLifecycleRegistry.currentState = Lifecycle.State.CREATED + } + + private lateinit var tvAutoDriveLineSelect: TextView + private lateinit var tvSpeedTitle: TextView + private lateinit var ivSpeedReduce: ImageView + private lateinit var etInputSpeed: AppCompatEditText + private lateinit var ivSpeedAdd: ImageView + private lateinit var tvSureModify: AppCompatTextView + private lateinit var tvGearP: TextView + private lateinit var tvGearR: TextView + private lateinit var tvGearN: TextView + private lateinit var tvGearD: TextView + private lateinit var btnAutoPilotStatus: Button + private lateinit var btnControlAutoPilot: ToggleButton + private lateinit var rvReportConsole: RecyclerView + + + private fun initView(context: Context, attrs: AttributeSet) { + tvAutoDriveLineSelect = findViewById(R.id.tvAutoDriveLineSelect) + tvSpeedTitle = findViewById(R.id.tvSpeedTitle) + ivSpeedReduce = findViewById(R.id.ivSpeedReduce) + etInputSpeed = findViewById(R.id.etInputSpeed) + ivSpeedAdd = findViewById(R.id.ivSpeedAdd) + tvSureModify = findViewById(R.id.tvSureModify) + tvGearP = findViewById(R.id.tvGearP) + tvGearR = findViewById(R.id.tvGearR) + tvGearN = findViewById(R.id.tvGearN) + tvGearD = findViewById(R.id.tvGearD) + btnAutoPilotStatus = findViewById(R.id.btnAutoPilotStatus) + btnControlAutoPilot = findViewById(R.id.btnControlAutoPilot) + rvReportConsole = findViewById(R.id.rvReportConsole) + + + + +// initSpeedView() TODO + consoleAdapter.setData(consoleList) + rvReportConsole.adapter = consoleAdapter + initAutopilotLineData() + + // 启动自动驾驶 + btnControlAutoPilot.setOnClickListener { + if (currentAutopilotStatus != 0) { + if (currentAutopilotStatus != 2) { + mTrajectoryListInfo?.let { trajectoryListInfo -> + mTrajectorySiteInfo?.let { trajectorySiteInfo -> + if (trajectorySiteInfo.isEmpty()) { + if (btnControlAutoPilot.isChecked) { + ToastUtils.showShort("该路线缺少站点信息") + } + btnControlAutoPilot.isChecked = false + return@setOnClickListener + } + val routeInfo = MessagePad.RouteInfo.newBuilder() + routeInfo.routeID = trajectoryListInfo.lineId + routeInfo.routeName = trajectoryListInfo.lineName + + routeInfo.vehicleType = + if (VehicleConfigData.getCarType() == VehicleType.TAXI) { + 9 + } else { + 10 + } + routeInfo.isSpeakVoice = false + + val startSite = trajectorySiteInfo[0] + val endSite = trajectorySiteInfo[trajectorySiteInfo.size - 1] + + routeInfo.startName = + PinYinUtil.getPinYinHeadChar(startSite.name) // 起点名称拼音首字母大写:科学城B区2号门(KXCBQ2HM) + routeInfo.endName = + PinYinUtil.getPinYinHeadChar(endSite.name) // 终点名称拼音首字母大写:科学城C区三号门(KXCCQSHM) + + val startLoc = routeInfo.startLocationBuilder + startLoc.latitude = startSite.wgs84Lat + startLoc.longitude = startSite.wgs84Lon + + val endLoc = routeInfo.endLocationBuilder + endLoc.latitude = endSite.wgs84Lat + endLoc.longitude = endSite.wgs84Lon + + routeInfo.startLocation = startLoc.build() + routeInfo.endLocation = endLoc.build() + + //传入站点列表 + for(site in trajectorySiteInfo){ + val locBuilder = MessagePad.Location.newBuilder() + locBuilder.latitude = site.wgs84Lat + locBuilder.longitude = site.wgs84Lon + routeInfo.addWayPoints(locBuilder.build()) + } + + // 初始化选择的自动驾驶路线信息 + routeInfo.line = initTrajectoryLine(trajectoryListInfo) + + // 模拟强制进入 + //if (TelematicsControlApi.instance.requestEnterAutoPilotSimulate(true)) { + // 启动自动驾驶 TODO +// if (CallerAutoPilotControlManager.startAutoPilot(currentAutopilot)) { +// btnControlAutoPilot.isChecked = true +// Log.d(TAG, "自动驾驶命令下发成功") +// ToastUtils.showShort("自动驾驶命令下发成功") +// } else { +// btnControlAutoPilot.isChecked = false +// Log.e(TAG, "自动驾驶命令下发失败") +// ToastUtils.showShort("自动驾驶命令下发失败") +// } + } ?: let { + btnControlAutoPilot.isChecked = false + Log.e(TAG, "进入自动驾驶--失败") + Log.e(TAG, "站点信息异常,请选择要测试的驾驶路线!!!") + ToastUtils.showShort("进入自动驾驶--失败") + } + } ?: let { + btnControlAutoPilot.isChecked = false + Log.e(TAG, "进入自动驾驶--失败") + Log.e(TAG, "未选择自动驾驶路线,请选择要测试的驾驶路线!!!") + ToastUtils.showShort("进入自动驾驶--失败") + } + } else { + // 模拟强制退出 + //if (TelematicsControlApi.instance.requestEnterAutoPilotSimulate(false)) { + // 正常流程退出自动驾驶 + CallerAutoPilotControlManager.cancelAutoPilot() + } + } else { + btnControlAutoPilot.isChecked = false + ToastUtils.showShort("车辆未就绪,请稍后再试") + } + } + + } + + /** + * 自动驾驶车速设置 + */ + //TODO + + /** + * 初始化轨迹信息 + */ + private fun initTrajectoryLine(trajectoryListInfo: TrajectoryListInfo): MessagePad.Line { + // 给自动驾驶用于进行循迹路线加载 + mTrajectoryInfo?.trackContrail?.let { + mTrajectoryLine.lineId = trajectoryListInfo.lineId.toLong() + mTrajectoryLine.lineName =trajectoryListInfo.lineName + mTrajectoryLine.trajMd5 = it.csvFileMd5 + mTrajectoryLine.trajUrl = it.csvFileUrl + mTrajectoryLine.stopMd5 = it.txtFileMd5 + mTrajectoryLine.stopUrl = it.txtFileUrl + mTrajectoryLine.timestamp = it.contrailSaveTime + mTrajectoryLine.vehicleModel = + VehicleConfigData.getCarBrand() + VehicleConfigData.getCarModel() + } ?: let { + btnControlAutoPilot.isChecked = false + Log.e(TAG, "循迹路线未配置! 请登录运营管理平台配置!") + ToastUtils.showShort("循迹路线未配置!请登录运营管理平台配置!") + } + mTrajectoryInfo?.dbqpContrail?.let { + mTrajectoryLine.trajUrlDpqp = it.csvFileUrl + mTrajectoryLine.trajMd5Dpqp = it.csvFileMd5 + mTrajectoryLine.stopUrlDpqp = it.txtFileUrl + mTrajectoryLine.stopMd5Dpqp = it.txtFileMd5 + mTrajectoryLine.timestampDpqp = it.contrailSaveTime + } ?: let { + Log.e(TAG, "dbqp路线未配置!请登录运营管理平台配置!") + //ToastUtils.show("dbqp路线未配置!请登录运营管理平台配置!") + } + + return mTrajectoryLine.build() + } + + /** + * 初始化路线选择器 + */ + private fun initAutopilotLineData() { + // 循迹路线选择 + tvAutoDriveLineSelect.setOnClickListener { + //弹出路线选择弹窗 + if (selectAutopilotLineDialog == null) { + selectAutopilotLineDialog = SelectAutopilotLineDialog(context) + } + mActivity?.let { activity -> + selectAutopilotLineDialog?.setListener(object : + SelectAutopilotLineDialog.ClickListener { + override fun onClick(info: TrajectoryListInfo) { + Log.d(TAG, "选中路线:${info}") + info.let { + mTrajectoryListInfo = it + tvAutoDriveLineSelect.text = it.lineName + checkAutoLine(it) + } + } + }) + selectAutopilotLineDialog?.showSelectLineDialog(activity) + } + } + } + + /** + * 调用接口获取选中的路线信息 + */ + private fun checkAutoLine(trajectoryListInfo: TrajectoryListInfo) { + val trajectoryInfoReq = TrajectoryInfoReq( + VehicleConfigData.getCarBrand(), + VehicleConfigData.getCarModel(), + trajectoryListInfo.lineId + ) + Log.d( + TAG, + "调用接口获取选中的路线信息 checkAutoLine,trajectoryInfoReq:${trajectoryInfoReq}" + ) + // 处理Taxi + // 处理BUS包含:JV、KW、FT、SW + TrajectoryApiClient.querySiteList( + this, + VehicleConfigData.getCarType().name, + trajectoryListInfo.lineId, + object : NetworkCallback> { + override fun onSuccess(data: ArrayList) { + mTrajectorySiteInfo = data + if (data.size > 0) { + btnControlAutoPilot.isEnabled = true + } else { + btnControlAutoPilot.isEnabled = false + ToastUtils.showShort("该路线缺少站点信息") + } + } + + override fun onError(msg: String) { + Log.e( + TAG, + "获取 ${VehicleConfigData.getCarType().name} 站点详情异常,异常原因:网络异常" + ) + ToastUtils.showShort("获取 ${VehicleConfigData.getCarType().name} 站点详情异常,异常原因:网络异常") + } + } + ) + TrajectoryApiClient.queryTrajectoryInfo( + this, + VehicleConfigData.getCarType().name, + trajectoryInfoReq, + object : NetworkCallback { + override fun onSuccess(data: TrajectoryInfo) { + mTrajectoryInfo = data + + // 先发给自动驾驶下载路线 TODO +// CallerAutoPilotControlManager.sendTrajectoryDownloadReq( +// mAutoPilotLine +// ) + } + + override fun onError(msg: String) { + Log.e( + TAG, + "查询 ${VehicleConfigData.getCarType().name} 线路对应的轨迹 异常,异常原因:网络异常" + ) + ToastUtils.showShort("查询 ${VehicleConfigData.getCarType().name} 线路对应的轨迹 异常,异常原因:网络异常") + } + } + ) + } + + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + mLifecycleRegistry.currentState = Lifecycle.State.STARTED + //订阅工控机异常上报 TODO + + //reportMsgErrorSubscriber TODO + + // 订阅数据 + FlowBus.with(TopicSubscriberEventKey.REPORT_MSG_SUBSCRIBER) + .register(this) { + consoleObserver.onChanged(it) + } + + //订阅到站提醒 + FlowBus.with(TelematicsSubscriberEventKey.Subscribe_Arrival_Notification) + .register(this) { + arrivalObserver.onChanged(it) + } + + //订阅工控机日志监控 + FlowBus.with(TelematicsSubscriberEventKey.Subscribe_Mogo_Report_Message) + .register(this) { + reportObserver.onChanged(it) + } + + //订阅自动驾驶状态 + FlowBus.with(TelematicsSubscriberEventKey.Subscribe_Autopilot_State) + .register(this) { + autopilotStateObserver.onChanged(it) + } + + //订阅车机基础信息 + FlowBus.withStick(TelematicsSubscriberEventKey.Subscribe_CarConfig_Resp) + .register(this) { + carConfigObserver.onChanged(it) + } + + //订阅自车状态(底盘),车灯、转向灯等 + FlowBus.with(TelematicsSubscriberEventKey.Subscribe_Vehicle_State) + .register(this) { + vehicleStateObserver.onChanged(it) + } + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + scopeUploadReportInfo.cancel() + mLifecycleRegistry.currentState = Lifecycle.State.DESTROYED + } + + override fun getLifecycle(): Lifecycle { + return mLifecycleRegistry + } + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/views/ColorHintFloatWindow.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/views/ColorHintFloatWindow.java new file mode 100644 index 0000000000..c3a4e86560 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/views/ColorHintFloatWindow.java @@ -0,0 +1,119 @@ +package com.zhjt.mogo_core_function_devatools.rviz.ui.views; + +import android.content.Context; +import android.graphics.Rect; +import android.view.LayoutInflater; +import android.view.MotionEvent; +import android.view.View; +import android.view.WindowManager; +import android.widget.LinearLayout; +import android.widget.TextView; + +import androidx.annotation.NonNull; + +import com.zhjt.mogo_core_function_devatools.rviz.R; +import com.zhjt.mogo_core_function_devatools.rviz.constant.FaultLevel; + + +/** + * 2017/1/10. + * Description:全局悬浮窗口 + */ + +public class ColorHintFloatWindow extends LinearLayout { + + + private final WindowManager wm; + //此wmParams变量为获取的全局变量,用以保存悬浮窗口的属性 + private WindowManager.LayoutParams wmParams; + + private float mInViewX; + private float mInViewY; + private View sshConnectErrorView = null; + + public void setWmParams(WindowManager.LayoutParams wmParams) { + this.wmParams = wmParams; + } + + public ColorHintFloatWindow(@NonNull Context context, boolean isOverviewFrag) { + super(context, null, 0); + setOrientation(LinearLayout.VERTICAL); + setBackgroundResource(R.drawable.rvzi_fmd_bg_color_hint_float); + setPadding(10, 10, 10, 10); + wm = (WindowManager) context.getApplicationContext().getSystemService(Context.WINDOW_SERVICE); + //加载布局 + init(isOverviewFrag); + } + + private void init(boolean isOverviewFrag) { + // 遍历布局资源 ID 数组 + for (FaultLevel level : FaultLevel.getALL()) { + addChild(level); + } + if (isOverviewFrag) { + sshConnectErrorView = addChild(FaultLevel.SSH_CONNECT_ERROR); + } + } + + private View addChild(FaultLevel level) { + View view = View.inflate(getContext(), R.layout.rviz_fmd_item_color_hint, null); + TextView name = view.findViewById(R.id.name); + View view1 = view.findViewById(R.id.view); + name.setText(level.getMsg() + ":"); + view1.setBackgroundColor(getContext().getColor(level.getColorRes())); + this.addView(view); + return view; + } + + public void updateSshConnectErrorView(boolean isOverviewFrag) { + if (isOverviewFrag) { + if (sshConnectErrorView == null) { + sshConnectErrorView = addChild(FaultLevel.SSH_CONNECT_ERROR); + } + } else { + if (sshConnectErrorView != null) { + removeView(sshConnectErrorView); + sshConnectErrorView = null; + } + } + } + + + @Override + public boolean onTouchEvent(MotionEvent event) { + //获取到状态栏的高度 + Rect frame = new Rect(); + getWindowVisibleDisplayFrame(frame); + int statusBarHeight = frame.top; + switch (event.getAction()) { + case MotionEvent.ACTION_DOWN: + // 获取相对View的坐标,即以此View左上角为原点 + mInViewX = event.getX(); + mInViewY = event.getY(); + // 获取相对屏幕的坐标,即以屏幕左上角为原点 + float mDownInScreenX = event.getRawX(); + float mDownInScreenY = event.getRawY() - statusBarHeight; + float mInScreenX = mDownInScreenX; + float mInScreenY = mDownInScreenY; + break; + case MotionEvent.ACTION_MOVE: + // 更新浮动窗口位置参数 + mInScreenX = event.getRawX(); + mInScreenY = event.getRawY() - statusBarHeight; + wmParams.x = (int) (mInScreenX - mInViewX); + wmParams.y = (int) (mInScreenY - mInViewY); + updateViewLayout(); + break; + + case MotionEvent.ACTION_UP: + ColorHintFloatWindowManager.setFloatWindowLocation(wmParams.x, wmParams.y); + break; + } + return true; + } + + public void updateViewLayout() { + wm.updateViewLayout(this, wmParams); + } + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/views/ColorHintFloatWindowManager.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/views/ColorHintFloatWindowManager.java new file mode 100644 index 0000000000..1b97e6b15d --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/views/ColorHintFloatWindowManager.java @@ -0,0 +1,95 @@ +package com.zhjt.mogo_core_function_devatools.rviz.ui.views; + +import android.content.Context; +import android.graphics.PixelFormat; +import android.os.Build; +import android.util.DisplayMetrics; +import android.view.Gravity; +import android.view.ViewTreeObserver; +import android.view.WindowManager; + +import com.zhidao.support.adas.high.common.MMKVUtils; + + +public class ColorHintFloatWindowManager { + private final WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams(); + private ColorHintFloatWindow floatWindow = null; + private WindowManager wm = null; + + public ColorHintFloatWindowManager() { + } + + + public void remove() { + if (floatWindow != null) { + wm.removeView(floatWindow); + floatWindow = null; + wm = null; + } + } + + public void show(Context context, boolean isOverviewFrag) { + if (floatWindow == null) { + wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE); + //检查版本,注意当type为TYPE_APPLICATION_OVERLAY时,铺满活动窗口,但在关键的系统窗口下面,如状态栏或IME + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + layoutParams.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY; + } else { + layoutParams.type = WindowManager.LayoutParams.TYPE_SYSTEM_ALERT; + } + layoutParams.format = PixelFormat.RGBA_8888; + layoutParams.flags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE; + layoutParams.gravity = Gravity.START | Gravity.TOP; + layoutParams.width = WindowManager.LayoutParams.WRAP_CONTENT; + layoutParams.height = WindowManager.LayoutParams.WRAP_CONTENT; + floatWindow = new ColorHintFloatWindow(context, isOverviewFrag); + floatWindow.setWmParams(layoutParams); + int x = getFloatWindowLocationX(); + if (x == -1) { + layoutParams.x = 10000; + layoutParams.y = 0; + floatWindow.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() { + @Override + public void onGlobalLayout() { + int floatingWidth = floatWindow.getWidth(); + if (floatingWidth != 0) { + // 移除监听器以避免重复调用 + floatWindow.getViewTreeObserver().removeOnGlobalLayoutListener(this); + DisplayMetrics metrics2 = context.getResources().getDisplayMetrics(); + int screenWidth = metrics2.widthPixels; + layoutParams.x = screenWidth - floatingWidth; + layoutParams.y = getFloatWindowLocationY(); + floatWindow.updateViewLayout(); + setFloatWindowLocation(layoutParams.x, layoutParams.y); + } + } + }); + } else { + layoutParams.x = getFloatWindowLocationX(); + layoutParams.y = getFloatWindowLocationY(); + } + wm.addView(floatWindow, layoutParams); + } + } + + public void updateSshConnectErrorView(boolean isOverviewFrag) { + if (floatWindow != null) { + floatWindow.updateSshConnectErrorView(isOverviewFrag); + } + } + + + public static void setFloatWindowLocation(int x, int y) { + MMKVUtils.getInstance().put("color_hint_float_window_x", x); + MMKVUtils.getInstance().put("color_hint_float_window_y", y); + } + + private int getFloatWindowLocationX() { + return MMKVUtils.getInstance().getInt("color_hint_float_window_x", -1); + } + + private int getFloatWindowLocationY() { + return MMKVUtils.getInstance().getInt("color_hint_float_window_y"); + } + +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/views/MoGoLoadingView.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/views/MoGoLoadingView.java new file mode 100644 index 0000000000..1242f02cdb --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/views/MoGoLoadingView.java @@ -0,0 +1,65 @@ +package com.zhjt.mogo_core_function_devatools.rviz.ui.views; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.Gravity; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.ProgressBar; +import android.widget.TextView; + +import com.zhjt.mogo_core_function_devatools.rviz.R; + +/** + * 加载进度View + */ +public class MoGoLoadingView extends LinearLayout { + + private Context context; + private ProgressBar progressBar; + private ImageView placeholderMap; + private TextView textView; + + public MoGoLoadingView(Context context) { + this(context, null); + } + + public MoGoLoadingView(Context context, AttributeSet attrs) { + this(context, attrs, 0); + } + + public MoGoLoadingView(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + this.context = context; + setOrientation(LinearLayout.VERTICAL); + setGravity(Gravity.CENTER); + + // 创建ProgressBar + progressBar = new ProgressBar(context); + addView(progressBar); + + // 创建TextView + textView = new TextView(context); + textView.setTextSize(30f); + textView.setTextColor(getResources().getColor(R.color.white)); + LayoutParams params = new LayoutParams( + ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); + params.setMargins(0, 16, 0, 0); // 设置文字的上边距 + textView.setLayoutParams(params); + addView(textView); + } + + public void setText(String text) { + textView.setText(text); + } + + public void show(String text) { + setVisibility(VISIBLE); + textView.setText(text); + } + + public void hide() { + setVisibility(GONE); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/views/SensorStatusView.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/views/SensorStatusView.kt new file mode 100644 index 0000000000..9fd88beed9 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/views/SensorStatusView.kt @@ -0,0 +1,206 @@ +package com.zhjt.mogo_core_function_devatools.rviz.ui.views + +import android.content.Context +import android.content.res.ColorStateList +import android.graphics.Color +import android.graphics.drawable.Drawable +import android.graphics.drawable.StateListDrawable +import android.graphics.drawable.VectorDrawable +import android.text.TextUtils +import android.util.AttributeSet +import android.view.Gravity +import android.view.LayoutInflater +import android.widget.CheckBox +import android.widget.GridLayout +import android.widget.ImageView +import android.widget.TextView +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.content.ContextCompat +import com.zhjt.mogo_core_function_devatools.rviz.R +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.ModuleStatusEntity +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.SensorStatusEntity + + +/** + * 传感器状态View + */ +class SensorStatusView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : ConstraintLayout(context, attrs, defStyleAttr) { + private lateinit var tvModuleTitle: TextView + private lateinit var ivBg: ImageView + private lateinit var cl: ConstraintLayout + private lateinit var glSensorStatus: GridLayout + + init { + initView() + } + + private fun initView() { + LayoutInflater.from(context) + .inflate(R.layout.rviz_fmd_item_car_status_module_sensor_status, this, true) + tvModuleTitle = findViewById(R.id.tvModuleTitle); + ivBg = findViewById(R.id.ivBg); + cl = findViewById(R.id.cl); + glSensorStatus = findViewById(R.id.glSensorStatus); + // TODO 模拟数据 +// val sensorStatus = ArrayList() +// sensorStatus.add(SensorStatusEntity("102", true)) +// sensorStatus.add(SensorStatusEntity("103", true)) +// sensorStatus.add(SensorStatusEntity("104", false)) +// sensorStatus.add(SensorStatusEntity("105", true)) +// sensorStatus.add(SensorStatusEntity("106", true)) +// sensorStatus.add(SensorStatusEntity("107", true)) +// +// val carSensorStatusEntity = +// ModuleStatusEntity("域控主机", R.drawable.icon_camera, sensorStatus, false) +// +// updateSensors(carSensorStatusEntity) + + } + + + /** + * 更新模块状态 + */ + fun updateSensors(moduleStatusEntity: ModuleStatusEntity) { + setModuleTitle(moduleStatusEntity.title) + changeBg(moduleStatusEntity.sensorBg) + updateSensors(moduleStatusEntity.isLog, moduleStatusEntity.sensorList) + } + + /** + * 设置标题 + */ + private fun setModuleTitle(title: String) { + tvModuleTitle.text = title + } + + /** + * 修改背景图标 + */ + private fun changeBg(backgroundResource: Int) { + ivBg.setImageDrawable(resources.getDrawable(backgroundResource)) + } + + /** + * 修改是否正常状态 + */ + private fun changeStatus(isOk: Boolean) { + if (isOk) { + cl.setBackgroundResource(R.drawable.rviz_fmd_bg_item_normal) + ivBg.setColorFilter(Color.BLUE) + } else { + cl.setBackgroundResource(R.drawable.rviz_fmd_bg_item_error) + ivBg.setColorFilter(Color.RED) + } + } + + /** + * 更新内部的子传感器状态 + */ + private fun updateSensors(isLog: Boolean = false, sensorStatus: ArrayList) { + glSensorStatus.removeAllViews() + var moduleIsOk = true + sensorStatus.forEachIndexed { index, item -> + // 日志数据最多展示3条 + if (isLog && index > 3) { + return + } + // 网格最多展示6个数据 + if (!isLog && index > 6) { + return + } + // 只要有一个异常的信息就设置模块为异常 + if (!item.sensorIsOk) { + moduleIsOk = false + } + + // 在设置布局参数时指定layout_columnWeight + val layoutParams = GridLayout.LayoutParams() + + if (isLog) { + layoutParams.columnSpec = + GridLayout.spec(0, 1f) // 权重1f + } else { + layoutParams.columnSpec = + GridLayout.spec(GridLayout.UNDEFINED, 1f) // 权重1f + layoutParams.rowSpec = + GridLayout.spec(GridLayout.UNDEFINED, 1f) // 权重1f + } + + layoutParams.height = LayoutParams.WRAP_CONTENT + layoutParams.width = LayoutParams.WRAP_CONTENT + + val sensorItemView = CheckBox(context) + sensorItemView.isEnabled = false + sensorItemView.layoutParams = layoutParams + val buttonDrawable: Drawable? + val textColor: ColorStateList? + if (item.notOkColorRes == -1) { + buttonDrawable = + ContextCompat.getDrawable(context, R.drawable.rviz_fmd_selector_status_icon) + textColor = ContextCompat.getColorStateList(context, R.color.rviz_fmd_selector_txt_color) + } else { + val color = ContextCompat.getColor(context, item.notOkColorRes) + textColor = ColorStateList( + arrayOf( + intArrayOf(android.R.attr.state_checked), + intArrayOf() // 默认状态 + ), + intArrayOf( + ContextCompat.getColor(context, R.color.rvizFmdColorBlock), + color + ) + ) + + buttonDrawable = StateListDrawable() + val vectorDrawableSelected = + ContextCompat.getDrawable( + context, + R.drawable.rviz_fmd_icon_normal + ) as VectorDrawable + val vectorDrawableDefault = + ContextCompat.getDrawable(context, R.drawable.rviz_fmd_icon_error) as VectorDrawable + vectorDrawableDefault.setTint(color) + buttonDrawable.addState( + intArrayOf(android.R.attr.state_selected), + vectorDrawableSelected + ) + buttonDrawable.addState( + intArrayOf(android.R.attr.state_checked), + vectorDrawableSelected + ) + buttonDrawable.addState(intArrayOf(), vectorDrawableDefault) // 默认状态 + } + buttonDrawable?.let { + sensorItemView.buttonDrawable = it + } + textColor?.let { + sensorItemView.setTextColor(it) + } + sensorItemView.maxLines = 1 + sensorItemView.ellipsize = TextUtils.TruncateAt.END + sensorItemView.textSize = 24f + sensorItemView.setPadding( + 10, + 10, + 10, + 10 + ) + sensorItemView.compoundDrawablePadding = 5 + sensorItemView.gravity = Gravity.CENTER_VERTICAL + + // 更新数据 + sensorItemView.text = item.sensorName + sensorItemView.isChecked = item.sensorIsOk + + glSensorStatus.addView(sensorItemView) + } + + changeStatus(moduleIsOk) + } + +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/views/StateBarView.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/views/StateBarView.java new file mode 100644 index 0000000000..983afc9b45 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/ui/views/StateBarView.java @@ -0,0 +1,314 @@ +package com.zhjt.mogo_core_function_devatools.rviz.ui.views; + +import static kotlinx.coroutines.CoroutineScopeKt.MainScope; + +import android.content.Context; +import android.content.Intent; +import android.graphics.Color; +import android.net.ConnectivityManager; +import android.net.LinkProperties; +import android.net.Network; +import android.net.NetworkCapabilities; +import android.os.Build; +import android.text.Html; +import android.text.TextUtils; +import android.util.AttributeSet; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.LinearLayout; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleRegistry; + +import com.mogo.eagle.core.utilcode.util.NetworkUtils; +import com.zhjt.mogo.adas.data.AdasConstants; +import com.zhjt.mogo_core_function_devatools.rviz.R; +import com.zhjt.mogo_core_function_devatools.rviz.common.config.SSHAccountConfig; +import com.zhjt.mogo_core_function_devatools.rviz.common.coroutines.FlowBus; +import com.zhjt.mogo_core_function_devatools.rviz.common.utils.DetectHtml; +import com.zhjt.mogo_core_function_devatools.rviz.common.utils.NetworkUtilsExtend; +import com.zhjt.mogo_core_function_devatools.rviz.constant.AppConfigInfo; +import com.zhjt.mogo_core_function_devatools.rviz.constant.EventKey; +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.AdasConnectionStatus; +import com.zhjt.mogo_core_function_devatools.rviz.ssh.SSH; +import com.zhjt.mogo_core_function_devatools.rviz.ssh.function.call.CallerSshConnectionListenerManager; +import com.zhjt.mogo_core_function_devatools.rviz.ssh.function.listener.OnSshConnectionListener; +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.SSHHostBean; + +import java.net.Inet4Address; +import java.net.InetAddress; +import java.net.NetworkInterface; +import java.net.SocketException; +import java.util.Enumeration; + +import kotlinx.coroutines.CoroutineScope; +import kotlinx.coroutines.CoroutineScopeKt; +import mogo.telematics.pad.MessagePad; + +/** + * 连接以及状态展示 + */ +public class StateBarView extends LinearLayout implements LifecycleOwner, NetworkUtilsExtend.NetworkCallbackListener, OnSshConnectionListener { + private static final String TAG = StateBarView.class.getSimpleName(); + private final CoroutineScope scopeSubscriber = CoroutineScopeKt.CoroutineScope(MainScope().getCoroutineContext()); + private final LifecycleRegistry lifecycle = new LifecycleRegistry(this); + private TextView netNameView; + private TextView ipView; + private TextView vehicleNumberView; + private TextView adasStateView; + private TextView sshStateView; + + @NonNull + @Override + public Lifecycle getLifecycle() { + return lifecycle; + } + + @Override + public void onConnected(@Nullable Network network) { + setHintTextView(netNameView, getNetWorkType()); + setHintTextView(ipView, getIpAddressString()); + } + + @Override + public void onDisconnected() { + setHintTextView(netNameView, getNetWorkType()); + setHintTextView(ipView, getIpAddressString()); + } + + @Override + public void onLinkChanged(@Nullable Network network, @Nullable LinkProperties linkProperties) { + + } + + + public StateBarView(@NonNull Context context) { + super(context); + init(context); + } + + public StateBarView(@NonNull Context context, @Nullable AttributeSet attrs) { + super(context, attrs); + init(context); + } + + public StateBarView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + init(context); + } + + private void init(Context context) { + lifecycle.setCurrentState(Lifecycle.State.CREATED); + LayoutInflater.from(context).inflate(R.layout.rviz_fmd_view_state_bar, this, true); + setListener(); + initView(); + getNetWorkType(); + FlowBus.INSTANCE.with(EventKey.UPDATE_CAR_CONFIG_STATE).register(this, it -> { + setHintTextView(vehicleNumberView, it.getPlateNumber()); + }); + FlowBus.INSTANCE.with(EventKey.UPDATE_ADAS_CONNECT_STATE).register(this, it -> { + String msg = getResources().getString(R.string.rviz_fmd_disconnected); + AdasConstants.IpcConnectionStatus ipcConnectionStatus = it.getIpcConnectionStatus(); + String reason = it.getReason(); + if (ipcConnectionStatus == AdasConstants.IpcConnectionStatus.DISCONNECTED) { + msg = getResources().getString(R.string.rviz_fmd_disconnected); + } else if (ipcConnectionStatus == AdasConstants.IpcConnectionStatus.CONNECTED) { + msg = getResources().getString(R.string.rviz_fmd_connected); + } else if (ipcConnectionStatus == AdasConstants.IpcConnectionStatus.CONNECTING) { + msg = getResources().getString(R.string.rviz_fmd_connecting); + setHintTextView(netNameView, getNetWorkType()); + setHintTextView(ipView, getIpAddressString()); + } else if (ipcConnectionStatus == AdasConstants.IpcConnectionStatus.RECONNECTING_TIMER || + ipcConnectionStatus == AdasConstants.IpcConnectionStatus.RECONNECTING_NETWORK) { + msg = getResources().getString(R.string.rviz_fmd_reconnecting); + setHintTextView(netNameView, getNetWorkType()); + setHintTextView(ipView, getIpAddressString()); + } else if (ipcConnectionStatus == AdasConstants.IpcConnectionStatus.CONNECT_EXCEPTION) { + msg = getResources().getString(R.string.rviz_fmd_connect_exception); + } else if (ipcConnectionStatus == AdasConstants.IpcConnectionStatus.ILLEGAL_ADDRESS) { + msg = getResources().getString(R.string.rviz_fmd_illegal_address); + } else if (ipcConnectionStatus == AdasConstants.IpcConnectionStatus.SEARCH_ADDRESS) { + msg = getResources().getString(R.string.rviz_fmd_search_address); + } else if (ipcConnectionStatus == AdasConstants.IpcConnectionStatus.NOT_FOUND_ADDRESS) { + msg = getResources().getString(R.string.rviz_fmd_not_found_address); + } else if (ipcConnectionStatus == AdasConstants.IpcConnectionStatus.CERTIFICATION_FAILED) { + msg = getResources().getString(R.string.rviz_fmd_certification_failed); + } else if (ipcConnectionStatus == AdasConstants.IpcConnectionStatus.HEARTBEAT_TIMEOUT) { + msg = getResources().getString(R.string.rviz_fmd_heartbeat_timeout); + } else if (ipcConnectionStatus == AdasConstants.IpcConnectionStatus.PROTOCOL_MISMATCH) { + msg = getResources().getString(R.string.rviz_fmd_protocol_mismatch); + } else if (ipcConnectionStatus == AdasConstants.IpcConnectionStatus.SERVER_DISCONNECTED) { + msg = getResources().getString(R.string.rviz_fmd_server_disconnected); + } + setHintTextView(adasStateView, msg); + if (ipcConnectionStatus != AdasConstants.IpcConnectionStatus.CONNECTED) { + setHintTextView(vehicleNumberView, getResources().getString(R.string.rviz_fmd_disconnected)); + } + }); + + } + + + private void setListener() { + netNameView.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + Intent wifiSettingsIntent = new Intent("android.settings.WIFI_SETTINGS"); + getContext().startActivity(wifiSettingsIntent); + } + }); + } + + + //初始化 + private void initView() { + netNameView = findViewById(R.id.net_name_view); + ipView = findViewById(R.id.ip_view); + vehicleNumberView = findViewById(R.id.vehicle_number_view); + adasStateView = findViewById(R.id.adas_state_view); + sshStateView = findViewById(R.id.ssh_state_view); + setHintTextView(netNameView, getNetWorkType()); + setHintTextView(ipView, getIpAddressString()); + setHintTextView(vehicleNumberView, TextUtils.isEmpty(AppConfigInfo.INSTANCE.getPlateNumber()) ? getResources().getString(R.string.rviz_fmd_disconnected) : AppConfigInfo.INSTANCE.getPlateNumber()); + setHintTextView(adasStateView, getResources().getString(R.string.rviz_fmd_disconnected)); + setHintTextView(sshStateView, getResources().getString(R.string.rviz_fmd_disconnected)); + } + + /** + * 获取当前IP + * + * @return IP + */ + private String getIpAddressString() { + try { + for (Enumeration enNetI = NetworkInterface.getNetworkInterfaces(); enNetI.hasMoreElements(); ) { + NetworkInterface netI = enNetI.nextElement(); + for (Enumeration enumIpAddr = netI.getInetAddresses(); enumIpAddr.hasMoreElements(); ) { + InetAddress inetAddress = enumIpAddr.nextElement(); + if (inetAddress instanceof Inet4Address && !inetAddress.isLoopbackAddress()) { + return inetAddress.getHostAddress(); + } + } + } + } catch (SocketException e) { + e.printStackTrace(); + } + return getResources().getString(R.string.rviz_fmd_unknown); + } + + /** + * 获取网络状态 + * + * @return 网络类型 + */ + private String getNetWorkType() { + String networkType = getResources().getString(R.string.rviz_fmd_disconnected); + ConnectivityManager connectivityManager = (ConnectivityManager) getContext().getSystemService(Context.CONNECTIVITY_SERVICE); + if (connectivityManager != null) { + Network networks = connectivityManager.getActiveNetwork(); + NetworkCapabilities networkCapabilities = connectivityManager.getNetworkCapabilities(networks); + if (networkCapabilities != null) { + if (networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) { + String ssid = NetworkUtils.getSSID(); + if (!TextUtils.isEmpty(ssid) && !ssid.contains("unknown ssid")) { + networkType = ssid + getResources().getString(R.string.rviz_fmd_wifi); + } else { + networkType = "WiFi"; + } + } else if (networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) { + networkType = getResources().getString(R.string.rviz_fmd_mobile_network); + } else if (networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)) { + networkType = getResources().getString(R.string.rviz_fmd_ethernet); + } else { + networkType = getResources().getString(R.string.rviz_fmd_other_network); + } + } + } + return networkType; + } + + //设置6个提示信息View数据 + private void setHintTextView(TextView textView, String text) { + if (DetectHtml.isHtml(text)) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + textView.setText(Html.fromHtml(text, Html.FROM_HTML_MODE_COMPACT)); + } else { + textView.setText(Html.fromHtml(text)); + } + } else { + if (getResources().getString(R.string.rviz_fmd_disconnected).equals(text) || + getResources().getString(R.string.rviz_fmd_unknown).equals(text) || + getResources().getString(R.string.rviz_fmd_connect_exception).equals(text) || + getResources().getString(R.string.rviz_fmd_illegal_address).equals(text) || + getResources().getString(R.string.rviz_fmd_not_found_address).equals(text) || + getResources().getString(R.string.rviz_fmd_certification_failed).equals(text) || + getResources().getString(R.string.rviz_fmd_heartbeat_timeout).equals(text) || + getResources().getString(R.string.rviz_fmd_protocol_mismatch).equals(text) || + getResources().getString(R.string.rviz_fmd_server_disconnected).equals(text)) { + textView.setTextColor(getResources().getColor(R.color.rviz_fmd_status_error)); + } else if (getResources().getString(R.string.rviz_fmd_gain).equals(text) || + getResources().getString(R.string.rviz_fmd_connecting).equals(text) || + getResources().getString(R.string.rviz_fmd_reconnecting).equals(text) || + getResources().getString(R.string.rviz_fmd_search_address).equals(text)) { + textView.setTextColor(Color.YELLOW); + } else { + textView.setTextColor(getResources().getColor(R.color.rviz_fmd_status_normal)); + } + textView.setText(text); + } + } + + @Override + protected void onAttachedToWindow() { + super.onAttachedToWindow(); + lifecycle.setCurrentState(Lifecycle.State.STARTED); + NetworkUtilsExtend.Companion.addNetworkCallback(this); + CallerSshConnectionListenerManager.INSTANCE.addListener(TAG, this); + } + + @Override + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + lifecycle.setCurrentState(Lifecycle.State.DESTROYED); + NetworkUtilsExtend.Companion.removeNetworkCallback(this); + CallerSshConnectionListenerManager.INSTANCE.removeListener(TAG); + } + + public View getVehicleNumberView() { + return vehicleNumberView; + } + + @Override + public void onSshConnecting(@NonNull SSHHostBean host, int rosHostArgumentPosition, boolean isInserted) { + if (TextUtils.equals(host.getHostname(), SSHAccountConfig.INSTANCE.getRosMasterIp())) { + setHintTextView(sshStateView, "连接中"); + } + } + + @Override + public void onSshConnected(@NonNull SSH ssh) { + if (TextUtils.equals(ssh.host.getHostname(), SSHAccountConfig.INSTANCE.getRosMasterIp())) { + setHintTextView(sshStateView, getResources().getString(R.string.rviz_fmd_connected)); + } + } + + @Override + public void onSshDisconnected(@NonNull SSHHostBean host) { + if (TextUtils.equals(host.getHostname(), SSHAccountConfig.INSTANCE.getRosMasterIp())) { + setHintTextView(sshStateView, "已断开"); + } + } + + @Override + public void onSshConnectFailure(@NonNull SSHHostBean host, @NonNull String msg) { + if (TextUtils.equals(host.getHostname(), SSHAccountConfig.INSTANCE.getRosMasterIp())) { + setHintTextView(sshStateView, "连接失败"); + setHintTextView(netNameView, getNetWorkType()); + setHintTextView(ipView, getIpAddressString()); + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/utils/PinYinUtil.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/utils/PinYinUtil.java new file mode 100644 index 0000000000..264c1c28c8 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/utils/PinYinUtil.java @@ -0,0 +1,31 @@ +package com.zhjt.mogo_core_function_devatools.rviz.utils; + +import net.sourceforge.pinyin4j.PinyinHelper; + +/** + * @author: wangmingjun + * @date: 2021/11/26 + */ +public class PinYinUtil { + /** + * 得到中文字符串首字母 + * @param str 需要转化的中文字符串 + * @return 大写首字母缩写的字符串 + */ + public static String getPinYinHeadChar(String str) { + str = str.replaceAll("[\\p{P}‘’“”|+=¥$<>^~~]", ""); + StringBuilder convert = new StringBuilder(); + for (int j = 0; j < str.length(); j++) { + char word = str.charAt(j); + String[] pinyinArray = PinyinHelper.toHanyuPinyinStringArray(word); + if (pinyinArray != null) { + convert.append(pinyinArray[0].charAt(0)); + } else { + if (!"".equals(String.valueOf(word).trim())){ + convert.append(word); + } + } + } + return convert.toString().trim().toUpperCase(); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/CustomCheckBox.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/CustomCheckBox.java new file mode 100644 index 0000000000..99080d3268 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/CustomCheckBox.java @@ -0,0 +1,23 @@ +package com.zhjt.mogo_core_function_devatools.rviz.widgets; + + +import android.content.Context; +import android.util.AttributeSet; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatCheckBox; + +public class CustomCheckBox extends AppCompatCheckBox { + public CustomCheckBox(@NonNull Context context) { + super(context); + } + + public CustomCheckBox(@NonNull Context context, @Nullable AttributeSet attrs) { + super(context, attrs); + } + + public CustomCheckBox(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/FmdProgressBar.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/FmdProgressBar.java new file mode 100644 index 0000000000..2806d7599a --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/FmdProgressBar.java @@ -0,0 +1,158 @@ +package com.zhjt.mogo_core_function_devatools.rviz.widgets; + +import android.content.Context; +import android.content.res.TypedArray; +import android.util.AttributeSet; +import android.util.TypedValue; +import android.view.LayoutInflater; +import android.widget.ProgressBar; +import android.widget.TextView; + +import androidx.annotation.ColorInt; +import androidx.constraintlayout.widget.ConstraintLayout; + +import com.zhjt.mogo_core_function_devatools.rviz.R; + +import java.text.DecimalFormat; +import java.util.Locale; + +public class FmdProgressBar extends ConstraintLayout { + private boolean progressWarning = true; + private int progressWarningValue = 90; + private int progressMax; + private final DecimalFormat decimalFormat = new DecimalFormat("#.##"); // 保留两位小数 + private TextView totalText; + private TextView progressPercentText; + private ProgressBar progressBar; + + public FmdProgressBar(Context context) { + super(context); + } + + public FmdProgressBar(Context context, AttributeSet attrs) { + super(context, attrs); + init(context, attrs, -1, 0); + } + + public FmdProgressBar(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + init(context, attrs, defStyleAttr, 0); + } + + public FmdProgressBar(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + init(context, attrs, defStyleAttr, defStyleRes); + } + + private void init(Context context, AttributeSet attributeSet, int defStyleAttr, int defStyleRes) { + LayoutInflater.from(context).inflate(R.layout.rviz_fmd_view_progress_bar, this, true); + TypedArray a = context.obtainStyledAttributes(attributeSet, R.styleable.RvizFmdProgressBar, defStyleAttr, defStyleRes); + progressWarning = a.getBoolean(R.styleable.RvizFmdProgressBar_progress_warning, true); + progressWarningValue = a.getInt(R.styleable.RvizFmdProgressBar_progress_warning_value, 90); + progressMax = a.getInt(R.styleable.RvizFmdProgressBar_progress_max, 100); + int progressTextColor = a.getColor(R.styleable.RvizFmdProgressBar_progress_text_color, 0xFF000000); + float progressTextSize = a.getDimensionPixelSize(R.styleable.RvizFmdProgressBar_progress_text_size, -1); + a.recycle(); + totalText = findViewById(R.id.total_text); + progressPercentText = findViewById(R.id.progress_percent_text); + progressBar = findViewById(R.id.progressBar); + setProgressWarning(progressWarning); + setProgressMax(progressMax); + setTextColor(progressTextColor); + if (progressTextSize != -1) { + totalText.setTextSize(TypedValue.COMPLEX_UNIT_PX, progressTextSize); + progressPercentText.setTextSize(TypedValue.COMPLEX_UNIT_PX, progressTextSize); + } + } + + public void setProgressMax(int max) { + progressBar.setMax(max); + } + + /** + * 设置字体颜色 + * + * @param value 颜色值 + */ + public void setTextColor(@ColorInt int value) { + totalText.setTextColor(value); + progressPercentText.setTextColor(value); + } + + /** + * 设置字体大小 + * + * @param size sp + */ + public void setTextSize(float size) { + totalText.setTextSize(size); + progressPercentText.setTextSize(size); + } + + /** + * 是否启用预警 + * + * @param progressWarning 是否启用 + */ + public void setProgressWarning(boolean progressWarning) { + this.progressWarning = progressWarning; + progressBar.setSecondaryProgress(0); + } + + /** + * 预警值 progressWarning true 时生效 + * + * @param progressWarningValue 值 + */ + public void setProgressWarningValue(int progressWarningValue) { + this.progressWarningValue = progressWarningValue; + } + + /** + * 设置当前和总计提示 + * + * @param total 总计 + */ + public void setTotalText(CharSequence total) { + totalText.setText(total); + } + + public void setProgress(double progress) { + if (progress < 0.0) { + progress = 0.0; + progressPercentText.setText(""); + } else { + if (progress > progressMax) { + progress = progressMax; + } + String format = decimalFormat.format(progress); + progressPercentText.setText(String.format(Locale.getDefault(), "%s%%", format)); + } + progress((int) Math.round(progress)); + } + + public void setProgress(int progress) { + if (progress < 0) { + progress = 0; + progressPercentText.setText(""); + } else { + progressPercentText.setText(String.format(Locale.getDefault(), "%d%%", progress)); + } + progress(progress); + } + + private void progress(int progress) { + if (progressWarning) { + if (progress >= progressWarningValue) { + progressBar.setSecondaryProgress(progress); + } else { + if (progressBar.getSecondaryProgress() != 0) { + progressBar.setSecondaryProgress(0); + } + progressBar.setProgress(progress); + } + } else { + progressBar.setProgress(progress); + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/JustifiedTextView.kt b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/JustifiedTextView.kt new file mode 100644 index 0000000000..73dac213da --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/JustifiedTextView.kt @@ -0,0 +1,47 @@ +package com.zhjt.mogo_core_function_devatools.rviz.widgets + +import android.content.Context +import android.graphics.Canvas +import android.util.AttributeSet +import androidx.appcompat.widget.AppCompatTextView + +class JustifiedTextView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : AppCompatTextView(context, attrs, defStyleAttr) { + + override fun onDraw(canvas: Canvas) { + val text = text.toString() + if (text.isEmpty()) return + + val paint = paint + val totalWidth = width.toFloat() + val charWidth = paint.measureText(text) / text.length + + // 计算每个字符之间的间距 + val space = if (text.length > 1) { + (totalWidth - charWidth * text.length) / (text.length - 1) + } else { + 0f + } + + var x = 0f + + // 将文本居中对齐 + canvas.save() + canvas.translate( + (totalWidth - (charWidth * text.length + space * (text.length - 1))) / 2, + 0f + ) + + // 绘制每个字符,均匀分布并两端对齐 + for (i in text.indices) { + val char = text[i].toString() + canvas.drawText(char, x, baseline.toFloat(), paint) + x += charWidth + space + } + + canvas.restore() + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/MyLinearLayoutManager.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/MyLinearLayoutManager.java new file mode 100644 index 0000000000..320cf9640d --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/MyLinearLayoutManager.java @@ -0,0 +1,37 @@ +package com.zhjt.mogo_core_function_devatools.rviz.widgets; + +import android.content.Context; +import android.util.AttributeSet; + +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + + +public class MyLinearLayoutManager extends LinearLayoutManager { + public MyLinearLayoutManager(Context context) { + super(context); + } + + public MyLinearLayoutManager(Context context, int orientation, boolean reverseLayout) { + super(context, orientation, reverseLayout); + } + + public MyLinearLayoutManager(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { + super(context, attrs, defStyleAttr, defStyleRes); + } + + @Override + public boolean supportsPredictiveItemAnimations() { + return false; + } + + @Override + public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) { + //override this method and implement code as below + try { + super.onLayoutChildren(recycler, state); + } catch (Exception e) { + e.printStackTrace(); + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/ros/TelematicsSubscriberEventKey.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/ros/TelematicsSubscriberEventKey.java new file mode 100644 index 0000000000..345bcbdb86 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/ros/TelematicsSubscriberEventKey.java @@ -0,0 +1,280 @@ +package com.zhjt.mogo_core_function_devatools.rviz.widgets.ros; + +/** + * 通过LiveEventBus订阅的消息key + * + * @author mogoauto + */ +public interface TelematicsSubscriberEventKey { + + /** + * 感知物体 + */ + String Subscribe_Tracked_Objects = "Telematics_Tracked_Objects"; + + /** + * 工控机日志监控 + */ + String Subscribe_Mogo_Report_Message = "Telematics_Mogo_Report_Message"; + + /** + * 感知红绿灯 + */ + String Subscribe_Traffic_Lights = "Telematics_TrafficLights"; + + /** + * 车前引导线 + */ + String Subscribe_Trajectory = "Telematics_Trajectory"; + + /** + * 他车轨迹预测 + */ + String Subscribe_Prediction_Objects = "Telematics_PredictionObjects"; + + /** + * 过滤后的点云数据 + */ + String Subscribe_PointCloud = "Telematics_PointCloud"; + + /** + * planning障碍物 + */ + String Subscribe_Planning_Objects = "Telematics_PlanningObjects"; + + /** + * 数据采集结果 + */ + String Subscribe_Record_Panel = "Telematics_RecordPanel"; + + /** + * 报警信息 + * 暂时保留,目前没有使用 + */ + String Subscribe_Warn = "Telematics_Warn"; + + /** + * 到站提醒 自动驾驶站点 + */ + String Subscribe_Arrival_Notification = "Telematics_ArrivalNotification"; + + String Arrival_Notification = "Arrival_Notification"; + + /** + * 工控机数据错误 + */ + String Subscribe_Error = "Telematics_Error"; + + /** + * 车机基础信息应答 + */ + String Subscribe_CarConfig_Resp = "Telematics_CarConfigResp"; + + /** + * 自动驾驶状态 + */ + String Subscribe_Autopilot_State = "Telematics_AutopilotState"; + + /** + * 工控机健康状态查询应答 + */ + String Subscribe_System_Status_Info = "Telematics_SystemStatusInfo"; + + /** + * 自车定位信息 + */ + String Subscribe_Gnss_Info = "Telematics_GnssInfo"; + + /** + * 自车状态(底盘),车灯等。 + */ + String Subscribe_Vehicle_State = "Telematics_VehicleState"; + /** + * 自车状态(底盘),车灯等。 + */ + String Subscribe_ChassisStates_State = "Telematics_ChassisStates"; + + /** + * DebugInfo + */ + String Subscribe_DebugInfo = "Telematics_DebugInfo"; + + /** + * 自动驾驶路径应答 + */ + String Subscribe_Global_Path_Resp = "Telematics_GlobalPathResp"; + + /** + * planning决策状态, 透传 + */ + String Subscribe_Planning_Action_Msg = "Telematics_PlanningActionMsg"; + + /** + * 是否有能力启动自动驾驶 + */ + String Subscribe_Autopilot_Ability = "Telematics_AutopilotAbility"; + + /** + * 启动自动驾驶状态统计 + */ + String Subscribe_Autopilot_Statistics = "Telematics_AutopilotStatistics"; + + /** + * 数据采集配置应答 + */ + String Subscribe_Record_Data_Config = "Telematics_RecordDataConfig"; + + /** + * 启动自动驾驶调用结果数组 + * enterResult[0]===true-进入自动驾驶,false-未进入自动驾驶 + * enterResult[1]===具体原因 + */ + String Control_Enter_Autopilot_Result = "Telematics_ControlEnterAutopilotResult"; + + /** + * 退出自动驾驶调用结果数组 + * enterResult[0]===true-退出自动驾驶,false-未退出自动驾驶 + * enterResult[1]===具体原因 + */ + String Control_Out_Autopilot_Result = "Telematics_ControlOutAutopilotResult"; + + /** + * 向工控机发送红绿灯数据 + */ + String Control_Traffic_Light_Result = "Telematics_ControlTrafficLightResult"; + + /** + * 向工控机发送红绿灯数据 + */ + String Control_Trajectory_Download_Result = "Telematics_ControlTrajectoryDownloadResult"; + + /** + * 向工控机发送 录制开始Bag包请求 + */ + String Control_Start_Record_Package_Result = "Telematics_ControlStartRecordPackageResult"; + /** + * 向工控机发送 录制结束Bag包请求 + */ + String Control_Stop_Record_Package_Result = "Telematics_ControlStartRecordPackageResult"; + + /** + * 向工控机发送 向左变道 请求 + */ + String Control_Operator_Change_Lane_Left_Result = "Telematics_ControlOperatorChangeLaneLeftResult"; + + /** + * 向工控机发送 向右变道 请求 + */ + String Control_Operator_Change_Lane_Right_Result = "Telematics_ControlOperatorChangeLaneRightResult"; + + /** + * 向工控机发送 设置加速度 请求 + */ + String Control_Operator_Set_Accelerated_Speed_Result = "Telematics_ControlOperatorSetAcceleratedSpeedResult"; + + /** + * 向工控机发送 鸣笛 请求 + */ + String Control_Operator_Set_Horn_Result = "Telematics_ControlOperatorSetHornResult"; + + /** + * 向工控机发送 所有节点重启命令 请求 + */ + String Control_Ipc_Reboot_Result = "Telematics_ControlIpcRebootResult"; + + /** + * 向工控机发送 办公室调试使用,强制开启自动驾驶,将 status,pilotMode,control_pilotMode,强追设置为 1 请求 + */ + String Control_Auto_Pilot_Mode_Result = "Telematics_ControlAutoPilotModeResult"; + + /** + * 向工控机发送 发生行程相关 请求 + */ + String Set_Trip_Info_Result = "Telematics_SetTripInfoResult"; + + /** + * 向工控机发送 设置自动驾驶最大速度 请求 + */ + String Set_Speed_Limit_Result = "Telematics_SetSpeedLimitResult"; + + /** + * 向工控机发送 设置工控机演示模式(美化模式)开启、关闭 请求 + */ + String Set_Demo_Mode_Result = "Telematics_SetDemoModeResult"; + + /** + * 向工控机发送 雨天模式 开启、关闭 请求 + */ + String Set_Rain_Mode_Result = "Telematics_SetRainModeResult"; + + /** + * 向工控机发送 绕障类功能开关 开启、关闭 请求 + */ + String Set_Detouring_Mode_Result = "Telematics_SetDetouringModeResult"; + + /** + * 向工控机发送 主动查询工控机的各topic状态 请求 + */ + String Get_Ros_Topic_Status_Query_Result = "Telematics_GetRosTopicStatusQueryResult"; + + /** + * 向工控机发送 获取数据采集录制模式配置列表 请求 + */ + String Get_Bad_Case_Config_Result = "Telematics_GetBadCaseConfigResult"; + + /** + * 向工控机发送 请求工控机基础配置信息 请求 + */ + String Get_Car_Config_Result = "Telematics_GetCarConfigResult"; + + /** + * 向工控机发送 获取全局路径 请求 + */ + String Get_Global_Path_Result = "Telematics_GetGlobalPathResult"; + + /** + * 向工控机发送 获取协议版本 请求 + */ + String Get_Protocol_Version_Result = "Telematics_GetProtocolVersionResult"; + + /** + * 向工控机发送 获取工控机上报数据result 请求 + */ + String Get_Report_Result_Desc_Result = "Telematics_GetReportResultDescResult"; + + /** + * 向工控机发送 获取工控机上报数据action 请求 + */ + String Get_Report_Action_Desc_Result = "Telematics_GetReportActionDescResult"; + + + /** + * 相机标定检查视频30 1Hz + */ + String Camera_Calib_Check_Data30 = "Camera_Calib_Check_Data30"; + /** + * 相机标定检查视频60 1Hz + */ + String Camera_Calib_Check_Data60 = "Camera_Calib_Check_Data60"; + /** + * 相机标定检查视频120前 1Hz + */ + String Camera_Calib_Check_Data120Front = "Camera_Calib_Check_Data120Front"; + /** + * 相机标定检查视频120后 1Hz + */ + String Camera_Calib_Check_Data120Back = "Camera_Calib_Check_Data120Back"; + /** + * 相机标定检查视频120左 1Hz + */ + String Camera_Calib_Check_Data120Left = "Camera_Calib_Check_Data120Left"; + /** + * 相机标定检查视频120右 1Hz + */ + String Camera_Calib_Check_Data120Right = "Camera_Calib_Check_Data120Right"; + + /** + *电源盒协议接口 + */ + String Power_Supply_Unit = "Power_Supply_Unit"; +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/ros/TopicSubscriberEventKey.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/ros/TopicSubscriberEventKey.java new file mode 100644 index 0000000000..30cc410ae9 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/ros/TopicSubscriberEventKey.java @@ -0,0 +1,57 @@ +package com.zhjt.mogo_core_function_devatools.rviz.widgets.ros; + +/** + * 通过LiveEventBus订阅的消息key + */ +public interface TopicSubscriberEventKey { + // 红绿灯 + String HAD_MAP_TRAFFIC_LIGHTS_SUBSCRIBER = "HadMapTrafficLightsSubscriber"; + // 自车GPS/TRK位置数据 + String LOCALIZATION_GLOBAL_SUBSCRIBER = "LocalizationGlobalSubscriber"; + //RTK检测 /sensor/gnss/gps_fix + String GPS_FIX_SUBSCRIBER = "GpsFixSubscriber"; + // 自车底盘信息 + String LOCALIZATION_ODOMETRY_SUBSCRIBER = "LocalizationOdometrySubscriber"; + + // 图像识别 + String PERCEPTION_OBJECT_DETECTION_IMAGE_SUBSCRIBER = "PerceptionObjectDetectionImageSubscriber"; + // PB格式的点云数据 + String PERCEPTION_POINT_CLOUD_PB_SUBSCRIBER = "PerceptionPointCloudPbSubscriber"; + // 激光雷达+图像标定融合Image数据 + String SIG_IMAGE_SUBSCRIBER = "SignImageSubscriber"; + // H264 视频流 + String SIG_H264_IMAGE_SUBSCRIBER = "SIG_H264_IMAGE_SUBSCRIBER"; + // 规划控制画的车道线、引导线 + String PLANNING_CONTROL_SUBSCRIBER = "PlanningControlSubscriber"; + // ROS数据格式的点云数据 + String SENSOR_POINT_CLOUD2_SUBSCRIBER = "SensorPointCloud2Subscriber"; + // 全局地图 + String TELEMATICS_GLOBAL_DISPLAY_SUBSCRIBER = "TelematicsGlobalDisplaySubscriber"; + // 底盘状态信息 + String VEHICLE_STATE_SUBSCRIBER = "VehicleStateSubscriber"; + // 融合感知TXT数据 + String PERCEPTION_TEXT_SUBSCRIBER = "PerceptionTextSubscriber"; + // 融合感知框数据 + String PERCEPTION_BOX_SUBSCRIBER = "PerceptionBoxSubscriber"; + // 用户交互选中到命名空间 + String PERCEPTION_BOX_SUBSCRIBER_SHOW = "PERCEPTION_BOX_SUBSCRIBER_SHOW"; + // Marker的分类命名空间 + String PERCEPTION_BOX_NAME_SPACE_CHANGE = "PERCEPTION_BOX_NAME_SPACE_CHANGE"; + + + // 系统日志--错误日志&错误日志 + String REPORT_MSG_SUBSCRIBER = "REPORT_MSG_SUBSCRIBER"; + + + // 公用的取消注册监听,配合传入的String参数区分具体是谁 + String COMMON_UN_SUBSCRIBER = "COMMON_UN_SUBSCRIBER"; + + // Topic HZ + String TOPIC_HZ_SUBSCRIBER = "TOPIC_HZ_SUBSCRIBER"; + + // Node Health + String NODE_HEALTH_SUBSCRIBER = "NODE_HEALTH_SUBSCRIBER"; + + // System cmd + String SYSTEM_CMS_SUBSCRIBER = "SYSTEM_CMS_SUBSCRIBER"; +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/ros/host/OnRosHostClickListener.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/ros/host/OnRosHostClickListener.java new file mode 100644 index 0000000000..cfe1d09637 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/ros/host/OnRosHostClickListener.java @@ -0,0 +1,16 @@ +package com.zhjt.mogo_core_function_devatools.rviz.widgets.ros.host; + +import androidx.annotation.NonNull; + +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.RosHostArgument; +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.SSHHostBean; + +public interface OnRosHostClickListener { + void onDockerClick(@NonNull SSHHostBean hostBean); + + void onConfigClick(@NonNull SSHHostBean hostBean); + + void onDiskClick(@NonNull SSHHostBean hostBean); + + void onReconnect(@NonNull RosHostArgument argument); +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/ros/host/RosHostAdapter.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/ros/host/RosHostAdapter.java new file mode 100644 index 0000000000..87f0b8e417 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/ros/host/RosHostAdapter.java @@ -0,0 +1,222 @@ +package com.zhjt.mogo_core_function_devatools.rviz.widgets.ros.host; + +import android.graphics.Color; +import android.os.Build; +import android.text.Html; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.Button; +import android.widget.ProgressBar; +import android.widget.TextView; + +import com.mogo.eagle.core.utilcode.util.SpanUtils; +import com.zhjt.mogo_core_function_devatools.rviz.R; +import com.zhjt.mogo_core_function_devatools.rviz.common.base.BaseAdapter; +import com.zhjt.mogo_core_function_devatools.rviz.common.base.BaseViewHolder; +import com.zhjt.mogo_core_function_devatools.rviz.common.utils.DetectHtml; +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.RosHostArgument; +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.SSHHostBean; +import com.zhjt.mogo_core_function_devatools.rviz.widgets.FmdProgressBar; + +import java.util.Locale; + +import kotlin.Pair; + +public class RosHostAdapter extends BaseAdapter { + private String cloudMapVersion = "未知"; + private OnRosHostClickListener listener; + + public void setCloudMapVersion(String cloudMapVersion) { + this.cloudMapVersion = cloudMapVersion; + } + + public void notifyConnectFailure(SSHHostBean host) { + if (mDatas != null) { + RosHostArgument tem = new RosHostArgument(host); + int index = mDatas.indexOf(tem); + if (index > -1) { + notifyItemChanged(index); + } + } + } + + public void setOnItemClickListener(OnRosHostClickListener l) { + this.listener = l; + } + + @Override + protected View getItemViewResource(ViewGroup viewGroup) { + return LayoutInflater.from(mContext).inflate(R.layout.rviz_fmd_item_ros, viewGroup, false); + } + + @Override + protected MyViewHolder getViewHolder(View view) { + return new MyViewHolder(view, this); + } + + + @Override + protected void onBindDataToItem(MyViewHolder viewHolder, RosHostArgument data, int position) { + viewHolder.ipView.setText(data.host.getHostname()); + viewHolder.rosMasterView.setVisibility(data.isRosMaster() ? View.VISIBLE : View.GONE); + if (data.isConnectFailure) { + viewHolder.btnDocker.setVisibility(View.GONE); + viewHolder.btnConfig.setVisibility(View.GONE); + viewHolder.btnDisk.setVisibility(View.GONE); + viewHolder.layoutData.setVisibility(View.GONE); + viewHolder.loading.setVisibility(View.GONE); + viewHolder.viewFailure.setText(data.connectFailureReason); + viewHolder.viewFailure.setSelected(true); + viewHolder.layoutReconnect.setVisibility(View.VISIBLE); + } else { + viewHolder.layoutReconnect.setVisibility(View.GONE); + viewHolder.layoutData.setVisibility(View.VISIBLE); + String localMapVersion = data.getDockerVersion(); + viewHolder.localMapView.setText(localMapVersion); + viewHolder.cloudMapView.setText(cloudMapVersion); + if (TextUtils.isEmpty(cloudMapVersion) || TextUtils.equals(cloudMapVersion, "未知") || TextUtils.equals(cloudMapVersion, mContext.getString(R.string.rviz_fmd_cloud_map_version_unknown))) { + viewHolder.cloudMapView.setTextColor(mContext.getColor(R.color.rviz_fmd_status_error)); + if (TextUtils.isEmpty(localMapVersion) || TextUtils.equals(localMapVersion, "未知")) { + viewHolder.localMapView.setTextColor(mContext.getColor(R.color.rviz_fmd_status_error)); + } else { + viewHolder.localMapView.setTextColor(mContext.getColor(R.color.rviz_fmd_status_normal)); + } + } else { + viewHolder.localMapView.setTextColor(mContext.getColor(TextUtils.equals(localMapVersion, cloudMapVersion) ? R.color.rviz_fmd_status_normal : R.color.rviz_fmd_status_error)); + viewHolder.cloudMapView.setTextColor(mContext.getColor(R.color.rviz_fmd_status_normal)); + } + Pair p = data.getMemUsageRate(); + viewHolder.ramRateView.setProgress(p.getFirst()); + viewHolder.ramRateView.setTotalText(p.getSecond()); + p = data.getSwapUsageRate(); + viewHolder.swapRateView.setProgress(p.getFirst()); + viewHolder.swapRateView.setTotalText(p.getSecond()); + p = data.getDiskUsageRate(); + viewHolder.diskRateView.setProgress(p.getFirst()); + viewHolder.diskRateView.setTotalText(p.getSecond()); + viewHolder.cpuRateView.setProgress(data.getCpuUsageRate()); + viewHolder.cpuRateView.setTotalText(data.getCpuUsageRate() < 0.0 ? "未知" : ""); + String load = data.getLoad(); + if (DetectHtml.isHtml(load)) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + viewHolder.loadView.setText(Html.fromHtml(load, Html.FROM_HTML_MODE_COMPACT)); + } else { + viewHolder.loadView.setText(Html.fromHtml(load)); + } + } else { + viewHolder.loadView.setText(load); + } + String runningTime = data.getRunningTime(); + viewHolder.runningTimeView.setText(runningTime); + viewHolder.loading.setVisibility(!TextUtils.isEmpty(runningTime) && !"未知".equals(runningTime) ? View.GONE : View.VISIBLE); + viewHolder.btnDocker.setVisibility(View.VISIBLE); + viewHolder.btnConfig.setVisibility(View.VISIBLE); + viewHolder.btnDisk.setVisibility(View.VISIBLE); + viewHolder.layoutDiskRate.setVisibility(View.VISIBLE); + } + } + + + //返回Item的数量 + @Override + public int getItemCount() { + return mDatas == null ? 0 : mDatas.size(); + } + + //继承RecyclerView.ViewHolder抽象类的自定义ViewHolder + class MyViewHolder extends BaseViewHolder { + ProgressBar loading; + Button btnDocker; + Button btnConfig; + Button btnDisk; + Button btnReconnect; + TextView ipView; + TextView rosMasterView; + View layoutData; + TextView viewFailure; + View layoutReconnect; + View layoutDiskRate; + TextView runningTimeView; + TextView localMapView; + TextView cloudMapView; + FmdProgressBar ramRateView; + FmdProgressBar swapRateView; + FmdProgressBar diskRateView; + FmdProgressBar cpuRateView; + TextView loadView; + + + public MyViewHolder(View view, RosHostAdapter adapter) { + super(view, adapter); + loading = view.findViewById(R.id.loading); + btnDocker = view.findViewById(R.id.btn_docker); + btnConfig = view.findViewById(R.id.btn_config); + btnDisk = view.findViewById(R.id.btn_disk); + ipView = view.findViewById(R.id.ip_view); + btnReconnect = view.findViewById(R.id.btn_reconnect); + rosMasterView = view.findViewById(R.id.ros_master_view); + layoutData = view.findViewById(R.id.layout_data); + viewFailure = view.findViewById(R.id.view_failure); + layoutReconnect = view.findViewById(R.id.layout_reconnect); + layoutDiskRate = view.findViewById(R.id.layout_disk_rate); + runningTimeView = view.findViewById(R.id.running_time_view); + localMapView = view.findViewById(R.id.local_map_view); + cloudMapView = view.findViewById(R.id.cloud_map_view); + ramRateView = view.findViewById(R.id.ram_rate_view); + swapRateView = view.findViewById(R.id.swap_rate_view); + diskRateView = view.findViewById(R.id.disk_rate_view); + cpuRateView = view.findViewById(R.id.cpu_rate_view); + loadView = view.findViewById(R.id.load_view); + + loading.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + } + }); + btnDocker.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (listener != null) { + RosHostArgument bean = mDatas.get(getBindingAdapterPosition()); + listener.onDockerClick(bean.host); + } + } + }); + btnConfig.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (listener != null) { + RosHostArgument bean = mDatas.get(getBindingAdapterPosition()); + listener.onConfigClick(bean.host); + } + + + } + }); + btnDisk.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (listener != null) { + RosHostArgument bean = mDatas.get(getBindingAdapterPosition()); + listener.onDiskClick(bean.host); + } + } + }); + btnReconnect.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + int pos = getBindingAdapterPosition(); + if (mDatas != null && mDatas.size() > pos) { + RosHostArgument rosHostArgument = mDatas.get(pos); + if (listener != null) { + listener.onReconnect(rosHostArgument); + } + } + } + }); + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/ros/host/RosHostView.java b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/ros/host/RosHostView.java new file mode 100644 index 0000000000..6960383bac --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/java/com/zhjt/mogo_core_function_devatools/rviz/widgets/ros/host/RosHostView.java @@ -0,0 +1,254 @@ +package com.zhjt.mogo_core_function_devatools.rviz.widgets.ros.host; + +import android.content.Context; +import android.graphics.Rect; +import android.util.AttributeSet; +import android.view.LayoutInflater; +import android.view.View; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.lifecycle.Lifecycle; +import androidx.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleRegistry; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.SimpleItemAnimator; + +import com.zhjt.mogo_core_function_devatools.rviz.R; +import com.zhjt.mogo_core_function_devatools.rviz.common.coroutines.FlowBus; +import com.zhjt.mogo_core_function_devatools.rviz.constant.EventKey; +import com.zhjt.mogo_core_function_devatools.rviz.model.entities.RosHostArgument; +import com.zhjt.mogo_core_function_devatools.rviz.ssh.SSH; +import com.zhjt.mogo_core_function_devatools.rviz.ssh.function.call.CallerSshConnectionListenerManager; +import com.zhjt.mogo_core_function_devatools.rviz.ssh.function.listener.OnSshConnectionListener; +import com.zhjt.mogo_core_function_devatools.rviz.ssh.module.SSHHostBean; + +import java.util.List; + + +/** + * ROS主机展示View + */ +public class RosHostView extends ConstraintLayout implements LifecycleOwner, OnRosHostClickListener, OnSshConnectionListener { + private static final String TAG = RosHostView.class.getSimpleName(); + + private RosHostAdapter rosHostAdapter; + private OnRosHostClickListener onRosHostClickListener; + private final LifecycleRegistry lifecycle = new LifecycleRegistry(this); + private OnRosHostViewListener onRosHostViewListener; + private RecyclerView rosHosts; + private View hintDisconnected; + + public interface OnRosHostViewListener { + void onUpdateNotify(); + } + + public RosHostView(@NonNull Context context) { + super(context); + init(context); + } + + public RosHostView(@NonNull Context context, @Nullable AttributeSet attrs) { + super(context, attrs); + init(context); + } + + public RosHostView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + init(context); + } + + private void init(Context context) { + lifecycle.setCurrentState(Lifecycle.State.CREATED); + LayoutInflater.from(context).inflate(R.layout.rviz_fmd_view_ros_host, this, true); + rosHosts = findViewById(R.id.ros_hosts); + hintDisconnected = findViewById(R.id.hint_disconnected); + // 取消动画 + RecyclerView.ItemAnimator animator = rosHosts.getItemAnimator(); + if (animator instanceof SimpleItemAnimator) { + ((SimpleItemAnimator) animator).setSupportsChangeAnimations(false); + } + GridLayoutManager linearLayoutManager = new GridLayoutManager(context, 2); + linearLayoutManager.setOrientation(GridLayoutManager.VERTICAL); + rosHosts.setLayoutManager(linearLayoutManager); + rosHostAdapter = new RosHostAdapter(); + rosHostAdapter.setOnItemClickListener(this); + rosHosts.setAdapter(rosHostAdapter); + // 设置项目之间的间距 + rosHosts.addItemDecoration(new SpacesItemDecoration(getResources().getDimension(R.dimen.dp_8))); + + FlowBus.INSTANCE.with(EventKey.QUERY_ROS_HOST_STATUS).register(this, this::notifyItemChanged); + FlowBus.INSTANCE.with(EventKey.REMOVE_ROS_HOST_ITEM).register(this, it -> { + rosHostAdapter.notifyItemRemoved(it); + } + ); + FlowBus.INSTANCE.with(EventKey.UPDATE_SYSTEM_RESOURCE_RED_DOT).register(this, it -> { + if (onRosHostViewListener != null) { + onRosHostViewListener.onUpdateNotify(); + } + }); + FlowBus.INSTANCE.with(EventKey.SEND_CLOUD_MAP_VERSION).register(this, it -> { + rosHostAdapter.setCloudMapVersion(it); + notifyDataSetChanged(); + }); + } + + public void addListener(OnRosHostViewListener onRosHostViewListener) { + this.onRosHostViewListener = onRosHostViewListener; + } + + public void removeListener() { + this.onRosHostViewListener = null; + } + + public void setOnRosHostClickListener(OnRosHostClickListener onRosHostClickListener) { + this.onRosHostClickListener = onRosHostClickListener; + } + + public void setDatas(List datas, String cloudMapVersion) { + rosHostAdapter.setCloudMapVersion(cloudMapVersion); + rosHostAdapter.setData(datas); + notifyDataSetChanged(); + if (onRosHostViewListener != null) { + onRosHostViewListener.onUpdateNotify(); + } + } + + public void notifyItemInserted(int position) { + rosHostAdapter.notifyItemInserted(position); + if (hintDisconnected.getVisibility() == View.VISIBLE) { + hintDisconnected.setVisibility(GONE); + } + if (onRosHostViewListener != null) { + onRosHostViewListener.onUpdateNotify(); + } + } + + public void notifyItemChanged(int position) { + rosHostAdapter.notifyItemChanged(position); + } + + + public void notifyDataSetChanged() { + rosHostAdapter.notifyDataSetChanged(); + if (rosHostAdapter.getItemCount() == 0) { + if (hintDisconnected.getVisibility() == View.GONE) { + hintDisconnected.setVisibility(VISIBLE); + } + } else { + if (hintDisconnected.getVisibility() == View.VISIBLE) { + hintDisconnected.setVisibility(GONE); + } + } + if (onRosHostViewListener != null) { + onRosHostViewListener.onUpdateNotify(); + } + } + + @Override + protected void onAttachedToWindow() { + super.onAttachedToWindow(); + lifecycle.setCurrentState(Lifecycle.State.STARTED); + CallerSshConnectionListenerManager.INSTANCE.addListener(TAG, this); + } + + @Override + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + lifecycle.setCurrentState(Lifecycle.State.DESTROYED); + CallerSshConnectionListenerManager.INSTANCE.removeListener(TAG); + } + + @NonNull + @Override + public Lifecycle getLifecycle() { + return lifecycle; + } + + @Override + public void onDockerClick(@NonNull SSHHostBean hostBean) { + if (onRosHostClickListener != null) { + onRosHostClickListener.onDockerClick(hostBean); + } + } + + @Override + public void onConfigClick(@NonNull SSHHostBean hostBean) { + if (onRosHostClickListener != null) { + onRosHostClickListener.onConfigClick(hostBean); + } + } + + @Override + public void onDiskClick(@NonNull SSHHostBean hostBean) { + if (onRosHostClickListener != null) { + onRosHostClickListener.onDiskClick(hostBean); + } + } + + @Override + public void onReconnect(@NonNull RosHostArgument argument) { + if (onRosHostClickListener != null) { + onRosHostClickListener.onReconnect(argument); + } + } + + @Override + public void onSshConnecting(@NonNull SSHHostBean host, int rosHostArgumentPosition, boolean isInserted) { + if (isInserted) { + notifyItemInserted(rosHostArgumentPosition); + } else { + notifyItemChanged(rosHostArgumentPosition); + } + } + + @Override + public void onSshConnected(@NonNull SSH ssh) { + if (onRosHostViewListener != null) { + onRosHostViewListener.onUpdateNotify(); + } + } + + @Override + public void onSshDisconnected(@NonNull SSHHostBean host) { + + } + + @Override + public void onSshConnectFailure(@NonNull SSHHostBean host, @NonNull String msg) { + rosHostAdapter.notifyConnectFailure(host); + if (onRosHostViewListener != null) { + onRosHostViewListener.onUpdateNotify(); + } + } + + + private static class SpacesItemDecoration extends RecyclerView.ItemDecoration { + private final float spacing; + private final float spacingHalf; + + public SpacesItemDecoration(float spacing) { + this.spacing = spacing; + this.spacingHalf = spacing / 2; + } + + @Override + public void getItemOffsets(Rect outRect, @NonNull View view, RecyclerView parent, @NonNull RecyclerView.State state) { + int pos = parent.getChildAdapterPosition(view); + if (pos % 2 == 0) { + outRect.left = (int) spacing; + outRect.right = (int) spacingHalf; + } else { + outRect.left = (int) spacingHalf; + outRect.right = (int) spacing; + } + outRect.bottom = (int) spacing; + // Add top spacing only for the first row to avoid double spacing between items + if (parent.getChildAdapterPosition(view) < 2) { + outRect.top = (int) spacing; + } + } + } +} diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/color/rviz_fmd_selector_default_config_input_text_color.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/color/rviz_fmd_selector_default_config_input_text_color.xml new file mode 100644 index 0000000000..a93c386e9d --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/color/rviz_fmd_selector_default_config_input_text_color.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/color/rviz_fmd_selector_txt_color.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/color/rviz_fmd_selector_txt_color.xml new file mode 100644 index 0000000000..fb7f596822 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/color/rviz_fmd_selector_txt_color.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_camera.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_camera.png new file mode 100644 index 0000000000..66526b732f Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_camera.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_car_chassis.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_car_chassis.png new file mode 100644 index 0000000000..f3d273243f Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_car_chassis.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_hd_map_version.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_hd_map_version.png new file mode 100644 index 0000000000..45d5320030 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_hd_map_version.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_ipc.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_ipc.png new file mode 100644 index 0000000000..86edb805ed Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_ipc.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_ipc_error.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_ipc_error.png new file mode 100644 index 0000000000..10edcc69ed Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_ipc_error.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_laser_radar.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_laser_radar.png new file mode 100644 index 0000000000..47b710e027 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_laser_radar.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_launcher_eagle.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_launcher_eagle.png new file mode 100644 index 0000000000..93b57caa19 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_launcher_eagle.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_map_verson.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_map_verson.png new file mode 100644 index 0000000000..2fccdd9a59 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_map_verson.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_millimeter_wave_radar.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_millimeter_wave_radar.png new file mode 100644 index 0000000000..9800ea3a75 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_millimeter_wave_radar.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_rtk.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_rtk.png new file mode 100644 index 0000000000..faca03cfa5 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_icon_rtk.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_tab_car_status_select.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_tab_car_status_select.png new file mode 100644 index 0000000000..ff8d10bf00 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_tab_car_status_select.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_tab_car_status_unselect.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_tab_car_status_unselect.png new file mode 100644 index 0000000000..9468e56e5c Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_tab_car_status_unselect.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_tab_fault_code_select.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_tab_fault_code_select.png new file mode 100644 index 0000000000..26724b3c7a Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_tab_fault_code_select.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_tab_fault_code_unselect.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_tab_fault_code_unselect.png new file mode 100644 index 0000000000..3c5204db43 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_tab_fault_code_unselect.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_tab_system_resource_select.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_tab_system_resource_select.png new file mode 100644 index 0000000000..be24544d10 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_tab_system_resource_select.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_tab_system_resource_unselect.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_tab_system_resource_unselect.png new file mode 100644 index 0000000000..77eacff63f Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-hdpi/rviz_fmd_tab_system_resource_unselect.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_camera.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_camera.png new file mode 100644 index 0000000000..29feb457f0 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_camera.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_car_chassis.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_car_chassis.png new file mode 100644 index 0000000000..775a7ebc51 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_car_chassis.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_hd_map_version.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_hd_map_version.png new file mode 100644 index 0000000000..d134bf21bd Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_hd_map_version.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_ipc.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_ipc.png new file mode 100644 index 0000000000..759b4a5903 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_ipc.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_ipc_error.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_ipc_error.png new file mode 100644 index 0000000000..774bd4c366 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_ipc_error.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_laser_radar.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_laser_radar.png new file mode 100644 index 0000000000..db092e0cba Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_laser_radar.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_launcher_eagle.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_launcher_eagle.png new file mode 100644 index 0000000000..5042b598e2 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_launcher_eagle.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_map_verson.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_map_verson.png new file mode 100644 index 0000000000..d7382e79f3 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_map_verson.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_rtk.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_rtk.png new file mode 100644 index 0000000000..009c577dda Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_icon_rtk.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_tab_car_status_select.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_tab_car_status_select.png new file mode 100644 index 0000000000..2d6abb894f Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_tab_car_status_select.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_tab_car_status_unselect.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_tab_car_status_unselect.png new file mode 100644 index 0000000000..2465292ff7 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_tab_car_status_unselect.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_tab_fault_code_select.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_tab_fault_code_select.png new file mode 100644 index 0000000000..57aa3881df Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_tab_fault_code_select.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_tab_fault_code_unselect.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_tab_fault_code_unselect.png new file mode 100644 index 0000000000..3ddc2367b6 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_tab_fault_code_unselect.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_tab_system_resource_select.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_tab_system_resource_select.png new file mode 100644 index 0000000000..4ee1bc10dd Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_tab_system_resource_select.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_tab_system_resource_unselect.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_tab_system_resource_unselect.png new file mode 100644 index 0000000000..1e38a0d0e1 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-mdpi/rviz_fmd_tab_system_resource_unselect.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/icon_line_delect.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/icon_line_delect.png new file mode 100644 index 0000000000..7b11122e9a Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/icon_line_delect.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/icon_line_search.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/icon_line_search.png new file mode 100644 index 0000000000..b84d692946 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/icon_line_search.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/icon_speed_add.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/icon_speed_add.png new file mode 100644 index 0000000000..bbd0601d27 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/icon_speed_add.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/icon_speed_reduce.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/icon_speed_reduce.png new file mode 100644 index 0000000000..905094d461 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/icon_speed_reduce.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_camera.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_camera.png new file mode 100644 index 0000000000..7e240c20c3 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_camera.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_car_chassis.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_car_chassis.png new file mode 100644 index 0000000000..bdb3e532bc Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_car_chassis.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_hd_map_version.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_hd_map_version.png new file mode 100644 index 0000000000..84bb008ed3 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_hd_map_version.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_ipc.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_ipc.png new file mode 100644 index 0000000000..94ff47a241 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_ipc.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_ipc_error.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_ipc_error.png new file mode 100644 index 0000000000..28564a71e7 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_ipc_error.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_laser_radar.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_laser_radar.png new file mode 100644 index 0000000000..96e954f0ca Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_laser_radar.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_launcher_eagle.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_launcher_eagle.png new file mode 100644 index 0000000000..3c721ff54d Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_launcher_eagle.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_map_verson.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_map_verson.png new file mode 100644 index 0000000000..13ddcfd861 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_map_verson.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_millimeter_wave_radar.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_millimeter_wave_radar.png new file mode 100644 index 0000000000..9800ea3a75 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_millimeter_wave_radar.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_rtk.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_rtk.png new file mode 100644 index 0000000000..73e2d68f6c Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_icon_rtk.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_tab_car_status_select.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_tab_car_status_select.png new file mode 100644 index 0000000000..9f1d7cc673 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_tab_car_status_select.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_tab_car_status_unselect.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_tab_car_status_unselect.png new file mode 100644 index 0000000000..898061483b Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_tab_car_status_unselect.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_tab_fault_code_select.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_tab_fault_code_select.png new file mode 100644 index 0000000000..9518cd9c16 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_tab_fault_code_select.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_tab_fault_code_unselect.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_tab_fault_code_unselect.png new file mode 100644 index 0000000000..4b9c709371 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_tab_fault_code_unselect.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_tab_system_resource_select.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_tab_system_resource_select.png new file mode 100644 index 0000000000..e3a1b87977 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_tab_system_resource_select.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_tab_system_resource_unselect.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_tab_system_resource_unselect.png new file mode 100644 index 0000000000..653c0d6bd0 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable-xhdpi/rviz_fmd_tab_system_resource_unselect.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_bg_dialog.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_bg_dialog.xml new file mode 100644 index 0000000000..4b6567500e --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_bg_dialog.xml @@ -0,0 +1,14 @@ + + + + + + + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_bg_dockers_item_header.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_bg_dockers_item_header.xml new file mode 100644 index 0000000000..ec00f699c2 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_bg_dockers_item_header.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_bg_fmd_dialog_btn.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_bg_fmd_dialog_btn.xml new file mode 100644 index 0000000000..047e3d7c34 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_bg_fmd_dialog_btn.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_dialog_default_config_input_bg.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_dialog_default_config_input_bg.xml new file mode 100644 index 0000000000..ff8d91d972 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_dialog_default_config_input_bg.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_select_dialog_default_config_button_bg.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_select_dialog_default_config_button_bg.xml new file mode 100644 index 0000000000..12128f7194 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_common_select_dialog_default_config_button_bg.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_close_flow_button.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_close_flow_button.xml new file mode 100644 index 0000000000..26d94e0fc1 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_close_flow_button.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_color_hint_button.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_color_hint_button.xml new file mode 100644 index 0000000000..c2db7690a7 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_color_hint_button.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_dialog_btn.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_dialog_btn.xml new file mode 100644 index 0000000000..047e3d7c34 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_dialog_btn.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_dialog_fault_code_details.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_dialog_fault_code_details.xml new file mode 100644 index 0000000000..f27a006bcb --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_dialog_fault_code_details.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_dialog_fault_code_details_item.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_dialog_fault_code_details_item.xml new file mode 100644 index 0000000000..dade08cddc --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_dialog_fault_code_details_item.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_fm_btn.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_fm_btn.xml new file mode 100644 index 0000000000..2393d37b14 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_fm_btn.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_fm_data_show_data.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_fm_data_show_data.xml new file mode 100644 index 0000000000..2107d3431c --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_fm_data_show_data.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_fmd_dialog_btn.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_fmd_dialog_btn.xml new file mode 100644 index 0000000000..047e3d7c34 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_fmd_dialog_btn.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_btn.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_btn.xml new file mode 100644 index 0000000000..8d2c1102a0 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_btn.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_btn_reconnect.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_btn_reconnect.xml new file mode 100644 index 0000000000..9dc087210a --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_btn_reconnect.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_dockers_even.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_dockers_even.xml new file mode 100644 index 0000000000..18795fd45e --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_dockers_even.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_dockers_odd.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_dockers_odd.xml new file mode 100644 index 0000000000..ff1b015478 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_dockers_odd.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_error.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_error.xml new file mode 100644 index 0000000000..8a9f05a659 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_error.xml @@ -0,0 +1,10 @@ + + + + + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_host.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_host.xml new file mode 100644 index 0000000000..b779b75e0e --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_host.xml @@ -0,0 +1,14 @@ + + + + + + + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_host_loading.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_host_loading.xml new file mode 100644 index 0000000000..fdcaba4d9c --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_host_loading.xml @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_normal.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_normal.xml new file mode 100644 index 0000000000..1f4b041b53 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_item_normal.xml @@ -0,0 +1,10 @@ + + + + + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_ros_host_view.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_ros_host_view.xml new file mode 100644 index 0000000000..b779b75e0e --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_ros_host_view.xml @@ -0,0 +1,14 @@ + + + + + + + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_show_config_value.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_show_config_value.xml new file mode 100644 index 0000000000..36e34d5f7f --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_bg_show_config_value.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_dialog_default_config_input_bg.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_dialog_default_config_input_bg.xml new file mode 100644 index 0000000000..c78e36ee32 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_dialog_default_config_input_bg.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_connect_failed.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_connect_failed.png new file mode 100644 index 0000000000..8a466d9c8b Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_connect_failed.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_disconnected.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_disconnected.png new file mode 100644 index 0000000000..6830869281 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_disconnected.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_fault_code_normal.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_fault_code_normal.xml new file mode 100644 index 0000000000..d11e08576b --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_fault_code_normal.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_fault_code_unknown.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_fault_code_unknown.xml new file mode 100644 index 0000000000..06e70a1959 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_fault_code_unknown.xml @@ -0,0 +1,9 @@ + + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_group_indicator_expanded.9.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_group_indicator_expanded.9.png new file mode 100644 index 0000000000..a00dd55e02 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_group_indicator_expanded.9.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_group_indicator_unexpanded.9.png b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_group_indicator_unexpanded.9.png new file mode 100644 index 0000000000..b78a6ee9f9 Binary files /dev/null and b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_ic_group_indicator_unexpanded.9.png differ diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_icon_error.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_icon_error.xml new file mode 100644 index 0000000000..0b10666637 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_icon_error.xml @@ -0,0 +1,12 @@ + + + + + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_icon_normal.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_icon_normal.xml new file mode 100644 index 0000000000..75a3587f4c --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_icon_normal.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_progress_bar.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_progress_bar.xml new file mode 100644 index 0000000000..5f90911094 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_progress_bar.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_selector_fault_code.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_selector_fault_code.xml new file mode 100644 index 0000000000..44dc12559a --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_selector_fault_code.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_selector_group_indicator.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_selector_group_indicator.xml new file mode 100644 index 0000000000..8e59dbfb35 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_selector_group_indicator.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_selector_item_bg.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_selector_item_bg.xml new file mode 100644 index 0000000000..c9bfd36c09 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_selector_item_bg.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_selector_status_icon.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_selector_status_icon.xml new file mode 100644 index 0000000000..c39d48ab99 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_selector_status_icon.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_selector_text_color.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_selector_text_color.xml new file mode 100644 index 0000000000..0b4868e915 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rviz_fmd_selector_text_color.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rvzi_fmd_bg_color_hint_float.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rvzi_fmd_bg_color_hint_float.xml new file mode 100644 index 0000000000..4abb80c031 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/drawable/rvzi_fmd_bg_color_hint_float.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/dialog_select_autopilot_line.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/dialog_select_autopilot_line.xml new file mode 100644 index 0000000000..fef58e1458 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/dialog_select_autopilot_line.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/item_autopilot_line.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/item_autopilot_line.xml new file mode 100644 index 0000000000..5ddb6a64a7 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/item_autopilot_line.xml @@ -0,0 +1,11 @@ + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/item_console.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/item_console.xml new file mode 100644 index 0000000000..a92461ce8c --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/item_console.xml @@ -0,0 +1,26 @@ + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/layout_autopilot_check.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/layout_autopilot_check.xml new file mode 100644 index 0000000000..04293193ab --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/layout_autopilot_check.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/layout_tab_bottom.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/layout_tab_bottom.xml new file mode 100644 index 0000000000..229e640c96 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/layout_tab_bottom.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/layout_tab_left.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/layout_tab_left.xml new file mode 100644 index 0000000000..dd9c729c2f --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/layout_tab_left.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/layout_tab_right.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/layout_tab_right.xml new file mode 100644 index 0000000000..0d65d851c1 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/layout_tab_right.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/layout_tab_top.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/layout_tab_top.xml new file mode 100644 index 0000000000..68478b6858 --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/layout_tab_top.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/rviz_common_dialog_default_config.xml b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/rviz_common_dialog_default_config.xml new file mode 100644 index 0000000000..d33b18afeb --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools-rviz/src/main/res/layout/rviz_common_dialog_default_config.xml @@ -0,0 +1,198 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +