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

[6.10.0]

Browse Source 
[fea]
[清扫车半兼容]
This commit is contained in:
yangyakun
2025-02-08 12:18:38 +08:00
parent c7fb6f8067
commit cc5dd866eb
4 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OCH/common/biz/src/main/java/com/mogo/och/biz/login/LoginServiceManager.kt
View File

@@ -192,7 +192,10 @@ object LoginServiceManager {
fun loginOut() {
d(tag, "loginOut ")
FunctionBuildConfig.ochdebug = false
if(FunctionBuildConfig.ochdebug){
FunctionBuildConfig.ochdebug = false
queryLoginStatusByNet()
}
if(FunctionBuildConfig.isOffLine) {
FunctionBuildConfig.isOffLine = false
sendLogin2Client(1)
@@ -449,6 +452,10 @@ object LoginServiceManager {
FunctionBuildConfig.appIdentityMode = "${AppIdentityModeUtils.SCHEDULED}_${identity}_${model}"
OchSPManager.putString(OCHPRODUCT,AppIdentityModeUtils.SCHEDULED)
}
Product.SWEEPER -> {
FunctionBuildConfig.appIdentityMode = "${AppIdentityModeUtils.SWEEPER}_${identity}_${model}"
OchSPManager.putString(OCHPRODUCT,AppIdentityModeUtils.SWEEPER)
}
}
ScreenHelper.setScreenConfig(AbsMogoApplication.getApp())
CallerDevaToolsManager.updateAppChannel()

2
OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/debugview/BusinessView.kt
View File

@@ -18,6 +18,7 @@ import com.mogo.och.common.module.biz.login.EnumLoginStatus
import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business_bus
import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business_charter
import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business_shuttle
import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business_sweeper
import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_business_taxi
import kotlinx.android.synthetic.main.biz_login_business_view.view.actv_debugview
@@ -64,6 +65,7 @@ class BusinessView : ConstraintLayout, BusinessViewModel.IErrorInfoViewCallback
actv_business_bus.onClick { swtichBusiness(Product.BUS) }
actv_business_taxi.onClick { swtichBusiness(Product.TAXI) }
actv_business_charter.onClick { swtichBusiness(Product.CHARTER) }
actv_business_sweeper.onClick { swtichBusiness(Product.SWEEPER) }
actv_debugview.onClick { ToggleDebugView.toggleDebugView.toggle(context) }
}

21
OCH/common/biz/src/main/res/layout/biz_login_business_view.xml
View File

@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="@dimen/dp_200"
android:layout_height="@dimen/dp_400"
android:layout_height="@dimen/dp_480"
android:background="@drawable/biz_login_error_info">
<androidx.appcompat.widget.AppCompatTextView
@@ -57,10 +57,25 @@
android:gravity="center"
android:text="出租车模式"
android:textColor="@color/white"
app:layout_constraintBottom_toBottomOf="@+id/actv_debugview"
app:layout_constraintBottom_toBottomOf="@+id/actv_business_sweeper"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/actv_business_shuttle" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_business_sweeper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/dp_20"
android:paddingBottom="@dimen/dp_20"
android:gravity="center"
android:text="清扫车模式"
android:textColor="@color/white"
app:layout_constraintBottom_toTopOf="@+id/actv_debugview"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/actv_business_taxi" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_debugview"
android:layout_width="match_parent"
@@ -73,7 +88,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/actv_business_taxi" />
app:layout_constraintTop_toBottomOf="@+id/actv_business_sweeper" />
</androidx.constraintlayout.widget.ConstraintLayout>

4
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt
View File

@@ -361,10 +361,10 @@ object AppIdentityModeUtils {
enum class Product(val code: Int) {
NONE(0),
BUS(10),
TAXI(9),
SWEEPER(-1),
BUS(10),
SHUTTLE(11),
SWEEPER(12),
CHARTER(13) ,
SCHEDULED(14);
companion object {