Merge branch 'master' of http://git.choozmo.com:3000/choozmo/AI_Anchor_2

OpenshotService/openshot_video_generator.py

@@ -793,7 +793,10 @@ def anchor_video_v2(name_hash,name,text_content, image_urls,multiLang,avatar,fre
         anchor_list[idx].Open()
         anchor_clip_list[idx] = video_photo_clip(vid=anchor_list[idx],layer=4,scale_x=0.65,scale_y=0.65,
                 location_x=0.35,location_y=0.25,position=main_timer, end=clip_duration,ck=ck_anchor,audio=False)
-        t.AddClip(anchor_clip_list[idx])
+        if avatar!=18:
+            print('avatar is ', avatar)
+            t.AddClip(anchor_clip_list[idx])
+        
 
         img_list[idx] = openshot.FFmpegReader(dir_photo+name_hash+'/'+p)
         img_list[idx].Open()
@@ -812,6 +815,7 @@ def anchor_video_v2(name_hash,name,text_content, image_urls,multiLang,avatar,fre
         img_list[idx].Close()
         anchor_list[idx].Close()
         audio_list[idx].Close()
+        
             
         sub_img_list[idx] = [None] * len(sub_list[idx])
         sub_clip_list[idx] = [None] * len(sub_list[idx])

html/index.html

@@ -23,7 +23,6 @@
     <link rel="stylesheet" href="static/scss/style.css">
     <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
     <div id="fb-root"></div>
-
     <!-- Google Tag Manager -->
     <script>(function (w, d, s, l, i) {
             w[l] = w[l] || []; w[l].push({
@@ -68,7 +67,7 @@
                                     onclick="changeLan(this)" value="en">English</button></li>
                             <li><button class="nav-link lan-switch" aria-current="page" set-lan="html:zh"
                                     onclick="changeLan(this)" value="zh">中文</button></li>
-                        </ul> -->
+                        </ul> <div></div>-->
                     </li>
                     <div id="lang-manu">
                         <li><button class="nav-link lan-swtich bg-transparent text-white border-0 mx-auto"