~wjc/HDLPhotovoltaicDebugAPP.git

			@@ -67,6 +67,8 @@
			implementation project(path: ':third-zxing')
			//Link本地库
			implementation project(path: ':HDLLinkLocalSdk')
			// implementation project(path: ':HDLLinkPMSdk')

			testImplementation 'junit:junit:4.13.2'
			androidTestImplementation 'androidx.test.ext:junit:1.1.3'
			androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

New file
			@@ -0,0 +1,18 @@
			{
			"version": 2,
			"artifactType": {
			"type": "APK",
			"kind": "Directory"
			},
			"applicationId": "com.hdl.photovoltaic",
			"variantName": "processReleaseResources",
			"elements": [
			{
			"type": "SINGLE",
			"filters": [],
			"versionCode": 1,
			"versionName": "1.0",
			"outputFile": "app-release.apk"
			}
			]
			}

			@@ -53,15 +53,13 @@
			if (list.size() > 0) {
			for (int i = 0; i < list.size(); i++) {
			GatewayBean gatewayBean = list.get(i);
			if (!TextUtils.isEmpty(gatewayBean.getHomeId())
			if (gatewayBean.getMaster().equals("true")
			&& gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
			newList.add(gatewayBean);
			}

			}
			}
			return newList;

			}

			/**

			@@ -6,7 +6,6 @@

			import com.google.gson.Gson;
			import com.hdl.linkpm.sdk.core.exception.HDLException;
			import com.google.gson.JsonObject;
			import com.hdl.photovoltaic.HDLApp;
			import com.hdl.photovoltaic.bean.BaseEventBus;
			import com.hdl.photovoltaic.bean.ModBusBean;
			@@ -255,9 +254,9 @@
			// ModBusBean modBusBean = new ModBusBean();
			// modBusBean.setOid("0101050219D44A00");
			// modBusBean.setData(new byte[]{00,01,00,00,00,0x09,00,00,00,01,03,00,00,00,01});
			if (TextUtils.isEmpty(modBusBean.getOid())) {
			modBusBean.setOid("0101050217BBC400");
			}
			// if (TextUtils.isEmpty(modBusBean.getOid())) {
			// modBusBean.setOid("0101050217BBC400");
			// }
			if (modBusBean.getOid() == null \|\| modBusBean.getData() == null) {
			HdlLogLogic.print("内容为空,oid=" + modBusBean.getOid() + " data=" + modBusBean.getData());
			return;

Binary files differ

	app/build.gradle	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/release/output-metadata.json	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	keystore/Untitled	补丁 \| 查看 \| 原始文档 \| blame \| 历史