APIModuleGis 增加精准度状态改版 1.1.8

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

@@ -1,4 +1,4 @@
-#Tue Nov 07 10:35:10 CST 2023
+#Tue Dec 26 14:15:08 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

@@ -42,18 +42,23 @@
 	        var res = uzmoduleGis.huaceRtkList(param);
 	        alert("获取手机已配对RTK设备列表:"+JSON.stringify(res));
 		}
+		function startGisAndSend(){
+			var param = {"rtkName":"GNSS-3702407","ip":"rtk.huacenav.com","mountName":"RTCM33","userName":"sdlt0122","passWord":"35909559","port":"8001","diffType":"diffType","stationld":"stationld","type":0};
+	        var res = uzmoduleGis.startGisAndSend(param);
+	        alert("高效率启动结果为:"+JSON.stringify(res));
+		}
 		function startGisService(){
 			var param = {appParam:"Hello APICloud!"};
 	        var res = uzmoduleGis.startGisService(param);
 	        alert("启动GisService获取结果为:"+JSON.stringify(res));
 		}
 		function sendConnect(){
-			var param = {rtkName:"GNSS-3543574"};
+			var param = {rtkName:"GNSS-3369536"};
 	        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 param = {"rtkName":"GNSS-3702407","ip":"rtk.huacenav.com","mountName":"RTCM33","userName":"sdlt0122","passWord":"35909559","port":"8001","diffType":"diffType","stationld":"stationld","type":0};
 	        var res = uzmoduleGis.loginCors(param);
 	        alert("登录cors:获取结果为:"+JSON.stringify(res));
 		}
@@ -72,7 +77,12 @@
 		}
 
 		function gisLatLng(){
-			var param = {appParam:"Hello APICloud!"};
+			var param = {"rtkName":"GNSS-3369536","ip":"rtk.huacenav.com","mountName":"RTCM33","userName":"chwj048109","passWord":"99293296","port":"8001"};
+	        var res = uzmoduleGis.gisLatLng(param);
+	        alert("获取结果为基本数据!\n结果：" + JSON.stringify(res));
+		}
+		function gisLatLng2(){
+			var param = {"rtkName":"GNSS-3702407","ip":"rtk.huacenav.com","mountName":"RTCM33","userName":"sdlt0122","passWord":"35909559","port":"8001","diffType":"diffType","stationld":"stationld","type":0};
 	        var res = uzmoduleGis.gisLatLng(param);
 	        alert("获取结果为基本数据!\n结果：" + JSON.stringify(res));
 		}
@@ -205,12 +215,14 @@
 				<div class="clickbtn" tapmode="active" onclick="showAlert()" >点击弹出</div>     
 <!--				<div class="clickbtn" tapmode="active" onclick="startGisActivity()" >启动GisActivity</div>-->
 				<div class="clickbtn" tapmode="active" onclick="huaceRtkList()" >获取手机已配对RTK设备列表</div>
+				<div class="clickbtn" tapmode="active" onclick="startGisAndSend()" >高效率简洁启动Gnss服务并发送连接</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="gisLatLng2()" >获取经纬度2</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>

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

@@ -43,7 +43,7 @@
 	        alert("获取手机已配对RTK设备列表:"+JSON.stringify(res));
 		}
 		function startGisAndSend(){
-			var param = {rtkName:"GNSS-3369536"};
+			var param = {"rtkName":"GNSS-3702407","ip":"rtk.huacenav.com","mountName":"RTCM33","userName":"sdlt0122","passWord":"35909559","port":"8001","diffType":"diffType","stationld":"stationld","type":0};
 	        var res = uzmoduleGis.startGisAndSend(param);
 	        alert("高效率启动结果为:"+JSON.stringify(res));
 		}
@@ -58,7 +58,7 @@
 	        alert("发送连接命令:获取结果为:"+JSON.stringify(res));
 		}
 		function loginCors(){
-			var param = {ip:"rtk.huacenav.com",port:"8001",mountName:"RTCM33",userName:"zxcq1009",passWord:"52480331"};
+			var param = {"rtkName":"GNSS-3702407","ip":"rtk.huacenav.com","mountName":"RTCM33","userName":"sdlt0122","passWord":"35909559","port":"8001","diffType":"diffType","stationld":"stationld","type":0};
 	        var res = uzmoduleGis.loginCors(param);
 	        alert("登录cors:获取结果为:"+JSON.stringify(res));
 		}
@@ -82,7 +82,7 @@
 	        alert("获取结果为基本数据!\n结果：" + JSON.stringify(res));
 		}
 		function gisLatLng2(){
-			var param = {"rtkName":"GNSS-3369536","ip":"rtk.huacenav.com","mountName":"RTCM33","userName":"chwj048109","passWord":"99293296","port":"80011"};
+			var param = {"rtkName":"GNSS-3702407","ip":"rtk.huacenav.com","mountName":"RTCM33","userName":"sdlt0122","passWord":"35909559","port":"8001","diffType":"diffType","stationld":"stationld","type":0};
 	        var res = uzmoduleGis.gisLatLng(param);
 	        alert("获取结果为基本数据!\n结果：" + JSON.stringify(res));
 		}

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

@@ -142,7 +142,7 @@ public class APIModuleGis extends UZModule {
 		try {
 			res.put("code",code);
 			res.put("msg",msg);
-			res.put("version","1.1.7");
+			res.put("version","1.1.8");
 
 			BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
 			if (adapter == null) {
@@ -201,6 +201,11 @@ public class APIModuleGis extends UZModule {
 			Log.i(TAG+"test",wgslat);
 			Log.i(TAG+"test",wgslng);
 			Log.i(TAG+"test",wgsblh);
+			if("0".equals(postType)||"2".equals(postType)){
+				wgslat = "0.0";
+				wgslng = "0.0";
+			}
+
 			if(!"0.0".equals(wgslat)&&!"0.0".equals(wgslng)) {
 				gisObj.put("wgslat", wgslat);
 				gisObj.put("wgslng", wgslng);
@@ -242,6 +247,9 @@ public class APIModuleGis extends UZModule {
 			String mountName = context.optString("mountName");
 			String userName = context.optString("userName");
 			String passWord = context.optString("passWord");
+			String diffType = context.optString("diffType");
+			String stationId = context.optString("stationId");
+			Integer type = context.optInt("type");
 
 			//TODO 熔断
 			if(!"0".equals(bindCode)){
@@ -261,7 +269,7 @@ public class APIModuleGis extends UZModule {
 				return new ModuleResult(res);
 			}
 			if(!"0".equals(logCorsCod)) {
-				DiffConnectManager.loginCors(this.context(), ip, port, mountName, userName, passWord);
+				DiffConnectManager.loginCors(this.context(), ip, port, mountName, userName, passWord,diffType,stationId,type);
 			}
 
 			//TODO rtk连接比cors连接优先级要高
@@ -297,7 +305,7 @@ public class APIModuleGis extends UZModule {
 						userName!=null&&userName.length()>0&&
 						passWord!=null&&passWord.length()>0){
 					//TODO 重连必须满足以上条件
-					DiffConnectManager.loginCors(this.context(),ip,port,mountName,userName,passWord);
+					DiffConnectManager.loginCors(this.context(),ip,port,mountName,userName,passWord,diffType,stationId,type);
 				}
 			}
 			ramRtkName = rtkName;
@@ -607,6 +615,9 @@ public class APIModuleGis extends UZModule {
 			String mountName = context.optString("mountName");
 			String userName = context.optString("userName");
 			String passWord = context.optString("passWord");
+			String diffType = context.optString("diffType");
+			String stationId = context.optString("stationId");
+			Integer type = context.optInt("type");
 			if(ip==null||"".equals(ip)||
 					port==null||
 					mountName==null||"".equals(mountName)||
@@ -617,7 +628,7 @@ public class APIModuleGis extends UZModule {
 				return new ModuleResult(res);
 			}
 			if(!"0".equals(logCorsCod)){
-				DiffConnectManager.loginCors(this.context(),ip,port,mountName,userName,passWord);
+				DiffConnectManager.loginCors(this.context(),ip,port,mountName,userName,passWord,diffType,stationId,type);
 			}else{
 				code = "0";
 				msg = "success";
@@ -724,6 +735,9 @@ public class APIModuleGis extends UZModule {
 		String mountName = moduleContext.optString("mountName");
 		String userName = moduleContext.optString("userName");
 		String passWord = moduleContext.optString("passWord");
+		String diffType = moduleContext.optString("diffType");
+		String stationId = moduleContext.optString("stationId");
+		Integer type = moduleContext.optInt("type");
 
 		if (!EventBus.getDefault().isRegistered(this)) {
 			EventBus.getDefault().register(this);
@@ -783,7 +797,7 @@ public class APIModuleGis extends UZModule {
 					@Override
 					public void run() {
 						if(!"0".equals(logCorsCod)){
-							DiffConnectManager.loginCors(corsContext,ip,port,mountName,userName,passWord);
+							DiffConnectManager.loginCors(corsContext,ip,port,mountName,userName,passWord,diffType,stationId,type);
 						}else{
 							//TODO cors更换
 							if((ip!=null&&!ip.equals(ramIp))||(port!=null&&!port.equals(ramPort))
@@ -798,7 +812,7 @@ public class APIModuleGis extends UZModule {
 										userName!=null&&userName.length()>0&&
 										passWord!=null&&passWord.length()>0){
 									//TODO 重连必须满足以上条件
-									DiffConnectManager.loginCors(thisContext,ip,port,mountName,userName,passWord);
+									DiffConnectManager.loginCors(thisContext,ip,port,mountName,userName,passWord,diffType,stationId,type);
 								}
 							}
 						}

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

@@ -4,27 +4,40 @@ import android.content.Context;
 import android.content.Intent;
 import android.support.annotation.NonNull;
 import android.support.v4.content.LocalBroadcastManager;
+import android.util.Log;
 
 import com.huace.gnssserver.gnss.data.CorsConnectionArgs;
 import com.huace.gnssserver.gnss.data.GnssCommand;
 
+import java.lang.reflect.Type;
+
 public class DiffConnectManager {
 
     private static final String BROADCAST_INTENT = "com.huace.gnssserver.COMMAND";
 
     public static void loginCors(@NonNull Context context,String ip,Integer port,String
-                                  mountName,String userName,String passWord) {
+                                  mountName,String userName,String passWord,String diffType,String stationId,
+                                Integer type) {
         Intent intent = new Intent(BROADCAST_INTENT);
+        if(diffType==null||diffType.length()<=0){
+            diffType = "diffType";
+        }
+        if(stationId==null||stationId.length()<=0){
+            stationId = "stationId";
+        }
+        if(type==null){
+            type = 0;
+        }
         CorsConnectionArgs args = new CorsConnectionArgs()
                 .setAction(1)               //命令类型 0：断开 1：连接
-                .setType(0)                 //差分数据源链接类型 0:CORS 1:APIS 2:TCP,3:千寻差分
+                .setType(type)                 //差分数据源链接类型 0:CORS 1:APIS 2:TCP,3:千寻差分
                 .setIp(ip)    //IP地址
                 .setPort(port)              //端口
                 .setMountName(mountName)  //源名称    根据链接服务器设置类型选填
-                .setDiffType("diffType")    //差分类型   根据链接服务器设置类型选填
+                .setDiffType(diffType)    //差分类型   根据链接服务器设置类型选填 原默认值"diffType"
                 .setUserName(userName)    //登陆用户名 根据链接服务器设置类型选填
                 .setPassword(passWord)    //登陆密码   根据链接服务器设置类型选填
-                .setStationId("stationId"); //基站ID    根据链接服务器设置类型选填
+                .setStationId(stationId); //基站ID    根据链接服务器设置类型选填 原默认值 "stationId"
         intent.putExtra(GnssCommand.GNSS_COMMAND, GnssCommand.CORS)
                 .putExtra(GnssCommand.CORS, args);
         sendBroadcast(context, intent);