Etusivu Tutki Apua
Rekisteröidy Kirjaudu sisään
zhangyupeng
/
daikan-international
1
0
Fork 0
Tiedostot Ongelmat 0 Pull-pyynnöt 0 Wiki
Selaa lähdekoodia

fixed

gemercheung 1 vuosi sitten
vanhempi
d84db26605
commit
b32485ad6b
9 muutettua tiedostoa jossa 22 lisäystä ja 16 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 2 1
      .env.home.test
  2. 3 4
      index.html
  3. 2 2
      src/App.vue
  4. 1 1
      src/components/chatRoom/controls/actions.ts
  5. 0 1
      src/components/chatRoom/controls/sync.ts
  6. 2 0
      src/components/chatRoom/dialog/password.vue
  7. 2 0
      src/components/chatRoom/index.vue
  8. 2 3
      src/components/chatRoom/memberList.vue
  9. 8 4
      src/components/hotspot/index.vue

+ 2 - 1
.env.home.test
Näytä tiedosto 

@@ -3,7 +3,8 @@ VITE_APP_RESOURCE_URL=https://4dkk.4dage.com/
 
 # 静态资源地址
 
 VITE_APP_CDN_URL=https://4dkk.4dage.com/v4/www/
 
 # sdk文件地址
 
-VITE_APP_SDK_DIR=https://4dkk.4dage.com/v4/sdk/4.7.9
 
+VITE_APP_SDK_DIR=https://4dkk.4dage.com/v4-test/www/sdk
 
+# VITE_APP_SDK_DIR=https://4dkk.4dage.com/v4/sdk/4.7.9
 
 # VITE_APP_SOCKET_URL=wss://ws.gemer.xyz
 
 VITE_APP_SOCKET_URL=wss://testws.4dkankan.com
 
 # VITE_APP_SOCKET_URL=wss://221.4.210.172:16666

+ 3 - 4
index.html
Näytä tiedosto 

@@ -27,16 +27,15 @@
 
   <body>
 
     <div id="app"></div>
 
     <script type="module" src="/src/main.ts"></script>
 
-    <script src="<{VITE_APP_SDK_DIR}>/kankan-sdk-deps.js"></script>
 
-    <script src="<{VITE_APP_SDK_DIR}>/kankan-sdk.js"></script>
 
+
 
     <script src="<{BASE_URL}><{VITE_APP_STATIC_DIR}>/static/lib/flv.min.js"></script>
 
     <script src="<{BASE_URL}><{VITE_APP_STATIC_DIR}>/static/lib/vconsole.js"></script>
 
     <script src="<{BASE_URL}><{VITE_APP_STATIC_DIR}>/static/lib/swiper/swiper-bundle.min.js"></script>
 
     <script src="<{BASE_URL}><{VITE_APP_STATIC_DIR}>/static/lib/socket.io.msgpack.min.js"></script>
 
-
 
     <script src="<{BASE_URL}><{VITE_APP_STATIC_DIR}>/static/lib/zmjm.min.js"></script>
 
     <script src="<{BASE_URL}><{VITE_APP_STATIC_DIR}>/static/lib/jweixin-1.6.0.js"></script>
 
-
 
+    <script src="<{VITE_APP_SDK_DIR}>/kankan-sdk-deps.js"></script>
 
+    <script src="<{VITE_APP_SDK_DIR}>/kankan-sdk.js"></script>
 
     <script>
 
       if ((query = window.location.href.indexOf('vlog') != -1)) {
 
         var vConsole = new window.VConsole();

+ 2 - 2
src/App.vue
Näytä tiedosto 

@@ -405,8 +405,8 @@
 
         v-if="isTourMode"
 
         :is-single="true"
 
         :show="showPasswordDialog"
 
-        @confirm="handlePasswordConfirm"
 
-        @close="handlePasswordConfirm"
 
+        @confirm-dialog="handlePasswordConfirm"
 
+        @close-dialog="handlePasswordConfirm"
 
       />
 
       <!-- panel end -->
 
     </template>

+ 1 - 1
src/components/chatRoom/controls/actions.ts
Näytä tiedosto 

@@ -433,7 +433,7 @@ const handleLeaderDismiss = () => {
 
           },

           '*',

         );

-    }, 2000);

+    }, 4500);

   }

 };

+ 0 - 1
src/components/chatRoom/controls/sync.ts
Näytä tiedosto 

@@ -8,7 +8,6 @@ export async function handleSync(data: any) {
 
     const app = getApp();

     const rtcStore = useRtcStore();

     if (!rtcStore.isLeader) {

-      // console.log('app.Connect.follow', app.Connect.follow.started)

       app.Connect.follow.receive(data);

     }

   } catch (error) {}

+ 2 - 0
src/components/chatRoom/dialog/password.vue
Näytä tiedosto 

@@ -73,7 +73,9 @@
 
   };
 
   const createdConfirm = async () => {
 
     const { validPassRoom, firstNum } = useRoom();
 
+
 
     if (unref(password).length > 0 && unref(password).length === 4) {
 
+
 
       const encyrptPassword = md5(unref(password)).toString();
 
       let rid = unref(roomId);
 
       if (!rid) {

+ 2 - 0
src/components/chatRoom/index.vue
Näytä tiedosto 

@@ -402,6 +402,7 @@
 
       } else {

         console.log('customer-follow');

         app.Connect.follow.start({ follow: true });

+        // debugger

       }

       app.Connect.follow.on('data', leaderSync);

       app.Connect.paint.on('data', leaderPaint);

@@ -682,6 +683,7 @@
 
     }

   };

   const handlePasswordConfirm = async () => {

+    debugger;

     showPasswordDialog.value = false;

     const socket = createSocket();

     initSocketEvent(socket);

+ 2 - 3
src/components/chatRoom/memberList.vue
Näytä tiedosto 

@@ -44,10 +44,9 @@
 
                 :wo="i.IsWords"

                 @click="isLeaderOrAssistant && userCanInput(i)"

               ></div>

-

               <ImageIcon

                 class="assistant_icon"

-                v-if="(isNativeLeader && i?.Role !== 'leader') || i.IsAssistant"

+                v-if="isLeaderOrAssistant && i.Role !== 'leader'"

                 type="assistants"

                 @click="(isNativeLeader || i.IsAssistant) && userCanBeAssistant(i)"

               />

@@ -92,7 +91,7 @@
 
 

   const isLeaderOrAssistant = computed(() => rtcStore.isLeader || rtcStore.isAssistant);

   const isNativeLeader = computed(() => rtcStore.isLeader);

-

+  // const isAssistant = computed(() => rtcStore.isAssistant);

   // const animateActive = ref(false);

   // const props =

   defineProps({

+ 8 - 4
src/components/hotspot/index.vue
Näytä tiedosto 

@@ -5,7 +5,9 @@
 
         :tag-sid="tag.sid"
 
         @mouseleave.prevent="onMouseLeave($event, tag)"
 
         :style="{
 
-          transform: `translate3d(${tag.x}px,${tag.y}px,0)`,
 
+          // transform: `translate3d(${tag.x}px,${tag.y}px,0)`,
 
+          left: `${tag.x}px`,
 
+          top: `${tag.y}px`,
 
           'z-index': isShowTag(tag) ? 1 : 0,
 
         }"
 
         :class="{
 
@@ -23,6 +25,7 @@
 
             class="trans"
 
             :class="{
 
               active: isShowTag(tag),
 
+              fixed: isMobile,
 
             }"
 
           >
 
             <template v-if="tag && !showLayer">
 
@@ -138,15 +141,16 @@
 
   onMounted(async () => {
 
     const app = await useApp();
 
     app.TagManager.on('loaded', (data: any) => {
 
-      console.log('data', data);
 
+      console.log('tag-data', data);
 
       sceneStore.loadTags(data);
 
     });
 
     watchEffect(() => {
 
       if (tags.value?.length) {
 
         app.TagManager.load(tags.value);
 
+        console.log('TagManager-load', tags.value);
 
         app.TagManager.updatePosition(tags.value);
 
       }
 
-      if (currentTag.value) {
 
+      if (currentTag.value?.sid) {
 
         //用 watch deep由于object prop过多会引起loop
 
         if (unref(isMobile)) {
 
           focusTag(currentTag.value);
 
@@ -211,7 +215,7 @@
 
           };
 
 
           let position = isMobile.value ? 'center' : 'left';
 
-          // console.log('app.TagManager', app.TagManager, position, params);
 
+          console.warn('app.TagManager', typeof app.TagManager.focus, position, params);
 
           app.TagManager.focus(params, 'board', position);
 
         } catch (err) {}
 
       }, 300);