Skip to content

Commit 53e8c64

Browse files
committed
feat: 完善应用横屏配置对Android 13 - Android 14的兼容性
1 parent 9714c6d commit 53e8c64

File tree

4 files changed

+59
-12
lines changed

4 files changed

+59
-12
lines changed

src/apis/ksuApi.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export const getDeviceCharacteristics = (): Promise<string> => {
3333
export const getAndroidTargetSdk = (): Promise<number> => {
3434
return new Promise(async (resolve, reject) => {
3535
if (import.meta.env.MODE === 'development') {
36-
resolve(34)
36+
resolve(35)
3737
return;
3838
}
3939
const { errno, stdout, stderr }: ExecResult = await exec("getprop ro.build.version.sdk");

src/components/EmbeddedAppDrawer.vue

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<script setup lang="ts">
1+
<script setup lang="tsx">
22
import { onMounted, ref, type CSSProperties } from 'vue';
33
import { useDeviceStore } from '@/stores/device';
44
import { useEmbeddedStore } from '@/stores/embedded';
@@ -15,8 +15,7 @@ const emit = defineEmits(['submit'])
1515
const activeDrawer = ref(false); // 控制drawer显示
1616
const deviceStore = useDeviceStore();
1717
const embeddedStore = useEmbeddedStore();
18-
const { message } = createDiscreteApi(['message'])
19-
18+
const { message, modal } = createDiscreteApi(['message', 'modal'])
2019
export interface EmbeddedAppDrawerSubmitResult {
2120
name: string;
2221
settingMode: EmbeddedMergeRuleItem["settingMode"];
@@ -208,6 +207,24 @@ const currentAppNameInputStatus = ref<string>('')
208207
const isSupportEmbedded = ref<boolean>(false);
209208
210209
const handleDrawerSubmit = () => {
210+
if (!currentAppName.value) {
211+
modal.create({
212+
title: '应用包名不能为空',
213+
type: 'error',
214+
preset: 'dialog',
215+
content: () => (<p>噫?应用包名不能为空(敲</p>)
216+
})
217+
return
218+
}
219+
if (currentSettingMode.value === 'fullScreen' && !currentFullRule.value) {
220+
modal.create({
221+
title: '应用全屏规则不能为空',
222+
type: 'error',
223+
preset: 'dialog',
224+
content: () => (<p>噫?应用全屏规则不能为空(敲</p>)
225+
})
226+
return
227+
}
211228
// 开启loading
212229
drawerSubmitLoading.value = true;
213230

src/views/HomeView.vue

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,20 @@ const openAddEmbeddedApp = async () => {
103103
}
104104
}))
105105
if (submitAddEmbeddedAppErr) {
106-
message.error('发生错误')
106+
modal.create({
107+
title: '应用添加失败',
108+
type: 'error',
109+
preset: 'dialog',
110+
content: () => (<p>发生异常错误,添加失败了QwQ,该功能尚在测试阶段,尚不稳定,出现异常请及时反馈~</p>)
111+
})
107112
addEmbeddedAppRes.loadingCallback && addEmbeddedAppRes.loadingCallback()
108113
} else {
109-
message.info('添加成功')
114+
modal.create({
115+
title: '应用添加成功',
116+
type: 'success',
117+
preset: 'dialog',
118+
content: () => (<p>好耶w,应用配置添加成功了OwO~如果应用更新后的规则不生效,可以尝试重启平板再试试~</p>)
119+
})
110120
embeddedStore.updateMergeRuleList()
111121
addEmbeddedAppRes.loadingCallback && addEmbeddedAppRes.loadingCallback()
112122
addEmbeddedAppRes.closeCallback && addEmbeddedAppRes.closeCallback()
@@ -200,10 +210,20 @@ const openUpdateEmbeddedApp = async (row: EmbeddedMergeRuleItem, index: number)
200210
}
201211
}))
202212
if (submitUpdateEmbeddedAppErr) {
203-
message.error('发生错误')
213+
modal.create({
214+
title: '应用更新失败',
215+
type: 'error',
216+
preset: 'dialog',
217+
content: () => (<p>发生异常错误,更新失败了QwQ,该功能尚在测试阶段,尚不稳定,出现异常请及时反馈~</p>)
218+
})
204219
updateEmbeddedAppRes.loadingCallback && updateEmbeddedAppRes.loadingCallback()
205220
} else {
206-
message.info('更新成功')
221+
modal.create({
222+
title: '应用更新成功',
223+
type: 'success',
224+
preset: 'dialog',
225+
content: () => (<p>好耶w,应用配置更新成功了OwO~如果应用更新后的规则不生效,可以尝试重启平板再试试~</p>)
226+
})
207227
embeddedStore.updateMergeRuleList()
208228
updateEmbeddedAppRes.loadingCallback && updateEmbeddedAppRes.loadingCallback()
209229
updateEmbeddedAppRes.closeCallback && updateEmbeddedAppRes.closeCallback()
@@ -253,9 +273,19 @@ const handleRuleMode = (row: EmbeddedMergeRuleItem, index: number, ruleMode: Emb
253273
settingConfigXML: xmlFormat.objectToXML(embeddedStore.embeddedSettingConfig)
254274
}))
255275
if (submitUpdateEmbeddedAppErr) {
256-
message.error('清除自定义规则失败')
276+
modal.create({
277+
title: '清除自定义规则失败',
278+
type: 'error',
279+
preset: 'dialog',
280+
content: () => (<p>发生异常错误,更新失败了QwQ,该功能尚在测试阶段,尚不稳定,出现异常请及时反馈~</p>)
281+
})
257282
} else {
258-
message.info('清除自定义规则成功')
283+
modal.create({
284+
title: '清除自定义规则成功',
285+
type: 'success',
286+
preset: 'dialog',
287+
content: () => (<p>好耶w,清除自定义规则成功了OwO~如果应用更新后的规则不生效,可以尝试重启平板再试试~</p>)
288+
})
259289
embeddedStore.updateMergeRuleList()
260290
}
261291
}

src/views/SettingsView.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ const railStyle = ({
7171
'非Android设备环境' }}
7272
</dd>
7373
</div>
74-
<div class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0">
74+
<!-- <div class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0">
7575
<dt class="text-sm font-medium leading-6 text-gray-900">游戏显示布局</dt>
7676
<dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">启用(*Android 15+ 需额外搭配修改版手机/平板管家)</dd>
7777
</div>
@@ -89,7 +89,7 @@ const railStyle = ({
8989
</n-switch>
9090
<div v-else>设备不支持</div>
9191
</dd>
92-
</div>
92+
</div> -->
9393
<!-- <div class="px-4 py-6 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-0">
9494
<dt class="text-sm font-medium leading-6 text-gray-900">Salary expectation</dt>
9595
<dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">$120,000</dd>

0 commit comments

Comments
 (0)