diff --git a/app/build.gradle b/app/build.gradle index a60488a..5898196 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,7 +7,7 @@ android { minSdkVersion 19 targetSdkVersion 28 versionCode 20 - versionName "v0.11.5" + versionName "v0.11.6" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/release/app-release.apk b/app/release/app-release.apk index 7a1342b..4ea6090 100644 Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ diff --git a/app/src/main/java/com/zyc/zcontrol/controlItem/tc1/TC1Fragment.java b/app/src/main/java/com/zyc/zcontrol/controlItem/tc1/TC1Fragment.java index 8779f6f..5ad93e9 100644 --- a/app/src/main/java/com/zyc/zcontrol/controlItem/tc1/TC1Fragment.java +++ b/app/src/main/java/com/zyc/zcontrol/controlItem/tc1/TC1Fragment.java @@ -267,8 +267,15 @@ public void onClick(View v) { void Send(String message) { if (mConnectService == null) return; - boolean b = getActivity().getSharedPreferences("Setting_" + device_mac, 0).getBoolean("always_UDP", false); - mConnectService.Send(b ? null : "device/ztc1/" + device_mac + "/set", message); + boolean udp = getActivity().getSharedPreferences("Setting_" + device_mac, 0).getBoolean("always_UDP", false); + boolean oldProtocol = getActivity().getSharedPreferences("Setting_" + device_mac, 0).getBoolean("old_protocol", false); + + String topic = null; + if (!udp) { + if (oldProtocol) topic = "device/ztc1/set"; + else topic = "device/ztc1/" + device_mac + "/set"; + } + mConnectService.Send(topic, message); } //数据接收处理函数 diff --git a/app/src/main/java/com/zyc/zcontrol/controlItem/tc1/TC1PlugActivity.java b/app/src/main/java/com/zyc/zcontrol/controlItem/tc1/TC1PlugActivity.java index 4937f4d..be8fbb5 100644 --- a/app/src/main/java/com/zyc/zcontrol/controlItem/tc1/TC1PlugActivity.java +++ b/app/src/main/java/com/zyc/zcontrol/controlItem/tc1/TC1PlugActivity.java @@ -449,8 +449,16 @@ public void onClick(View v) { //region 数据接收发送处理函数 void Send(String message) { - boolean b = getSharedPreferences("Setting_" + device_mac, 0).getBoolean("always_UDP", false); - mConnectService.Send(b ? null : "device/ztc1/" + device_mac + "/set", message); + if (mConnectService == null) return; + boolean udp = getSharedPreferences("Setting_" + device_mac, 0).getBoolean("always_UDP", false); + boolean oldProtocol = getSharedPreferences("Setting_" + device_mac, 0).getBoolean("old_protocol", false); + + String topic = null; + if (!udp) { + if (oldProtocol) topic = "device/ztc1/set"; + else topic = "device/ztc1/" + device_mac + "/set"; + } + mConnectService.Send(topic, message); } void Receive(String ip, int port, String message) { diff --git a/app/src/main/java/com/zyc/zcontrol/controlItem/tc1/TC1SettingFragment.java b/app/src/main/java/com/zyc/zcontrol/controlItem/tc1/TC1SettingFragment.java index f4269cb..a841b70 100644 --- a/app/src/main/java/com/zyc/zcontrol/controlItem/tc1/TC1SettingFragment.java +++ b/app/src/main/java/com/zyc/zcontrol/controlItem/tc1/TC1SettingFragment.java @@ -429,8 +429,16 @@ public void onClick(DialogInterface dialogInterface, int i) { //endregion void Send(String message) { - boolean b = getActivity().getSharedPreferences("Setting_" + device_mac, 0).getBoolean("always_UDP", false); - mConnectService.Send(b ? null : "device/ztc1/" + device_mac + "/set", message); + if (mConnectService == null) return; + boolean udp = getActivity().getSharedPreferences("Setting_" + device_mac, 0).getBoolean("always_UDP", false); + boolean oldProtocol = getActivity().getSharedPreferences("Setting_" + device_mac, 0).getBoolean("old_protocol", false); + + String topic = null; + if (!udp) { + if (oldProtocol) topic = "device/ztc1/set"; + else topic = "device/ztc1/" + device_mac + "/set"; + } + mConnectService.Send(topic, message); } //数据接收处理函数 diff --git a/app/src/main/res/xml/tc1_setting.xml b/app/src/main/res/xml/tc1_setting.xml index b3bcf5d..d3afd7e 100644 --- a/app/src/main/res/xml/tc1_setting.xml +++ b/app/src/main/res/xml/tc1_setting.xml @@ -38,6 +38,13 @@ android:title="重新获取数据" android:summary="获取版本/激活状态失败时点此重试"/> + +