v1.0.0开发：调整自有sdk包名

channel_registry/channel_huawei/src/main/AndroidManifest.xml

@@ -314,6 +314,7 @@
                     android:scheme="fbconnect" />
             </intent-filter>
         </activity>
+
         <provider
             android:name="com.facebook.internal.FacebookInitProvider"
             android:authorities="${applicationId}.FacebookInitProvider"
@@ -321,7 +322,7 @@
 
         <receiver
             android:name="com.facebook.CurrentAccessTokenExpirationBroadcastReceiver"
-            android:exported="false" >
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.facebook.sdk.ACTION_CURRENT_ACCESS_TOKEN_CHANGED" />
             </intent-filter>

channel_registry/channel_huawei/src/main/assets/agconnect-services.json

@@ -1,75 +1,75 @@
 {
-	"agcgw":{
-		"backurl":"connect-dra.hispace.hicloud.com",
-		"url":"connect-dra.dbankcloud.cn",
-		"websocketbackurl":"connect-ws-dra.hispace.dbankcloud.com",
-		"websocketurl":"connect-ws-dra.hispace.dbankcloud.cn"
-	},
-	"agcgw_all":{
-		"CN":"connect-drcn.dbankcloud.cn",
-		"CN_back":"connect-drcn.hispace.hicloud.com",
-		"DE":"connect-dre.dbankcloud.cn",
-		"DE_back":"connect-dre.hispace.hicloud.com",
-		"RU":"connect-drru.dbankcloud.cn",
-		"RU_back":"connect-drru.hispace.hicloud.com",
-		"SG":"connect-dra.dbankcloud.cn",
-		"SG_back":"connect-dra.hispace.hicloud.com"
-	},
-	"client":{
-		"cp_id":"2640852000031689367",
-		"product_id":"737518067793991082",
-		"client_id":"781642244007414976",
-		"client_secret":"4F6D961703766A0590BCDC06B76B55BCA30F2AE5B09102CFBFB6ABEF7661821D",
-		"project_id":"737518067793991082",
-		"app_id":"105116483",
-		"api_key":"CwEAAAAAl0Ub8lJcC4b2nuGaT+j1NznFNrKGrBF5jKY3mpV8EXPIUkKrgSF5aqXcn6VhUuta+LncBgT7fwvI7mwsP/ZkPmcvoBw=",
-		"package_name":"com.xgyy.jpcq.huawei"
-	},
-	"oauth_client":{
-		"client_id":"105116483",
-		"client_type":1
-	},
-	"app_info":{
-		"app_id":"105116483",
-		"package_name":"com.xgyy.jpcq.huawei"
-	},
-	"service":{
-		"analytics":{
-			"collector_url":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
-			"collector_url_ru":"datacollector-drru.dt.hicloud.com,datacollector-drru.dt.dbankcloud.cn",
-			"collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
-			"collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
-			"collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
-			"resource_id":"p1",
-			"channel_id":""
-		},
-		"search":{
-			"url":"https://search-dra.cloud.huawei.com"
-		},
-		"cloudstorage":{
-			"storage_url":"https://ops-dra.agcstorage.link",
-			"default_storage":""
-		},
-		"ml":{
-			"mlservice_url":"ml-api-dra.ai.dbankcloud.com,ml-api-dra.ai.dbankcloud.cn"
-		}
-	},
-	"region":"SG",
-	"configuration_version":"3.0",
-	"appInfos":[
-		{
-			"package_name":"com.xgyy.jpcq.huawei",
-			"client":{
-				"app_id":"105116483"
-			},
-			"app_info":{
-				"package_name":"com.xgyy.jpcq.huawei",
-				"app_id":"105116483"
-			},
-			"oauth_client":{
-				"client_type":1,
-				"client_id":"105116483"
-			}
-		}
-	]
+  "agcgw": {
+    "backurl": "connect-dra.hispace.hicloud.com",
+    "url": "connect-dra.dbankcloud.cn",
+    "websocketbackurl": "connect-ws-dra.hispace.dbankcloud.com",
+    "websocketurl": "connect-ws-dra.hispace.dbankcloud.cn"
+  },
+  "agcgw_all": {
+    "CN": "connect-drcn.dbankcloud.cn",
+    "CN_back": "connect-drcn.hispace.hicloud.com",
+    "DE": "connect-dre.dbankcloud.cn",
+    "DE_back": "connect-dre.hispace.hicloud.com",
+    "RU": "connect-drru.dbankcloud.cn",
+    "RU_back": "connect-drru.hispace.hicloud.com",
+    "SG": "connect-dra.dbankcloud.cn",
+    "SG_back": "connect-dra.hispace.hicloud.com"
+  },
+  "client": {
+    "cp_id": "2640852000031689367",
+    "product_id": "737518067793991082",
+    "client_id": "781642244007414976",
+    "client_secret": "4F6D961703766A0590BCDC06B76B55BCA30F2AE5B09102CFBFB6ABEF7661821D",
+    "project_id": "737518067793991082",
+    "app_id": "105116483",
+    "api_key": "CwEAAAAAl0Ub8lJcC4b2nuGaT+j1NznFNrKGrBF5jKY3mpV8EXPIUkKrgSF5aqXcn6VhUuta+LncBgT7fwvI7mwsP/ZkPmcvoBw=",
+    "package_name": "com.xgyy.jpcq.huawei"
+  },
+  "oauth_client": {
+    "client_id": "105116483",
+    "client_type": 1
+  },
+  "app_info": {
+    "app_id": "105116483",
+    "package_name": "com.xgyy.jpcq.huawei"
+  },
+  "service": {
+    "analytics": {
+      "collector_url": "datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
+      "collector_url_ru": "datacollector-drru.dt.hicloud.com,datacollector-drru.dt.dbankcloud.cn",
+      "collector_url_sg": "datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
+      "collector_url_de": "datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
+      "collector_url_cn": "datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+      "resource_id": "p1",
+      "channel_id": ""
+    },
+    "search": {
+      "url": "https://search-dra.cloud.huawei.com"
+    },
+    "cloudstorage": {
+      "storage_url": "https://ops-dra.agcstorage.link",
+      "default_storage": ""
+    },
+    "ml": {
+      "mlservice_url": "ml-api-dra.ai.dbankcloud.com,ml-api-dra.ai.dbankcloud.cn"
+    }
+  },
+  "region": "SG",
+  "configuration_version": "3.0",
+  "appInfos": [
+    {
+      "package_name": "com.xgyy.jpcq.huawei",
+      "client": {
+        "app_id": "105116483"
+      },
+      "app_info": {
+        "package_name": "com.xgyy.jpcq.huawei",
+        "app_id": "105116483"
+      },
+      "oauth_client": {
+        "client_type": 1,
+        "client_id": "105116483"
+      }
+    }
+  ]
 }

channel_registry/channel_huawei/src/main/assets/grs_sdk_global_route_config_apptouchupdatesdk.json

@@ -1,62 +1,317 @@
 {
-  "applications":[],
-  "services":[
+  "applications": [],
+  "services": [
     {
-      "name":"com.huawei.apptouch.updatesdk",
-      "routeBy":"ser_country",
-      "servings":[
+      "name": "com.huawei.apptouch.updatesdk",
+      "routeBy": "ser_country",
+      "servings": [
         {
-          "countryOrAreaGroup":"DR1",
-          "addresses":{
-            "ROOT":""
+          "countryOrAreaGroup": "DR1",
+          "addresses": {
+            "ROOT": ""
           }
         },
         {
-          "countryOrAreaGroup":"DR2",
-          "addresses":{
-            "ROOT":""
+          "countryOrAreaGroup": "DR2",
+          "addresses": {
+            "ROOT": ""
           }
         },
         {
-          "countryOrAreaGroup":"DR3",
-          "addresses":{
-            "ROOT":"https://store-at-dre.hispace.dbankcloud.com/hwmarket/api/"
+          "countryOrAreaGroup": "DR3",
+          "addresses": {
+            "ROOT": "https://store-at-dre.hispace.dbankcloud.com/hwmarket/api/"
           }
         },
         {
-          "countryOrAreaGroup":"DR4",
-          "addresses":{
-            "ROOT":""
+          "countryOrAreaGroup": "DR4",
+          "addresses": {
+            "ROOT": ""
           }
         }
       ],
-      "countryOrAreaGroups":[
+      "countryOrAreaGroups": [
         {
-          "id":"DR1",
-          "name":"China",
-          "countriesOrAreas":["CN"],
-          "description":"China zone"
+          "id": "DR1",
+          "name": "China",
+          "countriesOrAreas": [
+            "CN"
+          ],
+          "description": "China zone"
         },
         {
-          "id":"DR2",
-          "name":"Asian",
-          "countriesOrAreas":["AE","AF","AG","AI","AM","AO","AQ","AR","AS","AW","AZ","BB","BD","BF","BH","BI","BJ","BL","BM","BN","BO","BR","BS","BT","BV","BW","BY","BZ","CC","CD","CF","CG","CI","CK","CL","CM","CO","CR","CU","CV","CX","DJ","DM","DO","DZ","EC","EG","EH","ER","ET","FJ","FK","FM","GA","GD","GE","GF","GH","GM","GN","GP","GQ","GS","GT","GU","GW","GY","HK","HM","HN","HT","ID","IN","IO","IQ","JM","JO","JP","KE","KG","KH","KI","KM","KN","KP","KW","KY","KZ","KR","LA","LB","LC","LK","LR","LS","LY","MA","MG","MH","ML","MM","MN","MO","MP","MQ","MR","MS","MU","MV","MW","MX","MY","MZ","NA","NC","NE","NF","NG","NI","NP","NR","NU","OM","PA","PE","PF","PG","PH","PK","PN","PR","PS","PW","PY","QA","RE","RW","SA","SB","SC","SD","SG","SH","SL","SN","SO","SR","SS","ST","SV","SY","SZ","TC","TD","TF","TG","TH","TJ","TK","TL","TM","TN","TO","TT","TV","TW","TZ","UG","UY","UZ","VE","VG","VI","VN","VU","WF","WS","YE","YT","ZA","ZM","ZW"],
-          "description":"Asian-African-Latin American zone"
+          "id": "DR2",
+          "name": "Asian",
+          "countriesOrAreas": [
+            "AE",
+            "AF",
+            "AG",
+            "AI",
+            "AM",
+            "AO",
+            "AQ",
+            "AR",
+            "AS",
+            "AW",
+            "AZ",
+            "BB",
+            "BD",
+            "BF",
+            "BH",
+            "BI",
+            "BJ",
+            "BL",
+            "BM",
+            "BN",
+            "BO",
+            "BR",
+            "BS",
+            "BT",
+            "BV",
+            "BW",
+            "BY",
+            "BZ",
+            "CC",
+            "CD",
+            "CF",
+            "CG",
+            "CI",
+            "CK",
+            "CL",
+            "CM",
+            "CO",
+            "CR",
+            "CU",
+            "CV",
+            "CX",
+            "DJ",
+            "DM",
+            "DO",
+            "DZ",
+            "EC",
+            "EG",
+            "EH",
+            "ER",
+            "ET",
+            "FJ",
+            "FK",
+            "FM",
+            "GA",
+            "GD",
+            "GE",
+            "GF",
+            "GH",
+            "GM",
+            "GN",
+            "GP",
+            "GQ",
+            "GS",
+            "GT",
+            "GU",
+            "GW",
+            "GY",
+            "HK",
+            "HM",
+            "HN",
+            "HT",
+            "ID",
+            "IN",
+            "IO",
+            "IQ",
+            "JM",
+            "JO",
+            "JP",
+            "KE",
+            "KG",
+            "KH",
+            "KI",
+            "KM",
+            "KN",
+            "KP",
+            "KW",
+            "KY",
+            "KZ",
+            "KR",
+            "LA",
+            "LB",
+            "LC",
+            "LK",
+            "LR",
+            "LS",
+            "LY",
+            "MA",
+            "MG",
+            "MH",
+            "ML",
+            "MM",
+            "MN",
+            "MO",
+            "MP",
+            "MQ",
+            "MR",
+            "MS",
+            "MU",
+            "MV",
+            "MW",
+            "MX",
+            "MY",
+            "MZ",
+            "NA",
+            "NC",
+            "NE",
+            "NF",
+            "NG",
+            "NI",
+            "NP",
+            "NR",
+            "NU",
+            "OM",
+            "PA",
+            "PE",
+            "PF",
+            "PG",
+            "PH",
+            "PK",
+            "PN",
+            "PR",
+            "PS",
+            "PW",
+            "PY",
+            "QA",
+            "RE",
+            "RW",
+            "SA",
+            "SB",
+            "SC",
+            "SD",
+            "SG",
+            "SH",
+            "SL",
+            "SN",
+            "SO",
+            "SR",
+            "SS",
+            "ST",
+            "SV",
+            "SY",
+            "SZ",
+            "TC",
+            "TD",
+            "TF",
+            "TG",
+            "TH",
+            "TJ",
+            "TK",
+            "TL",
+            "TM",
+            "TN",
+            "TO",
+            "TT",
+            "TV",
+            "TW",
+            "TZ",
+            "UG",
+            "UY",
+            "UZ",
+            "VE",
+            "VG",
+            "VI",
+            "VN",
+            "VU",
+            "WF",
+            "WS",
+            "YE",
+            "YT",
+            "ZA",
+            "ZM",
+            "ZW"
+          ],
+          "description": "Asian-African-Latin American zone"
         },
         {
-          "id":"DR3",
-          "name":"Europe",
-          "countriesOrAreas":["AD","AL","AN","AT","AU","AX","BA","BE","BG","BQ","CA","CH","CW","CY","CZ","DE","DK","EE","ES","FI","FO","FR","GB","GG","GI","GL","GR","HR","HU","IE","IL","IM","IS","IT","JE","LI","LT","LU","LV","MC","MD","ME","MF","MK","MT","NL","NO","NZ","PL","PM","PT","RO","RS","SE","SI","SJ","SK","SM","SX","TR","UA","UM","US","VA","VC","XK","YK"],
-          "description":"Europe zone"
+          "id": "DR3",
+          "name": "Europe",
+          "countriesOrAreas": [
+            "AD",
+            "AL",
+            "AN",
+            "AT",
+            "AU",
+            "AX",
+            "BA",
+            "BE",
+            "BG",
+            "BQ",
+            "CA",
+            "CH",
+            "CW",
+            "CY",
+            "CZ",
+            "DE",
+            "DK",
+            "EE",
+            "ES",
+            "FI",
+            "FO",
+            "FR",
+            "GB",
+            "GG",
+            "GI",
+            "GL",
+            "GR",
+            "HR",
+            "HU",
+            "IE",
+            "IL",
+            "IM",
+            "IS",
+            "IT",
+            "JE",
+            "LI",
+            "LT",
+            "LU",
+            "LV",
+            "MC",
+            "MD",
+            "ME",
+            "MF",
+            "MK",
+            "MT",
+            "NL",
+            "NO",
+            "NZ",
+            "PL",
+            "PM",
+            "PT",
+            "RO",
+            "RS",
+            "SE",
+            "SI",
+            "SJ",
+            "SK",
+            "SM",
+            "SX",
+            "TR",
+            "UA",
+            "UM",
+            "US",
+            "VA",
+            "VC",
+            "XK",
+            "YK"
+          ],
+          "description": "Europe zone"
         },
         {
-          "id":"DR4",
-          "name":"RU",
-          "countriesOrAreas":["RU"],
-          "description":"RU zone"
+          "id": "DR4",
+          "name": "RU",
+          "countriesOrAreas": [
+            "RU"
+          ],
+          "description": "RU zone"
         }
       ]
     }
   ],
-  "countryOrAreaGroups":[]
+  "countryOrAreaGroups": []
 }

channel_registry/channel_huawei/src/main/assets/grs_sdk_global_route_config_opensdkService.json

@@ -1,318 +1,318 @@
 {
-    "applications": [],
-    "services": [
+  "applications": [],
+  "services": [
+    {
+      "name": "com.huawei.cloud.opensdkhianalytics",
+      "routeBy": "issue_country",
+      "servings": [
         {
-            "name": "com.huawei.cloud.opensdkhianalytics",
-            "routeBy": "issue_country",
-            "servings": [
-                {
-                    "countryGroup": "DR1",
-                    "addresses": {
-                        "ROOT": "https://metrics1.data.hicloud.com:6447"
-                    }
-                },
-                {
-                    "countryGroup": "DR2",
-                    "addresses": {
-                        "ROOT": "https://metrics-dra.dt.hicloud.com:6447"
-                    }
-                },
-                {
-                    "countryGroup": "DR3",
-                    "addresses": {
-                        "ROOT": "https://metrics2.data.hicloud.com:6447"
-                    }
-                },
-                {
-                    "countryGroup": "DR4",
-                    "addresses": {
-                        "ROOT": "https://metrics5.data.hicloud.com:6447"
-                    }
-                }
-            ],
-            "countryGroups": [
-                {
-                    "id": "DR1",
-                    "name": "China",
-                    "countries": [
-                        "CN"
-                    ],
-                    "description": "China zone"
-                },
-                {
-                    "id": "DR2",
-                    "name": "Asian-African-Latin American",
-                    "countries": [
-                        "AE",
-                        "AF",
-                        "AG",
-                        "AI",
-                        "AM",
-                        "AO",
-                        "AQ",
-                        "AR",
-                        "AS",
-                        "AW",
-                        "AZ",
-                        "BB",
-                        "BD",
-                        "BF",
-                        "BH",
-                        "BI",
-                        "BJ",
-                        "BL",
-                        "BM",
-                        "BN",
-                        "BO",
-                        "BR",
-                        "BS",
-                        "BT",
-                        "BV",
-                        "BW",
-                        "BY",
-                        "BZ",
-                        "CC",
-                        "CD",
-                        "CF",
-                        "CG",
-                        "CI",
-                        "CK",
-                        "CL",
-                        "CM",
-                        "CO",
-                        "CR",
-                        "CU",
-                        "CV",
-                        "CX",
-                        "DJ",
-                        "DM",
-                        "DO",
-                        "DZ",
-                        "EC",
-                        "EG",
-                        "EH",
-                        "ER",
-                        "ET",
-                        "FJ",
-                        "FK",
-                        "FM",
-                        "GA",
-                        "GD",
-                        "GE",
-                        "GF",
-                        "GH",
-                        "GM",
-                        "GN",
-                        "GP",
-                        "GQ",
-                        "GS",
-                        "GT",
-                        "GU",
-                        "GW",
-                        "GY",
-                        "HK",
-                        "HM",
-                        "HN",
-                        "HT",
-                        "ID",
-                        "IN",
-                        "IO",
-                        "IQ",
-                        "JM",
-                        "JO",
-                        "JP",
-                        "KR",
-                        "KE",
-                        "KG",
-                        "KH",
-                        "KI",
-                        "KM",
-                        "KN",
-                        "KP",
-                        "KW",
-                        "KY",
-                        "KZ",
-                        "LA",
-                        "LB",
-                        "LC",
-                        "LK",
-                        "LR",
-                        "LS",
-                        "LY",
-                        "MA",
-                        "MG",
-                        "MH",
-                        "ML",
-                        "MM",
-                        "MN",
-                        "MO",
-                        "MP",
-                        "MQ",
-                        "MR",
-                        "MS",
-                        "MU",
-                        "MV",
-                        "MW",
-                        "MX",
-                        "MY",
-                        "MZ",
-                        "NA",
-                        "NC",
-                        "NE",
-                        "NF",
-                        "NG",
-                        "NI",
-                        "NP",
-                        "NR",
-                        "NU",
-                        "OM",
-                        "PA",
-                        "PE",
-                        "PF",
-                        "PG",
-                        "PH",
-                        "PK",
-                        "PN",
-                        "PR",
-                        "PS",
-                        "PW",
-                        "PY",
-                        "QA",
-                        "RE",
-                        "RW",
-                        "SA",
-                        "SB",
-                        "SC",
-                        "SD",
-                        "SG",
-                        "SH",
-                        "SL",
-                        "SN",
-                        "SO",
-                        "SR",
-                        "SS",
-                        "ST",
-                        "SV",
-                        "SY",
-                        "SZ",
-                        "TC",
-                        "TD",
-                        "TF",
-                        "TG",
-                        "TH",
-                        "TJ",
-                        "TK",
-                        "TL",
-                        "TM",
-                        "TN",
-                        "TO",
-                        "TT",
-                        "TV",
-                        "TW",
-                        "TZ",
-                        "UG",
-                        "UY",
-                        "UZ",
-                        "VE",
-                        "VG",
-                        "VI",
-                        "VN",
-                        "VU",
-                        "WF",
-                        "WS",
-                        "YE",
-                        "YT",
-                        "ZA",
-                        "ZM",
-                        "ZW"
-                    ],
-                    "description": "Asian-African-Latin American zone"
-                },
-                {
-                    "id": "DR3",
-                    "name": "Europe",
-                    "countries": [
-                        "AD",
-                        "AL",
-                        "AN",
-                        "AT",
-                        "AU",
-                        "AX",
-                        "BA",
-                        "BE",
-                        "BG",
-                        "BQ",
-                        "CA",
-                        "CH",
-                        "CW",
-                        "CY",
-                        "CZ",
-                        "DE",
-                        "DK",
-                        "EE",
-                        "ES",
-                        "FI",
-                        "FO",
-                        "FR",
-                        "GB",
-                        "GG",
-                        "GI",
-                        "GL",
-                        "GR",
-                        "HR",
-                        "HU",
-                        "IE",
-                        "IL",
-                        "IM",
-                        "IS",
-                        "IT",
-                        "JE",
-                        "LI",
-                        "LT",
-                        "LU",
-                        "LV",
-                        "MC",
-                        "MD",
-                        "ME",
-                        "MF",
-                        "MK",
-                        "MT",
-                        "NL",
-                        "NO",
-                        "NZ",
-                        "PL",
-                        "PM",
-                        "PT",
-                        "RO",
-                        "RS",
-                        "SE",
-                        "SI",
-                        "SJ",
-                        "SK",
-                        "SM",
-                        "SX",
-                        "TR",
-                        "UA",
-                        "UM",
-                        "US",
-                        "VA",
-                        "VC",
-                        "XK",
-                        "YK"
-                    ],
-                    "description": "Europe zone"
-                },
-                {
-                    "id": "DR4",
-                    "name": "Russia",
-                    "countries": [
-                        "RU"
-                    ],
-                    "description": "Russia zone"
-                }
-            ]
+          "countryGroup": "DR1",
+          "addresses": {
+            "ROOT": "https://metrics1.data.hicloud.com:6447"
+          }
+        },
+        {
+          "countryGroup": "DR2",
+          "addresses": {
+            "ROOT": "https://metrics-dra.dt.hicloud.com:6447"
+          }
+        },
+        {
+          "countryGroup": "DR3",
+          "addresses": {
+            "ROOT": "https://metrics2.data.hicloud.com:6447"
+          }
+        },
+        {
+          "countryGroup": "DR4",
+          "addresses": {
+            "ROOT": "https://metrics5.data.hicloud.com:6447"
+          }
+        }
+      ],
+      "countryGroups": [
+        {
+          "id": "DR1",
+          "name": "China",
+          "countries": [
+            "CN"
+          ],
+          "description": "China zone"
+        },
+        {
+          "id": "DR2",
+          "name": "Asian-African-Latin American",
+          "countries": [
+            "AE",
+            "AF",
+            "AG",
+            "AI",
+            "AM",
+            "AO",
+            "AQ",
+            "AR",
+            "AS",
+            "AW",
+            "AZ",
+            "BB",
+            "BD",
+            "BF",
+            "BH",
+            "BI",
+            "BJ",
+            "BL",
+            "BM",
+            "BN",
+            "BO",
+            "BR",
+            "BS",
+            "BT",
+            "BV",
+            "BW",
+            "BY",
+            "BZ",
+            "CC",
+            "CD",
+            "CF",
+            "CG",
+            "CI",
+            "CK",
+            "CL",
+            "CM",
+            "CO",
+            "CR",
+            "CU",
+            "CV",
+            "CX",
+            "DJ",
+            "DM",
+            "DO",
+            "DZ",
+            "EC",
+            "EG",
+            "EH",
+            "ER",
+            "ET",
+            "FJ",
+            "FK",
+            "FM",
+            "GA",
+            "GD",
+            "GE",
+            "GF",
+            "GH",
+            "GM",
+            "GN",
+            "GP",
+            "GQ",
+            "GS",
+            "GT",
+            "GU",
+            "GW",
+            "GY",
+            "HK",
+            "HM",
+            "HN",
+            "HT",
+            "ID",
+            "IN",
+            "IO",
+            "IQ",
+            "JM",
+            "JO",
+            "JP",
+            "KR",
+            "KE",
+            "KG",
+            "KH",
+            "KI",
+            "KM",
+            "KN",
+            "KP",
+            "KW",
+            "KY",
+            "KZ",
+            "LA",
+            "LB",
+            "LC",
+            "LK",
+            "LR",
+            "LS",
+            "LY",
+            "MA",
+            "MG",
+            "MH",
+            "ML",
+            "MM",
+            "MN",
+            "MO",
+            "MP",
+            "MQ",
+            "MR",
+            "MS",
+            "MU",
+            "MV",
+            "MW",
+            "MX",
+            "MY",
+            "MZ",
+            "NA",
+            "NC",
+            "NE",
+            "NF",
+            "NG",
+            "NI",
+            "NP",
+            "NR",
+            "NU",
+            "OM",
+            "PA",
+            "PE",
+            "PF",
+            "PG",
+            "PH",
+            "PK",
+            "PN",
+            "PR",
+            "PS",
+            "PW",
+            "PY",
+            "QA",
+            "RE",
+            "RW",
+            "SA",
+            "SB",
+            "SC",
+            "SD",
+            "SG",
+            "SH",
+            "SL",
+            "SN",
+            "SO",
+            "SR",
+            "SS",
+            "ST",
+            "SV",
+            "SY",
+            "SZ",
+            "TC",
+            "TD",
+            "TF",
+            "TG",
+            "TH",
+            "TJ",
+            "TK",
+            "TL",
+            "TM",
+            "TN",
+            "TO",
+            "TT",
+            "TV",
+            "TW",
+            "TZ",
+            "UG",
+            "UY",
+            "UZ",
+            "VE",
+            "VG",
+            "VI",
+            "VN",
+            "VU",
+            "WF",
+            "WS",
+            "YE",
+            "YT",
+            "ZA",
+            "ZM",
+            "ZW"
+          ],
+          "description": "Asian-African-Latin American zone"
+        },
+        {
+          "id": "DR3",
+          "name": "Europe",
+          "countries": [
+            "AD",
+            "AL",
+            "AN",
+            "AT",
+            "AU",
+            "AX",
+            "BA",
+            "BE",
+            "BG",
+            "BQ",
+            "CA",
+            "CH",
+            "CW",
+            "CY",
+            "CZ",
+            "DE",
+            "DK",
+            "EE",
+            "ES",
+            "FI",
+            "FO",
+            "FR",
+            "GB",
+            "GG",
+            "GI",
+            "GL",
+            "GR",
+            "HR",
+            "HU",
+            "IE",
+            "IL",
+            "IM",
+            "IS",
+            "IT",
+            "JE",
+            "LI",
+            "LT",
+            "LU",
+            "LV",
+            "MC",
+            "MD",
+            "ME",
+            "MF",
+            "MK",
+            "MT",
+            "NL",
+            "NO",
+            "NZ",
+            "PL",
+            "PM",
+            "PT",
+            "RO",
+            "RS",
+            "SE",
+            "SI",
+            "SJ",
+            "SK",
+            "SM",
+            "SX",
+            "TR",
+            "UA",
+            "UM",
+            "US",
+            "VA",
+            "VC",
+            "XK",
+            "YK"
+          ],
+          "description": "Europe zone"
+        },
+        {
+          "id": "DR4",
+          "name": "Russia",
+          "countries": [
+            "RU"
+          ],
+          "description": "Russia zone"
         }
-    ],
-    "countryGroups": [],
-    "version": "202002120001"
+      ]
+    }
+  ],
+  "countryGroups": [],
+  "version": "202002120001"
 }

channel_registry/channel_huawei/src/main/assets/grs_sdk_global_route_config_updatesdk.json

@@ -1,62 +1,317 @@
 {
-    "applications":[],
-    "services":[
-        {
-            "name":"com.huawei.updatesdk",
-            "routeBy":"ser_country",
-            "servings":[
-                {
-                    "countryOrAreaGroup":"DR1",
-                    "addresses":{
-                        "ROOT":"https://store-drcn.hispace.dbankcloud.cn/hwmarket/api/"
-                    }
-                },
-                {
-                    "countryOrAreaGroup":"DR2",
-                    "addresses":{
-                        "ROOT":"https://store-dra.hispace.dbankcloud.com/hwmarket/api/"
-                    }
-                },
-                {
-                    "countryOrAreaGroup":"DR3",
-                    "addresses":{
-                        "ROOT":"https://store-dre.hispace.dbankcloud.com/hwmarket/api/"
-                    }
-                },
-                {
-                    "countryOrAreaGroup":"DR4",
-                    "addresses":{
-                        "ROOT":"https://store-drru.hispace.dbankcloud.com/hwmarket/api/"
-                    }
-                }
-            ],
-            "countryOrAreaGroups":[
-                {
-                    "id":"DR1",
-                    "name":"China",
-                    "countriesOrAreas":["CN"],
-                    "description":"China zone"
-                },
-                {
-                    "id":"DR2",
-                    "name":"Asian",
-                    "countriesOrAreas":["AE","AF","AG","AI","AM","AO","AQ","AR","AS","AW","AZ","BB","BD","BF","BH","BI","BJ","BL","BM","BN","BO","BR","BS","BT","BV","BW","BY","BZ","CC","CD","CF","CG","CI","CK","CL","CM","CO","CR","CU","CV","CX","DJ","DM","DO","DZ","EC","EG","EH","ER","ET","FJ","FK","FM","GA","GD","GE","GF","GH","GM","GN","GP","GQ","GS","GT","GU","GW","GY","HK","HM","HN","HT","ID","IN","IO","IQ","JM","JO","JP","KE","KG","KR","KH","KI","KM","KN","KP","KW","KY","KZ","LA","LB","LC","LK","LR","LS","LY","MA","MG","MH","ML","MM","MN","MO","MP","MQ","MR","MS","MU","MV","MW","MX","MY","MZ","NA","NC","NE","NF","NG","NI","NP","NR","NU","OM","PA","PE","PF","PG","PH","PK","PN","PR","PS","PW","PY","QA","RE","RW","SA","SB","SC","SD","SG","SH","SL","SN","SO","SR","SS","ST","SV","SY","SZ","TC","TD","TF","TG","TH","TJ","TK","TL","TM","TN","TO","TT","TV","TW","TZ","UG","UY","UZ","VE","VG","VI","VN","VU","WF","WS","YE","YT","ZA","ZM","ZW"],
-                    "description":"Asian-African-Latin American zone"
-                },
-                {
-                    "id":"DR3",
-                    "name":"Europe",
-                    "countriesOrAreas":["AD","AL","AN","AT","AU","AX","BA","BE","BG","BQ","CA","CH","CW","CY","CZ","DE","DK","EE","ES","FI","FO","FR","GB","GG","GI","GL","GR","HR","HU","IE","IL","IM","IS","IT","JE","LI","LT","LU","LV","MC","MD","ME","MF","MK","MT","NL","NO","NZ","PL","PM","PT","RO","RS","SE","SI","SJ","SK","SM","SX","TR","UA","UM","US","VA","VC","XK","YK"],
-                    "description":"Europe zone"
-                },
-                {
-                    "id":"DR4",
-                    "name":"RU",
-                    "countriesOrAreas":["RU"],
-                    "description":"RU zone"
-                }
-            ]
+  "applications": [],
+  "services": [
+    {
+      "name": "com.huawei.updatesdk",
+      "routeBy": "ser_country",
+      "servings": [
+        {
+          "countryOrAreaGroup": "DR1",
+          "addresses": {
+            "ROOT": "https://store-drcn.hispace.dbankcloud.cn/hwmarket/api/"
+          }
+        },
+        {
+          "countryOrAreaGroup": "DR2",
+          "addresses": {
+            "ROOT": "https://store-dra.hispace.dbankcloud.com/hwmarket/api/"
+          }
+        },
+        {
+          "countryOrAreaGroup": "DR3",
+          "addresses": {
+            "ROOT": "https://store-dre.hispace.dbankcloud.com/hwmarket/api/"
+          }
+        },
+        {
+          "countryOrAreaGroup": "DR4",
+          "addresses": {
+            "ROOT": "https://store-drru.hispace.dbankcloud.com/hwmarket/api/"
+          }
+        }
+      ],
+      "countryOrAreaGroups": [
+        {
+          "id": "DR1",
+          "name": "China",
+          "countriesOrAreas": [
+            "CN"
+          ],
+          "description": "China zone"
+        },
+        {
+          "id": "DR2",
+          "name": "Asian",
+          "countriesOrAreas": [
+            "AE",
+            "AF",
+            "AG",
+            "AI",
+            "AM",
+            "AO",
+            "AQ",
+            "AR",
+            "AS",
+            "AW",
+            "AZ",
+            "BB",
+            "BD",
+            "BF",
+            "BH",
+            "BI",
+            "BJ",
+            "BL",
+            "BM",
+            "BN",
+            "BO",
+            "BR",
+            "BS",
+            "BT",
+            "BV",
+            "BW",
+            "BY",
+            "BZ",
+            "CC",
+            "CD",
+            "CF",
+            "CG",
+            "CI",
+            "CK",
+            "CL",
+            "CM",
+            "CO",
+            "CR",
+            "CU",
+            "CV",
+            "CX",
+            "DJ",
+            "DM",
+            "DO",
+            "DZ",
+            "EC",
+            "EG",
+            "EH",
+            "ER",
+            "ET",
+            "FJ",
+            "FK",
+            "FM",
+            "GA",
+            "GD",
+            "GE",
+            "GF",
+            "GH",
+            "GM",
+            "GN",
+            "GP",
+            "GQ",
+            "GS",
+            "GT",
+            "GU",
+            "GW",
+            "GY",
+            "HK",
+            "HM",
+            "HN",
+            "HT",
+            "ID",
+            "IN",
+            "IO",
+            "IQ",
+            "JM",
+            "JO",
+            "JP",
+            "KE",
+            "KG",
+            "KR",
+            "KH",
+            "KI",
+            "KM",
+            "KN",
+            "KP",
+            "KW",
+            "KY",
+            "KZ",
+            "LA",
+            "LB",
+            "LC",
+            "LK",
+            "LR",
+            "LS",
+            "LY",
+            "MA",
+            "MG",
+            "MH",
+            "ML",
+            "MM",
+            "MN",
+            "MO",
+            "MP",
+            "MQ",
+            "MR",
+            "MS",
+            "MU",
+            "MV",
+            "MW",
+            "MX",
+            "MY",
+            "MZ",
+            "NA",
+            "NC",
+            "NE",
+            "NF",
+            "NG",
+            "NI",
+            "NP",
+            "NR",
+            "NU",
+            "OM",
+            "PA",
+            "PE",
+            "PF",
+            "PG",
+            "PH",
+            "PK",
+            "PN",
+            "PR",
+            "PS",
+            "PW",
+            "PY",
+            "QA",
+            "RE",
+            "RW",
+            "SA",
+            "SB",
+            "SC",
+            "SD",
+            "SG",
+            "SH",
+            "SL",
+            "SN",
+            "SO",
+            "SR",
+            "SS",
+            "ST",
+            "SV",
+            "SY",
+            "SZ",
+            "TC",
+            "TD",
+            "TF",
+            "TG",
+            "TH",
+            "TJ",
+            "TK",
+            "TL",
+            "TM",
+            "TN",
+            "TO",
+            "TT",
+            "TV",
+            "TW",
+            "TZ",
+            "UG",
+            "UY",
+            "UZ",
+            "VE",
+            "VG",
+            "VI",
+            "VN",
+            "VU",
+            "WF",
+            "WS",
+            "YE",
+            "YT",
+            "ZA",
+            "ZM",
+            "ZW"
+          ],
+          "description": "Asian-African-Latin American zone"
+        },
+        {
+          "id": "DR3",
+          "name": "Europe",
+          "countriesOrAreas": [
+            "AD",
+            "AL",
+            "AN",
+            "AT",
+            "AU",
+            "AX",
+            "BA",
+            "BE",
+            "BG",
+            "BQ",
+            "CA",
+            "CH",
+            "CW",
+            "CY",
+            "CZ",
+            "DE",
+            "DK",
+            "EE",
+            "ES",
+            "FI",
+            "FO",
+            "FR",
+            "GB",
+            "GG",
+            "GI",
+            "GL",
+            "GR",
+            "HR",
+            "HU",
+            "IE",
+            "IL",
+            "IM",
+            "IS",
+            "IT",
+            "JE",
+            "LI",
+            "LT",
+            "LU",
+            "LV",
+            "MC",
+            "MD",
+            "ME",
+            "MF",
+            "MK",
+            "MT",
+            "NL",
+            "NO",
+            "NZ",
+            "PL",
+            "PM",
+            "PT",
+            "RO",
+            "RS",
+            "SE",
+            "SI",
+            "SJ",
+            "SK",
+            "SM",
+            "SX",
+            "TR",
+            "UA",
+            "UM",
+            "US",
+            "VA",
+            "VC",
+            "XK",
+            "YK"
+          ],
+          "description": "Europe zone"
+        },
+        {
+          "id": "DR4",
+          "name": "RU",
+          "countriesOrAreas": [
+            "RU"
+          ],
+          "description": "RU zone"
         }
-    ],
-    "countryOrAreaGroups":[]
+      ]
+    }
+  ],
+  "countryOrAreaGroups": []
 }

channel_registry/channel_huawei/src/main/res/drawable/c_buoycircle_hide_shape.xml

@@ -1,4 +1,4 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- 圆角 -->
     <corners android:radius="25dp" />

channel_registry/channel_huawei/src/main/res/drawable/c_buoycircle_hide_shape_red.xml

@@ -1,4 +1,4 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- 圆角 -->
     <corners android:radius="25dp" />

channel_registry/channel_huawei/src/main/res/drawable/hms_game_achievement_bg_shape.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle"
-       android:useLevel="true">
-    <solid android:color="#191919"/>
-    <corners android:radius="16dp"/>
+    android:shape="rectangle"
+    android:useLevel="true">
+    <solid android:color="#191919" />
+    <corners android:radius="16dp" />
 </shape>

channel_registry/channel_huawei/src/main/res/layout-land/c_buoycircle_hide_guide_dialog.xml

@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:orientation="vertical"
     android:paddingTop="8dp">
 
     <ScrollView
-        android:layout_height="wrap_content"
         android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_above="@+id/game_id_buoy_hide_guide_checklayout">
+
         <LinearLayout
-            android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:orientation="vertical"
+            android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
-            android:layout_marginEnd="24dp"
             android:layout_marginLeft="24dp"
-            android:layout_marginRight="24dp">
-
-        <TextView
-            android:id="@+id/game_id_buoy_hide_guide_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textSize="15sp"
-            android:gravity="start"
-            />
-
-        <com.huawei.appmarket.component.buoycircle.impl.view.GifImageView
-            android:id="@+id/game_id_buoy_hide_guide_gif"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/c_buoycircle_hide_guide"/>
+            android:layout_marginEnd="24dp"
+            android:layout_marginRight="24dp"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/game_id_buoy_hide_guide_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="start"
+                android:textSize="15sp" />
+
+            <com.huawei.appmarket.component.buoycircle.impl.view.GifImageView
+                android:id="@+id/game_id_buoy_hide_guide_gif"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/c_buoycircle_hide_guide" />
         </LinearLayout>
 
     </ScrollView>
@@ -38,21 +38,21 @@
 
     <LinearLayout
         android:id="@+id/game_id_buoy_hide_guide_checklayout"
-        android:orientation="horizontal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
         android:layout_marginStart="12dp"
-        android:layout_marginEnd="12dp"
         android:layout_marginLeft="12dp"
+        android:layout_marginEnd="12dp"
         android:layout_marginRight="12dp"
-        android:layout_alignParentBottom="true">
+        android:orientation="horizontal">
 
         <CheckBox
             android:id="@+id/game_id_buoy_hide_guide_remind"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/c_buoycircle_hide_guide_noremind"
-            android:textSize="13sp"/>
+            android:textSize="13sp" />
 
     </LinearLayout>
 </RelativeLayout>

channel_registry/channel_huawei/src/main/res/layout/activity_endisable_service.xml

@@ -2,18 +2,19 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingEnd="16dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
+    android:orientation="vertical"
     android:paddingStart="16dp"
-    android:orientation="vertical" >
+    android:paddingLeft="16dp"
+    android:paddingEnd="16dp"
+    android:paddingRight="16dp">
+
     <TextView
         android:id="@+id/enable_service_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
-        android:layout_marginTop="16dp"
         android:text="Please enable the HMS service in settings tag"
         android:textSize="13sp" />
 

channel_registry/channel_huawei/src/main/res/layout/c_buoycircle_hide_guide_dialog.xml

@@ -1,49 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:orientation="vertical"
     android:paddingTop="8dp">
 
     <TextView
         android:id="@+id/game_id_buoy_hide_guide_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textSize="15sp"
-        android:gravity="start"
         android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
         android:layout_marginLeft="24dp"
+        android:layout_marginEnd="24dp"
         android:layout_marginRight="24dp"
-        />
+        android:gravity="start"
+        android:textSize="15sp" />
 
     <com.huawei.appmarket.component.buoycircle.impl.view.GifImageView
         android:id="@+id/game_id_buoy_hide_guide_gif"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/game_id_buoy_hide_guide_text"
-        android:src="@drawable/c_buoycircle_hide_guide"
         android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
         android:layout_marginLeft="24dp"
-        android:layout_marginRight="24dp"/>
+        android:layout_marginEnd="24dp"
+        android:layout_marginRight="24dp"
+        android:src="@drawable/c_buoycircle_hide_guide" />
 
     <LinearLayout
         android:id="@+id/game_id_buoy_hide_guide_checklayout"
-        android:orientation="horizontal"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_below="@+id/game_id_buoy_hide_guide_gif"
         android:layout_marginStart="12dp"
-        android:layout_marginEnd="12dp"
         android:layout_marginLeft="12dp"
+        android:layout_marginEnd="12dp"
         android:layout_marginRight="12dp"
-        android:layout_below="@+id/game_id_buoy_hide_guide_gif">
+        android:orientation="horizontal">
 
         <CheckBox
             android:id="@+id/game_id_buoy_hide_guide_remind"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/c_buoycircle_hide_guide_noremind"
-            android:textSize="13sp"/>
+            android:textSize="13sp" />
     </LinearLayout>
 </RelativeLayout>

channel_registry/channel_huawei/src/main/res/layout/c_buoycircle_hide_notice.xml

@@ -1,44 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/game_id_buoy_hide_notice_view"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:id="@+id/game_id_buoy_hide_notice_view">
+    android:layout_height="wrap_content">
+
     <LinearLayout
         android:id="@+id/top_notice_bg"
         android:layout_width="match_parent"
         android:layout_height="100dp"
         android:background="@drawable/c_buoycircle_hide_float_top"
         android:orientation="horizontal">
+
         <RelativeLayout
             android:id="@+id/rl_top_notice"
             android:layout_width="match_parent"
             android:layout_height="30dp"
-            android:layout_marginTop="8dp"
-            android:layout_centerHorizontal="true">
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="8dp">
 
             <LinearLayout
                 android:id="@+id/game_id_buoy_hide_notice_bg"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
+                android:orientation="horizontal"
                 android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:orientation="horizontal">
+                android:paddingRight="8dp">
 
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:src="@drawable/c_buoycircle_hide_float_eye_off_gray"/>
+                    android:src="@drawable/c_buoycircle_hide_float_eye_off_gray" />
 
                 <TextView
                     android:id="@+id/top_notice_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
                     android:layout_marginLeft="8dp"
-                    android:textSize="13sp"
-                    android:textColor="#ffffff"
                     android:text="@string/c_buoycircle_auto_hide_notice"
-                    android:layout_gravity="center_vertical"/>
+                    android:textColor="#ffffff"
+                    android:textSize="13sp" />
 
             </LinearLayout>
         </RelativeLayout>

channel_registry/channel_huawei/src/main/res/layout/c_buoycircle_window_small.xml

@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/small_window_layout"
-    android:gravity="center"
     android:layout_width="48dp"
-    android:layout_height="48dp">
+    android:layout_height="48dp"
+    android:gravity="center">
 
-    <ImageView 
+    <ImageView
         android:id="@+id/half_hide_small_icon"
-        android:src="@drawable/c_buoycircle_icon_normal"
         android:layout_width="36dp"
-        android:layout_height="36dp"/>
-         
-    
-    <ImageView 
+        android:layout_height="36dp"
+        android:src="@drawable/c_buoycircle_icon_normal" />
+
+
+    <ImageView
         android:id="@+id/small_icon"
-        android:src="@drawable/c_buoycircle_icon_normal"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:src="@drawable/c_buoycircle_icon_normal" />
 
 </LinearLayout>

channel_registry/channel_huawei/src/main/res/layout/hms_download_progress.xml

@@ -2,47 +2,48 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingEnd="16dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
+    android:orientation="vertical"
     android:paddingStart="16dp"
-    android:orientation="vertical" >
-        <TextView
-            android:id="@+id/hms_message_text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
-            android:layout_marginRight="8dp"
-            android:layout_marginTop="16dp"
-            android:text="@string/hms_downloading_loading"
-            android:textSize="13sp" />
+    android:paddingLeft="16dp"
+    android:paddingEnd="16dp"
+    android:paddingRight="16dp">
 
-        <TextView
-            android:id="@+id/hms_progress_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentEnd="true"
-            android:layout_marginTop="16dp"
-            android:alpha="0.5"
-            android:textSize="13sp"/>
+    <TextView
+        android:id="@+id/hms_message_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:text="@string/hms_downloading_loading"
+        android:textSize="13sp" />
 
-        <RelativeLayout
-            android:id="@+id/hms_progress_bar"
-            android:layout_width="match_parent"
-            android:layout_height="18dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="16dp"
-            android:layout_below="@+id/hms_message_text">
+    <TextView
+        android:id="@+id/hms_progress_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginTop="16dp"
+        android:alpha="0.5"
+        android:gravity="center_vertical"
+        android:textSize="13sp" />
 
-            <ProgressBar
-                android:id="@+id/download_info_progress"
-                style="?android:attr/progressBarStyleHorizontal"
-                android:layout_width="match_parent"
-                android:layout_height="7dp"
-                android:layout_centerVertical="true" />
+    <RelativeLayout
+        android:id="@+id/hms_progress_bar"
+        android:layout_width="match_parent"
+        android:layout_height="18dp"
+        android:layout_below="@+id/hms_message_text"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="16dp">
+
+        <ProgressBar
+            android:id="@+id/download_info_progress"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
+            android:layout_height="7dp"
+            android:layout_centerVertical="true" />
 
-        </RelativeLayout>
+    </RelativeLayout>
 
 </RelativeLayout>

channel_registry/channel_huawei/src/main/res/layout/hms_game_achievement_finish.xml

@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:id="@+id/achievemnet_notice_view"
-             android:layout_width="wrap_content"
-             android:layout_height="36dp"
-             android:orientation="horizontal"
-             android:background="@drawable/hms_game_achievement_bg_shape">
+    android:id="@+id/achievemnet_notice_view"
+    android:layout_width="wrap_content"
+    android:layout_height="36dp"
+    android:background="@drawable/hms_game_achievement_bg_shape"
+    android:orientation="horizontal">
 
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="8dp"
+        android:layout_gravity="center"
         android:layout_marginStart="8dp"
-        android:layout_marginRight="16dp"
+        android:layout_marginLeft="8dp"
         android:layout_marginEnd="16dp"
-        android:layout_gravity="center"
-        android:src="@drawable/hms_game_achievement_finish"/>
+        android:layout_marginRight="16dp"
+        android:src="@drawable/hms_game_achievement_finish" />
 
     <TextView
         android:id="@+id/achievement_finish_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="center"
         android:layout_marginEnd="16dp"
         android:layout_marginRight="16dp"
-        android:layout_gravity="center"
-        android:textColor="#ffffff"
-        android:textSize="16sp"
         android:fontFamily="textFontFamilyRegular"
-        android:text="@string/hms_game_achievement_finish_notice"/>
+        android:text="@string/hms_game_achievement_finish_notice"
+        android:textColor="#ffffff"
+        android:textSize="16sp" />
 
 </LinearLayout>

channel_registry/channel_huawei/src/main/res/layout/hms_game_top_async_login.xml

@@ -1,41 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/login_notice_view"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:id="@+id/login_notice_view"> 
+    android:layout_height="wrap_content">
+
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="60dp"
         android:background="#b3ffffff">
-        
+
         <LinearLayout
-	        android:layout_width="wrap_content"
-	        android:layout_height="wrap_content"
-	        android:layout_centerInParent="true"
-	        android:layout_marginTop="14dp"
-	        android:layout_marginBottom="14dp"
-	        android:layout_marginLeft="12dp"
-	        android:layout_marginRight="12dp"
-	        android:orientation="horizontal">
-	        
-	        <ImageView 
-	            android:layout_width="32dp"
-	            android:layout_height="32dp"
-	            android:src="@drawable/c_buoycircle_icon"/>
-	        
-	        <TextView 
-	            android:id="@+id/top_notice_text"
-	            android:layout_width="wrap_content"
-	            android:layout_height="wrap_content"
-	            android:layout_marginLeft="8dp"
-	            android:ellipsize="end"
-	            android:singleLine="true"
-	            android:textSize="14dp"
-	            android:textColor="#000000"
-	            android:alpha="0.85"
-	            android:layout_gravity="center_vertical"/>
-	        
-	    </LinearLayout>
-     </RelativeLayout>
-    
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_marginLeft="12dp"
+            android:layout_marginTop="14dp"
+            android:layout_marginRight="12dp"
+            android:layout_marginBottom="14dp"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:src="@drawable/c_buoycircle_icon" />
+
+            <TextView
+                android:id="@+id/top_notice_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="8dp"
+                android:alpha="0.85"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:textColor="#000000"
+                android:textSize="14dp" />
+
+        </LinearLayout>
+    </RelativeLayout>
+
 </FrameLayout>

channel_registry/channel_huawei/src/main/res/layout/yyxx_dialog_hw_login.xml

@@ -4,8 +4,8 @@
     android:layout_height="wrap_content"
     android:layout_gravity="center"
     android:background="@drawable/yyxx_hw_container_bg"
-    android:orientation="vertical"
     android:gravity="center"
+    android:orientation="vertical"
     android:padding="10dp">
 
     <ImageView

channel_registry/channel_huawei/src/main/res/layout/yyxx_float_ball_item.xml

@@ -17,9 +17,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
-        android:text="feature"
         android:gravity="center"
         android:singleLine="true"
+        android:text="feature"
         android:textColor="#EA4D4D"
         android:textSize="8sp" />
 

channel_registry/channel_huawei/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+<resources>
         <string name="ag_sdk_cbg_root">MIIFZDCCA0ygAwIBAgIIYsLLTehAXpYwDQYJKoZIhvcNAQELBQAwUDELMAkGA1UE
 BhMCQ04xDzANBgNVBAoMBkh1YXdlaTETMBEGA1UECwwKSHVhd2VpIENCRzEbMBkG
 A1UEAwwSSHVhd2VpIENCRyBSb290IENBMB4XDTE3MDgyMTEwNTYyN1oXDTQyMDgx

channel_registry/channel_huawei/src/main/res/values/styles.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:ns2="http://schemas.android.com/tools">
+<resources>
     <!-- HMSSdkUI -->
     <style name="Base_Translucent" parent="@android:style/Theme.Translucent">
         <item name="android:windowNoTitle">true</item>

channel_registry/channel_huawei2/build.gradle

@@ -44,7 +44,7 @@ android {
 dependencies {
     api 'com.huawei.hms:iap:6.3.0.300'
     api 'com.huawei.hms:game:6.2.0.300'
-    
+
     api 'com.huawei.hms:hianalytics:6.4.0.300'
     api 'com.huawei.agconnect:agconnect-crash:1.6.4.300'
 

channel_registry/channel_huawei2/src/main/res/layout/yyxx_dialog_hw_login.xml

@@ -4,8 +4,8 @@
     android:layout_height="wrap_content"
     android:layout_gravity="center"
     android:background="@drawable/yyxx_hw_container_bg"
-    android:orientation="vertical"
     android:gravity="center"
+    android:orientation="vertical"
     android:padding="10dp">
 
     <ImageView

channel_registry/channel_huawei2/src/main/res/layout/yyxx_float_ball_item.xml

@@ -17,9 +17,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
-        android:text="feature"
         android:gravity="center"
         android:singleLine="true"
+        android:text="feature"
         android:textColor="#EA4D4D"
         android:textSize="8sp" />
 

channel_registry/channel_huawei2/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="facebook_app_id" translatable="false"/>
-    <string name="fb_login_protocol_scheme" translatable="false"/>
+    <string name="facebook_app_id" translatable="false" />
+    <string name="fb_login_protocol_scheme" translatable="false" />
 </resources>

channel_registry/channel_oppo/src/main/res/values/styles.xml

@@ -1,5 +1,6 @@
 <resources>
-	<style name="Theme_Dialog_Custom" parent="@android:style/Theme.Dialog">
+
+    <style name="Theme_Dialog_Custom" parent="@android:style/Theme.Dialog">
         <item name="android:windowFrame">@null</item>
         <item name="android:windowFullscreen">true</item>
         <item name="android:windowNoTitle">true</item>

channel_registry/channel_vivo/src/main/res/anim/vivo_common_bottom_enter_interpolator.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
     android:controlX1="0.28"
-    android:controlY1="0.85"
     android:controlX2="0.3"
+    android:controlY1="0.85"
     android:controlY2="1" />

channel_registry/channel_vivo/src/main/res/anim/vivo_common_bottom_exit_interpolator.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
     android:controlX1="0.28"
-    android:controlY1="0.4"
     android:controlX2="0.2"
+    android:controlY1="0.4"
     android:controlY2="1" />

channel_registry/channel_vivo/src/main/res/anim/vivo_common_bottom_window_enter.xml

@@ -3,11 +3,11 @@
     android:shareInterpolator="false"
     android:zAdjustment="top">
     <translate
-        android:fromYDelta="100%"
-        android:toYDelta="0"
-        android:fillEnabled="true"
-        android:fillBefore="true"
+        android:duration="350"
         android:fillAfter="true"
+        android:fillBefore="true"
+        android:fillEnabled="true"
+        android:fromYDelta="100%"
         android:interpolator="@anim/vivo_common_bottom_enter_interpolator"
-        android:duration="350" />
+        android:toYDelta="0" />
 </set>

channel_registry/channel_vivo/src/main/res/anim/vivo_common_bottom_window_exit.xml

@@ -3,11 +3,11 @@
     android:shareInterpolator="false"
     android:zAdjustment="top">
     <translate
-        android:fromYDelta="0"
-        android:toYDelta="100%"
-        android:fillEnabled="true"
-        android:fillBefore="true"
+        android:duration="350"
         android:fillAfter="true"
+        android:fillBefore="true"
+        android:fillEnabled="true"
+        android:fromYDelta="0"
         android:interpolator="@anim/vivo_common_bottom_exit_interpolator"
-        android:duration="350" />
+        android:toYDelta="100%" />
 </set>

channel_registry/channel_vivo/src/main/res/anim/vivo_common_center_enter_background_interpolator.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
     android:controlX1="0.33"
-    android:controlY1="0.1"
     android:controlX2="0.67"
+    android:controlY1="0.1"
     android:controlY2="1" />

channel_registry/channel_vivo/src/main/res/anim/vivo_common_center_enter_interpolator.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
     android:controlX1="0.28"
-    android:controlY1="0.85"
     android:controlX2="0.36"
+    android:controlY1="0.85"
     android:controlY2="1" />

channel_registry/channel_vivo/src/main/res/anim/vivo_common_center_exit_background_interpolator.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
     android:controlX1="0.33"
-    android:controlY1="0"
     android:controlX2="0.67"
+    android:controlY1="0"
     android:controlY2="1" />

channel_registry/channel_vivo/src/main/res/anim/vivo_common_center_exit_interpolator.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
     android:controlX1="0.25"
-    android:controlY1="0.1"
     android:controlX2="0.25"
+    android:controlY1="0.1"
     android:controlY2="1" />

channel_registry/channel_vivo/src/main/res/anim/vivo_common_center_window_background_enter.xml

@@ -3,11 +3,11 @@
     android:shareInterpolator="false"
     android:zAdjustment="top">
     <alpha
-        android:fromAlpha="0.0"
-        android:toAlpha="0.4"
         android:duration="300"
-        android:interpolator="@anim/vivo_common_center_enter_background_interpolator"
+        android:fillAfter="true"
         android:fillEnabled="true"
-        android:fillAfter="true" />
+        android:fromAlpha="0.0"
+        android:interpolator="@anim/vivo_common_center_enter_background_interpolator"
+        android:toAlpha="0.4" />
 
 </set>

channel_registry/channel_vivo/src/main/res/anim/vivo_common_center_window_background_exit.xml

@@ -3,11 +3,11 @@
     android:shareInterpolator="false"
     android:zAdjustment="top">
     <alpha
-        android:fromAlpha="0.4"
-        android:toAlpha="0.0"
         android:duration="300"
-        android:interpolator="@anim/vivo_common_center_exit_background_interpolator"
+        android:fillAfter="true"
         android:fillEnabled="true"
-        android:fillAfter="true" />
+        android:fromAlpha="0.4"
+        android:interpolator="@anim/vivo_common_center_exit_background_interpolator"
+        android:toAlpha="0.0" />
 
 </set>

channel_registry/channel_vivo/src/main/res/anim/vivo_common_center_window_enter.xml

@@ -3,23 +3,23 @@
     android:shareInterpolator="false"
     android:zAdjustment="top">
     <scale
+        android:duration="300"
+        android:fillAfter="true"
+        android:fillBefore="true"
+        android:fillEnabled="true"
         android:fromXScale="0.8"
-        android:toXScale="1"
         android:fromYScale="0.8"
-        android:toYScale="1"
+        android:interpolator="@anim/vivo_common_center_enter_interpolator"
         android:pivotX="50%"
         android:pivotY="50%"
-        android:fillEnabled="true"
-        android:fillBefore="true"
-        android:fillAfter="true"
-        android:interpolator="@anim/vivo_common_center_enter_interpolator"
-        android:duration="300" />
+        android:toXScale="1"
+        android:toYScale="1" />
     <alpha
-        android:fromAlpha="0.0"
-        android:toAlpha="1.0"
         android:duration="300"
-        android:interpolator="@anim/vivo_common_center_enter_interpolator"
+        android:fillAfter="true"
         android:fillEnabled="true"
-        android:fillAfter="true" />
+        android:fromAlpha="0.0"
+        android:interpolator="@anim/vivo_common_center_enter_interpolator"
+        android:toAlpha="1.0" />
 
 </set>

channel_registry/channel_vivo/src/main/res/anim/vivo_common_center_window_exit.xml

@@ -3,23 +3,23 @@
     android:shareInterpolator="false"
     android:zAdjustment="top">
     <scale
+        android:duration="300"
+        android:fillAfter="true"
+        android:fillBefore="true"
+        android:fillEnabled="true"
         android:fromXScale="1"
-        android:toXScale="0.8"
         android:fromYScale="1"
-        android:toYScale="0.8"
+        android:interpolator="@anim/vivo_common_center_exit_interpolator"
         android:pivotX="50%"
         android:pivotY="50%"
-        android:fillEnabled="true"
-        android:fillBefore="true"
-        android:fillAfter="true"
-        android:interpolator="@anim/vivo_common_center_exit_interpolator"
-        android:duration="300" />
+        android:toXScale="0.8"
+        android:toYScale="0.8" />
     <alpha
-        android:fromAlpha="1.0"
-        android:toAlpha="0.0"
         android:duration="250"
-        android:interpolator="@anim/vivo_common_center_exit_interpolator"
+        android:fillAfter="true"
         android:fillEnabled="true"
-        android:fillAfter="true" />
+        android:fromAlpha="1.0"
+        android:interpolator="@anim/vivo_common_center_exit_interpolator"
+        android:toAlpha="0.0" />
 
 </set>

channel_registry/channel_vivo/src/main/res/anim/vivo_common_enter_interpolator.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
     android:controlX1="0.28"
-    android:controlY1="0.85"
     android:controlX2="0.36"
+    android:controlY1="0.85"
     android:controlY2="1" />

channel_registry/channel_vivo/src/main/res/anim/vivo_common_exit_interpolator.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <pathInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
     android:controlX1="0.4"
-    android:controlY1="0"
     android:controlX2="1"
+    android:controlY1="0"
     android:controlY2="1" />

channel_registry/channel_vivo/src/main/res/anim/vivo_common_window_enter.xml

@@ -4,11 +4,11 @@
     android:shareInterpolator="false"
     android:zAdjustment="top">
     <translate
-        android:fromYDelta="100%"
-        android:toYDelta="0"
-        android:fillEnabled="true"
-        android:fillBefore="true"
+        android:duration="260"
         android:fillAfter="true"
+        android:fillBefore="true"
+        android:fillEnabled="true"
+        android:fromYDelta="100%"
         android:interpolator="@anim/vivo_common_enter_interpolator"
-        android:duration="260" />
+        android:toYDelta="0" />
 </set>

channel_registry/channel_vivo/src/main/res/anim/vivo_common_window_exit.xml

@@ -5,11 +5,11 @@
     android:shareInterpolator="false"
     android:zAdjustment="top">
     <translate
-        android:fromYDelta="0"
-        android:toYDelta="100%"
-        android:fillEnabled="true"
-        android:fillBefore="true"
+        android:duration="230"
         android:fillAfter="true"
+        android:fillBefore="true"
+        android:fillEnabled="true"
+        android:fromYDelta="0"
         android:interpolator="@anim/vivo_common_exit_interpolator"
-        android:duration="230" />
+        android:toYDelta="100%" />
 </set>

channel_registry/channel_vivo/src/main/res/color/iqoo_pay_exit_continue_fill_color_selector.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="true" android:color="@color/iqoo_pay_common_submit_blue_normal_bg_pressed_color" />
-    <item android:state_pressed="false" android:color="@color/vivo_pay_info_collection_editing_subline" />
+    <item android:color="@color/iqoo_pay_common_submit_blue_normal_bg_pressed_color" android:state_pressed="true" />
+    <item android:color="@color/vivo_pay_info_collection_editing_subline" android:state_pressed="false" />
 
 </selector>

channel_registry/channel_vivo/src/main/res/color/vivo_pay_exit_confirm_fill_color_selector.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="true" android:color="@color/vivo_pay_exit_confirm_fill_color" />
-    <item android:state_pressed="false" android:color="@color/vivo_common_white" />
+    <item android:color="@color/vivo_pay_exit_confirm_fill_color" android:state_pressed="true" />
+    <item android:color="@color/vivo_common_white" android:state_pressed="false" />
 
 </selector>

channel_registry/channel_vivo/src/main/res/color/vivo_pay_exit_continue_fill_color_selector.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="true" android:color="@color/vivo_pay_exit_continue_fill_color" />
-    <item android:state_pressed="false" android:color="@color/vivo_common_white" />
+    <item android:color="@color/vivo_pay_exit_continue_fill_color" android:state_pressed="true" />
+    <item android:color="@color/vivo_common_white" android:state_pressed="false" />
 
 </selector>

channel_registry/channel_vivo/src/main/res/drawable/common_loading_process_anim.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <animation-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:duration="200"
-        android:drawable="@drawable/common_loading_process_anim_1" />
+        android:drawable="@drawable/common_loading_process_anim_1"
+        android:duration="200" />
     <item
-        android:duration="200"
-        android:drawable="@drawable/common_loading_process_anim_2" />
+        android:drawable="@drawable/common_loading_process_anim_2"
+        android:duration="200" />
     <item
-        android:duration="200"
-        android:drawable="@drawable/common_loading_process_anim_3" />
+        android:drawable="@drawable/common_loading_process_anim_3"
+        android:duration="200" />
 </animation-list>

channel_registry/channel_vivo/src/main/res/drawable/common_textview_click_selected.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="false" android:color="@color/vivo_pay_info_collection_editing_subline" />
-    <item android:state_pressed="true" android:color="@color/vivo_pay_info_collection_edition_subline_click" />
+    <item android:color="@color/vivo_pay_info_collection_editing_subline" android:state_pressed="false" />
+    <item android:color="@color/vivo_pay_info_collection_edition_subline_click" android:state_pressed="true" />
 
 </selector>

channel_registry/channel_vivo/src/main/res/drawable/iqoo_common_negative_btn_bg.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape android:shape="rectangle"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
     <corners android:radius="@dimen/dp6" />
     <solid android:color="@color/vivo_pay_info_collection_editing_subline" />
 </shape>

channel_registry/channel_vivo/src/main/res/drawable/iqoo_common_negative_btn_bg_p.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape android:shape="rectangle"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
     <corners android:radius="@dimen/dp6" />
     <solid android:color="@color/iqoo_pay_common_submit_blue_normal_bg_pressed_color" />
 </shape>

channel_registry/channel_vivo/src/main/res/drawable/iqoo_common_negative_btn_bg_selector.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/iqoo_common_negative_btn_bg_p" />
+    <item android:drawable="@drawable/iqoo_common_negative_btn_bg_p" android:state_pressed="true" />
 
-    <item android:state_focused="true" android:drawable="@drawable/iqoo_common_negative_btn_bg_p" />
+    <item android:drawable="@drawable/iqoo_common_negative_btn_bg_p" android:state_focused="true" />
 
-    <item android:state_selected="true" android:drawable="@drawable/iqoo_common_negative_btn_bg_p" />
+    <item android:drawable="@drawable/iqoo_common_negative_btn_bg_p" android:state_selected="true" />
 
     <item android:drawable="@drawable/iqoo_common_negative_btn_bg" />
 </selector>

channel_registry/channel_vivo/src/main/res/drawable/iqoo_common_positive_btn_bg_selector.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/iqoo_common_negative_btn_bg_p" />
+    <item android:drawable="@drawable/iqoo_common_negative_btn_bg_p" android:state_pressed="true" />
 
-    <item android:state_focused="true" android:drawable="@drawable/iqoo_common_negative_btn_bg_p" />
+    <item android:drawable="@drawable/iqoo_common_negative_btn_bg_p" android:state_focused="true" />
 
-    <item android:state_selected="true" android:drawable="@drawable/iqoo_common_negative_btn_bg_p" />
+    <item android:drawable="@drawable/iqoo_common_negative_btn_bg_p" android:state_selected="true" />
 
     <item android:drawable="@drawable/iqoo_common_negative_btn_bg" />
 </selector>

channel_registry/channel_vivo/src/main/res/drawable/iqoo_common_submit_blue_bg_selector.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/iqoo_common_submit_blue_pressed_bg" />
-    <item android:state_enabled="false" android:drawable="@drawable/iqoo_common_submit_blue_pressed_bg" />
-    <item android:state_pressed="false" android:drawable="@drawable/iqoo_common_submit_blue_normal_bg" />
+    <item android:drawable="@drawable/iqoo_common_submit_blue_pressed_bg" android:state_pressed="true" />
+    <item android:drawable="@drawable/iqoo_common_submit_blue_pressed_bg" android:state_enabled="false" />
+    <item android:drawable="@drawable/iqoo_common_submit_blue_normal_bg" android:state_pressed="false" />
 </selector>

channel_registry/channel_vivo/src/main/res/drawable/iqoo_common_submit_blue_normal_bg.xml

@@ -5,8 +5,8 @@
     <corners android:radius="@dimen/dp6" />
 
     <gradient
-        android:startColor="@color/vivo_pay_info_collection_editing_subline"
         android:endColor="@color/vivo_pay_info_collection_editing_subline"
+        android:startColor="@color/vivo_pay_info_collection_editing_subline"
         android:type="linear" />
 
 </shape>

channel_registry/channel_vivo/src/main/res/drawable/vivo_common_dialog_negative_btn_selector.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="false" android:drawable="@drawable/vivo_common_dialog_negative_btn_bg" />
-    <item android:state_pressed="true" android:drawable="@drawable/vivo_common_dialog_negative_btn_pressed_bg" />
+    <item android:drawable="@drawable/vivo_common_dialog_negative_btn_bg" android:state_pressed="false" />
+    <item android:drawable="@drawable/vivo_common_dialog_negative_btn_pressed_bg" android:state_pressed="true" />
 
 </selector>

channel_registry/channel_vivo/src/main/res/drawable/vivo_common_dialog_negative_text_color_selector.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="false" android:color="@color/vivo_pay_info_collection_editing_subline" />
-    <item android:state_pressed="true" android:color="@color/vivo_pay_info_collection_edition_subline_click" />
+    <item android:color="@color/vivo_pay_info_collection_editing_subline" android:state_pressed="false" />
+    <item android:color="@color/vivo_pay_info_collection_edition_subline_click" android:state_pressed="true" />
 
 </selector>

channel_registry/channel_vivo/src/main/res/drawable/vivo_common_negative_btn_bg.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape android:shape="rectangle"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
     <stroke
         android:width="@dimen/dp1"
         android:color="@color/vivo_common_negative_btn_color" />

channel_registry/channel_vivo/src/main/res/drawable/vivo_common_negative_btn_bg_p.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape android:shape="rectangle"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
     <stroke
         android:width="@dimen/dp1"
         android:color="@color/vivo_common_negative_btn_color" />

channel_registry/channel_vivo/src/main/res/drawable/vivo_common_negative_btn_bg_selector.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/vivo_common_negative_btn_bg_p" />
+    <item android:drawable="@drawable/vivo_common_negative_btn_bg_p" android:state_pressed="true" />
 
-    <item android:state_focused="true" android:drawable="@drawable/vivo_common_negative_btn_bg_p" />
+    <item android:drawable="@drawable/vivo_common_negative_btn_bg_p" android:state_focused="true" />
 
-    <item android:state_selected="true" android:drawable="@drawable/vivo_common_negative_btn_bg_p" />
+    <item android:drawable="@drawable/vivo_common_negative_btn_bg_p" android:state_selected="true" />
 
     <item android:drawable="@drawable/vivo_common_negative_btn_bg" />
 </selector>

channel_registry/channel_vivo/src/main/res/drawable/vivo_common_neutral_btn_bg.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape android:shape="rectangle"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
     <corners android:radius="@dimen/dp6" />
 
     <gradient
-        android:startColor="@color/vivo_common_submit_blue_normal_bg_start_color"
         android:endColor="@color/vivo_common_submit_blue_normal_bg_end_color"
+        android:startColor="@color/vivo_common_submit_blue_normal_bg_start_color"
         android:type="linear" />
 </shape>

channel_registry/channel_vivo/src/main/res/drawable/vivo_common_neutral_btn_bg_selector.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/vivo_common_neutral_btn_bg_p" />
+    <item android:drawable="@drawable/vivo_common_neutral_btn_bg_p" android:state_pressed="true" />
 
-    <item android:state_focused="true" android:drawable="@drawable/vivo_common_neutral_btn_bg_p" />
+    <item android:drawable="@drawable/vivo_common_neutral_btn_bg_p" android:state_focused="true" />
 
-    <item android:state_selected="true" android:drawable="@drawable/vivo_common_neutral_btn_bg_p" />
+    <item android:drawable="@drawable/vivo_common_neutral_btn_bg_p" android:state_selected="true" />
 
     <item android:drawable="@drawable/vivo_common_neutral_btn_bg" />
 </selector>

channel_registry/channel_vivo/src/main/res/drawable/vivo_common_positive_btn_bg.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape android:shape="rectangle"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
     <stroke
         android:width="@dimen/dp1"
         android:color="@color/vivo_common_positive_btn_color" />

channel_registry/channel_vivo/src/main/res/drawable/vivo_common_positive_btn_bg_p.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape android:shape="rectangle"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
     <stroke
         android:width="@dimen/dp1"
         android:color="@color/vivo_common_positive_btn_color" />

channel_registry/channel_vivo/src/main/res/drawable/vivo_common_positive_btn_bg_selector.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/vivo_common_positive_btn_bg_p" />
+    <item android:drawable="@drawable/vivo_common_positive_btn_bg_p" android:state_pressed="true" />
 
-    <item android:state_focused="true" android:drawable="@drawable/vivo_common_positive_btn_bg_p" />
+    <item android:drawable="@drawable/vivo_common_positive_btn_bg_p" android:state_focused="true" />
 
-    <item android:state_selected="true" android:drawable="@drawable/vivo_common_positive_btn_bg_p" />
+    <item android:drawable="@drawable/vivo_common_positive_btn_bg_p" android:state_selected="true" />
 
     <item android:drawable="@drawable/vivo_common_positive_btn_bg" />
 </selector>

channel_registry/channel_vivo/src/main/res/drawable/vivo_common_stroke_white_bg.xml

@@ -5,8 +5,8 @@
         <shape android:shape="rectangle">
             <corners android:radius="@dimen/dp8" />
             <stroke
-                android:color="@color/vivo_pay_button_stroke_line_color"
-                android:width="@dimen/dp1" />
+                android:width="@dimen/dp1"
+                android:color="@color/vivo_pay_button_stroke_line_color" />
             <solid android:color="@android:color/white" />
         </shape>
     </item>

channel_registry/channel_vivo/src/main/res/drawable/vivo_common_submit_blue_bg_selector.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/vivo_common_submit_blue_pressed_bg" />
-    <item android:state_enabled="false" android:drawable="@drawable/vivo_common_submit_disable_bg" />
-    <item android:state_enabled="true" android:drawable="@drawable/vivo_common_submit_blue_normal_bg" />
+    <item android:drawable="@drawable/vivo_common_submit_blue_pressed_bg" android:state_pressed="true" />
+    <item android:drawable="@drawable/vivo_common_submit_disable_bg" android:state_enabled="false" />
+    <item android:drawable="@drawable/vivo_common_submit_blue_normal_bg" android:state_enabled="true" />
 </selector>

channel_registry/channel_vivo/src/main/res/drawable/vivo_common_submit_blue_normal_bg.xml

@@ -5,8 +5,8 @@
     <corners android:radius="@dimen/dp8" />
 
     <gradient
-        android:startColor="@color/vivo_pay_info_collection_submit_enable"
         android:endColor="@color/vivo_pay_info_collection_submit_enable"
+        android:startColor="@color/vivo_pay_info_collection_submit_enable"
         android:type="linear" />
 
 </shape>

channel_registry/channel_vivo/src/main/res/drawable/vivo_common_submit_white_bg_selector.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_enabled="true" android:drawable="@drawable/vivo_common_submit_white_enable_bg" />
-    <item android:state_enabled="false" android:drawable="@drawable/vivo_common_submit_white_enable_bg" />
-    <item android:state_pressed="true" android:drawable="@drawable/vivo_common_submit_white_pressed_bg" />
+    <item android:drawable="@drawable/vivo_common_submit_white_enable_bg" android:state_enabled="true" />
+    <item android:drawable="@drawable/vivo_common_submit_white_enable_bg" android:state_enabled="false" />
+    <item android:drawable="@drawable/vivo_common_submit_white_pressed_bg" android:state_pressed="true" />
 
 </selector>

channel_registry/channel_vivo/src/main/res/drawable/vivo_common_submit_white_enable_bg.xml

@@ -3,8 +3,8 @@
 
     <corners android:radius="@dimen/dp8" />
     <stroke
-        android:color="@color/vivo_pay_button_stroke_line_color"
-        android:width="@dimen/dp1" />
+        android:width="@dimen/dp1"
+        android:color="@color/vivo_pay_button_stroke_line_color" />
     <solid android:color="@android:color/white" />
 
 </shape>

channel_registry/channel_vivo/src/main/res/drawable/vivo_common_submit_white_pressed_bg.xml

@@ -3,7 +3,7 @@
 
     <corners android:radius="@dimen/dp8" />
     <stroke
-        android:color="@color/vivo_pay_button_pressed_stroke_line_color"
-        android:width="@dimen/dp1" />
+        android:width="@dimen/dp1"
+        android:color="@color/vivo_pay_button_pressed_stroke_line_color" />
     <solid android:color="#4CFFFFFF" />
 </shape>

channel_registry/channel_vivo/src/main/res/layout/activity_pay_checkout.xml

@@ -17,8 +17,8 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/header_title_view"
-        android:orientation="vertical"
-        android:layout_marginBottom="@dimen/dp68">
+        android:layout_marginBottom="@dimen/dp68"
+        android:orientation="vertical">
 
         <!--        通告栏-->
         <RelativeLayout
@@ -56,8 +56,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:gravity="center"
             android:layout_marginTop="@dimen/dp30"
+            android:gravity="center"
             android:paddingStart="@dimen/dp20"
             android:paddingEnd="@dimen/dp20"
             android:textColor="@color/vivo_pay_checkout_commodity_text_color"
@@ -121,8 +121,8 @@
                 android:id="@+id/payment_method_list"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:overScrollMode="never"
-                android:background="@drawable/common_item_touch_select" />
+                android:background="@drawable/common_item_touch_select"
+                android:overScrollMode="never" />
 
         </com.vivo.unionpay.embedded.pay.core.customview.springkit.NestedScrollLayout>
 

channel_registry/channel_vivo/src/main/res/layout/activity_pay_result.xml

@@ -63,8 +63,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp3"
                 android:textColor="@android:color/black"
-                android:textStyle="bold"
-                android:textSize="@dimen/sp33" />
+                android:textSize="@dimen/sp33"
+                android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/tv_tax_mark"
@@ -151,8 +151,8 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/tv_status_show"
             android:layout_centerHorizontal="true"
-            android:gravity="center"
             android:layout_marginTop="@dimen/dp12"
+            android:gravity="center"
             android:textColor="@color/vivo_pay_checkout_not_support_payment_text_color"
             android:textSize="@dimen/sp13" />
 
@@ -164,12 +164,12 @@
             android:layout_marginStart="@dimen/dp20"
             android:layout_marginEnd="@dimen/dp20"
             android:layout_marginBottom="@dimen/dp92"
+            android:background="@drawable/vivo_common_blue_bg"
             android:gravity="center"
             android:text="@string/vivo_pay_result_requery"
-            android:textSize="@dimen/sp14"
             android:textColor="@android:color/white"
+            android:textSize="@dimen/sp14"
             android:textStyle="bold"
-            android:background="@drawable/vivo_common_blue_bg"
             android:visibility="gone" />
 
         <TextView
@@ -180,11 +180,11 @@
             android:layout_marginStart="@dimen/dp20"
             android:layout_marginEnd="@dimen/dp20"
             android:layout_marginBottom="@dimen/dp36"
+            android:background="@drawable/vivo_common_stroke_white_bg"
             android:gravity="center"
-            android:textStyle="bold"
-            android:textSize="@dimen/sp14"
             android:textColor="@color/vivo_pay_info_collection_editing_subline"
-            android:background="@drawable/vivo_common_stroke_white_bg"
+            android:textSize="@dimen/sp14"
+            android:textStyle="bold"
             android:visibility="gone" />
 
     </RelativeLayout>

channel_registry/channel_vivo/src/main/res/layout/activity_price_point_selected.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
     android:background="@android:color/white"
     tools:context=".main.ui.activity.PricePointSelectedActivity">
 
@@ -32,8 +32,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp10"
                 android:text="@string/vivo_pay_price_point_header_tip"
-                android:textSize="@dimen/sp14"
-                android:textColor="@color/vivo_pay_checkout_tax_mark_text_color" />
+                android:textColor="@color/vivo_pay_checkout_tax_mark_text_color"
+                android:textSize="@dimen/sp14" />
 
             <com.vivo.unionpay.embedded.pay.core.customview.NoScrollGridView
                 android:id="@+id/grid_view"
@@ -41,9 +41,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp20"
                 android:horizontalSpacing="@dimen/dp8"
+                android:listSelector="@android:color/transparent"
                 android:numColumns="3"
-                android:verticalSpacing="@dimen/dp8"
-                android:listSelector="@android:color/transparent" />
+                android:verticalSpacing="@dimen/dp8" />
 
             <com.vivo.unionpay.embedded.pay.core.customview.SmartTextView
                 android:id="@+id/tv_kindly_tip"
@@ -51,8 +51,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp20"
                 android:text="@string/vivo_pay_price_point_kindly_tip"
-                android:textSize="@dimen/sp12"
-                android:textColor="@color/vivo_pay_checkout_tax_mark_text_color" />
+                android:textColor="@color/vivo_pay_checkout_tax_mark_text_color"
+                android:textSize="@dimen/sp12" />
 
         </LinearLayout>
 
@@ -73,14 +73,14 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp36"
         android:layout_alignParentBottom="true"
-        android:layout_marginBottom="@dimen/dp36"
         android:layout_marginStart="@dimen/dp20"
         android:layout_marginEnd="@dimen/dp20"
+        android:layout_marginBottom="@dimen/dp36"
+        android:background="@drawable/vivo_common_blue_bg"
         android:gravity="center"
         android:text="@string/vivo_pay_price_point_pay_btn"
-        android:textSize="@dimen/sp14"
         android:textColor="@android:color/white"
-        android:background="@drawable/vivo_common_blue_bg" />
+        android:textSize="@dimen/sp14" />
 
     <com.vivo.unionpay.embedded.pay.core.customview.LoadingView
         android:id="@+id/loading_view"

channel_registry/channel_vivo/src/main/res/layout/apk_install_check_message_view.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
     <!--    message-->
@@ -10,11 +10,11 @@
         android:id="@+id/tv_apk_install_check_content"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dp16"
         android:layout_marginTop="@dimen/dp16"
-        app:heightRatio="1.5"
+        android:layout_marginBottom="@dimen/dp16"
         android:textColor="@color/vivo_pay_common_dialog_message_color"
-        android:textSize="@dimen/sp14" />
+        android:textSize="@dimen/sp14"
+        app:heightRatio="1.5" />
 
     <com.vivo.unionpay.embedded.pay.core.customview.SmartTextView
         android:id="@+id/tv_apk_install_note"
@@ -22,9 +22,9 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp20"
         android:layout_marginBottom="@dimen/dp20"
-        app:heightRatio="1.5"
-        android:textColor="@color/vivo_common_black"
         android:text="@string/vivo_service_plugin_install_tips_"
-        android:textSize="@dimen/sp12" />
+        android:textColor="@color/vivo_common_black"
+        android:textSize="@dimen/sp12"
+        app:heightRatio="1.5" />
 
 </LinearLayout>

channel_registry/channel_vivo/src/main/res/layout/bottom_list_dialog.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/vivo_pay_carrier_select_bottom_dialog_bg">
+    android:background="@drawable/vivo_pay_carrier_select_bottom_dialog_bg"
+    android:orientation="vertical">
 
     <RelativeLayout
         android:id="@+id/header_title_layout"
@@ -15,11 +15,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:layout_marginTop="@dimen/dp10"
             android:layout_marginStart="@dimen/dp20"
-            android:textSize="@dimen/sp20"
+            android:layout_marginTop="@dimen/dp10"
+            android:singleLine="true"
             android:textColor="@color/vivo_pay_carrier_select_title_color"
-            android:singleLine="true" />
+            android:textSize="@dimen/sp20" />
 
         <View
             android:id="@+id/bottom_dialog_title_line"
@@ -55,15 +55,15 @@
             android:id="@+id/btn_next"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp36"
-            android:layout_marginTop="@dimen/dp20"
-            android:layout_marginBottom="@dimen/dp20"
             android:layout_marginStart="@dimen/dp20"
+            android:layout_marginTop="@dimen/dp20"
             android:layout_marginEnd="@dimen/dp20"
+            android:layout_marginBottom="@dimen/dp20"
+            android:background="@drawable/vivo_common_blue_bg"
             android:gravity="center"
             android:text="@string/vivo_pay_next_step"
-            android:textSize="@dimen/sp14"
             android:textColor="@android:color/white"
-            android:background="@drawable/vivo_common_blue_bg" />
+            android:textSize="@dimen/sp14" />
     </LinearLayout>
 
     <!--  抽屉弹窗底部增加40dp空白  -->

channel_registry/channel_vivo/src/main/res/layout/common_loading_view.xml

@@ -10,8 +10,8 @@
         style="@style/vivo_loading_progressbar"
         android:layout_width="@dimen/dp30"
         android:layout_height="@dimen/dp30"
-        android:layout_marginTop="@dimen/dp250"
         android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/dp250"
         android:indeterminateDrawable="@drawable/vivo_loading_progress_bg" />
 
     <TextView
@@ -19,14 +19,14 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/loading_process"
+        android:layout_centerHorizontal="true"
         android:layout_marginTop="@dimen/dp10"
         android:ellipsize="end"
-        android:layout_centerHorizontal="true"
         android:paddingStart="@dimen/dp20"
         android:paddingEnd="@dimen/dp20"
-        android:textSize="@dimen/sp14"
+        android:text="@string/vivo_common_loading_text"
         android:textColor="@color/vivo_pay_loading_tip_color"
-        android:text="@string/vivo_common_loading_text" />
+        android:textSize="@dimen/sp14" />
 
     <ImageView
         android:id="@+id/img_loading_failed"
@@ -34,8 +34,8 @@
         android:layout_height="@dimen/dp320"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="@dimen/dp60"
-        android:scaleType="center"
-        android:background="@drawable/network_connection_failed" />
+        android:background="@drawable/network_connection_failed"
+        android:scaleType="center" />
 
     <TextView
         android:id="@+id/tv_load_failed_prompt"
@@ -43,12 +43,12 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/img_loading_failed"
         android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/dp4"
         android:paddingStart="@dimen/dp20"
         android:paddingEnd="@dimen/dp20"
-        android:layout_marginTop="@dimen/dp4"
         android:text="@string/vivo_pay_network_connect_failed"
-        android:textSize="@dimen/sp14"
-        android:textColor="@color/vivo_pay_checkout_network_connection_failed_text_color" />
+        android:textColor="@color/vivo_pay_checkout_network_connection_failed_text_color"
+        android:textSize="@dimen/sp14" />
 
     <TextView
         android:id="@+id/tv_network_reload"
@@ -57,11 +57,11 @@
         android:layout_below="@id/tv_load_failed_prompt"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="@dimen/dp20"
+        android:background="@drawable/vivo_common_stroke_white_bg"
         android:gravity="center"
         android:text="@string/vivo_pay_reload"
+        android:textColor="@drawable/common_textview_click_selected"
         android:textSize="@dimen/sp14"
-        android:textStyle="bold"
-        android:background="@drawable/vivo_common_stroke_white_bg"
-        android:textColor="@drawable/common_textview_click_selected" />
+        android:textStyle="bold" />
 
 </RelativeLayout>

channel_registry/channel_vivo/src/main/res/layout/common_title_view.xml

@@ -21,8 +21,8 @@
             android:layout_alignParentStart="true"
             android:layout_marginStart="@dimen/dp20"
             android:layout_marginEnd="@dimen/dp8"
-            android:scaleType="center"
             android:background="@drawable/vivo_pay_checkout_back"
+            android:scaleType="center"
             android:visibility="gone" />
 
         <ImageView
@@ -32,8 +32,8 @@
             android:layout_alignParentStart="true"
             android:layout_marginStart="@dimen/dp20"
             android:layout_marginEnd="@dimen/dp24"
-            android:scaleType="center"
             android:background="@drawable/vivo_pay_checkout_close"
+            android:scaleType="center"
             android:visibility="gone" />
 
     </RelativeLayout>
@@ -54,8 +54,8 @@
             android:layout_width="@dimen/dp156"
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
-            android:ellipsize="end"
             android:layout_marginStart="@dimen/dp52"
+            android:ellipsize="end"
             android:singleLine="true"
             android:textColor="@color/vivo_pay_carrier_select_title_color"
             android:textSize="@dimen/sp18"
@@ -80,8 +80,8 @@
         android:layout_height="match_parent"
         android:layout_alignParentEnd="true"
         android:gravity="center_vertical"
-        android:paddingEnd="@dimen/dp20"
         android:paddingStart="@dimen/dp0"
+        android:paddingEnd="@dimen/dp20"
         android:visibility="gone"
         tools:visibility="visible">
 
@@ -89,10 +89,10 @@
             android:id="@+id/right_button"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/dp30"
-            android:paddingStart="@dimen/dp16"
-            android:paddingEnd="@dimen/dp16"
+            android:background="@drawable/common_title_right_button_bg"
             android:gravity="center"
-            android:background="@drawable/common_title_right_button_bg">
+            android:paddingStart="@dimen/dp16"
+            android:paddingEnd="@dimen/dp16">
 
             <com.vivo.unionpay.embedded.pay.core.customview.RobotoMediumTextView
                 android:id="@+id/tv_right"
@@ -102,15 +102,15 @@
                 android:singleLine="true"
                 android:textColor="@color/vivo_pay_title_right_text_color"
                 android:textSize="@dimen/sp14"
-                tools:text="country switch"/>
+                tools:text="country switch" />
 
             <ImageView
                 android:id="@+id/img_list_expand"
                 android:layout_width="@dimen/dp8"
                 android:layout_height="@dimen/dp8"
-                android:scaleType="center"
                 android:layout_marginStart="@dimen/dp6"
-                android:background="@drawable/vivo_pay_list_expand_icon" />
+                android:background="@drawable/vivo_pay_list_expand_icon"
+                android:scaleType="center" />
         </LinearLayout>
 
     </RelativeLayout>

channel_registry/channel_vivo/src/main/res/layout/common_union_dialog.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/common_union_dialog_bg"
     android:orientation="vertical"
     android:paddingStart="@dimen/dp24"
-    android:paddingEnd="@dimen/dp24"
-    android:paddingTop="@dimen/dp10">
+    android:paddingTop="@dimen/dp10"
+    android:paddingEnd="@dimen/dp24">
 
     <!--    title-->
     <RelativeLayout
@@ -34,9 +34,9 @@
         <!--        可替换层-->
         <LinearLayout
             android:id="@+id/vivo_common_dlg_content"
-            android:orientation="vertical"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:orientation="vertical"
             android:paddingTop="@dimen/dp16"
             android:paddingBottom="@dimen/dp16">
 
@@ -44,19 +44,19 @@
                 android:id="@+id/tv_vivo_common_dlg_content"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                app:heightRatio="1.5"
                 android:textColor="@color/vivo_pay_common_dialog_message_color"
-                android:textSize="@dimen/sp14" />
+                android:textSize="@dimen/sp14"
+                app:heightRatio="1.5" />
 
             <com.vivo.unionpay.embedded.pay.core.customview.SmartTextView
                 android:id="@+id/tv_vivo_common_dlg_sub_content"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                app:heightRatio="1.5"
+                android:layout_marginTop="@dimen/dp36"
                 android:textColor="@color/vivo_common_black"
                 android:textSize="@dimen/sp12"
-                android:layout_marginTop="@dimen/dp36"
-                android:visibility="gone"/>
+                android:visibility="gone"
+                app:heightRatio="1.5" />
 
         </LinearLayout>
 
@@ -67,10 +67,10 @@
         android:id="@+id/vivo_common_dlg_btn_horizontal_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
         android:orientation="horizontal"
         android:paddingTop="@dimen/dp10"
         android:paddingBottom="@dimen/dp20"
-        android:gravity="center_horizontal"
         android:visibility="gone">
 
         <com.vivo.unionpay.embedded.pay.core.customview.RobotoMediumTextView
@@ -78,23 +78,23 @@
             android:layout_width="0dp"
             android:layout_height="@dimen/dp36"
             android:layout_weight="1"
-            android:textSize="@dimen/sp16"
-            android:textColor="@color/vivo_pay_info_collection_editing_subline"
-            android:singleLine="true"
+            android:background="@drawable/vivo_common_white_bg"
             android:gravity="center"
-            android:background="@drawable/vivo_common_white_bg" />
+            android:singleLine="true"
+            android:textColor="@color/vivo_pay_info_collection_editing_subline"
+            android:textSize="@dimen/sp16" />
 
         <com.vivo.unionpay.embedded.pay.core.customview.RobotoMediumTextView
             android:id="@+id/vivo_common_dlg_btn_positive"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp36"
-            android:layout_weight="1"
             android:layout_marginStart="@dimen/dp8"
+            android:layout_weight="1"
+            android:background="@drawable/vivo_common_blue_bg"
             android:gravity="center"
-            android:textColor="@color/vivo_common_white"
-            android:textSize="@dimen/sp16"
             android:singleLine="true"
-            android:background="@drawable/vivo_common_blue_bg" />
+            android:textColor="@color/vivo_common_white"
+            android:textSize="@dimen/sp16" />
     </LinearLayout>
 
     <LinearLayout
@@ -110,11 +110,11 @@
             android:layout_height="@dimen/dp36"
             android:layout_marginTop="@dimen/dp10"
             android:layout_marginBottom="@dimen/dp10"
+            android:background="@drawable/vivo_common_blue_bg"
             android:gravity="center"
-            android:textColor="@color/vivo_common_white"
-            android:textSize="@dimen/sp16"
             android:singleLine="true"
-            android:background="@drawable/vivo_common_blue_bg" />
+            android:textColor="@color/vivo_common_white"
+            android:textSize="@dimen/sp16" />
 
         <com.vivo.unionpay.embedded.pay.core.customview.RobotoMediumTextView
             android:id="@+id/vivo_common_dlg_btn_bottom"
@@ -122,24 +122,24 @@
             android:layout_height="@dimen/dp36"
             android:layout_marginTop="@dimen/dp10"
             android:layout_marginBottom="@dimen/dp20"
-            android:textSize="@dimen/sp16"
-            android:textColor="@color/vivo_pay_info_collection_editing_subline"
-            android:singleLine="true"
+            android:background="@drawable/vivo_common_white_bg"
             android:gravity="center"
-            android:background="@drawable/vivo_common_white_bg" />
+            android:singleLine="true"
+            android:textColor="@color/vivo_pay_info_collection_editing_subline"
+            android:textSize="@dimen/sp16" />
     </LinearLayout>
 
     <com.vivo.unionpay.embedded.pay.core.customview.RobotoMediumTextView
         android:id="@+id/vivo_common_dlg_one_btn"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp36"
-        android:gravity="center"
         android:layout_marginTop="@dimen/dp10"
         android:layout_marginBottom="@dimen/dp20"
-        android:textSize="@dimen/sp16"
-        android:textColor="@color/vivo_pay_radio_button_checked"
-        android:singleLine="true"
         android:background="@drawable/vivo_common_white_bg"
+        android:gravity="center"
+        android:singleLine="true"
+        android:textColor="@color/vivo_pay_radio_button_checked"
+        android:textSize="@dimen/sp16"
         android:visibility="gone" />
 
 </LinearLayout>

channel_registry/channel_vivo/src/main/res/layout/iqoo_common_dialog.xml

@@ -1,15 +1,15 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@drawable/vivo_common_bottom_dialog_bg">
+    android:background="@drawable/vivo_common_bottom_dialog_bg"
+    android:orientation="vertical">
 
     <!-- title -->
     <RelativeLayout
         android:id="@+id/vivo_common_dlg_title_layout"
         android:layout_width="match_parent"
-        android:visibility="gone"
-        android:layout_height="@dimen/dp56">
+        android:layout_height="@dimen/dp56"
+        android:visibility="gone">
 
         <TextView
             android:id="@+id/vivo_common_dlg_title"
@@ -19,8 +19,8 @@
             android:layout_centerHorizontal="true"
             android:layout_marginBottom="@dimen/dp16"
             android:singleLine="true"
-            android:textSize="@dimen/sp16"
-            android:textColor="@color/vivo_common_black" />
+            android:textColor="@color/vivo_common_black"
+            android:textSize="@dimen/sp16" />
     </RelativeLayout>
 
     <!-- message -->
@@ -42,8 +42,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:textSize="@dimen/sp14"
-                android:textColor="@color/vivo_common_grey" />
+                android:textColor="@color/vivo_common_grey"
+                android:textSize="@dimen/sp14" />
         </FrameLayout>
     </FrameLayout>
 
@@ -63,22 +63,22 @@
             android:id="@+id/vivo_common_dlg_btn_negative"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/dp36"
-            android:textColor="@color/vivo_common_white"
-            android:textSize="@dimen/sp16"
+            android:background="@drawable/iqoo_common_negative_btn_bg_selector"
             android:gravity="center"
             android:singleLine="true"
-            android:background="@drawable/iqoo_common_negative_btn_bg_selector"
+            android:textColor="@color/vivo_common_white"
+            android:textSize="@dimen/sp16"
             android:visibility="gone" />
 
         <TextView
             android:id="@+id/vivo_common_dlg_btn_positive"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/dp36"
-            android:textColor="@color/vivo_common_white"
-            android:textSize="@dimen/sp16"
+            android:background="@drawable/iqoo_common_positive_btn_bg_selector"
             android:gravity="center"
             android:singleLine="true"
-            android:background="@drawable/iqoo_common_positive_btn_bg_selector"
+            android:textColor="@color/vivo_common_white"
+            android:textSize="@dimen/sp16"
             android:visibility="gone" />
 
     </RelativeLayout>

channel_registry/channel_vivo/src/main/res/layout/price_point_list_item.xml

@@ -3,23 +3,23 @@
     android:id="@+id/price_point_item"
     android:layout_width="match_parent"
     android:layout_height="@dimen/dp60"
-    android:orientation="vertical"
+    android:background="@drawable/common_gridview_item_bg"
     android:gravity="center_horizontal"
-    android:background="@drawable/common_gridview_item_bg">
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/tv_currency_unit"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp10"
-        android:textSize="@dimen/sp10"
-        android:textColor="@color/vivo_pay_info_collection_editing_subline" />
+        android:textColor="@color/vivo_pay_info_collection_editing_subline"
+        android:textSize="@dimen/sp10" />
 
     <TextView
         android:id="@+id/tv_price_point"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="@dimen/sp21"
         android:textColor="@color/vivo_pay_info_collection_editing_subline"
+        android:textSize="@dimen/sp21"
         android:textStyle="bold" />
 </LinearLayout>

channel_registry/channel_vivo/src/main/res/layout/result_detail_first_level_item.xml

@@ -8,19 +8,19 @@
         android:id="@+id/tv_left_content_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="@dimen/sp14"
-        android:textColor="@android:color/black" />
+        android:textColor="@android:color/black"
+        android:textSize="@dimen/sp14" />
 
     <TextView
         android:id="@+id/tv_right_content_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toEndOf="@id/tv_left_content_name"
         android:layout_alignParentEnd="true"
+        android:layout_toEndOf="@id/tv_left_content_name"
+        android:ellipsize="end"
         android:gravity="end"
         android:lines="2"
-        android:ellipsize="end"
-        android:textSize="@dimen/sp14"
-        android:textColor="@android:color/black" />
+        android:textColor="@android:color/black"
+        android:textSize="@dimen/sp14" />
 
 </RelativeLayout>

channel_registry/channel_vivo/src/main/res/layout/result_detail_secondary_level_item.xml

@@ -8,15 +8,15 @@
         android:id="@+id/tv_left_content_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="@dimen/sp12"
-        android:textColor="@color/vivo_common_negative_btn_color" />
+        android:textColor="@color/vivo_common_negative_btn_color"
+        android:textSize="@dimen/sp12" />
 
     <TextView
         android:id="@+id/tv_right_content_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
-        android:textSize="@dimen/sp12"
-        android:textColor="@color/vivo_common_negative_btn_color" />
+        android:textColor="@color/vivo_common_negative_btn_color"
+        android:textSize="@dimen/sp12" />
 
 </RelativeLayout>

channel_registry/channel_vivo/src/main/res/layout/vcoin_product_list_item.xml

@@ -9,17 +9,17 @@
         android:id="@+id/vcoin_product_amount_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
         android:layout_marginTop="@dimen/dp5"
+        android:baselineAligned="true"
         android:gravity="center_horizontal"
-        android:baselineAligned="true">
+        android:orientation="horizontal">
 
         <TextView
             android:id="@+id/tv_vcoin_amount"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="@dimen/sp21"
             android:textColor="@color/iqoo_pay_checkout_payment_instruction_color"
+            android:textSize="@dimen/sp21"
             android:textStyle="bold" />
 
         <TextView
@@ -27,8 +27,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/vivo_pay_vcoin_currency_unit"
-            android:textSize="@dimen/sp10"
-            android:textColor="@color/iqoo_pay_checkout_payment_instruction_color" />
+            android:textColor="@color/iqoo_pay_checkout_payment_instruction_color"
+            android:textSize="@dimen/sp10" />
     </LinearLayout>
 
     <TextView
@@ -36,9 +36,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/vcoin_product_amount_view"
-        android:layout_marginTop="@dimen/dp3"
         android:layout_centerHorizontal="true"
-        android:textSize="@dimen/sp10"
-        android:textColor="@color/iqoo_pay_checkout_payment_instruction_color" />
+        android:layout_marginTop="@dimen/dp3"
+        android:textColor="@color/iqoo_pay_checkout_payment_instruction_color"
+        android:textSize="@dimen/sp10" />
 
 </RelativeLayout>

channel_registry/channel_vivo/src/main/res/layout/vivo_checkout_pay_method_item.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="wrap_content">
 
     <TextView
         android:id="@+id/tv_method_title_tip"
@@ -104,10 +104,10 @@
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
                 android:layout_marginEnd="@dimen/dp17"
+                android:background="?android:attr/listChoiceIndicatorSingle"
+                android:button="@null"
                 android:clickable="false"
                 android:focusable="false"
-                android:button="@null"
-                android:background="?android:attr/listChoiceIndicatorSingle"
                 android:theme="@style/RadioButton" />
 
         </RelativeLayout>
@@ -132,7 +132,7 @@
                 android:layout_width="@dimen/dp72"
                 android:layout_height="@dimen/dp17"
                 android:src="@drawable/pay_method_recommend"
-                android:visibility="gone"/>
+                android:visibility="gone" />
 
             <TextView
                 android:id="@+id/tv_payment_method_name"
@@ -151,27 +151,27 @@
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
                 android:layout_marginEnd="@dimen/dp17"
+                android:background="?android:attr/listChoiceIndicatorSingle"
+                android:button="@null"
                 android:clickable="false"
                 android:focusable="false"
-                android:button="@null"
-                android:background="?android:attr/listChoiceIndicatorSingle"
                 android:theme="@style/RadioButton" />
 
             <com.vivo.unionpay.embedded.pay.core.customview.IconsLayout
                 android:id="@+id/pay_method_icons_layout"
-                android:layout_toStartOf="@+id/pay_method_selected_checkbox"
-                android:layout_marginEnd="@dimen/dp12"
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent"/>
+                android:layout_height="match_parent"
+                android:layout_marginEnd="@dimen/dp12"
+                android:layout_toStartOf="@+id/pay_method_selected_checkbox" />
         </RelativeLayout>
 
     </RelativeLayout>
 
     <LinearLayout
         android:id="@+id/layout_security_statements"
-        android:layout_below="@id/total_method_item"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_below="@id/total_method_item"
         android:visibility="gone">
 
         <com.vivo.unionpay.embedded.pay.core.customview.SmartTextView

channel_registry/channel_vivo/src/main/res/layout/vivo_common_dialog.xml

@@ -1,15 +1,15 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@drawable/vivo_common_bottom_dialog_bg">
+    android:background="@drawable/vivo_common_bottom_dialog_bg"
+    android:orientation="vertical">
 
     <!-- title -->
     <RelativeLayout
         android:id="@+id/vivo_common_dlg_title_layout"
         android:layout_width="match_parent"
-        android:visibility="gone"
-        android:layout_height="@dimen/dp54">
+        android:layout_height="@dimen/dp54"
+        android:visibility="gone">
 
         <TextView
             android:id="@+id/vivo_common_dlg_title"
@@ -19,8 +19,8 @@
             android:layout_centerHorizontal="true"
             android:layout_marginBottom="@dimen/dp16"
             android:singleLine="true"
-            android:textSize="@dimen/sp16"
-            android:textColor="@color/vivo_common_black" />
+            android:textColor="@color/vivo_common_black"
+            android:textSize="@dimen/sp16" />
     </RelativeLayout>
 
     <!-- message -->
@@ -41,8 +41,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:textSize="@dimen/sp14"
-                android:textColor="@color/vivo_common_grey" />
+                android:textColor="@color/vivo_common_grey"
+                android:textSize="@dimen/sp14" />
         </FrameLayout>
     </FrameLayout>
 
@@ -62,22 +62,22 @@
             android:id="@+id/vivo_common_dlg_btn_negative"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/dp36"
-            android:textColor="@color/vivo_common_negative_btn_text_color"
-            android:textSize="@dimen/sp16"
+            android:background="@drawable/vivo_common_negative_btn_bg_selector"
             android:gravity="center"
             android:singleLine="true"
-            android:background="@drawable/vivo_common_negative_btn_bg_selector"
+            android:textColor="@color/vivo_common_negative_btn_text_color"
+            android:textSize="@dimen/sp16"
             android:visibility="gone" />
 
         <TextView
             android:id="@+id/vivo_common_dlg_btn_positive"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/dp36"
-            android:textColor="@color/vivo_common_positive_btn_text_color"
-            android:textSize="@dimen/sp16"
+            android:background="@drawable/vivo_common_positive_btn_bg_selector"
             android:gravity="center"
             android:singleLine="true"
-            android:background="@drawable/vivo_common_positive_btn_bg_selector"
+            android:textColor="@color/vivo_common_positive_btn_text_color"
+            android:textSize="@dimen/sp16"
             android:visibility="gone" />
 
     </RelativeLayout>

channel_registry/channel_vivo/src/main/res/layout/vivo_country_switch_item.xml

@@ -2,9 +2,9 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="@dimen/dp56"
+    android:background="@drawable/common_rv_item_ripple"
     android:paddingStart="@dimen/dp0"
-    android:paddingEnd="@dimen/dp0"
-    android:background="@drawable/common_rv_item_ripple">
+    android:paddingEnd="@dimen/dp0">
 
     <CheckBox
         android:id="@+id/check_box_of_country"
@@ -13,10 +13,10 @@
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
         android:layout_marginEnd="@dimen/dp21"
-        android:focusable="false"
-        android:clickable="false"
-        android:button="@null"
         android:background="?android:attr/listChoiceIndicatorSingle"
+        android:button="@null"
+        android:clickable="false"
+        android:focusable="false"
         android:theme="@style/RadioButton" />
 
     <TextView
@@ -27,8 +27,8 @@
         android:layout_marginStart="@dimen/dp24"
         android:layout_marginEnd="@dimen/dp56"
         android:ellipsize="end"
-        android:singleLine="true"
         android:lines="1"
+        android:singleLine="true"
         android:textColor="@color/vivo_pay_carrier_select_title_color"
         android:textSize="@dimen/sp16" />
 

channel_registry/channel_vivo/src/main/res/layout/vivo_pay_choose_carrier_item.xml

@@ -9,24 +9,24 @@
         android:id="@+id/img_carrier_icon"
         android:layout_width="@dimen/dp32"
         android:layout_height="@dimen/dp32"
-        android:layout_marginStart="@dimen/dp20"
         android:layout_centerVertical="true"
-        android:scaleType="center"
-        android:background="@drawable/default_method_icon" />
+        android:layout_marginStart="@dimen/dp20"
+        android:background="@drawable/default_method_icon"
+        android:scaleType="center" />
 
     <ImageView
         android:id="@+id/img_payment_recommend"
         android:layout_width="@dimen/dp72"
         android:layout_height="@dimen/dp17"
-        android:src="@drawable/pay_method_recommend"/>
+        android:src="@drawable/pay_method_recommend" />
 
     <TextView
         android:id="@+id/tv_carrier_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp68"
-        android:layout_marginEnd="@dimen/dp56"
         android:layout_marginTop="@dimen/dp14"
+        android:layout_marginEnd="@dimen/dp56"
         android:ellipsize="end"
         android:lines="1"
         android:textColor="@color/vivo_pay_carrier_select_title_color"
@@ -34,14 +34,14 @@
 
     <TextView
         android:id="@+id/tv_carrier_quota_description"
-        android:layout_below="@id/tv_carrier_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_below="@id/tv_carrier_name"
         android:layout_marginStart="@dimen/dp68"
         android:layout_marginEnd="@dimen/dp56"
         android:ellipsize="end"
-        android:singleLine="true"
         android:lines="1"
+        android:singleLine="true"
         android:textColor="@color/vivo_pay_common_dialog_message_color"
         android:textSize="@dimen/sp14" />
 
@@ -65,10 +65,10 @@
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
         android:layout_marginEnd="@dimen/dp10"
-        android:focusable="false"
-        android:clickable="false"
         android:background="@color/vivo_common_transparent"
         android:button="@drawable/vivo_common_radio_button_bg_selector"
+        android:clickable="false"
+        android:focusable="false"
         android:visibility="visible" />
 
     <ImageView

channel_registry/channel_vivo/src/main/res/layout/vivo_pay_deault_layout.xml

@@ -11,8 +11,8 @@
         android:layout_height="@dimen/dp108"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="@dimen/dp169"
-        android:scaleType="center"
-        android:background="@drawable/network_connection_failed" />
+        android:background="@drawable/network_connection_failed"
+        android:scaleType="center" />
 
     <TextView
         android:id="@+id/vivo_pay_webview_default_txt"
@@ -22,9 +22,9 @@
         android:layout_centerHorizontal="true"
         android:paddingStart="@dimen/dp20"
         android:paddingEnd="@dimen/dp20"
-        android:textSize="@dimen/sp14"
+        android:text="@string/vivo_union_network_error_message"
         android:textColor="@color/vivo_pay_checkout_network_connection_failed_text_color"
-        android:text="@string/vivo_union_network_error_message" />
+        android:textSize="@dimen/sp14" />
 
     <TextView
         android:id="@+id/tv_network_reload"
@@ -33,11 +33,11 @@
         android:layout_below="@id/vivo_pay_webview_default_txt"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="@dimen/dp20"
+        android:background="@drawable/vivo_common_stroke_white_bg"
         android:gravity="center"
         android:text="@string/vivo_pay_reload"
+        android:textColor="@drawable/common_textview_click_selected"
         android:textSize="@dimen/sp14"
-        android:textStyle="bold"
-        android:background="@drawable/vivo_common_stroke_white_bg"
-        android:textColor="@drawable/common_textview_click_selected" />
+        android:textStyle="bold" />
 
 </RelativeLayout>

channel_registry/channel_vivo/src/main/res/layout/webview_full_layout.xml

@@ -11,8 +11,8 @@
         android:layout_height="2dp"
         android:max="100"
         android:progress="0"
-        android:visibility="gone"
-        android:progressDrawable="@drawable/common_webview_progressbar_bg" />
+        android:progressDrawable="@drawable/common_webview_progressbar_bg"
+        android:visibility="gone" />
 
     <RelativeLayout
         android:id="@+id/web_view_content"

channel_registry/channel_vivo/src/main/res/values-v24/values-v24.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <style name="vivo_common_bottom_dialog_anim_style">
         <item name="android:windowEnterAnimation">@anim/vivo_common_bottom_window_enter</item>
         <item name="android:windowExitAnimation">@anim/vivo_common_bottom_window_exit</item>
@@ -8,6 +9,7 @@
             @anim/vivo_common_center_window_background_exit
         </item>
     </style>
+
     <style name="vivo_common_center_dialog_anim_style">
         <item name="android:windowEnterAnimation">@anim/vivo_common_center_window_enter</item>
         <item name="android:windowExitAnimation">@anim/vivo_common_center_window_exit</item>

channel_registry/channel_vivo/src/main/res/values/values.xml

@@ -97,14 +97,14 @@
     <color name="vivo_sms_deducation_white_color">#ffffff</color>
     <color name="vivo_window_background">#fff4f4f4</color>
     <declare-styleable name="MaxHeightRecyclerView">
-        <attr format="dimension" name="maxHeight"/>
+        <attr name="maxHeight" format="dimension" />
     </declare-styleable>
     <declare-styleable name="NestedScrollLayout">
-        <attr format="boolean" name="disallowintercept_enable"/>
-        <attr format="boolean" name="touch_enable"/>
+        <attr name="disallowintercept_enable" format="boolean" />
+        <attr name="touch_enable" format="boolean" />
     </declare-styleable>
     <declare-styleable name="SmartTextView">
-        <attr format="float" name="heightRatio"/>
+        <attr name="heightRatio" format="float" />
     </declare-styleable>
     <dimen name="dp0">0dp</dimen>
     <dimen name="dp1">0.89dp</dimen>
@@ -528,6 +528,7 @@
     <string name="vivo_union_web_ssl_error_exit">Back</string>
     <string name="vivo_union_web_ssl_error_title">Note</string>
     <string name="vivo_vcoin_rate_exchange_description">For use in the current country/region only</string>
+
     <style name="DialogStyle" parent="android:style/Theme.Dialog">
         <!--背景透明-->
         <item name="android:windowBackground">@drawable/common_union_dialog_bg</item>
@@ -543,39 +544,47 @@
         <!--半透明-->
         <item name="android:windowIsTranslucent">true</item>
     </style>
+
     <style name="RadioButton" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="colorControlNormal">@color/vivo_pay_radio_button_unchecked</item>
         <item name="colorControlActivated">@color/vivo_pay_radio_button_checked</item>
     </style>
+
     <style name="VivoUnionPayAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimary</item>
         <item name="colorAccent">@color/colorPrimary</item>
     </style>
+
     <style name="VivoUnionPayAppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:textCursorDrawable">@null</item>
     </style>
+
     <style name="vivo_common_bottom_dialog_anim_style">
         <item name="android:windowEnterAnimation">@anim/vivo_common_bottom_window_enter</item>
         <item name="android:windowExitAnimation">@anim/vivo_common_bottom_window_exit</item>
         <item name="android:background">@anim/vivo_common_center_window_background_enter</item>
     </style>
+
     <style name="vivo_common_center_dialog_anim_style">
         <item name="android:windowEnterAnimation">@anim/vivo_common_center_window_enter</item>
         <item name="android:windowExitAnimation">@anim/vivo_common_center_window_exit</item>
         <item name="android:windowBackground">@anim/vivo_common_center_window_background_enter
         </item>
     </style>
+
     <style name="vivo_common_dialog_activity_anim_style" parent="android:Theme.Dialog">
         <item name="android:windowAnimationStyle">@style/vivo_common_dialog_anim_style</item>
     </style>
+
     <style name="vivo_common_dialog_anim_style">
         <item name="android:windowEnterAnimation">@anim/vivo_common_window_enter</item>
         <item name="android:windowExitAnimation">@anim/vivo_common_window_exit</item>
     </style>
+
     <style name="vivo_loading_progressbar" parent="android:Widget.Holo.ProgressBar">
         <item name="android:indeterminateDrawable">@drawable/vivo_loading_progress_bg</item>
         <item name="android:indeterminateDuration">1400</item>

component/facebook-auth/facebook-comm/src/main/res/color/com_facebook_button_text_color.xml

@@ -19,15 +19,7 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_pressed="true"
-        android:color="@color/com_facebook_primary_button_pressed_text_color"
-        />
-    <item
-        android:state_enabled="false"
-        android:color="@color/com_facebook_primary_button_disabled_text_color"
-        />
-    <item
-        android:color="@color/com_facebook_primary_button_text_color"
-        />
+    <item android:color="@color/com_facebook_primary_button_pressed_text_color" android:state_pressed="true" />
+    <item android:color="@color/com_facebook_primary_button_disabled_text_color" android:state_enabled="false" />
+    <item android:color="@color/com_facebook_primary_button_text_color" />
 </selector>

component/facebook-auth/facebook-comm/src/main/res/drawable/com_facebook_auth_dialog_background.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
     Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
 
     You are hereby granted a non-exclusive, worldwide, royalty-free license to use,

component/facebook-auth/facebook-comm/src/main/res/drawable/com_facebook_auth_dialog_cancel_background.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
     Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
 
     You are hereby granted a non-exclusive, worldwide, royalty-free license to use,

component/facebook-auth/facebook-comm/src/main/res/drawable/com_facebook_auth_dialog_header_background.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
     Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
 
     You are hereby granted a non-exclusive, worldwide, royalty-free license to use,

component/facebook-auth/facebook-comm/src/main/res/drawable/com_facebook_button_background.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
     Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
 
     You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
@@ -20,8 +19,7 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false"
-        android:state_focused="false">
+    <item android:state_enabled="false" android:state_focused="false">
         <shape android:shape="rectangle">
             <corners android:radius="@dimen/com_facebook_button_corner_radius" />
             <solid android:color="@color/com_facebook_button_background_color_disabled" />

component/facebook-auth/facebook-comm/src/main/res/drawable/com_facebook_button_icon.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
     Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
 
     You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
@@ -18,15 +17,13 @@
     IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
     CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 -->
-<vector
-    android:height="16dp"
-    android:viewportHeight="1365.3333"
-    android:viewportWidth="1365.3333"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="16dp"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:tintMode="multiply"
+    android:height="16dp"
     android:tint="@color/com_facebook_button_text_color"
-    >
+    android:tintMode="multiply"
+    android:viewportWidth="1365.3333"
+    android:viewportHeight="1365.3333">
     <path
         android:fillAlpha="1"
         android:fillColor="#FFFFFF"
@@ -37,6 +34,5 @@
             13.33 152.81,13.33L986.67,448L900.58,448C815.78,448 789.33,500.62 789.33,
             554.61L789.33,682.67L978.67,682.67L948.4,880L789.33,880L789.33,1357.04C1115.69,
             1305.83 1365.33,1023.41 1365.33,682.67"
-        android:strokeColor="#00000000"
-        />
+        android:strokeColor="#00000000" />
 </vector>

component/facebook-auth/facebook-comm/src/main/res/drawable/com_facebook_button_like_background.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
     Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
 
     You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
@@ -26,8 +25,7 @@
             <solid android:color="@color/com_facebook_button_background_color_pressed" />
         </shape>
     </item>
-    <item android:state_enabled="false"
-        android:state_focused="false">
+    <item android:state_enabled="false" android:state_focused="false">
         <shape android:shape="rectangle">
             <corners android:radius="@dimen/com_facebook_button_corner_radius" />
             <solid android:color="@color/com_facebook_button_background_color_disabled" />

component/facebook-auth/facebook-comm/src/main/res/drawable/com_facebook_favicon_blue.xml

@@ -18,10 +18,12 @@
     CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 -->
 
-<vector android:height="14dp"
-    android:viewportHeight="22.0"
-    android:viewportWidth="22.0"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="14dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#3c6399" android:pathData="M20,0H2C0.895,0 0,0.896 0,2v18c0,1.105 0.895,2 2,2h9.96v-8.662H9.01V9.962h2.95v-2.49c0,-2.888 1.785,-4.46 4.393,-4.46 1.25,0 2.323,0.09 2.637,0.13v3.02l-1.81,0.002c-1.418,0 -1.693,0.666 -1.693,1.643v2.155h3.383l-0.44,3.376h-2.943V22H20c1.105,0 2,-0.895 2,-2V2c0,-1.104 -0.895,-2 -2,-2"/>
+    android:height="14dp"
+    android:viewportWidth="22.0"
+    android:viewportHeight="22.0">
+    <path
+        android:fillColor="#3c6399"
+        android:pathData="M20,0H2C0.895,0 0,0.896 0,2v18c0,1.105 0.895,2 2,2h9.96v-8.662H9.01V9.962h2.95v-2.49c0,-2.888 1.785,-4.46 4.393,-4.46 1.25,0 2.323,0.09 2.637,0.13v3.02l-1.81,0.002c-1.418,0 -1.693,0.666 -1.693,1.643v2.155h3.383l-0.44,3.376h-2.943V22H20c1.105,0 2,-0.895 2,-2V2c0,-1.104 -0.895,-2 -2,-2" />
 </vector>

component/facebook-auth/facebook-comm/src/main/res/layout/com_facebook_activity_layout.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
     Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
 
     You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
@@ -21,7 +20,6 @@
 
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:id="@+id/com_facebook_fragment_container"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent"
-    />
+    android:id="@+id/com_facebook_fragment_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />

component/facebook-auth/facebook-comm/src/main/res/layout/com_facebook_device_auth_dialog_fragment.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
     Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
 
     You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
@@ -45,9 +44,9 @@
                 <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="18dp"
                     android:layout_height="18dp"
-                    android:layout_marginBottom="11dp"
                     android:layout_marginLeft="12dp"
                     android:layout_marginTop="11dp"
+                    android:layout_marginBottom="11dp"
                     android:adjustViewBounds="false"
                     android:scaleType="fitXY"
                     app:srcCompat="@drawable/com_facebook_favicon_blue" />
@@ -69,10 +68,10 @@
                 android:id="@+id/progress_bar"
                 android:layout_width="wrap_content"
                 android:layout_height="0dp"
-                android:layout_alignBottom="@+id/confirmation_code"
                 android:layout_alignTop="@+id/confirmation_code"
-                android:layout_centerHorizontal="true"
+                android:layout_alignBottom="@+id/confirmation_code"
                 android:layout_centerInParent="true"
+                android:layout_centerHorizontal="true"
                 android:layout_centerVertical="true" />
 
         </RelativeLayout>
@@ -81,9 +80,9 @@
             android:id="@+id/com_facebook_device_auth_instructions"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
             android:layout_marginStart="16dp"
             android:layout_marginTop="20dp"
+            android:layout_marginEnd="16dp"
             android:fontFamily="roboto_condensed"
             android:gravity="center"
             android:singleLine="false"
@@ -94,8 +93,8 @@
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="17dp"
-            android:layout_marginTop="14dp">
+            android:layout_marginTop="14dp"
+            android:layout_marginBottom="17dp">
 
             <Button
                 android:id="@+id/cancel_button"
@@ -111,8 +110,9 @@
                 android:textColor="@color/com_facebook_device_auth_text"
                 android:textSize="10sp"
                 android:textStyle="bold"
-                android:typeface="sans" >
-                    <requestFocus />
+                android:typeface="sans">
+
+                <requestFocus />
             </Button>
         </FrameLayout>
 

component/facebook-auth/facebook-comm/src/main/res/layout/com_facebook_login_fragment.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
     Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
 
     You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
@@ -24,12 +23,13 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ProgressBar android:id="@+id/com_facebook_login_fragment_progress_bar"
-        android:indeterminate="true"
+    <ProgressBar
+        android:id="@+id/com_facebook_login_fragment_progress_bar"
         android:layout_width="wrap_content"
         android:layout_height="50dip"
         android:layout_centerInParent="true"
-        android:visibility="gone"
-        android:indeterminateOnly="true" />
+        android:indeterminate="true"
+        android:indeterminateOnly="true"
+        android:visibility="gone" />
 
 </RelativeLayout>