diff --git a/servicing/src/main/java/com/za/ui/servicing/wait_to_start/WaitToStartActivity.kt b/servicing/src/main/java/com/za/ui/servicing/wait_to_start/WaitToStartActivity.kt index 56107ce..109bf42 100644 --- a/servicing/src/main/java/com/za/ui/servicing/wait_to_start/WaitToStartActivity.kt +++ b/servicing/src/main/java/com/za/ui/servicing/wait_to_start/WaitToStartActivity.kt @@ -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 diff --git a/servicing/src/main/res/drawable/sv_setting.xml b/servicing/src/main/res/drawable/sv_setting.xml index 6637efc..cdb0015 100644 --- a/servicing/src/main/res/drawable/sv_setting.xml +++ b/servicing/src/main/res/drawable/sv_setting.xml @@ -1,22 +1,9 @@ + android:width="64.3dp" + android:height="64dp" + android:viewportWidth="1028" + android:viewportHeight="1024"> - + 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"/>