Merge pull request #2 from Unity-Technologies/update

udpate

Assets/HuaweiHms/README.md

-# HuaweiHms
-## Prepare information
+# HMS
+## Introduction
+This package enables parts of Hms Core service in Unity for Android Build, which is implemented by wrapping Hms SDK. Name and usage of corresponding classes and functions are the same. You can write code by referring [Hms SDK document](https://developer.huawei.com/consumer/en/doc/development/HMS-Guides/account-introduction-v4). But still there are some differences during development. We highly recommend downloading [example project](https://github.com/Unity-Technologies/HMSSDKSample) as a reference. 
+
+There are 4 Kits included.
+* Ads Kit: [reference](https://developer.huawei.com/consumer/en/doc/development/HMS-Guides/ads-sdk-development-process) and [param](https://developer.huawei.com/consumer/en/doc/development/HMS-Guides/ads-sdk-development-process)
+    * Rewarded Ads 
+    * Interstitial Ads 
+* Push Kit: [reference](https://developer.huawei.com/consumer/en/doc/development/HMS-Guides/push-use-cases) and [param](
+https://developer.huawei.com/consumer/en/doc/development/HMS-References/push-aaid-pkg) 
+    * all
+* Location Kit: [reference](https://developer.huawei.com/consumer/en/doc/development/HMS-Guides/location-description) and [param](
+https://developer.huawei.com/consumer/en/doc/development/HMS-References/locationv4) 
+    * all
+* Analytics Kit: [reference](https://developer.huawei.com/consumer/en/doc/development/HMS-Guides/Development-Guide) and [param](
+https://developer.huawei.com/consumer/en/doc/development/HMS-References/3021004)
+    * all
+
+## Preparation
+Before doing this step, you need to create HMS Account and project according to [the HMS document](https://developer.huawei.com/consumer/en/doc/development/HMS-Guides/Preparations).
+
+In this step, we will setup build environment for building Android apk with HMS SDK. After finish the following preparation.
+
 ### 1.  Enable AndroidManifest.xml
     Edit -> Project Settings -> Player -> Android(icon) -> Publishing Settings -> Build
 
     Edit -> Project Settings -> Player -> Android(icon) -> Publishing Settings -> Build
 
     enable `Custom Base Gradle Template`
-**If unity version is 2018, you should add implentment and other configuartion on `MainGradleTemplate`.**
+**If unity version is 2018, you should add implement and other configuration on `MainGradleTemplate`.**
-**If unity version is 2018, you should add implentment and other configuartion on `MainGradleTemplate`.**
+**If unity version is 2018, you should add implement and other configuration on `MainGradleTemplate`.**
 ### 4.  Enable unity library gradle
     Edit -> Project Settings -> Player -> Android(icon) -> Publishing Settings -> Build
 
 
-    Keytore... -> creat new
+    Keytore... -> create new
-**We donnot need add singnature on gradle**
+**We donnot need add signature on gradle**
 ### 6.  Package name
     Edit -> Project Settings -> Player
 
 
 `We must generate agconnect-services.json if we use analytic, push or location sdk.`
+Reference [Link](https://developer.huawei.com/consumer/en/doc/development/HMSCore-Guides/android-config-agc-0000001050170137) to create agconnect-services.json
+For getting the activity, you can use the following code.
-## SDK reference
-### Ads
-https://developer.huawei.com/consumer/cn/doc/development/HMS-Guides/ads-sdk-development-process
-https://developer.huawei.com/consumer/cn/doc/development/HMS-References/3030501
-#### Analytic
-https://developer.huawei.com/consumer/cn/doc/development/HMS-Guides/Development-Guide
+# SDK
+There are corresponding example scene in [example project](https://github.com/Unity-Technologies/HMSSDKSample) for all 4 Kits. For test, you need to build it onto Android mobile build by HMS. Make sure you have created HMS account and project. Then, you can change the configuration and test different functions.
+## Ads
+In example project, corresponding scene is `Assets/HuaweiHmsDemo/Scenes/HmsAdsSampleScene.unity` and code is `Assets/HuaweiHmsDemo/demo/test/ads/AdsTest.cs`.
-https://developer.huawei.com/consumer/cn/doc/development/HMS-References/3021004
-### Push
-https://developer.huawei.com/consumer/cn/doc/development/HMS-Guides/push-use-cases
+## Analytic
+In example project, corresponding scene is `Assets/HuaweiHmsDemo/Scenes/HmsAnalyticSampleScene.unity` and code is `Assets/HuaweiHmsDemo/demo/test/AnalyticTest.cs`.
-https://developer.huawei.com/consumer/cn/doc/development/HMS-References/push-aaid-pkg
-### Location
-https://developer.huawei.com/consumer/cn/doc/development/HMS-Guides/location-description
-
-https://developer.huawei.com/consumer/cn/doc/development/HMS-References/locationv4
-
-## SDK
-### Ads
-### Analytic
 ***Analytic initialize must initialize on `onCreate` of the first activity .***
 You can extend the UnityPlayerActivity file, and put java file on `Plugins/Android`.
 ```
 </application>
 ```
 **if you initialize analytic, you should add analytic implentment on mainTemplate.gradle**
-### Push
+## Push
+In example project, corresponding scene is `Assets/HuaweiHmsDemo/Scenes/HmsPushSampleScene.unity` and code is `Assets/HuaweiHmsDemo/demo/test/PushTest.cs`.
+
 We must set service.
 1.  Implement interface `IPushServiceListener`
 2.  Get Receiver by method `PushListenerRegister.RegisterListener`
 </application>
 ```
 `android:name` is fixed.
-### Location
+## Location
+In example project, corresponding scene is `Assets/HuaweiHmsDemo/Scenes/HmsLocationSampleScene.unity` and code is `Assets/HuaweiHmsDemo/demo/test/location/LocationTest.cs`.
-#### LocationBroadcastReceiver
+### LocationBroadcastReceiver
 1.  Implement interface `IBroadcastReceiver`
 2.  Get Receiver by method `BroadcastRegister.CreateLocationReceiver`
 3.  add to AndroidManifest.xml
 `android:name` is fixed.
 
 You can set value of `action android:name`. But the value should be the same as the parameter of `intent.setAction`.
-#### GeoFenceReceiver
+### GeoFenceReceiver
 1.  Implement interface `IBroadcastReceiver`
 2.  Get Receiver by method `BroadcastRegister.CreateGeoFenceReceiver`
 3.  add to AndroidManifest.xml

Assets/HuaweiHms/src/hms/JavaCode/enum/ContentClassification.cs.meta

 fileFormatVersion: 2
-guid: 17aa4c0d68b6f46f1967bc362aac321e
+guid: 4aa463b4ae2dc44d9923fed9e5e7eb39
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/enum/Gender.cs.meta

 fileFormatVersion: 2
-guid: b61ab4ff4146343eca131fbf060d96df
+guid: 3545bc9a942334c148e692632a6c2cdc
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/enum/HAEventType.cs.meta

 fileFormatVersion: 2
-guid: 67aee87cb88824fb3b1f202776ee313f
+guid: dcc78a38cbb4544e0bf2fdee274c4239
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/enum/HAParamType.cs.meta

 fileFormatVersion: 2
-guid: ae45f0ce9c2a8490d89874c59642f85e
+guid: 13a9c507fd8734e2ab6051599deb0c15
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/enum/NonPersonalizedAd.cs.meta

 fileFormatVersion: 2
-guid: 35a17352c2ba3413eaaa6d76b05a28d7
+guid: aa3c46ca98be94baab6c3e0f9c15a1db
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/enum/TagForChild.cs.meta

 fileFormatVersion: 2
-guid: a72e53da3398749a9bf11f3a6a5dcc94
+guid: d69b8c5bdf4984c3db36f44c15952724
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/enum/UnderAge.cs.meta

 fileFormatVersion: 2
-guid: f790cb5e350b444dcb5292420b3c37c3
+guid: b54d1c009366642a581259c12c96faa7
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/ads/AdParam.cs.meta

 fileFormatVersion: 2
-guid: dfe01e0d0f02a42e0934342d67da3bbe
+guid: 478b1620c86aa4fccba8739c9dfc9d14
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/ads/AdProvider.cs.meta

 fileFormatVersion: 2
-guid: 7eb4006f32ae241de83e3ecf4ee4162d
+guid: 3b6d538f8e638456c97059b397cff7d3
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/ads/Consent.cs.meta

 fileFormatVersion: 2
-guid: 072422686d0294fe1badb70c6b0ce8d2
+guid: 969dc67c0df344ffaba39ce1fd576edb
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/ads/HwAds.cs

         public static RequestOptions getRequestOptions() {
             return CallStatic<RequestOptions>("getRequestOptions");
         }
+        public static void setRequestOptions(RequestOptions arg0) {
+            CallStatic("setRequestOptions", arg0);
+        }
     }
 }

Assets/HuaweiHms/src/hms/JavaCode/javaClass/ads/HwAds.cs.meta

 fileFormatVersion: 2
-guid: 2edcd264d919d4faa8f2e0fa1ebfdad1
+guid: 5941a21aff0754d2f9ff541b221e7ab5
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/ads/InterstitialAd.cs.meta

 fileFormatVersion: 2
-guid: 6f2d96b13d75d48d08590a0916c70598
+guid: 6726feae425974cbe93e6d01eca90299
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/ads/RequestOptions.cs.meta

 fileFormatVersion: 2
-guid: e27c4b8d7f2a648ea94373b190ee40d8
+guid: b3860e07b4799425c890518286ef5d2a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/ads/Reward.cs.meta

 fileFormatVersion: 2
-guid: c9ccc7569914b4b9bae4fe6172c4d7dd
+guid: 4f557d1356bb7406cb86cc21514d95ff
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/ads/RewardAd.cs

         public RewardAdListener getRewardAdListener() {
             return Call<RewardAdListener>("getRewardAdListener");
         }
-        public void pause() {
-            Call("pause");
-        }
+        }
+        public void pause() {
+            Call("pause");
         }
         public void resume() {
             Call("resume");
         public void show(Activity arg0, RewardAdStatusListener arg1, bool arg2) {
             Call("show", arg0, arg1, arg2);
         }
-        public void show() {
-            Call("show");
-        }
+        }
+        public void show() {
+            Call("show");
         }
     }
 }

Assets/HuaweiHms/src/hms/JavaCode/javaClass/ads/RewardAd.cs.meta

 fileFormatVersion: 2
-guid: 741ada2b7156f4a319319a4d16d2d9d8
+guid: 3a4ef8553196841c4a5c9eab22f89012
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/ads/RewardAdListener.cs.meta

 fileFormatVersion: 2
-guid: 637130e1d15cd4a62acf4f577e836b00
+guid: e572e7b05fde0470cbdb6c0db9241609
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/ads/RewardVerifyConfig.cs.meta

 fileFormatVersion: 2
-guid: 8f3173aafdce64238ae5f372116615bc
+guid: 69e7c0e3f22574fb58428e7ed07ebccb
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/analytic/HiAnalytics.cs.meta

 fileFormatVersion: 2
-guid: f93b77cf97eb14f02bb7ef916703c103
+guid: fabdecf728fca4db385b260057f85c2c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/analytic/HiAnalyticsTools.cs.meta

 fileFormatVersion: 2
-guid: d18ac098d0e80448ba7049a7e75bea0a
+guid: f4e82ac3486564b1a820d18700d03b87
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/AGConnectServicesConfig.cs

     public class AGConnectServicesConfig :HmsClass<AGConnectServicesConfig_Data>
     {
         public AGConnectServicesConfig (): base() { }
-        public static AGConnectServicesConfig fromContext(Context arg0, string arg1) {
-            return CallStatic<AGConnectServicesConfig>("fromContext", arg0, arg1);
-        }
+        }
+        public static AGConnectServicesConfig fromContext(Context arg0, string arg1) {
+            return CallStatic<AGConnectServicesConfig>("fromContext", arg0, arg1);
         }
         public bool getBoolean(string arg0, bool arg1) {
             return Call<bool>("getBoolean", arg0, arg1);
         }
-        public int getInt(string arg0) {
-            return Call<int>("getInt", arg0);
-        }
-        public string getString(string arg0, string arg1) {
-            return Call<string>("getString", arg0, arg1);
+        public int getInt(string arg0) {
+            return Call<int>("getInt", arg0);
+        }
+        public string getString(string arg0, string arg1) {
+            return Call<string>("getString", arg0, arg1);
         }
     }
 }

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/AGConnectServicesConfig.cs.meta

 fileFormatVersion: 2
-guid: f33fb18cabaed47439806291012cb065
+guid: fbba5eeafdc87498188ab890e93a1602
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/ActivityCompat.cs.meta

 fileFormatVersion: 2
-guid: d3a98023921bb45c1a8ef2ad36ea841f
+guid: 91bb69ac373714ff6bfa2f2f35a7e632
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/AndroidUtil.cs.meta

 fileFormatVersion: 2
-guid: 707b5d47718f4468b97f679b9fd2e957
+guid: 1741a0e39ae8b4d66a0aaff458f26201
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/Bundle.cs

     }
     public class Bundle :HmsClass<Bundle_Data>
     {
-        public Bundle (PersistableBundle arg0): base(arg0) { }
-        public Bundle (int arg0): base(arg0) { }
+        public Bundle (int arg0): base(arg0) { }
+        public Bundle (PersistableBundle arg0): base(arg0) { }
         public void putByte(string arg0, byte arg1) {
             Call("putByte", arg0, arg1);
         }

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/Bundle.cs.meta

 fileFormatVersion: 2
-guid: f355271dd4b344a52bc9ea8eca75337e
+guid: 3428e3b672fbb429fa6fb8b846e6c447
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/Class.cs.meta

 fileFormatVersion: 2
-guid: 4064dbb1a74da4a6c9bff1eac051bb50
+guid: 51cbc31cff44f4df49cb1d7f3d19a64a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/ClassLoader.cs.meta

 fileFormatVersion: 2
-guid: a34b345afb7654a31a954ca911780899
+guid: ae4518f28cce94dfe9e1b54f3535584c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/Collection.cs.meta

 fileFormatVersion: 2
-guid: a62ec0265484b498a9b957ff6342826f
+guid: bb2e3f0be25f64f059de4ef66a782b04
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/Exception.cs

         public Exception (string arg0, Throwable arg1): base(arg0, arg1) { }
         public Exception (string arg0): base(arg0) { }
         public Exception (): base() { }
+        public string toString() {
+            return Call<string>("toString");
+        }
     }
 }

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/Exception.cs.meta

 fileFormatVersion: 2
-guid: 9ffc09969807046db84447e8d567e702
+guid: f53f25d0a55fc47e8a985c2fff51dd4e
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/Executor.cs.meta

 fileFormatVersion: 2
-guid: d2e707f9a809645f8a586dab9651f151
+guid: e8cdae2f2105840ad97df0288c6f0af2
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/Intent.cs

         public const int URI_ALLOW_UNSAFE = 4;
         public const int URI_ANDROID_APP_SCHEME = 2;
         public const int URI_INTENT_SCHEME = 1;
+        public Intent (Intent arg0): base(arg0) { }
-        public Intent (Context arg0, AndroidJavaClass arg1): base(arg0, arg1) { }
+        public Intent (Context arg0, AndroidJavaClass arg1): base(arg0, arg1) { }
-        public Intent (Intent arg0): base(arg0) { }
         public Intent (string arg0): base(arg0) { }
         public Intent setAction(string arg0) {
             return Call<Intent>("setAction", arg0);

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/Intent.cs.meta

 fileFormatVersion: 2
-guid: cb00515a0b0dc4ac3aedf2c2f72468c5
+guid: a02430b0011c14f4d877ab669090b807
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/Location.cs

         public float getAccuracy() {
             return Call<float>("getAccuracy");
         }
+        public void setLatitude(double arg0) {
+            Call("setLatitude", arg0);
+        }
+        public void setLongitude(double arg0) {
+            Call("setLongitude", arg0);
+        }
     }
 }

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/Location.cs.meta

 fileFormatVersion: 2
-guid: 54f2fd767a90c42308a86663a008f2ba
+guid: 1946caf0a81c34f47bac7c688d9fac47
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/Looper.cs.meta

 fileFormatVersion: 2
-guid: 4fc0fa93cea3b4b308e2ce6c18d8b4bf
+guid: 39d47998feedf442a97631a73f83ea9f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/Map.cs.meta

 fileFormatVersion: 2
-guid: f3b7184593a8e415688938d9c2c7217c
+guid: f47ac4a09a86e45fcaaec3413ed3827b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/Parcel.cs.meta

 fileFormatVersion: 2
-guid: 4ce787129f7314b4bbc8270cf59cc521
+guid: 4d30974602bd74658b0cf72d2b67fa69
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/PendingIntent.cs.meta

 fileFormatVersion: 2
-guid: 9245df6d2a23c4e949ddc44b06b15e52
+guid: 56518c97beaa44e7ea5fda7ee9bd2391
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/PersistableBundle.cs

     }
     public class PersistableBundle :HmsClass<PersistableBundle_Data>
     {
-        public PersistableBundle (PersistableBundle arg0): base(arg0) { }
-        public PersistableBundle (int arg0): base(arg0) { }
+        public PersistableBundle (int arg0): base(arg0) { }
+        public PersistableBundle (PersistableBundle arg0): base(arg0) { }
     }
 }

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/PersistableBundle.cs.meta

 fileFormatVersion: 2
-guid: c0287de0e4ea748c8a5bff6439130f8d
+guid: 0a77db1ef7c7c4d76be7144ecfee4d2d
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/Task.cs.meta

 fileFormatVersion: 2
-guid: 9d858d5575ee04406b0489fe6f669dde
+guid: b1300924ab82f481ebc52837e26e832a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/Throwable.cs.meta

 fileFormatVersion: 2
-guid: 17f0e731417d94f7bbfdfe186b579ab3
+guid: 64d5b6d5c35f74f8fa6838c10650dfa5
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/base/Uri.cs.meta

 fileFormatVersion: 2
-guid: ecc206835773c42d584c2576fc5d2178
+guid: 5a2b9a140a768426195a08f7124d9b23
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/ActivityConversionData.cs

     }
     public class ActivityConversionData :HmsClass<ActivityConversionData_Data>
     {
-        public ActivityConversionData (int arg0, int arg1, long arg2): base(arg0, arg1, arg2) { }
+        public ActivityConversionData (int arg0, int arg1, long arg2): base(arg0, arg1, arg2) { }
         public int getActivityType() {
             return Call<int>("getActivityType");
         }

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/ActivityConversionData.cs.meta

 fileFormatVersion: 2
-guid: 012f5e38bdd2a46158b75500a82737f4
+guid: fb023d3ef42ea41d1a9f79851d785a2c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/ActivityConversionInfo.cs

     {
         public const int ENTER_ACTIVITY_CONVERSION = 0;
         public const int EXIT_ACTIVITY_CONVERSION = 1;
-        public ActivityConversionInfo (int arg0, int arg1): base(arg0, arg1) { }
+        public ActivityConversionInfo (int arg0, int arg1): base(arg0, arg1) { }
         public int getActivityType() {
             return Call<int>("getActivityType");
         }

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/ActivityConversionInfo.cs.meta

 fileFormatVersion: 2
-guid: 3b5e010d92cb14b63966ee15ee0a16a3
+guid: 1def47a24c15e4d1f8772a6a262f905a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/ActivityConversionRequest.cs

     }
     public class ActivityConversionRequest :HmsClass<ActivityConversionRequest_Data>
     {
-        public ActivityConversionRequest (List arg0): base(arg0) { }
+        public ActivityConversionRequest (List arg0): base(arg0) { }
         public void setDataToIntent(Intent arg0) {
             Call("setDataToIntent", arg0);
         }

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/ActivityConversionRequest.cs.meta

 fileFormatVersion: 2
-guid: d82192be987ff4ac2be6075bd68b14ab
+guid: c127c9919c24c4feab003b1f1de5a46d
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/ActivityConversionResponse.cs

     }
     public class ActivityConversionResponse :HmsClass<ActivityConversionResponse_Data>
     {
-        public ActivityConversionResponse (List arg0): base(arg0) { }
+        public ActivityConversionResponse (List arg0): base(arg0) { }
         public static ActivityConversionResponse getDataFromIntent(Intent arg0) {
             return CallStatic<ActivityConversionResponse>("getDataFromIntent", arg0);
         }

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/ActivityConversionResponse.cs.meta

 fileFormatVersion: 2
-guid: 2085870c2e70345d2ab8f40dee38a0c9
+guid: 490439ad2ba67456b9c8e9d15c7597ac
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/ActivityIdentification.cs.meta

 fileFormatVersion: 2
-guid: dba33f2df4aa54d9a8890a880adc20e7
+guid: efc5064b1c9974d2c9270033e23ee83f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/ActivityIdentificationData.cs.meta

 fileFormatVersion: 2
-guid: 6b7eaa89b930940eb822eab0cadb3ecd
+guid: f73d9620e2efb48e1aeee92923f2c57c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/ActivityIdentificationResponse.cs

     }
     public class ActivityIdentificationResponse :HmsClass<ActivityIdentificationResponse_Data>
     {
-        public ActivityIdentificationResponse (ActivityIdentificationData arg0, long arg1, long arg2): base(arg0, arg1, arg2) { }
+        public ActivityIdentificationResponse (ActivityIdentificationData arg0, long arg1, long arg2): base(arg0, arg1, arg2) { }
         public ActivityIdentificationResponse (): base() { }
         public static ActivityIdentificationResponse getDataFromIntent(Intent arg0) {
             return CallStatic<ActivityIdentificationResponse>("getDataFromIntent", arg0);

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/ActivityIdentificationResponse.cs.meta

 fileFormatVersion: 2
-guid: 7156dc67b4b0b458ca6d8c6159740958
+guid: 822bd198b0f67492387e367c4ad8295d
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/ActivityIdentificationService.cs

     }
     public class ActivityIdentificationService :HmsClass<ActivityIdentificationService_Data>
     {
-        public ActivityIdentificationService (Context arg0): base(arg0) { }
+        public ActivityIdentificationService (Context arg0): base(arg0) { }
         public ActivityIdentificationService (): base() { }
         public Task deleteActivityConversionUpdates(PendingIntent arg0) {
             return Call<Task>("deleteActivityConversionUpdates", arg0);

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/ActivityIdentificationService.cs.meta

 fileFormatVersion: 2
-guid: e9e70772fc95e4e94b5336c1b8536daa
+guid: a126b2d82a1f24eceb4220a00c94ab8b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/FusedLocationProviderClient.cs

         public Task getLocationAvailability() {
             return Call<Task>("getLocationAvailability");
         }
-        public Task removeLocationUpdates(LocationCallback arg0) {
-            return Call<Task>("removeLocationUpdates", arg0);
-        }
-        public Task requestLocationUpdates(LocationRequest arg0, PendingIntent arg1) {
-            return Call<Task>("requestLocationUpdates", arg0, arg1);
+        public Task removeLocationUpdates(LocationCallback arg0) {
+            return Call<Task>("removeLocationUpdates", arg0);
+        }
+        public Task requestLocationUpdates(LocationRequest arg0, PendingIntent arg1) {
+            return Call<Task>("requestLocationUpdates", arg0, arg1);
         }
         public Task setMockMode(bool arg0) {
             return Call<Task>("setMockMode", arg0);

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/FusedLocationProviderClient.cs.meta

 fileFormatVersion: 2
-guid: aad14019fa0684518abb53eada13cad6
+guid: 843abec9d909e4fa8b983a44d3a47f53
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/Geofence.cs.meta

 fileFormatVersion: 2
-guid: 4e7a9c89cb10b49a498e1ddbab2af29c
+guid: 5503bcaa1619444af8063808b895f4cc
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/GeofenceData.cs.meta

 fileFormatVersion: 2
-guid: 13aab8ac143f64f4da2d7ac0969799f2
+guid: 2d704eef80bbc499290f516a73fe4666
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/GeofenceErrorCodes.cs.meta

 fileFormatVersion: 2
-guid: 23a4d45c5f23847d6a809c740735a337
+guid: 473fffae4ca9c4667b713dba909855a3
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/GeofenceRequest.cs.meta

 fileFormatVersion: 2
-guid: 196d962cd88244e1da3a50ef2caca320
+guid: 38098b072b783438cbf0f53d21c70445
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/GeofenceService.cs

     }
     public class GeofenceService :HmsClass<GeofenceService_Data>
     {
-        public GeofenceService (Context arg0): base(arg0) { }
+        public GeofenceService (Context arg0): base(arg0) { }
         public GeofenceService (): base() { }
         public Task createGeofenceList(GeofenceRequest arg0, PendingIntent arg1) {
             return Call<Task>("createGeofenceList", arg0, arg1);

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/GeofenceService.cs.meta

 fileFormatVersion: 2
-guid: f0c396a7a6d78484f9afb047dbc4a794
+guid: 479be86645d2640e2a770c24fd765792
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/HWLocation.cs.meta

 fileFormatVersion: 2
-guid: b1b9569fca9bc423ab6cf31da69e25f6
+guid: 2575e42a1fc184da1b602f9d35317bab
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/LocationAvailability.cs

         public bool isLocationAvailable() {
             return Call<bool>("isLocationAvailable");
         }
+        public string toString() {
+            return Call<string>("toString");
+        }
     }
 }

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/LocationAvailability.cs.meta

 fileFormatVersion: 2
-guid: 7c7f89000ed7c4b4abe549fa815a9788
+guid: 59041474ed1824459bcee7eed060311a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/LocationRequest.cs.meta

 fileFormatVersion: 2
-guid: 3352a61c195784c2ab39d3b96af98abb
+guid: 0b2884a8fd0e849ce8406215980892be
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/LocationResult.cs.meta

 fileFormatVersion: 2
-guid: 4ce68635f18b1476fb225933de5886ad
+guid: d32c9dc275dd44a34a1354ef5e0c7885
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/LocationServices.cs.meta

 fileFormatVersion: 2
-guid: 09804f5f12c2c43c4b414f0c6545e4d2
+guid: b3f209ac6fb55423eb5e82817558ad9a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/LocationSettingsRequest.cs.meta

 fileFormatVersion: 2
-guid: 942c39b61f5ca480a9e91a5f48f40ba3
+guid: b523558a9c3ff4ea8a72e7b3b691634b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/SettingsClient.cs

     }
     public class SettingsClient :HmsClass<SettingsClient_Data>
     {
-        public SettingsClient (Context arg0): base(arg0) { }
+        public SettingsClient (Context arg0): base(arg0) { }
         public SettingsClient (): base() { }
         public Task checkLocationSettings(LocationSettingsRequest arg0) {
             return Call<Task>("checkLocationSettings", arg0);

Assets/HuaweiHms/src/hms/JavaCode/javaClass/location/SettingsClient.cs.meta

 fileFormatVersion: 2
-guid: e009d667401684a85a49541742aeb88e
+guid: 76920e3cefe384c6eb7485753ed3c004
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/push/AAIDResult.cs.meta

 fileFormatVersion: 2
-guid: 7f43c941f61c34c0a8c06725d9cda088
+guid: 837c60986b2c84471bc464ee1ccb38ba
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/push/BaseException.cs.meta

 fileFormatVersion: 2
-guid: a4cd1ad1e7f9b4a579201a72e8c8243a
+guid: 17be4aa1a47e34f59b39b914952bf093
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/push/HmsInstanceId.cs.meta

 fileFormatVersion: 2
-guid: 9d523ed517cbe45179185b64a2e19bca
+guid: 1e5f4d22429b04a9d9abe25dccf20fd1
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/push/HmsMessaging.cs.meta

 fileFormatVersion: 2
-guid: 940074aea1f3944589fb23b978686177
+guid: 134557594a78a43e88330df3edf05ffc
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/javaClass/push/RemoteMessage.cs

             public Builder setCollapseKey(string arg0) {
                 return Call<Builder>("setCollapseKey", arg0);
             }
+            public Builder setSendMode(int arg0) {
+                return Call<Builder>("setSendMode", arg0);
+            }
+            public Builder setReceiptMode(int arg0) {
+                return Call<Builder>("setReceiptMode", arg0);
+            }
             public RemoteMessage build() {
                 return Call<RemoteMessage>("build");
             }

Assets/HuaweiHms/src/hms/JavaCode/javaClass/push/RemoteMessage.cs.meta

 fileFormatVersion: 2
-guid: 1ca2c0a4f463c4c50a7e0173ab0ff541
+guid: eca708d8455e648fab821aacc6ae755b
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/listener/AdListener.cs.meta

 fileFormatVersion: 2
-guid: cad79a07665774aa694735d411163f69
+guid: 998319fb0ca114b248482cc351cae016
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/listener/ConsentUpdateListener.cs.meta

 fileFormatVersion: 2
-guid: 8055127f12bb244a483d23c0e7a18f87
+guid: cea7d4ca1f9eb4885828ed5a378df2c6
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/listener/LocationCallback.cs.meta

 fileFormatVersion: 2
-guid: ff923e0d221a4404f817bdac10a7fbbc
+guid: caed4fc9041554940a964bbd076601c2
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/listener/OnCompleteListener.cs.meta

 fileFormatVersion: 2
-guid: d47a2e808486e44fbbad813e4a0e3339
+guid: 7e773246ddae84d42aba798ebb04a3b7
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/listener/OnFailureListener.cs.meta

 fileFormatVersion: 2
-guid: 22a15245500384a4881706327ea12011
+guid: 05d7a89067b2343a1b3a29c07a73c1fd
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/listener/OnSuccessListener.cs

     
         public virtual void onSuccess(AndroidJavaObject arg0) { }
     }
+    
+    public class OnSuccessListener<T> : HmsListener<OnSuccessListenerData> where T:IHmsBase,new()
+    {
+    
+        public virtual void onSuccess(T arg0) {}
+
+        public void onSuccess(AndroidJavaObject arg0)
+        {
+            onSuccess(HmsUtil.GetHmsBase<T>(arg0));
+        }
+    }
 }

Assets/HuaweiHms/src/hms/JavaCode/listener/OnSuccessListener.cs.meta

 fileFormatVersion: 2
-guid: 40e99b4f3f0a9470d893af34478db5ed
+guid: 5177c367f243d4b079b1b90a52e86cca
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/listener/RewardAdLoadListener.cs.meta

 fileFormatVersion: 2
-guid: 9bf1c194c4b024ce1b53223d99049bdb
+guid: 210518f54ffc84583ad166a963b7c999
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHms/src/hms/JavaCode/listener/RewardAdStatusListener.cs.meta

 fileFormatVersion: 2
-guid: 46fdbd916aad74f02846be3f2de702a3
+guid: 5643026b100314235aaa593b512c7a91
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/HuaweiHmsDemo/Scenes/HmsAdsSampleScene.unity

   m_Name: 
   m_EditorClassIdentifier: 
   AdsEnabled: 1
-  AnalyticEnabled: 1
-  PushEnabled: 1
-  LocationEnabled: 1
+  AnalyticEnabled: 0
+  PushEnabled: 0
+  LocationEnabled: 0
   btnParent: {fileID: 1664072771}
   btnPrefab: {fileID: 5079351762955741576, guid: d221bb8c0c7b8476294abb3b987699b9,
     type: 3}

Assets/HuaweiHmsDemo/Scenes/HmsAdsSampleScene.unity.meta

-fileFormatVersion: 2
-guid: 2cda990e2423bbf4892e6590ba056729
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: a518e96ecc8f24c66a12be14f8900ec4
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/HuaweiHmsDemo/demo/test/AnalyticTest.cs

         private bool enabled;
         public AnalyticTest()
         {
+            HiAnalyticsTools.enableLog();
-        public override void RegistEvent(TestEvent registEvent){
-            registEvent("SendProductId",SendProductId);
-            registEvent("SendAnalyticEnable",SendAnalyticEnable);
-            registEvent("CreateClearCache",CreateClearCache);
+        public override void RegisterEvent(TestEvent registerEvent){
+            registerEvent("SendProductId",SendProductId);
+            registerEvent("SendAnalyticEnable",SendAnalyticEnable);
+            registerEvent("CreateClearCache",CreateClearCache);
+            registerEvent("Set Favorite Sport",SetFavoriteSport);
         }
         public void SendProductId()
         {
         public void CreateClearCache()
         {
             instance.clearCachedData();
+        }
+
+        public void SetFavoriteSport()
+        {
+            instance.setUserProfile("favor_sport", "running");
         }
     }
 }

Assets/HuaweiHmsDemo/demo/test/PushTest.cs

-using UnityEngine;
+using System;
+using UnityEngine;
+using Exception = HuaweiHms.Exception;
 
 namespace HuaweiHmsDemo
 {
             SetListener();
         }
-        public override void RegistEvent(TestEvent registEvent){
-            registEvent("get token",GetToken);
-            registEvent("delete token",DeleteToken);
-            registEvent("set auto init enabled",SetAutoInitEnabled);
-            registEvent("SubscribeTest",SubscribeTest);
-            registEvent("UnSubscribeTest",UnSubscribeTest);
-            registEvent("TurnOn",TurnOn);
-            registEvent("TurnOff",TurnOff);
+        public override void RegisterEvent(TestEvent registerEvent){
+            registerEvent("get AAID",() => SetAAID(true));
+            registerEvent("delete AAID",() => SetAAID(false));
+            registerEvent("get token",GetToken);
+            registerEvent("delete token",DeleteToken);
+            registerEvent("get auto init enabled", GetAutoInitEnabled);
+            registerEvent("set auto init enabled",SetAutoInitEnabled);
+            registerEvent("SubscribeTest",SubscribeTest);
+            registerEvent("UnSubscribeTest",UnSubscribeTest);
+            registerEvent("TurnOn",TurnOn);
+            registerEvent("TurnOff",TurnOff);
+            registerEvent("SendMessage",SendMessage);
+        }
+
+        public void SetAAID(bool isGet)
+        {
+            if (isGet)
+            {
+                Task id = HmsInstanceId.getInstance(new Context()).getAAID();
+                id.addOnSuccessListener(new HmsSuccessListener<AAIDResult>((aaidResult) =>
+                {
+                    String aaId = aaidResult.getId();
+                    TestTip.Inst.ShowText("getAAID success:" + aaId);
+                })).addOnFailureListener(new HmsFailureListener((e) =>
+                {
+                    TestTip.Inst.ShowText($"getAAID failed: {e.toString()}");
+                }));
+            }
+            else
+            {
+                try {
+                    HmsInstanceId.getInstance(new Context()).deleteAAID();
+                    TestTip.Inst.ShowText("delete aaid and its generation timestamp success.");
+                } catch (System.Exception e) {
+                    TestTip.Inst.ShowText("deleteAAID failed. " + e);
+                }
+            }
+        
         public bool status = true;
         public void GetToken(){
             string appId = AGConnectServicesConfig.fromContext(new Context()).getString("client/app_id");
         public void SetListener(){
             PushListenerRegister.RegisterListener(new PServiceListener());
         }
+
+        public void GetAutoInitEnabled()
+        {
+            TestTip.Inst.ShowText($"isAutoInitEnabled: {HmsMessaging.getInstance(new Context()).isAutoInitEnabled()}");
+        } 
+            
         public void SetAutoInitEnabled(){
             status = !status;
             HmsMessaging.getInstance(new Context()).setAutoInitEnabled(status);
         public void TurnOff(){
             HmsMessaging.getInstance(new Context()).turnOffPush().addOnCompleteListener(new clistener());
         }
+
+        public void SendMessage()
+        {
+            string messageId = DateTime.Now.Millisecond.ToString();
+            RemoteMessage remoteMessage = new RemoteMessage.Builder("push.hcm.upstream")
+                .setMessageId(messageId)
+                .addData("key1", "data1")
+                .addData("key2", "data2")
+                .build();
+            try {
+                HmsMessaging.getInstance(new Context()).send(remoteMessage);
+                TestTip.Inst.ShowText("sending...");
+            } catch (System.Exception e) {
+                TestTip.Inst.ShowText( "send exception:" + e);
+            }
+        }
     }
     public class clistener:OnCompleteListener {
         public override void onComplete(Task task){
         public override void onNewToken(string var1) {
             TestTip.Inst.ShowText(var1);
         }
+
+        public override void onMessageSent(string arg0)
+        {
+            TestTip.Inst.ShowText( "onMessageSent called, Message id:" + arg0);
+        }
+
+        public override void onSendError(string arg0, BaseException arg1)
+        {
+            TestTip.Inst.ShowText("onSendError called, message id:" + arg0 + "+ ErrCode:"
+                       + arg1.getErrorCode() + ", description:" + arg1.getMessage());
+        }
+
+        public override void onTokenError(BaseException arg0)
+        {
+            TestTip.Inst.ShowText($"on Token Exception: {arg0.getMessage()}");
+        }
+
         public override void onMessageReceived(RemoteMessage message){
             string s = "getCollapseKey: " + message.getCollapseKey()
             + "\n getData: " + message.getData()

Assets/HuaweiHmsDemo/demo/test/Test.cs

         public static T GetInstance(){
             return _inst == null?_inst = new T():_inst;
         }
-        public abstract void RegistEvent(TestEvent registEvent);
+        public abstract void RegisterEvent(TestEvent registerEvent);
     }
 }

Assets/HuaweiHmsDemo/demo/test/ads/AdsTest.cs

 {
     public class AdsTest:Test<AdsTest>
     {
-        public override void RegistEvent(TestEvent registEvent){
-            registEvent("load image ads " + Screen.width,LoadImageAds);
-            registEvent("load video ads " + Screen.height,LoadVideoAds);
-            registEvent("load reward ads",LoadRewardAds);
-            registEvent("consent",checkConsentStatus);
+        public override void RegisterEvent(TestEvent registerEvent){
+            registerEvent("load image ads " + Screen.width,LoadImageAds);
+            registerEvent("load video ads " + Screen.height,LoadVideoAds);
+            registerEvent("load reward ads",LoadRewardAds);
+            registerEvent("consent",checkConsentStatus);
         }
         public void LoadImageAds()
         {

Assets/HuaweiHmsDemo/demo/test/location/LocationGeoTest.cs

+using System.Collections.Generic;
+using System.Text;
+using UnityEngine;
+using UnityEngine.UI;
+
+        private PendingIntent pendingIntent;
-        public override void RegistEvent(TestEvent registEvent){
-            registEvent("CreateGeo",CreateGeo);
-            registEvent("removeGeo",RemoveGeo);
+        public override void RegisterEvent(TestEvent registerEvent){
+            registerEvent("CreateGeo",CreateGeo);
+            registerEvent("removeGeo",RemoveGeo);
+            registerEvent("removeGeoIntent",RemoveGeoIntent);
+        
-                .setRoundArea(LocationCb.latitude,LocationCb.longitude,200)
+                .setRoundArea(LocationCallBackWrap.latitude,LocationCallBackWrap.longitude,200)
                 .setConversions(7)
                 .setValidContinueTime(1000000)
                 .setDwellDelayTime(10000)
             GeofenceRequest request =  builder.build();
 
             mService = new GeofenceService(new Context());
-            mService.createGeofenceList(request,getPendingIntent()).addOnCompleteListener(new MCompleteListener());
+            pendingIntent = getPendingIntent();
+            mService.createGeofenceList(request, pendingIntent).addOnCompleteListener(new MCompleteListener());
         }
         public void RemoveGeo(){
             List list = new List();
+
+        public void RemoveGeoIntent()
+        {
+            mService.deleteGeofenceList(pendingIntent).addOnCompleteListener(new MCompleteListener());
+        }
+        
         private PendingIntent getPendingIntent() {
             Context ctx = new Context();
             Intent intent = new Intent(ctx,BroadcastRegister.CreateGeoFenceReceiver(new GeoFenceBroadcast()));