DGJ 1 year ago
parent
commit
6d158722d8

BIN
miniprogram/assets/image/p1-btbg.png


BIN
miniprogram/assets/image/p1-text.png


BIN
miniprogram/assets/image/p1_bgbt2.png


BIN
miniprogram/assets/image/zhaohuan.png


+ 103 - 18
miniprogram/components/xr-classic-show/index.js

@@ -8,7 +8,18 @@ Component({
     loaded2:false,
     position2:[0,0,0],
     rot:0,
-    str:"1"
+    str:"1",
+    
+    zhaohuanstate:true,
+    paizhaostate:false,
+    luxiangstate:false,
+    isStartluxiang:true,
+    isCloseluxiang:false,
+    
+    captureState: 0,
+    recordState: 0,
+    captureQuality: 0.8,
+    captureType: 'jpg',
    
   },
   lifetimes: {
@@ -20,7 +31,7 @@ Component({
     handleReady: function ({detail}) {
       const xrScene = this.scene = detail.value;
       console.log('xr-scene', xrScene);
-
+      
       this.binglong = {el:this.scene.getElementById('binglong')};
     },
     handleAssetsProgress: function({detail}) {
@@ -72,6 +83,7 @@ Component({
       console.log('animation Stop');
     },
     handleGLTFLoadedbingLong:function({detail}){
+
       const el2 = detail.value;
       const el = detail.value.target;
       const animator = el.getComponent("animator");
@@ -91,21 +103,94 @@ Component({
         }else{
           state = true;
           animator.play("ui_motion_1");
-          el2.position =(0 -2.5 -40);
-        }
-        
-       }, 5000)
-       var interval2 = setInterval(function() {
-        if(false)
-        {
-          clearInterval(interval2);
-        }
-        console.log(5000 +" 毫秒更新");
-        binglong.position =(0 -2.5 -40);
-        
-        
-       }, 5000)
-
-    }
+         // position ="0 -5.5 -40";      
+        }     
+       }, 5000);
+    },
+    handleTouchModel: function ({detail}) {
+      const {target} = detail.value;
+      const id = target.id;
+      
+      wx.showToast({title: `点击了模型: ${id}`});
+    },
+    clickZhaoHuan(e){
+      this.setData({zhaohuanstate:true});
+      this.setData({paizhaostate:false});
+      this.setData({luxiangstate:false});
+      this.setData({isStartluxiang:false});
+    },
+    clickPaiZhao(e){
+      this.setData({zhaohuanstate:false});
+      this.setData({paizhaostate:true});
+      this.setData({luxiangstate:false});
+      this.setData({isStartluxiang:false});
+  
+    
+    },
+    clickLuXiang(e){
+       this.setData({luxiangstate:true});
+        this.setData({zhaohuanstate:false});
+        this.setData({paizhaostate:false});
+    },
+    ClickzhaohuanSS(e){
+      this.setData({zhaohuanstate:false});
+    },
+    Clickpaizhao(e){
+      this.setData({paizhaostate:false});
+     // this.capture();
+      this.scene.share.captureToFriends({
+        fileType: 'png',
+        quality: 0.8
+      });
+     
+      //const base64 = scene.share.captureToDataURL();
+      /*if(supported){
+         // 判断当前客户端是否支持分享系统
+     // const supported = scene.share.supported;
+     await this.scene.share.captureToFriends({
+      fileType: this.data.captureType,
+      quality: this.data.captureQuality
+    });
+      }*/
+   
+    },
+    Clickstartluxiang(e){
+    
+     this.setData({isStartluxiang:true});
+    this.StartRecord();
+    },
+    Clickcloseluxiang(e){
+  
+      this.setData({isStartluxiang:false});
+      this.CloseRecord();
+    },
+   /* async capture(){
+      await this.scene.share.captureToFriends({
+        fileType: 'png',
+        quality: 0.8
+      });
+    },*/
+    capture() {
+      this.scene.share.captureToFriends({
+        fileType: 'jpg',
+        quality: 0.8
+      });
+    },
+    async StartRecord(){
+      await this.scene.share.recordStart({
+        fps: 30,
+        width: scene.width,
+        height: scene.height,
+        videoBitsPerSecond: 20
+      });
+    },
+    async CloseRecord(){
+      await this.scene.share.recordFinishToAlbum({
+        fps: 30,
+        width: scene.width,
+        height: scene.height,
+        videoBitsPerSecond: 20
+      });
+    },
   }
 })

+ 3 - 3
miniprogram/components/xr-classic-show/index.wxml

@@ -18,8 +18,8 @@
         <xr-gltf id="wxball2" node-id="mesh-gltf-wxball2" scale="500 500 500" position="-5 0.5 5"    model="gltf-long"
           anim-autoplay 
           />
-      
-          <xr-gltf id="binglong" node-id="binglong" scale="25 25 25" position="0 -1.5 -40"    model="gltf-binglong"
+      -
+          <xr-gltf id="binglong" node-id="binglong" scale="25 25 25" position="0 -1.5 -40"  model="gltf-binglong"
             bind:gltf-loaded="handleGLTFLoadedbingLong"
           />
           <xr-gltf id="wxball2" node-id="mesh-gltf-wxball2" scale="300 300 300" position="-10 0 0"    model="gltf-lanjiachong"
@@ -111,7 +111,7 @@
         anim-autoplay
       />
       </xr-node>
-
+ 
 
 
    

+ 2 - 1
miniprogram/components/xr-classic-showsix/index.js

@@ -8,7 +8,8 @@ Component({
     loaded2:false,
     position2:[0,0,0],
     rot:0,
-    str:"1"
+    str:"1",
+  
   },
   lifetimes: {
     async attached() {

+ 50 - 3
miniprogram/components/xr-classic-showsix/index.wxml

@@ -11,12 +11,13 @@
     <xr-asset-load type="gltf" asset-id="gltf-huangfeilong" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/fourseasonsgriffons_spring.glb" />
     <xr-asset-load type="gltf" asset-id="gltf-lanniao" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/fourseasonsgriffons_winter.glb" />
     <xr-asset-load type="gltf" asset-id="gltf-denglong" src="https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/8.glb" />
+    
   </xr-assets>
   <xr-env node-id="World" env-data="env1"/>
 
       <xr-node  node-id="models">
         <xr-gltf id="wxball2" node-id="mesh-gltf-wxball2" scale="500 500 500" position="-5 0.5 5"    model="gltf-long"
-            anim-autoplay
+            anim-autoplay 
           />
       
           <xr-gltf id="wxball2" node-id="mesh-gltf-wxball2" scale="25 25 25" position="0 -1.5 -40"    model="gltf-binglong"
@@ -111,12 +112,58 @@
         anim-autoplay
       />
       </xr-node>
+<!--<view class="uiView">
+  <button class="tapbtn2" plain="true" bindtap="clickZhaoHuan"  style="position: fixed; right: 30rpx; top: 650rpx; width:180rpx; height: 160rpx" >
+  <image class="tapimg2" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/rigth_zhaohuan.png'  style="position: absolute; left: 0rpx; top:-15rpx;  height: 180rpx; width:180rpx;" ></image>
+</button>
+
+<button class="tapbtn3" plain="true" bindtap="clickPaiZhao"  style="position: fixed; right: 30rpx; top: 850rpx; width:180rpx; height: 160rpx">
+  <image class="tapimg3" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/right_paizhao.png'  style="position: absolute; left: 0rpx; top:-15rpx;  height: 180rpx; width:180rpx;" ></image>
+</button>
+
+<button class="tapbtn4" plain="true" bindtap="clickLuXiang"  style="position: fixed; right: 30rpx; top: 1050rpx; width:180rpx; height: 160rpx">
+  <image class="tapimg4" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/right_luxiang.png'  style="position: absolute; left: 0rpx; top:-15rpx;  height: 180rpx; width:180rpx;" ></image>
+</button>
+
+
+<view wx:if="{{zhaohuanstate}}" class="zhaohuanView">
+  <image  class="zhaohuan" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/zhaohuanText.png'    style="position: fixed; left: 100rpx; top: 1270rpx; width: 554rpx; height: 80rpx; display: flex; box-sizing: border-box"></image>
+
+  <button class="tapbtn5" plain="false" bindtap="ClickzhaohuanSS"  style="position: fixed; left:230rpx; top: 1390rpx; ">
+    <image  class="zhaohuan" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/zhaohuanBtn.png'    style="position: fixed; left:230rpx; top: 1390rpx; width: 300rpx; height: 100rpx; display: flex; box-sizing: border-box"></image>
+  </button>
+</view>
+
+<view wx:if="{{paizhaostate}}" class="paizhaoView">
+  <image  class="paizhao" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/paizhaoText.png'    style="position: fixed; left: 100rpx; top: 1270rpx; width: 554rpx; height: 80rpx; display: flex; box-sizing: border-box"></image>
+
+  <button class="tapbtn6" plain="true" bindtap="Clickpaizhao"  style="position: fixed; left:230rpx; top: 1390rpx;">
+    <image  class="paizhao" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/paizhaoBtn.png'    style="position: fixed; left:300rpx; top: 1390rpx; width: 160rpx; height: 160rpx; display: flex; box-sizing: border-box"></image>
+  </button>
+</view>
+
+<view wx:if="{{luxiangstate}}" class="luxiangView">
+  <view wx:if="{{isStartluxiang}}" class="startluxiang">
+    <image  class="luxiang" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/luxiang2Text.png'    style="position: fixed; left: 100rpx; top: 1270rpx; width: 554rpx; height: 80rpx; display: flex; box-sizing: border-box"></image>
+
+  <button class="tapbtn8" plain="true" bindtap="Clickcloseluxiang"  style="position: fixed; right: 30rpx; top: 1050rpx; ">
+    <image  class="luxiang" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/luxiang2Btn.png'    style="position: fixed; left:300rpx; top: 1390rpx; width: 160rpx; height: 160rpx; display: flex; box-sizing: border-box"></image>
+  </button>
+  </view>
 
+  <view wx:if="{{!isStartluxiang}}" class="closeluxiang">
+    <image  class="luxiang" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/luxiang1Text.png'    style="position: fixed; left: 100rpx; top: 1270rpx; width: 554rpx; height: 80rpx; display: flex; box-sizing: border-box"></image>
 
+<button class="tapbtn7" plain="true" bindtap="Clickstartluxiang"  style="position: fixed; left:230rpx; top: 1390rpx;">
+  <image  class="luxiang" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/luxiang1Btn.png'    style="position: fixed; left:300rpx; top: 1390rpx; width: 160rpx; height: 160rpx; display: flex; box-sizing: border-box"></image>
+</button>
+ 
+</view>
+</view>
+</view>-->
 
-   
     <xr-camera
-      id="camera" node-id="camera" position="1 1 1" clear-color="0.925 0.925 0.925 1"
+      id="camera" node-id="camera" position="1 1 10" clear-color="0.925 0.925 0.925 1"
       background="ar" is-ar-camera
     />
   

+ 4 - 2
miniprogram/pages/ar-classic/scene-classic-show/index.js

@@ -12,9 +12,11 @@ Page({
     this.setData({loaded: true});
   },
   handlestr: function({detail}) {
-    //console.log('assets handlestr', detail);
-
+    console.log('assets handlestr', detail);
     this.setData({loadedSaoMiao: true});
+  },
+  ontouchend(){
+   
   }
 });
 

+ 15 - 3
miniprogram/pages/index/index.js

@@ -14,6 +14,7 @@ import '../../xr-custom/elements/xr-shining-star';
 import '../../xr-custom/assets/effect-shining';
 import '../../xr-custom/assets/effect-last-record-final';
 */
+import { sup } from '../behavior-scene/scene-ready';
 import list from './data/index';
 
 let lastOpened = false;
@@ -23,10 +24,21 @@ let first = true;
 Page({
   data: {
     list,
-    root: ''
+    root: '',
+    zhaohuanstate:true,
+    paizhaostate:false,
+    luxiangstate:false,
+    isStartluxiang:true,
+    isCloseluxiang:false,
+    
+    captureState: 0,
+    recordState: 0,
+    captureQuality: 0.8,
+    captureType: 'jpg',
+    
   },
   onLoad() {
-    
+
   },
   onShareAppMessage() {
     return {
@@ -39,7 +51,7 @@ Page({
     }
   },
   clickHandle(e) {
-
+    
 
     wx.navigateTo({
     // url: '/pages/ar/plane-ar-v2-marker/plane-ar-v2-marker',

+ 50 - 3
miniprogram/pages/index/index.wxml

@@ -2,14 +2,61 @@
 
 <view class="page-background">
 
-  <image class="text" src='/assets/image/p1-text.png'    style="position: relative; left: 126rpx; top: 421rpx"></image>
+ <!-- <image class="text" src='/assets/image/p1-text.png'    style="position: relative; left: 126rpx; top: 421rpx"></image> -->
 
+<button class="tapbtn1" plain="true" bindtap="clickHandle"  style="position: relative; left: 1rpx; top: 1330rpx; width:300rpx; height: 120rpx">
+  <image class="tapimg1" src='/assets/image/p1_bgbt2.png'  style="position: relative; height: 120rpx; width: 300rpx;" ></image>
+</button>
+
+<!--<button class="tapbtn2" plain="true" bindtap="clickZhaoHuan"  style="position: fixed; right: 30rpx; top: 650rpx; width:180rpx; height: 160rpx" >
+  <image class="tapimg2" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/rigth_zhaohuan.png'  style="position: absolute; left: 0rpx; top:-15rpx;  height: 180rpx; width:180rpx;" ></image>
+</button>
+
+<button class="tapbtn3" plain="true" bindtap="clickPaiZhao"  style="position: fixed; right: 30rpx; top: 850rpx; width:180rpx; height: 160rpx">
+  <image class="tapimg3" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/right_paizhao.png'  style="position: absolute; left: 0rpx; top:-15rpx;  height: 180rpx; width:180rpx;" ></image>
+</button>
+
+<button class="tapbtn4" plain="true" bindtap="clickLuXiang"  style="position: fixed; right: 30rpx; top: 1050rpx; width:180rpx; height: 160rpx">
+  <image class="tapimg4" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/right_luxiang.png'  style="position: absolute; left: 0rpx; top:-15rpx;  height: 180rpx; width:180rpx;" ></image>
+</button>
+
+</view>
 
 
 
+<view wx:if="{{zhaohuanstate}}" class="zhaohuanView">
+  <image  class="zhaohuan" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/zhaohuanText.png'    style="position: fixed; left: 100rpx; top: 1270rpx; width: 554rpx; height: 80rpx; display: flex; box-sizing: border-box"></image>
 
-<button class="tapbtn1" plain="true" bindtap="clickHandle"  style="position: relative; left: 1rpx; top: 1110rpx">
-  <image class="tapimg1" src='/assets/image/p1-btbg.png' ></image>
+  <button class="tapbtn5" plain="false" bindtap="ClickzhaohuanSS"  style="position: fixed; left:230rpx; top: 1390rpx; ">
+    <image  class="zhaohuan" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/zhaohuanBtn.png'    style="position: fixed; left:230rpx; top: 1390rpx; width: 300rpx; height: 100rpx; display: flex; box-sizing: border-box"></image>
+  </button>
+</view>
+
+<view wx:if="{{paizhaostate}}" class="paizhaoView">
+  <image  class="paizhao" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/paizhaoText.png'    style="position: fixed; left: 100rpx; top: 1270rpx; width: 554rpx; height: 80rpx; display: flex; box-sizing: border-box"></image>
+
+  <button class="tapbtn6" plain="true" bindtap="Clickpaizhao"  style="position: fixed; left:230rpx; top: 1390rpx;">
+    <image  class="paizhao" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/paizhaoBtn.png'    style="position: fixed; left:300rpx; top: 1390rpx; width: 160rpx; height: 160rpx; display: flex; box-sizing: border-box"></image>
+  </button>
+</view>
+
+<view wx:if="{{luxiangstate}}" class="luxiangView">
+  <view wx:if="{{isStartluxiang}}" class="startluxiang">
+    <image  class="luxiang" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/luxiang2Text.png'    style="position: fixed; left: 100rpx; top: 1270rpx; width: 554rpx; height: 80rpx; display: flex; box-sizing: border-box"></image>
+
+  <button class="tapbtn8" plain="true" bindtap="Clickcloseluxiang"  style="position: fixed; right: 30rpx; top: 1050rpx; ">
+    <image  class="luxiang" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/luxiang2Btn.png'    style="position: fixed; left:300rpx; top: 1390rpx; width: 160rpx; height: 160rpx; display: flex; box-sizing: border-box"></image>
+  </button>
+  </view>
+
+  <view wx:if="{{!isStartluxiang}}" class="closeluxiang">
+    <image  class="luxiang" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/luxiang1Text.png'    style="position: fixed; left: 100rpx; top: 1270rpx; width: 554rpx; height: 80rpx; display: flex; box-sizing: border-box"></image>
+
+<button class="tapbtn7" plain="true" bindtap="Clickstartluxiang"  style="position: fixed; left:230rpx; top: 1390rpx;">
+  <image  class="luxiang" src='https://wx-model-1317557471.cos.ap-shanghai.myqcloud.com/WXImage/luxiang1Btn.png'    style="position: fixed; left:300rpx; top: 1390rpx; width: 160rpx; height: 160rpx; display: flex; box-sizing: border-box"></image>
 </button>
+ 
+</view>-->
 </view>
 
+

File diff suppressed because it is too large
+ 0 - 0
miniprogram/pages/index/index.wxss


+ 3 - 1
typings/index.d.ts

@@ -5,4 +5,6 @@ interface IAppOption {
     userInfo?: WechatMiniprogram.UserInfo,
   }
   userInfoReadyCallback?: WechatMiniprogram.GetUserInfoSuccessCallback,
-}
+}
+
+

Some files were not shown because too many files changed in this diff