APIModuleGis 增加API 登录cors 断开BT连接 断开Cors连接

app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Fri May 26 17:18:13 CST 2023
+#Mon May 29 19:34:15 CST 2023
 path.1=classes.dex
 path.0=classes.dex
 renamed.7=classes8.dex

app/build/intermediates/merged_assets/debug/out/widget/index_frm.html

@@ -46,10 +46,23 @@
 	        alert("启动GisService获取结果为:"+JSON.stringify(res));
 		}
 		function sendConnect(){
-			var param = {rtkName:"GNSS-3543574"};
+			var param = {rtkName:"GNSS-3561535"};
 	        var res = uzmoduleGis.sendConnect(param);
 	        alert("发送连接命令:获取结果为:"+JSON.stringify(res));
 		}
+		function loginCors(){
+			var param = {ip:"rtk.huacenav.com",port:"8001",mountName:"RTCM33",userName:"zxcq1009",passWord:"52480331"};
+	        var res = uzmoduleGis.loginCors(param);
+	        alert("登录cors:获取结果为:"+JSON.stringify(res));
+		}
+		function stopBTConnect(){
+	        var res = uzmoduleGis.stopBTConnect();
+	        alert("断开连接:获取结果为:"+JSON.stringify(res));
+		}
+		function stopGorsConnect(){
+	        var res = uzmoduleGis.stopGorsConnect();
+	        alert("断开cors:获取结果为:"+JSON.stringify(res));
+		}
 		function stopGisService(){
 			var param = {appParam:"Hello APICloud!"};
 	        var res = uzmoduleGis.stopGisService(param);
@@ -194,8 +207,11 @@
 				<div class="clickbtn" tapmode="active" onclick="huaceRtkList()" >获取手机已配对RTK设备列表</div>
 				<div class="clickbtn" tapmode="active" onclick="startGisService()" >启动GisService</div>
 				<div class="clickbtn" tapmode="active" onclick="sendConnect()" >尝试连接</div>
+				<div class="clickbtn" tapmode="active" onclick="loginCors()" >登录cors</div>
+				<div class="clickbtn" tapmode="active" onclick="stopBTConnect()" >断开BT连接</div>
+				<div class="clickbtn" tapmode="active" onclick="stopGorsConnect()" >断开Cors连接</div>
 				<div class="clickbtn" tapmode="active" onclick="gisLatLng()" >获取经纬度</div>
-				<div class="clickbtn" tapmode="active" onclick="stopGisService()" >停止GisService并断开Connect</div>
+				<div class="clickbtn" tapmode="active" onclick="stopGisService()" >停止GisService</div>
 			<div class='itemtitle'>2、启动Activity</div>
 				<div class="clickbtn" tapmode="active" onclick="startActivity()" >startActivity</div>
 				<div class="clickbtn" tapmode="active" onclick="startActivityForResult()" >startActivityForResult</div>

app/build/outputs/apk/debug/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug","dirName":""},"path":"app-debug.apk","properties":{}}]

app/build/outputs/logs/manifest-merger-debug-report.txt

@@ -1,417 +0,0 @@
-provider#com.uzmap.pkg.uzapp.DataProvider
-INJECTED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:74:3-77:50
-	android:grantUriPermissions
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:77:13-47
-	android:authorities
-		INJECTED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:75:13-56
-	android:exported
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:76:13-37
-	android:name
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:74:13-60
-manifest
-ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:2:1-80:12
-INJECTED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:2:1-80:12
-INJECTED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:2:1-80:12
-INJECTED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:2:1-80:12
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:2:1-47:12
-MERGED from [:gnssserver-1.1.20230214-053827-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\72dc1370dacef0cfbb308a281c75c3e7\gnssserver-1.1.20230214-053827-8.0.1\AndroidManifest.xml:2:1-27:12
-MERGED from [:gnsstoollib-1.1.20230214-054100-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\f458f8cdb1ba7faa295b45047778ca5f\gnsstoollib-1.1.20230214-054100-8.0.1\AndroidManifest.xml:2:1-11:12
-MERGED from [:sdk4a-v1.6.0.3958:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\492a94d4bbc6f2ee082770c1db8e315b\sdk4a-v1.6.0.3958\AndroidManifest.xml:2:1-17:12
-MERGED from [com.android.support:multidex:1.0.2] G:\Android Studio\gradle\caches\transforms-2\files-2.1\5a8cd89d192afa40a3f460d7d46570fc\multidex-1.0.2\AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:support-v4:26.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\271ec858bdff550b8e63ef908885aeaf\support-v4-26.0.0\AndroidManifest.xml:17:1-31:12
-MERGED from [:moduleDemo] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleDemo\build\intermediates\library_manifest\debug\AndroidManifest.xml:2:1-25:12
-MERGED from [:moduleScrollPicture] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleScrollPicture\build\intermediates\library_manifest\debug\AndroidManifest.xml:2:1-15:12
-MERGED from [:moduleSyncInterface] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleSyncInterface\build\intermediates\library_manifest\debug\AndroidManifest.xml:2:1-15:12
-MERGED from [:moduleRefresh] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleRefresh\build\intermediates\library_manifest\debug\AndroidManifest.xml:2:1-15:12
-MERGED from [:moduleAppdelegate] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleAppdelegate\build\intermediates\library_manifest\debug\AndroidManifest.xml:2:1-9:12
-MERGED from [com.android.support:support-media-compat:26.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\449474a9c4be2d1ad947b87dd974b1d8\support-media-compat-26.0.0\AndroidManifest.xml:17:1-31:12
-MERGED from [com.android.support:appcompat-v7:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\aaffe2c7f23d715ca045db9d0a51d031\appcompat-v7-28.0.0\AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:support-fragment:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\6e07dd593fd232c7452c3c20dd27a8e1\support-fragment-28.0.0\AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:animated-vector-drawable:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\dd73b81ee8477d30c51950de1c7d4569\animated-vector-drawable-28.0.0\AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:support-core-ui:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\4ac8bacc6bdc06da514981c2a3855a4a\support-core-ui-28.0.0\AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:support-core-utils:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\d5d5e0afb6d849720ba2f95b3e39fcb5\support-core-utils-28.0.0\AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:support-vector-drawable:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\f70c181cc5010e4998d82bc8bd89fbfc\support-vector-drawable-28.0.0\AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:loader:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\1b9d515d8d1965c403de8914ca55cb7e\loader-28.0.0\AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:viewpager:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\f92ce9c7365574accb4fbe105fd65c21\viewpager-28.0.0\AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:coordinatorlayout:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\27bfd3d5fa1a19402f7d4ba14fb093b2\coordinatorlayout-28.0.0\AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:drawerlayout:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\efc59ff1f1e99fe01414b630035d92d4\drawerlayout-28.0.0\AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:slidingpanelayout:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\6064ab6775e6301e62ccb69ace9dbdbd\slidingpanelayout-28.0.0\AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:customview:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\3c823cc0e07b899cd90d87fa2096c1f1\customview-28.0.0\AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:swiperefreshlayout:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\a3a8c8cd8e894f6104aa84c89d48db43\swiperefreshlayout-28.0.0\AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:asynclayoutinflater:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\65fb01e2ae4e35f2f343847d68c9b98d\asynclayoutinflater-28.0.0\AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:support-compat:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\4e7b3bbed8e6e29e2ba6d4fc6e8eccff\support-compat-28.0.0\AndroidManifest.xml:17:1-24:12
-MERGED from [com.android.support:versionedparcelable:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\d107c5806233895e5be684de327d381f\versionedparcelable-28.0.0\AndroidManifest.xml:17:1-25:12
-MERGED from [com.android.support:cursoradapter:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\ad328008f0a36049c16e2e42bbe6ba36\cursoradapter-28.0.0\AndroidManifest.xml:17:1-22:12
-MERGED from [android.arch.lifecycle:runtime:1.1.1] G:\Android Studio\gradle\caches\transforms-2\files-2.1\0160f619c43aa1ecd28ae91ba8993552\runtime-1.1.1\AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:documentfile:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\1938455035f0a35aa3eefef3aa9fbbc4\documentfile-28.0.0\AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:localbroadcastmanager:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\1dc9df8e70a38f62679d702ec717a6a9\localbroadcastmanager-28.0.0\AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:print:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\4fd4a6ed80eb447e76c05986ef3fd6a1\print-28.0.0\AndroidManifest.xml:17:1-22:12
-MERGED from [android.arch.lifecycle:viewmodel:1.1.1] G:\Android Studio\gradle\caches\transforms-2\files-2.1\823f37c489bd02c4a4d0f6ca442a27d7\viewmodel-1.1.1\AndroidManifest.xml:17:1-22:12
-MERGED from [android.arch.lifecycle:livedata:1.1.1] G:\Android Studio\gradle\caches\transforms-2\files-2.1\f33d666ad8cee70ee4e661f9bad8e372\livedata-1.1.1\AndroidManifest.xml:17:1-22:12
-MERGED from [android.arch.lifecycle:livedata-core:1.1.1] G:\Android Studio\gradle\caches\transforms-2\files-2.1\85526c118dcfe3eae0cf402e2cecc572\livedata-core-1.1.1\AndroidManifest.xml:17:1-22:12
-MERGED from [android.arch.core:runtime:1.1.1] G:\Android Studio\gradle\caches\transforms-2\files-2.1\5853616defd81755613306a8befefe63\runtime-1.1.1\AndroidManifest.xml:17:1-22:12
-MERGED from [com.android.support:interpolator:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\d622bc834304bbaef61946e6b6568c26\interpolator-28.0.0\AndroidManifest.xml:17:1-22:12
-INJECTED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:2:1-80:12
-INJECTED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:2:1-80:12
-INJECTED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:2:1-80:12
-	package
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:4:5-35
-		INJECTED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml
-		INJECTED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml
-	android:versionName
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:5:29-54
-		INJECTED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml
-		INJECTED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml
-	xmlns:tools
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:3:5-51
-	xmlns:android
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:2:11-69
-	android:versionCode
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:5:5-28
-		INJECTED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml
-		INJECTED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml
-uses-sdk
-ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:7:5-47
-INJECTED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:7:5-47
-INJECTED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:7:5-47
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:6:5-8:41
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:6:5-8:41
-MERGED from [:gnssserver-1.1.20230214-053827-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\72dc1370dacef0cfbb308a281c75c3e7\gnssserver-1.1.20230214-053827-8.0.1\AndroidManifest.xml:7:5-9:41
-MERGED from [:gnssserver-1.1.20230214-053827-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\72dc1370dacef0cfbb308a281c75c3e7\gnssserver-1.1.20230214-053827-8.0.1\AndroidManifest.xml:7:5-9:41
-MERGED from [:gnsstoollib-1.1.20230214-054100-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\f458f8cdb1ba7faa295b45047778ca5f\gnsstoollib-1.1.20230214-054100-8.0.1\AndroidManifest.xml:7:5-9:41
-MERGED from [:gnsstoollib-1.1.20230214-054100-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\f458f8cdb1ba7faa295b45047778ca5f\gnsstoollib-1.1.20230214-054100-8.0.1\AndroidManifest.xml:7:5-9:41
-MERGED from [:sdk4a-v1.6.0.3958:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\492a94d4bbc6f2ee082770c1db8e315b\sdk4a-v1.6.0.3958\AndroidManifest.xml:7:5-9:41
-MERGED from [:sdk4a-v1.6.0.3958:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\492a94d4bbc6f2ee082770c1db8e315b\sdk4a-v1.6.0.3958\AndroidManifest.xml:7:5-9:41
-MERGED from [com.android.support:multidex:1.0.2] G:\Android Studio\gradle\caches\transforms-2\files-2.1\5a8cd89d192afa40a3f460d7d46570fc\multidex-1.0.2\AndroidManifest.xml:20:5-43
-MERGED from [com.android.support:multidex:1.0.2] G:\Android Studio\gradle\caches\transforms-2\files-2.1\5a8cd89d192afa40a3f460d7d46570fc\multidex-1.0.2\AndroidManifest.xml:20:5-43
-MERGED from [com.android.support:support-v4:26.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\271ec858bdff550b8e63ef908885aeaf\support-v4-26.0.0\AndroidManifest.xml:21:5-23:54
-MERGED from [com.android.support:support-v4:26.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\271ec858bdff550b8e63ef908885aeaf\support-v4-26.0.0\AndroidManifest.xml:21:5-23:54
-MERGED from [:moduleDemo] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleDemo\build\intermediates\library_manifest\debug\AndroidManifest.xml:7:5-9:41
-MERGED from [:moduleDemo] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleDemo\build\intermediates\library_manifest\debug\AndroidManifest.xml:7:5-9:41
-MERGED from [:moduleScrollPicture] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleScrollPicture\build\intermediates\library_manifest\debug\AndroidManifest.xml:7:5-44
-MERGED from [:moduleScrollPicture] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleScrollPicture\build\intermediates\library_manifest\debug\AndroidManifest.xml:7:5-44
-MERGED from [:moduleSyncInterface] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleSyncInterface\build\intermediates\library_manifest\debug\AndroidManifest.xml:7:5-44
-MERGED from [:moduleSyncInterface] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleSyncInterface\build\intermediates\library_manifest\debug\AndroidManifest.xml:7:5-44
-MERGED from [:moduleRefresh] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleRefresh\build\intermediates\library_manifest\debug\AndroidManifest.xml:7:5-44
-MERGED from [:moduleRefresh] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleRefresh\build\intermediates\library_manifest\debug\AndroidManifest.xml:7:5-44
-MERGED from [:moduleAppdelegate] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleAppdelegate\build\intermediates\library_manifest\debug\AndroidManifest.xml:7:5-44
-MERGED from [:moduleAppdelegate] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleAppdelegate\build\intermediates\library_manifest\debug\AndroidManifest.xml:7:5-44
-MERGED from [com.android.support:support-media-compat:26.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\449474a9c4be2d1ad947b87dd974b1d8\support-media-compat-26.0.0\AndroidManifest.xml:21:5-23:63
-MERGED from [com.android.support:support-media-compat:26.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\449474a9c4be2d1ad947b87dd974b1d8\support-media-compat-26.0.0\AndroidManifest.xml:21:5-23:63
-MERGED from [com.android.support:appcompat-v7:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\aaffe2c7f23d715ca045db9d0a51d031\appcompat-v7-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:appcompat-v7:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\aaffe2c7f23d715ca045db9d0a51d031\appcompat-v7-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:support-fragment:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\6e07dd593fd232c7452c3c20dd27a8e1\support-fragment-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:support-fragment:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\6e07dd593fd232c7452c3c20dd27a8e1\support-fragment-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:animated-vector-drawable:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\dd73b81ee8477d30c51950de1c7d4569\animated-vector-drawable-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:animated-vector-drawable:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\dd73b81ee8477d30c51950de1c7d4569\animated-vector-drawable-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:support-core-ui:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\4ac8bacc6bdc06da514981c2a3855a4a\support-core-ui-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:support-core-ui:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\4ac8bacc6bdc06da514981c2a3855a4a\support-core-ui-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:support-core-utils:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\d5d5e0afb6d849720ba2f95b3e39fcb5\support-core-utils-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:support-core-utils:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\d5d5e0afb6d849720ba2f95b3e39fcb5\support-core-utils-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:support-vector-drawable:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\f70c181cc5010e4998d82bc8bd89fbfc\support-vector-drawable-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:support-vector-drawable:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\f70c181cc5010e4998d82bc8bd89fbfc\support-vector-drawable-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:loader:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\1b9d515d8d1965c403de8914ca55cb7e\loader-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:loader:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\1b9d515d8d1965c403de8914ca55cb7e\loader-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:viewpager:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\f92ce9c7365574accb4fbe105fd65c21\viewpager-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:viewpager:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\f92ce9c7365574accb4fbe105fd65c21\viewpager-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:coordinatorlayout:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\27bfd3d5fa1a19402f7d4ba14fb093b2\coordinatorlayout-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:coordinatorlayout:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\27bfd3d5fa1a19402f7d4ba14fb093b2\coordinatorlayout-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:drawerlayout:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\efc59ff1f1e99fe01414b630035d92d4\drawerlayout-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:drawerlayout:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\efc59ff1f1e99fe01414b630035d92d4\drawerlayout-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:slidingpanelayout:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\6064ab6775e6301e62ccb69ace9dbdbd\slidingpanelayout-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:slidingpanelayout:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\6064ab6775e6301e62ccb69ace9dbdbd\slidingpanelayout-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:customview:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\3c823cc0e07b899cd90d87fa2096c1f1\customview-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:customview:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\3c823cc0e07b899cd90d87fa2096c1f1\customview-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:swiperefreshlayout:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\a3a8c8cd8e894f6104aa84c89d48db43\swiperefreshlayout-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:swiperefreshlayout:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\a3a8c8cd8e894f6104aa84c89d48db43\swiperefreshlayout-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:asynclayoutinflater:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\65fb01e2ae4e35f2f343847d68c9b98d\asynclayoutinflater-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:asynclayoutinflater:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\65fb01e2ae4e35f2f343847d68c9b98d\asynclayoutinflater-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:support-compat:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\4e7b3bbed8e6e29e2ba6d4fc6e8eccff\support-compat-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:support-compat:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\4e7b3bbed8e6e29e2ba6d4fc6e8eccff\support-compat-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:versionedparcelable:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\d107c5806233895e5be684de327d381f\versionedparcelable-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:versionedparcelable:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\d107c5806233895e5be684de327d381f\versionedparcelable-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:cursoradapter:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\ad328008f0a36049c16e2e42bbe6ba36\cursoradapter-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:cursoradapter:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\ad328008f0a36049c16e2e42bbe6ba36\cursoradapter-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [android.arch.lifecycle:runtime:1.1.1] G:\Android Studio\gradle\caches\transforms-2\files-2.1\0160f619c43aa1ecd28ae91ba8993552\runtime-1.1.1\AndroidManifest.xml:20:5-44
-MERGED from [android.arch.lifecycle:runtime:1.1.1] G:\Android Studio\gradle\caches\transforms-2\files-2.1\0160f619c43aa1ecd28ae91ba8993552\runtime-1.1.1\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:documentfile:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\1938455035f0a35aa3eefef3aa9fbbc4\documentfile-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:documentfile:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\1938455035f0a35aa3eefef3aa9fbbc4\documentfile-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:localbroadcastmanager:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\1dc9df8e70a38f62679d702ec717a6a9\localbroadcastmanager-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:localbroadcastmanager:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\1dc9df8e70a38f62679d702ec717a6a9\localbroadcastmanager-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:print:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\4fd4a6ed80eb447e76c05986ef3fd6a1\print-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:print:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\4fd4a6ed80eb447e76c05986ef3fd6a1\print-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [android.arch.lifecycle:viewmodel:1.1.1] G:\Android Studio\gradle\caches\transforms-2\files-2.1\823f37c489bd02c4a4d0f6ca442a27d7\viewmodel-1.1.1\AndroidManifest.xml:20:5-44
-MERGED from [android.arch.lifecycle:viewmodel:1.1.1] G:\Android Studio\gradle\caches\transforms-2\files-2.1\823f37c489bd02c4a4d0f6ca442a27d7\viewmodel-1.1.1\AndroidManifest.xml:20:5-44
-MERGED from [android.arch.lifecycle:livedata:1.1.1] G:\Android Studio\gradle\caches\transforms-2\files-2.1\f33d666ad8cee70ee4e661f9bad8e372\livedata-1.1.1\AndroidManifest.xml:20:5-44
-MERGED from [android.arch.lifecycle:livedata:1.1.1] G:\Android Studio\gradle\caches\transforms-2\files-2.1\f33d666ad8cee70ee4e661f9bad8e372\livedata-1.1.1\AndroidManifest.xml:20:5-44
-MERGED from [android.arch.lifecycle:livedata-core:1.1.1] G:\Android Studio\gradle\caches\transforms-2\files-2.1\85526c118dcfe3eae0cf402e2cecc572\livedata-core-1.1.1\AndroidManifest.xml:20:5-44
-MERGED from [android.arch.lifecycle:livedata-core:1.1.1] G:\Android Studio\gradle\caches\transforms-2\files-2.1\85526c118dcfe3eae0cf402e2cecc572\livedata-core-1.1.1\AndroidManifest.xml:20:5-44
-MERGED from [android.arch.core:runtime:1.1.1] G:\Android Studio\gradle\caches\transforms-2\files-2.1\5853616defd81755613306a8befefe63\runtime-1.1.1\AndroidManifest.xml:20:5-44
-MERGED from [android.arch.core:runtime:1.1.1] G:\Android Studio\gradle\caches\transforms-2\files-2.1\5853616defd81755613306a8befefe63\runtime-1.1.1\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:interpolator:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\d622bc834304bbaef61946e6b6568c26\interpolator-28.0.0\AndroidManifest.xml:20:5-44
-MERGED from [com.android.support:interpolator:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\d622bc834304bbaef61946e6b6568c26\interpolator-28.0.0\AndroidManifest.xml:20:5-44
-INJECTED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:7:5-47
-INJECTED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:7:5-47
-	tools:overrideLibrary
-		ADDED from [com.android.support:support-v4:26.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\271ec858bdff550b8e63ef908885aeaf\support-v4-26.0.0\AndroidManifest.xml:23:9-51
-	android:targetSdkVersion
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:7:16-45
-		INJECTED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml
-		INJECTED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml
-	android:minSdkVersion
-		INJECTED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:7:5-47
-		INJECTED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml
-supports-screens
-ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:9:5-15:40
-	android:largeScreens
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:11:9-36
-	android:smallScreens
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:14:9-36
-	android:normalScreens
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:12:9-37
-	android:xlargeScreens
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:15:9-37
-	android:resizeable
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:13:9-34
-	android:anyDensity
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:10:9-34
-uses-permission#android.permission.BLUETOOTH
-ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:18:5-67
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:11:5-68
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:11:5-68
-MERGED from [:gnssserver-1.1.20230214-053827-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\72dc1370dacef0cfbb308a281c75c3e7\gnssserver-1.1.20230214-053827-8.0.1\AndroidManifest.xml:14:5-68
-MERGED from [:gnssserver-1.1.20230214-053827-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\72dc1370dacef0cfbb308a281c75c3e7\gnssserver-1.1.20230214-053827-8.0.1\AndroidManifest.xml:14:5-68
-	android:name
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:18:22-65
-uses-permission#android.permission.BLUETOOTH_ADMIN
-ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:19:5-73
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:12:5-74
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:12:5-74
-MERGED from [:gnssserver-1.1.20230214-053827-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\72dc1370dacef0cfbb308a281c75c3e7\gnssserver-1.1.20230214-053827-8.0.1\AndroidManifest.xml:15:5-74
-MERGED from [:gnssserver-1.1.20230214-053827-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\72dc1370dacef0cfbb308a281c75c3e7\gnssserver-1.1.20230214-053827-8.0.1\AndroidManifest.xml:15:5-74
-	android:name
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:19:22-71
-uses-permission#android.permission.READ_PHONE_STATE
-ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:22:5-74
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:15:5-75
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:15:5-75
-MERGED from [:gnssserver-1.1.20230214-053827-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\72dc1370dacef0cfbb308a281c75c3e7\gnssserver-1.1.20230214-053827-8.0.1\AndroidManifest.xml:20:5-75
-MERGED from [:gnssserver-1.1.20230214-053827-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\72dc1370dacef0cfbb308a281c75c3e7\gnssserver-1.1.20230214-053827-8.0.1\AndroidManifest.xml:20:5-75
-	android:name
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:22:22-72
-uses-permission#android.permission.READ_EXTERNAL_STORAGE
-ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:23:5-79
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:16:5-80
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:16:5-80
-MERGED from [:sdk4a-v1.6.0.3958:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\492a94d4bbc6f2ee082770c1db8e315b\sdk4a-v1.6.0.3958\AndroidManifest.xml:15:5-80
-MERGED from [:sdk4a-v1.6.0.3958:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\492a94d4bbc6f2ee082770c1db8e315b\sdk4a-v1.6.0.3958\AndroidManifest.xml:15:5-80
-	android:name
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:23:22-77
-uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
-ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:24:5-80
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:17:5-81
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:17:5-81
-MERGED from [:sdk4a-v1.6.0.3958:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\492a94d4bbc6f2ee082770c1db8e315b\sdk4a-v1.6.0.3958\AndroidManifest.xml:14:5-81
-MERGED from [:sdk4a-v1.6.0.3958:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\492a94d4bbc6f2ee082770c1db8e315b\sdk4a-v1.6.0.3958\AndroidManifest.xml:14:5-81
-	android:name
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:24:22-78
-uses-permission#android.permission.MOUNT_UNMOUNT_FILESYSTEMS
-ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:25:5-83
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:18:5-84
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:18:5-84
-	android:name
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:25:22-81
-uses-permission#android.permission.INTERNET
-ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:28:5-66
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:21:5-67
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:21:5-67
-	android:name
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:28:22-64
-uses-permission#android.permission.ACCESS_NETWORK_STATE
-ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:29:5-78
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:22:5-79
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:22:5-79
-MERGED from [:gnssserver-1.1.20230214-053827-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\72dc1370dacef0cfbb308a281c75c3e7\gnssserver-1.1.20230214-053827-8.0.1\AndroidManifest.xml:12:5-79
-MERGED from [:gnssserver-1.1.20230214-053827-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\72dc1370dacef0cfbb308a281c75c3e7\gnssserver-1.1.20230214-053827-8.0.1\AndroidManifest.xml:12:5-79
-	android:name
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:29:22-76
-uses-permission#android.permission.ACCESS_WIFI_STATE
-ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:30:5-75
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:23:5-76
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:23:5-76
-MERGED from [:gnssserver-1.1.20230214-053827-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\72dc1370dacef0cfbb308a281c75c3e7\gnssserver-1.1.20230214-053827-8.0.1\AndroidManifest.xml:13:5-76
-MERGED from [:gnssserver-1.1.20230214-053827-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\72dc1370dacef0cfbb308a281c75c3e7\gnssserver-1.1.20230214-053827-8.0.1\AndroidManifest.xml:13:5-76
-	android:name
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:30:22-73
-uses-permission#android.permission.CHANGE_NETWORK_STATE
-ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:32:5-78
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:25:5-79
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:25:5-79
-	android:name
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:32:22-76
-uses-permission#android.permission.CHANGE_WIFI_STATE
-ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:34:5-75
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:27:5-76
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:27:5-76
-MERGED from [:gnssserver-1.1.20230214-053827-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\72dc1370dacef0cfbb308a281c75c3e7\gnssserver-1.1.20230214-053827-8.0.1\AndroidManifest.xml:16:5-76
-MERGED from [:gnssserver-1.1.20230214-053827-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\72dc1370dacef0cfbb308a281c75c3e7\gnssserver-1.1.20230214-053827-8.0.1\AndroidManifest.xml:16:5-76
-	android:name
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:34:22-73
-uses-permission#android.permission.SYSTEM_ALERT_WINDOW
-ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:37:5-77
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:30:5-78
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:30:5-78
-	android:name
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:37:22-75
-uses-permission#android.permission.ACCESS_LOCATION_EXTRA_COMMANDS
-ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:39:5-88
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:31:5-89
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:31:5-89
-	android:name
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:39:22-86
-application
-ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:42:5-78:19
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:33:5-45:19
-MERGED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:33:5-45:19
-MERGED from [com.android.support:support-v4:26.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\271ec858bdff550b8e63ef908885aeaf\support-v4-26.0.0\AndroidManifest.xml:25:5-29:19
-MERGED from [com.android.support:support-v4:26.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\271ec858bdff550b8e63ef908885aeaf\support-v4-26.0.0\AndroidManifest.xml:25:5-29:19
-MERGED from [:moduleDemo] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleDemo\build\intermediates\library_manifest\debug\AndroidManifest.xml:14:5-23:19
-MERGED from [:moduleDemo] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleDemo\build\intermediates\library_manifest\debug\AndroidManifest.xml:14:5-23:19
-MERGED from [:moduleScrollPicture] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleScrollPicture\build\intermediates\library_manifest\debug\AndroidManifest.xml:9:5-13:19
-MERGED from [:moduleScrollPicture] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleScrollPicture\build\intermediates\library_manifest\debug\AndroidManifest.xml:9:5-13:19
-MERGED from [:moduleSyncInterface] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleSyncInterface\build\intermediates\library_manifest\debug\AndroidManifest.xml:9:5-13:19
-MERGED from [:moduleSyncInterface] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleSyncInterface\build\intermediates\library_manifest\debug\AndroidManifest.xml:9:5-13:19
-MERGED from [:moduleRefresh] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleRefresh\build\intermediates\library_manifest\debug\AndroidManifest.xml:9:5-13:19
-MERGED from [:moduleRefresh] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleRefresh\build\intermediates\library_manifest\debug\AndroidManifest.xml:9:5-13:19
-MERGED from [com.android.support:support-media-compat:26.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\449474a9c4be2d1ad947b87dd974b1d8\support-media-compat-26.0.0\AndroidManifest.xml:25:5-29:19
-MERGED from [com.android.support:support-media-compat:26.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\449474a9c4be2d1ad947b87dd974b1d8\support-media-compat-26.0.0\AndroidManifest.xml:25:5-29:19
-MERGED from [com.android.support:support-compat:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\4e7b3bbed8e6e29e2ba6d4fc6e8eccff\support-compat-28.0.0\AndroidManifest.xml:22:5-94
-MERGED from [com.android.support:support-compat:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\4e7b3bbed8e6e29e2ba6d4fc6e8eccff\support-compat-28.0.0\AndroidManifest.xml:22:5-94
-MERGED from [com.android.support:versionedparcelable:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\d107c5806233895e5be684de327d381f\versionedparcelable-28.0.0\AndroidManifest.xml:22:5-23:19
-MERGED from [com.android.support:versionedparcelable:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\d107c5806233895e5be684de327d381f\versionedparcelable-28.0.0\AndroidManifest.xml:22:5-23:19
-	android:appComponentFactory
-		ADDED from [com.android.support:support-compat:28.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\4e7b3bbed8e6e29e2ba6d4fc6e8eccff\support-compat-28.0.0\AndroidManifest.xml:22:18-91
-	android:supportsRtl
-		ADDED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:36:9-35
-	android:label
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:45:9-41
-	android:hardwareAccelerated
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:47:9-43
-	android:largeHeap
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:46:9-33
-	android:icon
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:44:9-41
-	android:allowBackup
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:43:9-36
-		REJECTED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:34:9-35
-		REJECTED from [:moduleDemo] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleDemo\build\intermediates\library_manifest\debug\AndroidManifest.xml:15:9-35
-		REJECTED from [:moduleScrollPicture] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleScrollPicture\build\intermediates\library_manifest\debug\AndroidManifest.xml:10:9-35
-		REJECTED from [:moduleSyncInterface] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleSyncInterface\build\intermediates\library_manifest\debug\AndroidManifest.xml:10:9-35
-		REJECTED from [:moduleRefresh] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleRefresh\build\intermediates\library_manifest\debug\AndroidManifest.xml:10:9-35
-	tools:replace
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:48:9-57
-	android:name
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:42:18-66
-meta-data#uz_version
-ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:50:9-70
-	android:value
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:50:46-67
-	android:name
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:50:20-45
-activity#com.uzmap.pkg.LauncherUI
-ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:52:9-63:20
-	android:label
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:54:13-45
-	android:launchMode
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:55:13-43
-	android:windowSoftInputMode
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:57:13-109
-	android:configChanges
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:58:13-132
-	android:theme
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:56:13-44
-	android:name
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:53:13-52
-intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
-ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:59:11-62:33
-action#android.intent.action.MAIN
-ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:60:18-70
-	android:name
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:60:26-67
-category#android.intent.category.LAUNCHER
-ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:61:18-78
-	android:name
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:61:28-75
-activity#com.uzmap.pkg.EntranceActivity
-ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:64:9-73:20
-	android:screenOrientation
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:70:13-49
-	android:label
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:66:13-45
-	android:launchMode
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:68:13-44
-	android:windowSoftInputMode
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:71:13-52
-	android:exported
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:69:4-27
-	android:configChanges
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:72:13-145
-	android:theme
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:67:13-44
-	android:name
-		ADDED from G:\Android Studio\project\APICloudModuleSDKTrueGis\app\src\main\AndroidManifest.xml:65:13-58
-service#com.huace.gnssserver.GnssService
-ADDED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:37:9-44:19
-	android:enabled
-		ADDED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:39:13-35
-	android:exported
-		ADDED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:40:13-36
-	android:name
-		ADDED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:38:13-60
-intent-filter#action:name:com.huace.gnssserver.GnssService
-ADDED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:41:13-43:29
-action#com.huace.gnssserver.GnssService
-ADDED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:42:17-75
-	android:name
-		ADDED from [:moduleGis] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleGis\build\intermediates\library_manifest\debug\AndroidManifest.xml:42:25-72
-uses-permission#android.permission.ACCESS_FINE_LOCATION
-ADDED from [:gnssserver-1.1.20230214-053827-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\72dc1370dacef0cfbb308a281c75c3e7\gnssserver-1.1.20230214-053827-8.0.1\AndroidManifest.xml:11:5-79
-	android:name
-		ADDED from [:gnssserver-1.1.20230214-053827-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\72dc1370dacef0cfbb308a281c75c3e7\gnssserver-1.1.20230214-053827-8.0.1\AndroidManifest.xml:11:22-76
-uses-permission#android.permission.FOREGROUND_SERVICE
-ADDED from [:gnssserver-1.1.20230214-053827-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\72dc1370dacef0cfbb308a281c75c3e7\gnssserver-1.1.20230214-053827-8.0.1\AndroidManifest.xml:17:5-77
-	android:name
-		ADDED from [:gnssserver-1.1.20230214-053827-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\72dc1370dacef0cfbb308a281c75c3e7\gnssserver-1.1.20230214-053827-8.0.1\AndroidManifest.xml:17:22-74
-uses-permission#android.permission.WAKE_LOCK
-ADDED from [:gnssserver-1.1.20230214-053827-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\72dc1370dacef0cfbb308a281c75c3e7\gnssserver-1.1.20230214-053827-8.0.1\AndroidManifest.xml:21:5-68
-	android:name
-		ADDED from [:gnssserver-1.1.20230214-053827-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\72dc1370dacef0cfbb308a281c75c3e7\gnssserver-1.1.20230214-053827-8.0.1\AndroidManifest.xml:21:22-65
-uses-permission#android.permission.ACCESS_COARSE_LOCATION
-ADDED from [:gnssserver-1.1.20230214-053827-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\72dc1370dacef0cfbb308a281c75c3e7\gnssserver-1.1.20230214-053827-8.0.1\AndroidManifest.xml:24:5-81
-	android:name
-		ADDED from [:gnssserver-1.1.20230214-053827-8.0.1:] G:\Android Studio\gradle\caches\transforms-2\files-2.1\72dc1370dacef0cfbb308a281c75c3e7\gnssserver-1.1.20230214-053827-8.0.1\AndroidManifest.xml:24:22-78
-meta-data#android.support.VERSION
-ADDED from [com.android.support:support-v4:26.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\271ec858bdff550b8e63ef908885aeaf\support-v4-26.0.0\AndroidManifest.xml:26:9-28:38
-MERGED from [com.android.support:support-media-compat:26.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\449474a9c4be2d1ad947b87dd974b1d8\support-media-compat-26.0.0\AndroidManifest.xml:26:9-28:38
-MERGED from [com.android.support:support-media-compat:26.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\449474a9c4be2d1ad947b87dd974b1d8\support-media-compat-26.0.0\AndroidManifest.xml:26:9-28:38
-	android:value
-		ADDED from [com.android.support:support-v4:26.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\271ec858bdff550b8e63ef908885aeaf\support-v4-26.0.0\AndroidManifest.xml:28:13-35
-	android:name
-		ADDED from [com.android.support:support-v4:26.0.0] G:\Android Studio\gradle\caches\transforms-2\files-2.1\271ec858bdff550b8e63ef908885aeaf\support-v4-26.0.0\AndroidManifest.xml:27:13-51
-uses-permission#android.permission.VIBRATE
-ADDED from [:moduleDemo] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleDemo\build\intermediates\library_manifest\debug\AndroidManifest.xml:11:5-66
-	android:name
-		ADDED from [:moduleDemo] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleDemo\build\intermediates\library_manifest\debug\AndroidManifest.xml:11:22-63
-activity#com.apicloud.moduleDemo.DemoActivity
-ADDED from [:moduleDemo] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleDemo\build\intermediates\library_manifest\debug\AndroidManifest.xml:18:9-22:84
-	android:screenOrientation
-		ADDED from [:moduleDemo] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleDemo\build\intermediates\library_manifest\debug\AndroidManifest.xml:21:13-49
-	android:configChanges
-		ADDED from [:moduleDemo] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleDemo\build\intermediates\library_manifest\debug\AndroidManifest.xml:20:13-55
-	android:theme
-		ADDED from [:moduleDemo] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleDemo\build\intermediates\library_manifest\debug\AndroidManifest.xml:22:13-81
-	android:name
-		ADDED from [:moduleDemo] G:\Android Studio\project\APICloudModuleSDKTrueGis\moduleDemo\build\intermediates\library_manifest\debug\AndroidManifest.xml:19:13-64

app/src/main/assets/widget/index_frm.html

@@ -46,10 +46,23 @@
 	        alert("启动GisService获取结果为:"+JSON.stringify(res));
 		}
 		function sendConnect(){
-			var param = {rtkName:"GNSS-3543574"};
+			var param = {rtkName:"GNSS-3561535"};
 	        var res = uzmoduleGis.sendConnect(param);
 	        alert("发送连接命令:获取结果为:"+JSON.stringify(res));
 		}
+		function loginCors(){
+			var param = {ip:"rtk.huacenav.com",port:"8001",mountName:"RTCM33",userName:"zxcq1009",passWord:"52480331"};
+	        var res = uzmoduleGis.loginCors(param);
+	        alert("登录cors:获取结果为:"+JSON.stringify(res));
+		}
+		function stopBTConnect(){
+	        var res = uzmoduleGis.stopBTConnect();
+	        alert("断开连接:获取结果为:"+JSON.stringify(res));
+		}
+		function stopGorsConnect(){
+	        var res = uzmoduleGis.stopGorsConnect();
+	        alert("断开cors:获取结果为:"+JSON.stringify(res));
+		}
 		function stopGisService(){
 			var param = {appParam:"Hello APICloud!"};
 	        var res = uzmoduleGis.stopGisService(param);
@@ -194,8 +207,11 @@
 				<div class="clickbtn" tapmode="active" onclick="huaceRtkList()" >获取手机已配对RTK设备列表</div>
 				<div class="clickbtn" tapmode="active" onclick="startGisService()" >启动GisService</div>
 				<div class="clickbtn" tapmode="active" onclick="sendConnect()" >尝试连接</div>
+				<div class="clickbtn" tapmode="active" onclick="loginCors()" >登录cors</div>
+				<div class="clickbtn" tapmode="active" onclick="stopBTConnect()" >断开BT连接</div>
+				<div class="clickbtn" tapmode="active" onclick="stopGorsConnect()" >断开Cors连接</div>
 				<div class="clickbtn" tapmode="active" onclick="gisLatLng()" >获取经纬度</div>
-				<div class="clickbtn" tapmode="active" onclick="stopGisService()" >停止GisService并断开Connect</div>
+				<div class="clickbtn" tapmode="active" onclick="stopGisService()" >停止GisService</div>
 			<div class='itemtitle'>2、启动Activity</div>
 				<div class="clickbtn" tapmode="active" onclick="startActivity()" >startActivity</div>
 				<div class="clickbtn" tapmode="active" onclick="startActivityForResult()" >startActivityForResult</div>

moduleGis/src/main/java/com/example/moduleGis/APIModuleGis.java

@@ -22,6 +22,8 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.example.moduleGis.gnsstest.DiffConnectManager;
+import com.example.moduleGis.gnsstest.GnssListener;
 import com.example.moduleGis.gnsstest.GnssServiceManager;
 import com.example.moduleGis.gnsstest.ReceiverConnectProxy;
 import com.example.moduleGis.gnsstest.consts.BleStatusDefine;
@@ -34,8 +36,10 @@ import com.huace.gnssserver.GnssToolApp;
 import com.huace.gnssserver.app.GnssServerEnvironment;
 import com.huace.gnssserver.app.ILog;
 import com.huace.gnssserver.gnss.data.GnssInfo;
+import com.huace.gnssserver.gnss.data.receiver.CorsInfo;
 import com.huace.gnssserver.gnss.data.receiver.ReceiverInfo;
 import com.huace.gnssserver.gnss.data.receiver.WorkWay;
+import com.pop.android.net.security.StringUtil;
 import com.uzmap.pkg.uzcore.UZWebView;
 import com.uzmap.pkg.uzcore.uzmodule.ModuleResult;
 import com.uzmap.pkg.uzcore.uzmodule.UZModule;
@@ -84,6 +88,8 @@ public class APIModuleGis extends UZModule {
 	public volatile  static String bindCode = "";//绑定状态:0 绑定成功 1 绑定失败
 	private volatile static String connectCode = "";//连接状态:0连接成功 1:连接失败
 
+	private volatile static String logCorsCod = "";//连接状态:0登录成功 1:登录失败
+
 	//TODO Lx 获取经纬度
 	public ModuleResult jsmethod_gisLatLng_sync(final UZModuleContext context){
 		String code = "1";//0表示成功;1表示失败
@@ -393,6 +399,47 @@ public class APIModuleGis extends UZModule {
 		}
 	}
 
+
+
+	public ModuleResult jsmethod_loginCors_sync(final UZModuleContext context){
+		String code = "1";//0表示成功;1 表示失败
+		String msg = "error";
+		JSONObject res = new JSONObject();
+		try{
+			res.put("code",code);
+			res.put("msg",msg);
+			String ip = context.optString("ip");
+			Integer port = Integer.valueOf(context.optString("port"));
+			String mountName = context.optString("mountName");
+			String userName = context.optString("userName");
+			String passWord = context.optString("passWord");
+			if(ip==null||"".equals(ip)||
+					port==null||
+					mountName==null||"".equals(mountName)||
+					userName==null||"".equals(userName)||
+					passWord==null||"".equals(passWord)){
+				res.put("code","2");
+				res.put("msg","传递参数不完整");
+				return new ModuleResult(res);
+			}
+			if(!"0".equals(logCorsCod)){
+				DiffConnectManager.loginCors(this.context(),ip,port,mountName,userName,passWord);
+			}else{
+				code = "0";
+				msg = "success";
+			}
+			res.put("code",code);
+			res.put("msg",msg);
+			return new ModuleResult(res);
+		}catch(Exception ex){
+			code = "1";
+			msg = "errorException";
+			try{res.put("code",code);res.put("msg",msg);}catch(Exception e){}
+			Log.e(TAG,ex.getLocalizedMessage());
+			return new ModuleResult(res);
+		}
+	}
+
 	//TODO Lx 销毁服务绑定
 	public ModuleResult jsmethod_stopGisService_sync(final UZModuleContext context) {
 		String code = "1";//0表示成功;1表示失败
@@ -402,6 +449,21 @@ public class APIModuleGis extends UZModule {
 		try {
 //			GnssToolManager.getInstance().unBindService(this.context());
 			onUnBindClick();
+			code = "0";
+			res.put("code",code);
+		}catch (Exception e){
+			Log.i(TAG,e.getLocalizedMessage());
+		}
+		return new ModuleResult(res);
+	}
+	//TODO Lx 断开Connect连接
+	public ModuleResult jsmethod_stopBTConnect_sync(final UZModuleContext context) {
+		String code = "1";//0表示成功;1表示失败
+		String msg = "";
+		JSONObject res = new JSONObject();
+		//解绑服务
+		try {
+//			GnssToolManager.getInstance().unBindService(this.context());
 			ReceiverConnectProxy.getInstance().disConnect();
 			//TODO 无异常
 			connectCode = "1";
@@ -412,6 +474,24 @@ public class APIModuleGis extends UZModule {
 		}
 		return new ModuleResult(res);
 	}
+	//TODO Lx 断开Cors连接
+	public ModuleResult jsmethod_stopGorsConnect_sync(final UZModuleContext context) {
+		String code = "1";//0表示成功;1表示失败
+		String msg = "";
+		JSONObject res = new JSONObject();
+		//解绑服务
+		try {
+//			GnssToolManager.getInstance().unBindService(this.context());
+			DiffConnectManager.loginOutCors(this.context());
+			//TODO 无异常
+			logCorsCod = "1";
+			code = "0";
+			res.put("code",code);
+		}catch (Exception e){
+			Log.i(TAG,e.getLocalizedMessage());
+		}
+		return new ModuleResult(res);
+	}
 
 	private void onBindClick() {
 		GnssServiceManager.getInstance().bindService(this.context());
@@ -474,6 +554,7 @@ public class APIModuleGis extends UZModule {
 		switch (event.getGnssConnectStatus()) {
 			case GnssConnectStatusEvent.RECEIVER_DISCONNECT_CORS_DISCONNECT:
 				connectCode = "1";
+				logCorsCod = "1";
 				Log.i(TAG,"已断开");
 				break;
 			case GnssConnectStatusEvent.RECEIVER_CONNECT_CORS_DISCONNECT:
@@ -481,6 +562,7 @@ public class APIModuleGis extends UZModule {
 				Log.i(TAG,"已连接");
 				break;
 			case GnssConnectStatusEvent.RECEIVER_CONNECT_CORS_CONNECT:
+				logCorsCod = "0";
 				Log.i(TAG,"已登录");
 //                if (progressDialog != null && progressDialog.isShowing()) {
 //                    progressDialog.dismiss();

moduleGis/src/main/java/com/example/moduleGis/gnsstest/DiffConnectManager.java

@@ -12,17 +12,18 @@ public class DiffConnectManager {
 
     private static final String BROADCAST_INTENT = "com.huace.gnssserver.COMMAND";
 
-    public static void loginCors(@NonNull Context context) {
+    public static void loginCors(@NonNull Context context,String ip,Integer port,String
+                                  mountName,String userName,String passWord) {
         Intent intent = new Intent(BROADCAST_INTENT);
         CorsConnectionArgs args = new CorsConnectionArgs()
                 .setAction(1)               //命令类型 0：断开 1：连接
                 .setType(0)                 //差分数据源链接类型 0:CORS 1:APIS 2:TCP,3:千寻差分
-                .setIp("xxx.xxx.xxx.xxx")    //IP地址
-                .setPort(9999)              //端口
-                .setMountName("xxxx")  //源名称    根据链接服务器设置类型选填
+                .setIp(ip)    //IP地址
+                .setPort(port)              //端口
+                .setMountName(mountName)  //源名称    根据链接服务器设置类型选填
                 .setDiffType("diffType")    //差分类型   根据链接服务器设置类型选填
-                .setUserName("xxx")    //登陆用户名 根据链接服务器设置类型选填
-                .setPassword("xxx")    //登陆密码   根据链接服务器设置类型选填
+                .setUserName(userName)    //登陆用户名 根据链接服务器设置类型选填
+                .setPassword(passWord)    //登陆密码   根据链接服务器设置类型选填
                 .setStationId("stationId"); //基站ID    根据链接服务器设置类型选填
         intent.putExtra(GnssCommand.GNSS_COMMAND, GnssCommand.CORS)
                 .putExtra(GnssCommand.CORS, args);

moduleGis/src/main/java/com/example/moduleGis/gnsstest/GnssListener.java

@@ -3,6 +3,7 @@ package com.example.moduleGis.gnsstest;
 import android.location.Location;
 import android.os.Bundle;
 import android.os.RemoteException;
+import android.util.Log;
 
 import com.example.moduleGis.gnsstest.event.GnssConnectStatusEvent;
 import com.huace.gnssserver.IGnssListener;
@@ -27,6 +28,7 @@ public class GnssListener extends IGnssListener.Stub {
      */
     @Override
     public void onStatusChanged(String provider, int status, Bundle extras) throws RemoteException {
+        Log.i("GnssListenner-Status",String.valueOf(status));
         EventBus.getDefault().postSticky(new GnssConnectStatusEvent(provider, status));
     }