From 418087cfd0b7afeb828706eac7c7e827863ed503 Mon Sep 17 00:00:00 2001
From: duqingquan-jpc <zmobs0@163.com>
Date: Thu, 22 Dec 2022 12:09:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=AF=AD=E6=B3=95?=
 =?UTF-8?q?=E7=94=A8=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/SDKIntegration/Lottie/index.nvue        |  27 ++--
 .../assets/{AndroidWave.json => anim_a.json}  |   0
 .../{zy_lottie_live.json => anim_b.json}      |   0
 .../utssdk/app-android/index.vue              | 123 ++++++++++--------
 4 files changed, 79 insertions(+), 71 deletions(-)
 rename uni_modules/uts-animation-view/utssdk/app-android/assets/{AndroidWave.json => anim_a.json} (100%)
 rename uni_modules/uts-animation-view/utssdk/app-android/assets/{zy_lottie_live.json => anim_b.json} (100%)

diff --git a/pages/SDKIntegration/Lottie/index.nvue b/pages/SDKIntegration/Lottie/index.nvue
index 8f258ab..1b7b2ac 100644
--- a/pages/SDKIntegration/Lottie/index.nvue
+++ b/pages/SDKIntegration/Lottie/index.nvue
@@ -1,8 +1,8 @@
 <template>
     <div>
-        <button @tap="changeHiden">测试隐藏组件</button>
-        <button @tap="updateStyle" :style="{width:widthNum+'px',height:heightNum+'px',background:yanse}">测试更新样式</button>
-        <button @tap="changeUrl">测试更新动画链接</button>
+        <button @tap="changeUrl">播放本地动画资源</button>
+		<button @tap="changeServerUrl">播放远程动画资源</button>
+		
         <button @tap="changeAutoPlay">测试AutoPlay</button>
         <button @tap="changeLoop">测试Loop</button>
         <button @tap="changeAction(1)">测试action play</button>
@@ -26,8 +26,8 @@
                 action: "play",
                 loop: false,
                 yanse: "red",
-                widthNum: 200,
-                heightNum: 100,
+                widthNum: 375,
+                heightNum: 200,
                 comShow: true,
                 animUrl: "AndroidWave.json"
             }
@@ -35,25 +35,20 @@
         
         methods: {
 
-            updateStyle: function() {
-                this.heightNum = 200
-                this.widthNum = 300
-                this.yanse = "green"
-            },
-            changeHiden: function() {
-                this.hidden = !this.hidden
-            },
             changeAutoPlay: function() {
                 this.autoplay = !this.autoplay
             },
             changeUrl: function() {
-                if (this.animUrl == "zy_lottie_live.json") {
-                    this.animUrl = "AndroidWave.json"
+                if (this.animUrl == "anim_a.json") {
+                    this.animUrl = "anim_b.json"
                 } else {
-                    this.animUrl = "zy_lottie_live.json"
+                    this.animUrl = "anim_a.json"
                 }
             },
 
+			changeServerUrl: function() {
+                this.animUrl = "https://b.bdstatic.com/miniapp/images/lottie_example_one.json"
+            },
             changeAction: function(type) {
                 if (type == 1) {
                     this.action = "play"
diff --git a/uni_modules/uts-animation-view/utssdk/app-android/assets/AndroidWave.json b/uni_modules/uts-animation-view/utssdk/app-android/assets/anim_a.json
similarity index 100%
rename from uni_modules/uts-animation-view/utssdk/app-android/assets/AndroidWave.json
rename to uni_modules/uts-animation-view/utssdk/app-android/assets/anim_a.json
diff --git a/uni_modules/uts-animation-view/utssdk/app-android/assets/zy_lottie_live.json b/uni_modules/uts-animation-view/utssdk/app-android/assets/anim_b.json
similarity index 100%
rename from uni_modules/uts-animation-view/utssdk/app-android/assets/zy_lottie_live.json
rename to uni_modules/uts-animation-view/utssdk/app-android/assets/anim_b.json
diff --git a/uni_modules/uts-animation-view/utssdk/app-android/index.vue b/uni_modules/uts-animation-view/utssdk/app-android/index.vue
index 5befb26..423ed85 100644
--- a/uni_modules/uts-animation-view/utssdk/app-android/index.vue
+++ b/uni_modules/uts-animation-view/utssdk/app-android/index.vue
@@ -86,45 +86,51 @@
             "path": {
                 handler(newPath: string) {
 
-                    let lottieAnimationView = this.$el
-
-                    if (lottieAnimationView != null && !TextUtils.isEmpty(newPath)) {
-                        if (newPath.startsWith("http://") || newPath.startsWith("https://")) {
-                            lottieAnimationView.setAnimationFromUrl(newPath)
-                        } else {
-                            // 默认是asset了
-                            lottieAnimationView.setAnimation(newPath)
-                        }
-                    }
-                    if (this.autoplay) {
-                        lottieAnimationView.playAnimation()
-                    }
+                    
+					if(this.$el != null){
+						let lottieAnimationView = this.$el
+						if (!TextUtils.isEmpty(newPath)) {
+						    if (newPath.startsWith("http://") || newPath.startsWith("https://")) {
+						        lottieAnimationView.setAnimationFromUrl(newPath)
+						    } else {
+						        // 默认是asset了
+						        lottieAnimationView.setAnimation(newPath)
+						    }
+						}
+						if (this.autoplay) {
+						    lottieAnimationView.playAnimation()
+						}
+					}
                 },
                 immediate: false //创建时是否通过此方法更新属性，默认值为false  
             },
             "loop": {
                 handler(newLoop: Boolean) {
-
-                    if (newLoop) {
-                        this.$el.repeatCount = Int.MAX_VALUE
-                    } else {
-                        // 不循环则设置成1次
-                        this.$el.repeatCount = 0
-                    }
-
-                    if (this.autoplay) {
-                        this.$el.playAnimation()
-                    }
+					if(this.$el != null){
+						if (newLoop) {
+						    this.$el.repeatCount = Int.MAX_VALUE
+						} else {
+						    // 不循环则设置成1次
+						    this.$el.repeatCount = 0
+						}
+						
+						if (this.autoplay) {
+						    this.$el.playAnimation()
+						}
+					}
+                    
                 },
                 immediate: false //创建时是否通过此方法更新属性，默认值为false  
             },
 
             "autoplay": {
                 handler(newValue: boolean) {
-
-                    if (newValue) {
-                        this.$el.playAnimation()
-                    }
+					if(this.$el != null){
+						if (newValue) {
+						    this.$el.playAnimation()
+						}
+					}
+                    
                 },
                 immediate: false //创建时是否通过此方法更新属性，默认值为false  
             },
@@ -134,15 +140,17 @@
 
                     if (newAction == "play" || newAction == "pause" || newAction == "stop") {
 
-
-                        if (this.action == "play") {
-                            this.$el.playAnimation()
-                        } else if (this.action == "play") {
-                            this.$el.pauseAnimation()
-                        } else if (this.action == "stop") {
-                            this.$el.cancelAnimation()
-                            this.$el.clearAnimation()
-                        }
+						if(this.$el != null){
+							if (this.action == "play") {
+							    this.$el.playAnimation()
+							} else if (this.action == "pause") {
+							    this.$el.pauseAnimation()
+							} else if (this.action == "stop") {
+							    this.$el.cancelAnimation()
+							    this.$el.clearAnimation()
+							}
+						}
+                        
 
                     } else {
                         // 非法入参，不管
@@ -153,12 +161,13 @@
 
             "hidden": {
                 handler(newValue: boolean) {
-                console.log('hidden',newValue)
-                    if (newValue) {
-                        this.$el.visibility = View.GONE
-                    } else {
-                        this.$el.visibility = View.VISIBLE
-                    }
+					if(this.$el != null){
+						if (newValue) {
+						    this.$el.visibility = View.GONE
+						} else {
+						    this.$el.visibility = View.VISIBLE
+						}
+					}
                 },
                 immediate: false //创建时是否通过此方法更新属性，默认值为false  
             },
@@ -166,11 +175,13 @@
         },
         methods: {
             setRepeatMode(repeat: string) {
-                if ("RESTART" == repeat) {
-                    this.$el.repeatMode = LottieDrawable.RESTART
-                } else if ("REVERSE" == repeat) {
-                    this.$el.repeatMode = LottieDrawable.RESTART
-                }
+				if(this.$el != null){
+					if ("RESTART" == repeat) {
+					    this.$el.repeatMode = LottieDrawable.RESTART
+					} else if ("REVERSE" == repeat) {
+					    this.$el.repeatMode = LottieDrawable.RESTART
+					}
+				}
             },
             privateMethod() { //如何定义不对外暴露的API？ 暂不支持，需在export外写  
             }
@@ -183,16 +194,18 @@
         },
         NVLoad(): LottieAnimationView { //创建原生View，必须定义返回值类型（Android需要明确知道View类型，需特殊校验）  
             //必须实现  
-            let lottieAnimationView = new LottieAnimationView(this.$androidContext)
+            let lottieAnimationView = new LottieAnimationView($androidContext)
             return lottieAnimationView
         },
         NVLoaded() { //原生View已创建  
-            //可选实现，这里可以做后续操作  
-            this.$el.repeatMode = LottieDrawable.RESTART;
-            this.$el.visibility = View.GONE
-            this.$el.repeatCount = 0
-            this.$el.addAnimatorListener(new CustomAnimListener(this))
-
+			//可选实现，这里可以做后续操作
+			if(this.$el != null){
+				this.$el.repeatMode = LottieDrawable.RESTART;
+				this.$el.visibility = View.GONE
+				this.$el.repeatCount = 0
+				this.$el.addAnimatorListener(new CustomAnimListener(this))
+			}
+           
         },
         NVLayouted() { //原生View布局完成  
             //可选实现，这里可以做布局后续操作  
-- 
GitLab