From 0b30408aaeaf1f60e9356d6f0282eebf53fb012d Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 23 Aug 2023 15:47:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B03D=E6=A8=A1=E5=9E=8B=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/src/images/not_model.png           | Bin 0 -> 3601 bytes
 .../static/src/js/3d_viewer.js                |  27 ++++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 web_widget_model_viewer/static/src/images/not_model.png

diff --git a/web_widget_model_viewer/static/src/images/not_model.png b/web_widget_model_viewer/static/src/images/not_model.png
new file mode 100644
index 0000000000000000000000000000000000000000..16e69cea9bd5e71fa915970ada4e7083127f58d7
GIT binary patch
literal 3601
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
X(6rX59wR)Y00000NkvXXu0mjfct!U|

literal 0
HcmV?d00001

diff --git a/web_widget_model_viewer/static/src/js/3d_viewer.js b/web_widget_model_viewer/static/src/js/3d_viewer.js
index 582c887f..f93cf207 100644
--- a/web_widget_model_viewer/static/src/js/3d_viewer.js
+++ b/web_widget_model_viewer/static/src/js/3d_viewer.js
@@ -19,31 +19,34 @@ var QWeb = core.qweb;
 import { Component, onWillUpdateProps, useState, useRef, useEffect } from "@odoo/owl";
 
 export class StepViewer extends Component {
-   setup() {
-       console.log('setup')
+    setup() {
         this.props.url = this.formatUrl();
     }
-
     formatUrl(){
         var url = '';
         if (this.props.value) {
-            if (utils.is_bin_size(this.props.value)) {
+            if (this.props.value.slice(-1) == 'b' && !isNaN(this.props.value.split(' ')[0])) {
                 var url_props = {
                     base_url: session['web.base.url'],
                     model: this.props.record.resModel,
                     id: JSON.stringify(this.props.record.data['id']),
                     field: this.props.name}
-                url = url_props['base_url']+'/web/content/'+url_props['model']+'/'+url_props['id']+'/'+url_props['field']+'?download=true'
-                console.log('url', url)
-
+                url = url_props['base_url'].replace('http://', 'https://') +'/web/content/'+url_props['model']+'/'+url_props['id']+'/'+url_props['field']+'?download=true'
+                // url = 'http://localhost:8069'+'/web/content/'+url_props['model']+'/'+url_props['id']+'/'+url_props['field']+'?download=true'
+                console.log('url111111',url)
+                return url
             } else {
-                url = "data:model/gltf-binary;base64," + this.props.value;
-                console.log('url222', url)
+                    url = "data:model/gltf-binary;base64," + this.props.value;
+                    console.log('url2',url)
+                    return url
+                    // localStorage.setItem('url',url)
+                    // let new_url = localStorage.getItem(('url'))
+                    // var oViewer = document.getElementsByTagName('model-viewer')[0];
+                    // return new_url
+                    // url = "web_widget_model_viewer/static/src/images/not_model.png";
             }
         }
-        return url
-    }
-
+        }
 }
 
 StepViewer.template = "web_widget_model_viewer.BinaryField3d";