feat(servicing): 更新设置图标并调整发车按钮逻辑

- 更新设置图标为更大尺寸的白色图标
- 修改发车按钮点击逻辑,增加对 GlobalData.isMaster 的判断
This commit is contained in:
songzhiling
2025-04-17 20:19:32 +08:00
parent 6f39c3103f
commit e6dd140a34
2 changed files with 7 additions and 20 deletions

View File

@ -338,7 +338,7 @@ fun WaitToStartScreen(vm : WaitToStartVm = viewModel()) {
// 发车按钮
Button(onClick = {
if (GlobalData.driverInfoBean != null && GlobalData.driverInfoBean?.authStatus == 1) {
if (! GlobalData.isMaster && GlobalData.driverInfoBean != null && GlobalData.driverInfoBean?.authStatus == 1) {
vm.dispatch(WaitToStartVm.Action.UpdateState(uiState.value.copy(
showServicePeopleConfirmDialog = true)))
return@Button

View File

@ -1,22 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="19dp"
android:height="18dp"
android:viewportWidth="19"
android:viewportHeight="18">
android:width="64.3dp"
android:height="64dp"
android:viewportWidth="1028"
android:viewportHeight="1024">
<path
android:pathData="M17.872,7.599C17.783,7.095 17.339,6.72 16.815,6.74C16.115,6.76 15.473,6.394 15.127,5.792C14.782,5.19 14.792,4.45 15.157,3.857C15.423,3.413 15.334,2.84 14.94,2.515C14.189,1.893 13.35,1.399 12.442,1.063C11.958,0.886 11.415,1.093 11.168,1.547C10.843,2.159 10.201,2.544 9.5,2.544C8.809,2.544 8.167,2.159 7.831,1.547C7.585,1.093 7.042,0.886 6.558,1.063C5.65,1.399 4.801,1.883 4.06,2.515C3.665,2.84 3.576,3.423 3.843,3.857C4.208,4.45 4.218,5.19 3.873,5.792C3.527,6.394 2.876,6.75 2.184,6.74L2.155,6.74C1.651,6.74 1.207,7.105 1.128,7.599C1.049,8.073 1,8.566 1,9.04C1,9.524 1.039,10.007 1.128,10.481C1.217,10.985 1.671,11.36 2.185,11.34C2.876,11.321 3.527,11.686 3.873,12.288C4.218,12.89 4.208,13.631 3.843,14.223C3.577,14.667 3.666,15.24 4.06,15.566C4.811,16.188 5.65,16.681 6.558,17.017C7.042,17.194 7.585,16.987 7.831,16.533C8.157,15.921 8.799,15.536 9.5,15.536C10.201,15.536 10.833,15.921 11.169,16.533C11.356,16.878 11.711,17.086 12.087,17.086C12.205,17.086 12.323,17.066 12.442,17.027C13.35,16.691 14.199,16.207 14.94,15.575C15.335,15.25 15.423,14.667 15.157,14.233C14.791,13.64 14.782,12.9 15.127,12.298C15.473,11.696 16.124,11.34 16.815,11.35C17.329,11.36 17.783,10.995 17.872,10.491C17.951,10.017 18,9.524 18,9.05C18,8.576 17.951,8.073 17.872,7.599L17.872,7.599ZM16.638,10.067C15.552,10.106 14.555,10.699 14.012,11.646C13.459,12.594 13.449,13.759 13.953,14.717C13.41,15.141 12.817,15.487 12.176,15.743C11.593,14.825 10.586,14.253 9.49,14.253C8.395,14.253 7.378,14.815 6.805,15.743C6.163,15.487 5.571,15.141 5.028,14.717C5.541,13.759 5.522,12.594 4.969,11.646C4.416,10.699 3.429,10.106 2.343,10.067C2.294,9.731 2.274,9.386 2.274,9.04C2.274,8.694 2.294,8.359 2.343,8.013C3.429,7.974 4.426,7.381 4.969,6.434C5.522,5.486 5.532,4.321 5.028,3.363C5.571,2.939 6.163,2.593 6.805,2.336C7.388,3.255 8.395,3.827 9.49,3.827C10.586,3.827 11.603,3.264 12.176,2.336C12.817,2.593 13.41,2.939 13.953,3.363C13.439,4.321 13.459,5.486 14.012,6.434C14.565,7.381 15.552,7.974 16.638,8.013C16.687,8.349 16.707,8.694 16.707,9.04C16.707,9.386 16.687,9.731 16.638,10.067Z"
android:strokeAlpha="0.8515625"
android:strokeWidth="0.1"
android:fillColor="#F5F6F9"
android:fillType="nonZero"
android:strokeColor="#334885"
android:fillAlpha="0.8515625"/>
<path
android:pathData="M9.49,5.733C7.693,5.733 6.232,7.194 6.232,8.991C6.232,10.787 7.693,12.249 9.49,12.249C11.287,12.249 12.748,10.787 12.748,8.991C12.748,7.194 11.287,5.733 9.49,5.733ZM9.49,10.955C8.404,10.955 7.516,10.067 7.516,8.981C7.516,7.895 8.404,7.006 9.49,7.006C10.576,7.006 11.465,7.895 11.465,8.981C11.465,10.067 10.586,10.955 9.49,10.955L9.49,10.955Z"
android:strokeAlpha="0.8515625"
android:strokeWidth="0.1"
android:fillColor="#F5F6F9"
android:fillType="nonZero"
android:strokeColor="#334885"
android:fillAlpha="0.8515625"/>
android:pathData="M370,493.1L105.8,493.1c-58.4,0 -105.8,-47.5 -105.8,-105.8L0,105.8C0,47.5 47.5,0 105.8,0h264.1c58.3,0 105.8,47.5 105.8,105.8v281.4c-0,58.4 -47.5,105.8 -105.8,105.8zM94.5,47.9c-25.3,0 -45.9,20.6 -45.9,45.9v305.5c0,25.3 20.6,45.9 45.9,45.9L381.3,445.2c25.3,0 45.9,-20.6 45.9,-45.9L427.1,93.8c0,-25.3 -20.6,-45.9 -45.9,-45.9L94.5,47.9zM790.4,1023.9c-130.8,0 -237.3,-106.4 -237.3,-237.3s106.5,-237.3 237.3,-237.3c130.8,0 237.3,106.4 237.3,237.3s-106.4,237.3 -237.3,237.3zM790.4,595.4c-105.5,0 -191.3,85.8 -191.3,191.3 0,105.5 85.8,191.3 191.3,191.3 105.4,0 191.3,-85.8 191.3,-191.3 0,-105.5 -85.8,-191.3 -191.3,-191.3zM922.5,493.1h-264.1c-58.4,0 -105.8,-47.5 -105.8,-105.9L552.5,105.8C552.5,47.5 600,0 658.3,0h264.1c58.3,0 105.8,47.5 105.8,105.8L1028.3,387.2c-0,58.4 -47.5,105.9 -105.8,105.9zM647,47.9c-25.3,0 -45.9,20.6 -45.9,45.9v305.5c0,25.3 20.6,45.9 45.9,45.9h286.8c25.3,0 45.9,-20.6 45.9,-45.9L979.7,93.8c0,-25.3 -20.6,-45.9 -45.9,-45.9h-286.8zM370,1017L105.8,1017c-58.4,0 -105.8,-47.5 -105.8,-105.9v-281.4c0,-58.4 47.5,-105.8 105.8,-105.8h264.1c58.3,0 105.8,47.5 105.8,105.8v281.4c-0,58.4 -47.5,105.9 -105.8,105.9zM94.5,571.8c-25.3,0 -45.9,20.6 -45.9,45.9v305.5c0,25.3 20.6,45.9 45.9,45.9h286.8c25.3,0 45.9,-20.6 45.9,-45.9v-305.5c0,-25.3 -20.6,-45.9 -45.9,-45.9L94.5,571.8z"
android:fillColor="#ffffff"/>
</vector>