[6.6.0] update socket version and remove unuse code , plus add trace
This commit is contained in:
EmArrow
@@ -10,6 +10,9 @@ import androidx.fragment.app.Fragment
|
||||
import androidx.fragment.app.FragmentActivity
|
||||
import androidx.fragment.app.FragmentManager
|
||||
import com.alibaba.android.arouter.launcher.ARouter
|
||||
import com.mogo.commons.debug.DebugConfig
|
||||
import com.mogo.commons.env.ProjectUtils
|
||||
import com.mogo.commons.utils.MogoAnalyticUtils
|
||||
import com.mogo.eagle.core.data.config.FunctionBuildConfig
|
||||
import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider
|
||||
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
|
||||
@@ -19,22 +22,21 @@ import com.mogo.eagle.core.function.hmi.ui.widget.StatusBarView
|
||||
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.CallerLogger.d
|
||||
import com.mogo.eagle.core.utilcode.util.AppUtils
|
||||
import com.mogo.eagle.core.utilcode.util.DeviceUtils
|
||||
import com.mogo.eagle.core.utilcode.util.TimeUtils
|
||||
import com.mogo.eagle.core.utilcode.util.UiThreadHandler
|
||||
import com.mogo.eagle.core.utilcode.util.VolumeUtils
|
||||
import com.mogo.och.common.module.constant.OchCommonConst
|
||||
import com.mogo.och.common.module.biz.login.BusinessEnum
|
||||
import com.mogo.och.common.module.biz.login.ILoginCallback
|
||||
import com.mogo.och.common.module.biz.login.LoginStatusManager
|
||||
import com.mogo.och.common.module.biz.login.LoginStatusEnum
|
||||
import com.mogo.och.common.module.biz.login.LoginStatusManager
|
||||
import com.mogo.och.common.module.biz.provider.CommonService
|
||||
import com.mogo.och.common.module.constant.OchCommonConst
|
||||
import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
|
||||
import com.mogo.commons.env.ProjectUtils
|
||||
|
||||
/**
|
||||
* 网约车小巴业务实现入口
|
||||
*
|
||||
* @author tongchenfei
|
||||
*/
|
||||
abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
|
||||
private var containerId = 0
|
||||
@@ -79,38 +81,45 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
|
||||
}
|
||||
|
||||
private fun getFragment(): Fragment {
|
||||
if(FunctionBuildConfig.isOffLine){
|
||||
if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
|
||||
if (FunctionBuildConfig.isOffLine) {
|
||||
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
|
||||
return getFragmentByServeName(OchCommonConst.OFFLINE_DRIVER)
|
||||
}else if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){
|
||||
} else if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
|
||||
return getFragmentByServeName(OchCommonConst.OFFLINE_PASSENGER)
|
||||
}
|
||||
}
|
||||
if(DeviceUtils.isEB5Model()&&AppIdentityModeUtils.isCharterPassenger(FunctionBuildConfig.appIdentityMode)){
|
||||
if (DeviceUtils.isEB5Model() && AppIdentityModeUtils.isCharterPassenger(FunctionBuildConfig.appIdentityMode)) {
|
||||
val maxVolume = VolumeUtils.getMaxVolume(AudioManager.STREAM_MUSIC)
|
||||
val volume = VolumeUtils.getVolume(AudioManager.STREAM_MUSIC)
|
||||
val tartgetVolume = (maxVolume * 0.8).toInt()
|
||||
OchChainLogManager.writeChainLog("音量","最大声音量:${maxVolume}------当前音量:${volume}----目的音量:${tartgetVolume}")
|
||||
if(volume<tartgetVolume){
|
||||
VolumeUtils.setVolume( AudioManager.STREAM_MUSIC, tartgetVolume, AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE)
|
||||
OchChainLogManager.writeChainLog(
|
||||
"音量",
|
||||
"最大声音量:${maxVolume}------当前音量:${volume}----目的音量:${tartgetVolume}"
|
||||
)
|
||||
if (volume < tartgetVolume) {
|
||||
VolumeUtils.setVolume(
|
||||
AudioManager.STREAM_MUSIC,
|
||||
tartgetVolume,
|
||||
AudioManager.FLAG_REMOVE_SOUND_AND_VIBRATE
|
||||
)
|
||||
}
|
||||
}
|
||||
if (AppIdentityModeUtils.isBusDriver(FunctionBuildConfig.appIdentityMode)) {
|
||||
return getFragmentByServeName(OchCommonConst.BUS_DRIVER)
|
||||
} else if (AppIdentityModeUtils.isShuttleDriver(FunctionBuildConfig.appIdentityMode)) {
|
||||
return if(ProjectUtils.isSaas()){
|
||||
return if (ProjectUtils.isSaas()) {
|
||||
getFragmentByServeName(OchCommonConst.SHUTTLE_DRIVER_WEAKNET)
|
||||
}else{
|
||||
} else {
|
||||
getFragmentByServeName(OchCommonConst.SHUTTLE_DRIVER)
|
||||
}
|
||||
} else if (AppIdentityModeUtils.isCharterDriver(FunctionBuildConfig.appIdentityMode)) {
|
||||
return getFragmentByServeName(OchCommonConst.CHARTER_DRIVER)
|
||||
} else if (AppIdentityModeUtils.isTaxiDriver(FunctionBuildConfig.appIdentityMode)) {
|
||||
return if(ProjectUtils.isMogo()){
|
||||
return if (ProjectUtils.isMogo()) {
|
||||
getFragmentByServeName(OchCommonConst.TAXI_DRIVER)
|
||||
}else if(ProjectUtils.isSaas()){
|
||||
} else if (ProjectUtils.isSaas()) {
|
||||
getFragmentByServeName(OchCommonConst.TAXI_UNMANNED_DRIVER)
|
||||
}else{
|
||||
} else {
|
||||
getFragmentByServeName(OchCommonConst.TAXI_DRIVER)
|
||||
}
|
||||
} else if (AppIdentityModeUtils.isSweeper(FunctionBuildConfig.appIdentityMode)) {
|
||||
@@ -118,19 +127,19 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
|
||||
} else if (AppIdentityModeUtils.isBusPassenger(FunctionBuildConfig.appIdentityMode)) {
|
||||
return getFragmentByServeName(OchCommonConst.BUS_PASSENGER)
|
||||
} else if (AppIdentityModeUtils.isShuttlePassenger(FunctionBuildConfig.appIdentityMode)) {
|
||||
return if(ProjectUtils.isSaas()){
|
||||
return if (ProjectUtils.isSaas()) {
|
||||
getFragmentByServeName(OchCommonConst.SHUTTLE_PASSENGER_WEAKNET)
|
||||
}else{
|
||||
} else {
|
||||
getFragmentByServeName(OchCommonConst.SHUTTLE_PASSENGER)
|
||||
}
|
||||
} else if (AppIdentityModeUtils.isCharterPassenger(FunctionBuildConfig.appIdentityMode)) {
|
||||
return getFragmentByServeName(OchCommonConst.CHARTER_PASSENGER)
|
||||
} else if (AppIdentityModeUtils.isTaxiPassenger(FunctionBuildConfig.appIdentityMode)) {
|
||||
return if(ProjectUtils.isMogo()){
|
||||
return if (ProjectUtils.isMogo()) {
|
||||
getFragmentByServeName(OchCommonConst.TAXI_PASSENGER)
|
||||
}else if(ProjectUtils.isSaas()){
|
||||
} else if (ProjectUtils.isSaas()) {
|
||||
getFragmentByServeName(OchCommonConst.TAXI_UNMANNED_PASSENGER)
|
||||
}else{
|
||||
} else {
|
||||
getFragmentByServeName(OchCommonConst.TAXI_PASSENGER)
|
||||
}
|
||||
}
|
||||
@@ -162,7 +171,7 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
|
||||
}
|
||||
|
||||
override fun onStatusChange(currentStatus: LoginStatusEnum) {
|
||||
d(TAG, "登录状态发生改变 ${currentStatus}")
|
||||
d(TAG, "登录状态发生改变 $currentStatus")
|
||||
UiThreadHandler.post {
|
||||
showFragment()
|
||||
}
|
||||
@@ -170,18 +179,32 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
|
||||
|
||||
override fun onBusinessChange(businessEnum: BusinessEnum) {
|
||||
super.onBusinessChange(businessEnum)
|
||||
val (_, identity, model) =AppIdentityModeUtils.getInfo(FunctionBuildConfig.appIdentityMode)
|
||||
val (_, identity, model) = AppIdentityModeUtils.getInfo(FunctionBuildConfig.appIdentityMode)
|
||||
when (businessEnum) {
|
||||
BusinessEnum.None -> {}
|
||||
BusinessEnum.Taxi -> FunctionBuildConfig.appIdentityMode = "${AppIdentityModeUtils.TAXI}_${identity}_${model}"
|
||||
BusinessEnum.Bus -> FunctionBuildConfig.appIdentityMode = "${AppIdentityModeUtils.BUS}_${identity}_${model}"
|
||||
BusinessEnum.Shuttle -> FunctionBuildConfig.appIdentityMode = "${AppIdentityModeUtils.SHUTTLE}_${identity}_${model}"
|
||||
BusinessEnum.Charter -> FunctionBuildConfig.appIdentityMode = "${AppIdentityModeUtils.CHARTER}_${identity}_${model}"
|
||||
BusinessEnum.Taxi -> FunctionBuildConfig.appIdentityMode =
|
||||
"${AppIdentityModeUtils.TAXI}_${identity}_${model}"
|
||||
|
||||
BusinessEnum.Bus -> FunctionBuildConfig.appIdentityMode =
|
||||
"${AppIdentityModeUtils.BUS}_${identity}_${model}"
|
||||
|
||||
BusinessEnum.Shuttle -> FunctionBuildConfig.appIdentityMode =
|
||||
"${AppIdentityModeUtils.SHUTTLE}_${identity}_${model}"
|
||||
|
||||
BusinessEnum.Charter -> FunctionBuildConfig.appIdentityMode =
|
||||
"${AppIdentityModeUtils.CHARTER}_${identity}_${model}"
|
||||
}
|
||||
// 加入启动统计
|
||||
val mStartParams: HashMap<String, Any> = HashMap()
|
||||
mStartParams["start_time"] = TimeUtils.getNowMills()
|
||||
mStartParams["app_version"] = AppUtils.getAppVersionName()
|
||||
mStartParams["app_flavor"] = DebugConfig.getProductFlavor()
|
||||
mStartParams["app_identity_mode"] = FunctionBuildConfig.appIdentityMode
|
||||
MogoAnalyticUtils.track("app_start_time", mStartParams)
|
||||
}
|
||||
|
||||
override fun onBusinessChangeDebug(businessEnum: BusinessEnum) {
|
||||
if(businessEnum==BusinessEnum.None){
|
||||
if (businessEnum == BusinessEnum.None) {
|
||||
removeStatusBar()
|
||||
CallerHmiManager.hideToolsView()
|
||||
ToggleDebugView.toggleDebugView.dismiss()
|
||||
@@ -194,7 +217,7 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
|
||||
back.replace(containerId, fragment, fragment.tag)
|
||||
back.commitAllowingStateLoss()
|
||||
}
|
||||
}else {
|
||||
} else {
|
||||
onBusinessChange(businessEnum)
|
||||
val supportFragmentManager: FragmentManager? = activity?.supportFragmentManager
|
||||
val fragment = getFragment()
|
||||
@@ -227,22 +250,23 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
|
||||
)
|
||||
statusBarLP.topMargin = 0
|
||||
statusBarLP.gravity = Gravity.TOP
|
||||
statusBar?.let {view->
|
||||
if(view.isAttachedToWindow){
|
||||
statusBar?.let { view ->
|
||||
if (view.isAttachedToWindow) {
|
||||
return
|
||||
}
|
||||
}
|
||||
CallerLogger.d(TAG,"添加statusBar---${commonService}")
|
||||
CallerLogger.d(TAG, "添加statusBar---${commonService}")
|
||||
decorView.addView(statusBarView, statusBarLP)
|
||||
}
|
||||
}
|
||||
private fun removeStatusBar(){
|
||||
|
||||
private fun removeStatusBar() {
|
||||
activity?.let {
|
||||
CallerLogger.d(TAG,"移除statusBar")
|
||||
CallerLogger.d(TAG, "移除statusBar")
|
||||
val decorView = it.window.decorView as? FrameLayout ?: return
|
||||
val statusBar = decorView.findViewWithTag<View>("status_bar")
|
||||
statusBar?.let {
|
||||
decorView.removeView(it)
|
||||
val statusBar = decorView.findViewWithTag<View>("status_bar")
|
||||
statusBar?.let { view ->
|
||||
decorView.removeView(view)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user