fix tracking etl job

src/main/scala/mobvista/dmp/datasource/adn/AdnOrgLogEtlHours.scala

@@ -125,18 +125,32 @@ class AdnOrgLogEtlHours extends CommonSparkJob with Serializable {
         } else {
           ""
         }
-
         var f_platform = if (StringUtils.isNotBlank(platform)) {
           platform.toLowerCase()
         } else {
           ""
         }
+        val f_brand = if (StringUtils.isNotBlank(deviceBrand)) {
+          deviceBrand.trim
+        } else {
+          ""
+        }
+        val f_model = if (StringUtils.isNotBlank(deviceModel)) {
+          deviceModel.trim
+        } else {
+          ""
+        }
+        val f_osv = if (StringUtils.isNotBlank(osVersion)) {
+          osVersion.trim
+        } else {
+          ""
+        }
 
-        f_platform = if (f_platform.contains("ios") || f_platform.contains("iphone") || deviceBrand.toLowerCase.contains("apple")
-          || deviceModel.toLowerCase.contains("iphone") || deviceModel.toLowerCase.contains("ipad") || osVersion.toLowerCase.contains("ios")
+        f_platform = if (f_platform.contains("ios") || f_platform.contains("iphone") || f_brand.toLowerCase.contains("apple")
+          || f_model.toLowerCase.contains("iphone") || f_model.toLowerCase.contains("ipad") || f_osv.toLowerCase.contains("ios")
           || StringUtils.isNotBlank(f_idfa) || StringUtils.isNotBlank(f_idfv) || StringUtils.isNotBlank(f_ruid)) {
           "ios"
-        } else if (f_platform.contains("android") || osVersion.toLowerCase.contains("android") ||
+        } else if (f_platform.contains("android") || f_osv.toLowerCase.contains("android") ||
           StringUtils.isNotBlank(f_imei) || StringUtils.isNotBlank(f_androidId) || StringUtils.isNotBlank(f_oaid) || StringUtils.isNotBlank(f_gaid)) {
           "android"
         } else {