ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Added scanning button animation, detection of scannable controllers and scan start

Browse source
This commit is contained in:
Ziver Koc 2021-06-09 22:17:32 +02:00
parent 6656882859
commit a80a1c5cdc
26 changed files with 100 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/hal-nvr/src/se/hal/plugin/nvr/CameraControllerManager.java
View file

@ -47,11 +47,6 @@ public class CameraControllerManager extends HalAbstractControllerManager<HalCam
}
@Override
public Collection<HalCameraController> getControllers() {
return null;
}
public void initialize(PluginManager pluginManager){
super.initialize(pluginManager);

6
plugins/hal-nvr/src/se/hal/plugin/nvr/page/CameraConfigWebPage.java
View file

@ -29,7 +29,7 @@ import se.hal.intf.HalWebPage;
import se.hal.page.HalAlertManager;
import se.hal.plugin.nvr.CameraControllerManager;
import se.hal.plugin.nvr.struct.Camera;
import se.hal.struct.ClassConfigurationData;
import se.hal.util.ClassConfigurationFacade;
import se.hal.struct.User;
import zutil.ObjectUtil;
import zutil.db.DBConnection;
@ -47,7 +47,7 @@ public class CameraConfigWebPage extends HalWebPage {
private static final Logger logger = LogUtil.getLogger();
private static final String TEMPLATE = HalContext.RESOURCE_WEB_ROOT + "/camera_config.tmpl";
private ArrayList<ClassConfigurationData> cameraConfigurations;
private ArrayList<ClassConfigurationFacade> cameraConfigurations;
public CameraConfigWebPage() {
@ -56,7 +56,7 @@ public class CameraConfigWebPage extends HalWebPage {
cameraConfigurations = new ArrayList<>();
for (Class c : CameraControllerManager.getInstance().getAvailableDeviceConfigs())
cameraConfigurations.add(new ClassConfigurationData(c));
cameraConfigurations.add(new ClassConfigurationFacade(c));
}
@Override