Merge remote-tracking branch 'remotes/origin/locky' into test

Controller/RegionController.py

@@ -330,6 +330,8 @@ class RegionView(View):
                 app_name = 'Loocam'
             elif app_bundle_id in ['com.cloudlife.commissionf', 'com.cloudlife.commissionf_a']:
                 app_name = 'VSees'
+            elif app_bundle_id in ['com.livecamera.cooperationh', 'com.livecamera.cooperationh_a']:
+                app_name = 'ozi'
 
             country_qs = CountryLanguageModel.objects.filter(language_id=lang.id). \
                 annotate(push_api=F('country__region__push_api'))
@@ -341,6 +343,8 @@ class RegionView(View):
                 country_qs = country_qs.annotate(api=F('country__region__loocam_api'))
             elif app_name == 'VSees':
                 country_qs = country_qs.annotate(api=F('country__region__neutral_api'))
+            elif app_name == 'ozi':
+                country_qs = country_qs.annotate(api=F('country__region__ozi_api'))
             else:
                 country_qs = country_qs.annotate(api=F('country__region__api'))
             country_qs = country_qs.values('country_id', 'country_name', 'api', 'push_api').order_by('country_id')
@@ -355,6 +359,8 @@ class RegionView(View):
                                 country['api'] = 'https://api.zositech2.com/'
                             elif app_name == 'Loocam':
                                 country['api'] = 'https://api.loocam2.com/'
+                            elif app_name == 'ozi':
+                                country['api'] = 'https://api.zositech2.com/'
                             else:
                                 country['api'] = 'https://www.dvema.com/'
                             break

Model/models.py

@@ -2987,6 +2987,7 @@ class RegionModel(models.Model):
     loocam_api = models.CharField(max_length=50, default='', verbose_name='录看域名')
     neutral_api = models.CharField(max_length=50, default='', verbose_name='中性域名')
     push_api = models.CharField(max_length=50, default='', verbose_name='推送域名')
+    ozi_api = models.CharField(max_length=50, default='', verbose_name='ozi域名')
 
     class Meta:
         db_table = 'tb_region'