forked from a2633063/SmartControl_Android_MQTT
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add: 以zKey51为模板增加zC1/z485toMqtt设备(仅增加文件)
add: mqtt连接失败时log中显示错误信息/错误码 add: 新增设备时,若点击mdns发现的设备,则使用udp往设备ip地址也发送device report信息
- Loading branch information
Showing
31 changed files
with
5,149 additions
and
19 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
95 changes: 95 additions & 0 deletions
95
app/src/main/java/com/zyc/zcontrol/deviceItem/DeviceClass/DeviceC1.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| package com.zyc.zcontrol.deviceItem.DeviceClass; | ||
|
|
||
| import android.preference.PreferenceFragment; | ||
|
|
||
| import androidx.fragment.app.Fragment; | ||
|
|
||
| import com.zyc.zcontrol.deviceItem.c1.C1Fragment; | ||
| import com.zyc.zcontrol.deviceItem.c1.C1SettingFragment; | ||
|
|
||
| public class DeviceC1 extends Device { | ||
|
|
||
| public DeviceC1(String name, String mac) { | ||
| super(TYPE_C1, name, mac); | ||
| } | ||
|
|
||
| //region 必须重构的函数 | ||
| public String[] getRecvMqttTopic() { | ||
| String[] topic = new String[3]; | ||
| topic[0] = "device/zc1/" + getMac() + "/state"; | ||
| topic[1] = "device/zc1/" + getMac() + "/sensor"; | ||
| topic[2] = "device/zc1/" + getMac() + "/availability"; | ||
| return topic; | ||
| } | ||
|
|
||
| public String getSendMqttTopic() { | ||
| return "device/zc1/" + getMac() + "/set"; | ||
| } | ||
|
|
||
|
|
||
| Fragment fragment; | ||
| PreferenceFragment settingFragment; | ||
| public Fragment getFragment() { | ||
| if (fragment == null) { | ||
| fragment = new C1Fragment(this); | ||
| } | ||
| return fragment; | ||
| } | ||
| public PreferenceFragment getSettingFragment(){ | ||
| if (settingFragment == null) { | ||
| settingFragment = new C1SettingFragment(this); | ||
| } | ||
| return settingFragment; | ||
| } | ||
| //endregion | ||
|
|
||
| // //region 参数 | ||
| // boolean lock; | ||
| // double power; | ||
| // int total_time; | ||
| // boolean[] plug = {false,false,false,false}; | ||
| // String[] plug_name = {"总开关","插口1","插口2","插口3"}; | ||
| // | ||
| // | ||
| // public boolean isLock() { | ||
| // return lock; | ||
| // } | ||
| // | ||
| // public void setLock(boolean lock) { | ||
| // this.lock = lock; | ||
| // } | ||
| // | ||
| // public double getPower() { | ||
| // return power; | ||
| // } | ||
| // | ||
| // public void setPower(double power) { | ||
| // this.power = power; | ||
| // } | ||
| // | ||
| // public int getTotal_time() { | ||
| // return total_time; | ||
| // } | ||
| // | ||
| // public void setTotal_time(int total_time) { | ||
| // this.total_time = total_time; | ||
| // } | ||
| // | ||
| // public boolean isPlug(int index) { | ||
| // return plug[index]; | ||
| // } | ||
| // | ||
| // public void setPlug(int index, boolean plug) { | ||
| // this.plug[index] = plug; | ||
| // } | ||
| // | ||
| // public String getPlug_name(int index) { | ||
| // return plug_name[index]; | ||
| // } | ||
| // | ||
| // public void setPlug_name(int index, String plug_name) { | ||
| // this.plug_name[index] = plug_name; | ||
| // } | ||
| // //endregion | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.