merge master

Assets/HuaweiServiceDemo/Scenes/HmsGameServiceDemo.unity

       objectReference: {fileID: 0}
     - target: {fileID: 114456233620969682, guid: 6d6d75170ea784433bdea8e915d0593b,
         type: 3}
-      propertyPath: m_FontData.m_FontSize
-      value: 40
+      propertyPath: m_FontData.m_MaxSize
+      value: 50
       objectReference: {fileID: 0}
     - target: {fileID: 114456233620969682, guid: 6d6d75170ea784433bdea8e915d0593b,
         type: 3}
     - target: {fileID: 114456233620969682, guid: 6d6d75170ea784433bdea8e915d0593b,
         type: 3}
-      propertyPath: m_FontData.m_MaxSize
-      value: 50
+      propertyPath: m_FontData.m_FontSize
+      value: 40
-      propertyPath: m_LocalPosition.x
-      value: 0
+      propertyPath: m_Pivot.x
+      value: 0.5
-      propertyPath: m_LocalPosition.y
-      value: 0
+      propertyPath: m_Pivot.y
+      value: 0.5
-      propertyPath: m_LocalPosition.z
-      value: 0
+      propertyPath: m_RootOrder
+      value: 1
-      propertyPath: m_LocalRotation.x
-      value: -0
+      propertyPath: m_AnchorMax.x
+      value: 0.5
-      propertyPath: m_LocalRotation.y
-      value: -0
+      propertyPath: m_AnchorMax.y
+      value: 0.5
-      propertyPath: m_LocalRotation.z
-      value: -0
+      propertyPath: m_AnchorMin.x
+      value: 0.5
-      propertyPath: m_LocalRotation.w
-      value: 1
+      propertyPath: m_AnchorMin.y
+      value: 0.5
-      propertyPath: m_RootOrder
-      value: 1
+      propertyPath: m_SizeDelta.x
+      value: 160
-      propertyPath: m_AnchoredPosition.x
-      value: -580
+      propertyPath: m_SizeDelta.y
+      value: 43.4
-      propertyPath: m_AnchoredPosition.y
-      value: 202
+      propertyPath: m_LocalPosition.x
+      value: 0
-      propertyPath: m_SizeDelta.x
-      value: 160
+      propertyPath: m_LocalPosition.y
+      value: 0
-      propertyPath: m_SizeDelta.y
-      value: 43.4
+      propertyPath: m_LocalPosition.z
+      value: 0
-      propertyPath: m_AnchorMin.x
-      value: 0.5
+      propertyPath: m_LocalRotation.w
+      value: 1
-      propertyPath: m_AnchorMin.y
-      value: 0.5
+      propertyPath: m_LocalRotation.x
+      value: -0
-      propertyPath: m_AnchorMax.x
-      value: 0.5
+      propertyPath: m_LocalRotation.y
+      value: -0
-      propertyPath: m_AnchorMax.y
-      value: 0.5
+      propertyPath: m_LocalRotation.z
+      value: -0
-      propertyPath: m_Pivot.x
-      value: 0.5
+      propertyPath: m_AnchoredPosition.x
+      value: -580
-      propertyPath: m_Pivot.y
-      value: 0.5
+      propertyPath: m_AnchoredPosition.y
+      value: 202
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 6d6d75170ea784433bdea8e915d0593b, type: 3}
   m_GameObject: {fileID: 1896786727}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b81caf03bd9156c4595c5dedead8c0c8, type: 3}
+  m_Script: {fileID: 11500000, guid: e95097d8abc0d4159bbb534f550ce14b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
 --- !u!1 &1901415242

Assets/HuaweiServiceDemo/Scripts/test/cloudstorage/Button/RequestPermissionButton.cs

         {
             AndroidJavaClass javaUnityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
             AndroidJavaObject currentActivity = javaUnityPlayer.GetStatic<AndroidJavaObject>("currentActivity");
-            Activity aaa = HmsUtil.GetHmsBase<Activity>(currentActivity);
-            ActivityCompat.requestPermissions(aaa, permissions, 1);
+            Activity activity = HmsUtil.GetHmsBase<Activity>(currentActivity);
+            ActivityCompat.requestPermissions(activity, permissions, 1);
         }
     }
 }

Assets/HuaweiServiceDemo/Scripts/test/cloudstorage/TestCases/StreamDownloadTest.cs

 		private AGCStorageManagement mAGCStorageManagement;
 		
 		private string storageFileName= "MetadataLoader.cpp";
-		private string downloadFileFolder = "/sdcard/"; 
-		
+
 		private void initAGCStorageManagement()
 		{
 			mAGCStorageManagement = AGCStorageManagement.getInstance();

Assets/HuaweiServiceDemo/Scripts/test/cloudstorage/TestCases/UploadTaskTest.cs

             mAGCStorageManagement = AGCStorageManagement.getInstance();
         }
 
-        public void uploadFile(string path)
-        {
-            Debug.Log("upload file start.");
-
-            File file = new File(path);
-            if (!System.IO.File.Exists(path))
-            {
-                Debug.Log("upload file does not exists: " + path);
-                return;
-            }
-
-            StorageReference storageReference = mAGCStorageManagement.getStorageReference(path);
-            UploadTask task = storageReference.putFile(file);
-
-            task.addOnFailureListener(new MyFailureListener()).addOnSuccessListener(new MySuccessListener());
-
-            Debug.Log("upload file end.");
-        }
-
         public void addOnCanceledListenerTest()
         {
             Debug.Log("UploadTask addOnCanceledListenerTest");
                 Debug.LogFormat("MyProgressListener:onProgress, get metadata failed!");
             }
 
-            //UploadTask.UploadResult uploadResult = (UploadTask.UploadResult)arg0;
             Debug.LogFormat(m_name + " progress : {0}",
                 (uploadResult.getBytesTransferred() * 1.0) / uploadResult.getTotalByteCount());
         }

Assets/HuaweiService/apm/Editor/Unity.Cecil.Mdb.dll.meta

+fileFormatVersion: 2
+guid: c7449664c3a974b36b2271a91984d7b5
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/HuaweiService/apm/Editor/Unity.Cecil.Pdb.dll.meta

+fileFormatVersion: 2
+guid: c1f85638e280d4fcea5d66f40e87b1eb
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/HuaweiService/apm/Editor/Unity.Cecil.dll.meta

+fileFormatVersion: 2
+guid: dbc41c2b339c445b0a6c49ae76d25dcc
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/HuaweiService/apm/GameAPM.cs.meta

+fileFormatVersion: 2
+guid: b20a78c5c43af4bf287066f9b4e0f046
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/HuaweiService/apm/GameAttribute.cs.meta

+fileFormatVersion: 2
+guid: ab4f67324391b4f2995864238102de70
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/HuaweiServiceDemo/Scripts/test/apm/EnableGamePluginButton.cs.meta

+fileFormatVersion: 2
+guid: 64ccd6332557749f9a5bee0313e242a8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/HuaweiServiceDemo/Scripts/test/apm/GameApmTest.cs.meta

+fileFormatVersion: 2
+guid: 0529b18a85b754f60888c1940d8c630e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/HuaweiServiceDemo/Scripts/test/apm/GameApmTestButton.cs.meta

+fileFormatVersion: 2
+guid: a63dfa2538d674731bb685972b5790cb
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/HuaweiServiceDemo/Scripts/test/apm/StopLoadingSceneButton.cs.meta

+fileFormatVersion: 2
+guid: 912273f27246744ed9855716e74c89a1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: