Merge remote-tracking branch 'refs/remotes/origin/main'

flomesh-io · Dec 2, 2024 · 2473580 · 2473580
2 parents eec9043 + aae58c6
commit 2473580
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/gui/src/layout/AppRoot.vue b/gui/src/layout/AppRoot.vue
@@ -103,7 +103,7 @@ const loaddata = (reload) => {
 				store.commit('account/setSelectedMesh', res[0]);
 				selectedMesh.value = res[0];
 			}
-			if(!merged.value && playing.value && (res.length == 0 || true)){
+			if(!merged.value && playing.value && (res.length == 0)){
 				merged.value = true;
 				ztmService.mergePrivateKey(()=>{})
 			}

diff --git a/gui/src/service/ZtmService.js b/gui/src/service/ZtmService.js
@@ -17,12 +17,15 @@ const VITE_APP_PUB_HUB_US = import.meta.env.VITE_APP_PUB_HUB_US;
 export default class ZtmService {
 	getPubHub() {
 		const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
-		if (timeZone === "Asia/Shanghai" || timeZone === "Asia/Chongqing" || timeZone === "Asia/Hong_Kong") {
+		if (timeZone === "Asia/Shanghai" || timeZone === "Asia/Chongqing") {
+			const pm = platform();
+			if(pm == 'ios'){
+				return '';
+			} else {
+				return VITE_APP_PUB_HUB_CN;
+			}
+		} else if (timeZone === "Asia/Hong_Kong") {
 			return VITE_APP_PUB_HUB_CN;
-		} else if (timeZone === "Asia/Macau") {
-			return VITE_APP_PUB_HUB_US;
-		} else if (timeZone.startsWith("Asia")) {
-			return VITE_APP_PUB_HUB_US;
 		} else {
 			return VITE_APP_PUB_HUB_US;
 		}

diff --git a/gui/src/views/mesh/Meshes.vue b/gui/src/views/mesh/Meshes.vue
@@ -84,6 +84,11 @@ const openEditor = () => {
 const emptyMsg = computed(()=>{
 	return `You haven't joined a mesh yet.`
 });
+
+const hasPubHub = computed(()=>{
+	return !!ztmService.getPubHub()
+});
+
 const selectedMesh = computed(() => {
 	return store.getters["account/selectedMesh"]
 });
@@ -169,7 +174,7 @@ onMounted(() => {
 					</template>
 					<template #end> 
 						<Button icon="pi pi-refresh" text @click="loaddata"  :loading="loader"/>
-						<Button v-if="!!meshes && meshes.length>0 && !meshes.find((m)=>m.name == 'Sample')"  :loading="tryLoading" v-tooltip="'Live Sample'" icon="pi pi-sparkles" text @click="openTryMesh" />
+						<Button v-if="hasPubHub && !!meshes && meshes.length>0 && !meshes.find((m)=>m.name == 'Sample')"  :loading="tryLoading" v-tooltip="'Live Sample'" icon="pi pi-sparkles" text @click="openTryMesh" />
 						<Button v-if="!!meshes && meshes.length>0" icon="pi pi-plus"  v-tooltip="'Join'" @click="() => visibleEditor = true"/>
 					</template>
 			</AppHeader>
@@ -197,7 +202,9 @@ onMounted(() => {
 				</div>
 			</div>
 			</ScrollPanel>
-			<Empty v-else :title="emptyMsg" cancelButton="Live Sample" @cancel="openTryMesh" button="Join Mesh" @primary="() => visibleEditor = true"/>
+			<Empty v-else-if="hasPubHub" :title="emptyMsg" cancelButton="Live Sample" @cancel="openTryMesh" button="Join Mesh" @primary="() => visibleEditor = true"/>
+			<Empty v-else :title="emptyMsg" button="Join Mesh" @primary="() => visibleEditor = true"/>
+		
 		</div>
 		<div class="flex-item h-full" v-if="!!visibleEditor">
 			<div class="shadow mobile-fixed h-full">