From 29ea37292f8d9476903c603ba83c4e40afa9f7f3 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 03 八月 2017 13:12:43 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java | 127 +++++++++++++++++++++++++++++++++---------
1 files changed, 99 insertions(+), 28 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java
index 1b6f127..4ce84c5 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java
@@ -10,11 +10,14 @@
import android.widget.Toast;
import com.bsk.zhangbo.demoforbsk.R;
+
+import cn.com.basic.face.base.BaseApplication;
import cn.com.basic.face.base.LeftRightBaseFragment;
import cn.com.basic.face.base.MainActivity;
import cn.com.basic.face.dialog.SelectDialog;
import cn.com.basic.face.discern.common.CommonVariables;
import cn.com.basic.face.discern.entity.Device;
+import cn.com.basic.face.discern.query.item.DeviceQueryItem;
import cn.com.basic.face.service.DeviceMng;
import cn.com.basic.face.util.Constant;
import cn.com.basic.face.util.OkClickedListener;
@@ -22,6 +25,8 @@
import com.lidroid.xutils.ViewUtils;
import com.lidroid.xutils.view.annotation.ViewInject;
import com.lidroid.xutils.view.annotation.event.OnClick;
+
+import org.xutils.http.RequestParams;
import java.util.HashMap;
import java.util.Map;
@@ -103,6 +108,17 @@
private View schoolView;
private View camera1View;
private View camera2View;
+
+ private DeviceQueryItem camera1;
+ private DeviceQueryItem camera2;
+
+ public DeviceQueryItem getCamera2() {
+ return camera2;
+ }
+
+ public DeviceQueryItem getCamera1() {
+ return camera1;
+ }
public void clearAll() {
fragment_device_left_wifi_check_box.setChecked(false);
@@ -228,38 +244,81 @@
@OnClick(R.id.fragment_device_right_school_save)
public void fragment_device_right_school_save_click(View view) {
- Map<String, String> fields = new HashMap<>();
- fields.put("fragment_device_right_device_info_sn", fragment_device_right_device_info_sn.getText().toString());
- fields.put("fragment_device_right_device_info_device_address", fragment_device_right_device_info_device_address.getText().toString());
- fields.put("fragment_device_right_device_info_school_name", fragment_device_right_device_info_school_name.getText().toString());
- DeviceMng.getInstance().saveSchoolSetting(fields);
- Toast.makeText(MainActivity.getInstance(), "淇濆瓨鎴愬姛", Toast.LENGTH_SHORT).show();
+// Map<String, String> fields = new HashMap<>();
+// fields.put("fragment_device_right_device_info_sn", fragment_device_right_device_info_sn.getText().toString());
+// fields.put("fragment_device_right_device_info_device_address", fragment_device_right_device_info_device_address.getText().toString());
+// fields.put("fragment_device_right_device_info_school_name", fragment_device_right_device_info_school_name.getText().toString());
+// DeviceMng.getInstance().saveSchoolSetting(fields);
+// Toast.makeText(MainActivity.getInstance(), "淇濆瓨鎴愬姛", Toast.LENGTH_SHORT).show();
+
+ RequestParams params = new RequestParams();
+ Device androidDevice = new Device();
+ if (BaseApplication.getInstance().networkAvailable()) {
+ params.addBodyParameter(Device.FieldNames.schoolName, fragment_device_right_device_info_school_name.getText().toString());
+ params.addBodyParameter(Device.FieldNames.sn, fragment_device_right_device_info_sn.getText().toString());
+ params.addBodyParameter(Device.FieldNames.installAddress, fragment_device_right_device_info_device_address.getText().toString());
+ params.addBodyParameter(Device.FieldNames.deviceId, BaseApplication.getInstance().getAndroidDevice().getDeviceId());
+
+ } else {
+ androidDevice.setSchoolName(fragment_device_right_device_info_school_name.getText().toString());
+ androidDevice.setSn(fragment_device_right_device_info_sn.getText().toString());
+ androidDevice.setInstallAddress(fragment_device_right_device_info_device_address.getText().toString());
+ androidDevice.setDeviceId(BaseApplication.getInstance().getAndroidDevice().getDeviceId());
+
+ }
+ DeviceMng.getInstance().updateAndroidDevice(params, androidDevice);
}
@OnClick(R.id.fragment_device_right_camera1_save)
public void fragment_device_right_camera1_save_click(View view) {
- Map<String, String> fields = new HashMap<>();
- fields.put("fragment_device_right_camera1_brand", fragment_device_right_camera1_brand.getText().toString());
- fields.put("fragment_device_right_camera1_ip", fragment_device_right_camera1_ip.getText().toString());
- fields.put("fragment_device_right_camera1_port", fragment_device_right_camera1_port.getText().toString());
- fields.put("fragment_device_right_camera1_resolution", fragment_device_right_camera1_resolution.getText().toString());
- fields.put("fragment_device_right_camera1_username", fragment_device_right_camera1_username.getText().toString());
- fields.put("fragment_device_right_camera1_password", fragment_device_right_camera1_password.getText().toString());
- DeviceMng.getInstance().saveCamera1Setting(fields);
- Toast.makeText(MainActivity.getInstance(), "淇濆瓨鎴愬姛", Toast.LENGTH_SHORT).show();
+ RequestParams params = new RequestParams();
+ Device camera1 = new Device();
+ if (BaseApplication.getInstance().networkAvailable()) {
+ params.addBodyParameter("brand", fragment_device_right_camera1_brand.getText().toString());
+ params.addBodyParameter(Device.FieldNames.ip, fragment_device_right_camera1_ip.getText().toString());
+ params.addBodyParameter(Device.FieldNames.port, fragment_device_right_camera1_port.getText().toString());
+ params.addBodyParameter("resolution", fragment_device_right_camera1_resolution.getText().toString());
+ params.addBodyParameter(Device.FieldNames.username, fragment_device_right_camera1_username.getText().toString());
+ params.addBodyParameter(Device.FieldNames.password, fragment_device_right_camera1_password.getText().toString());
+ params.addBodyParameter(Device.FieldNames.deviceId, camera1.getDeviceId());
+ params.addBodyParameter(Device.FieldNames.deviceCompanyId, BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+
+ } else {
+ camera1.setBrand(fragment_device_right_camera1_brand.getText().toString());
+ camera1.setIp(fragment_device_right_camera1_ip.getText().toString());
+ camera1.setPort(fragment_device_right_camera1_port.getText().toString());
+ camera1.setResolution(fragment_device_right_camera1_resolution.getText().toString());
+ camera1.setUsername(fragment_device_right_camera1_username.getText().toString());
+ camera1.setPassword(fragment_device_right_camera1_password.getText().toString());
+ camera1.setDeviceId(camera1.getDeviceId());
+ }
+ DeviceMng.getInstance().updateCamera(params, camera1);
}
@OnClick(R.id.fragment_device_right_camera2_save)
public void fragment_device_right_camera2_save_click(View view) {
- Map<String, String> fields = new HashMap<>();
- fields.put("fragment_device_right_camera2_brand", fragment_device_right_camera2_brand.getText().toString());
- fields.put("fragment_device_right_camera2_ip", fragment_device_right_camera2_ip.getText().toString());
- fields.put("fragment_device_right_camera2_port", fragment_device_right_camera2_port.getText().toString());
- fields.put("fragment_device_right_camera2_resolution", fragment_device_right_camera2_resolution.getText().toString());
- fields.put("fragment_device_right_camera2_username", fragment_device_right_camera2_username.getText().toString());
- fields.put("fragment_device_right_camera2_password", fragment_device_right_camera2_password.getText().toString());
- DeviceMng.getInstance().saveCamera2Setting(fields);
- Toast.makeText(MainActivity.getInstance(), "淇濆瓨鎴愬姛", Toast.LENGTH_SHORT).show();
+ RequestParams params = new RequestParams();
+ Device camera2 = new Device();
+ if (BaseApplication.getInstance().networkAvailable()) {
+ params.addBodyParameter("brand", fragment_device_right_camera2_brand.getText().toString());
+ params.addBodyParameter(Device.FieldNames.ip, fragment_device_right_camera2_ip.getText().toString());
+ params.addBodyParameter(Device.FieldNames.port, fragment_device_right_camera2_port.getText().toString());
+ params.addBodyParameter("resolution", fragment_device_right_camera2_resolution.getText().toString());
+ params.addBodyParameter(Device.FieldNames.username, fragment_device_right_camera2_username.getText().toString());
+ params.addBodyParameter(Device.FieldNames.password, fragment_device_right_camera2_password.getText().toString());
+ params.addBodyParameter(Device.FieldNames.deviceId, camera2.getDeviceId());
+ params.addBodyParameter(Device.FieldNames.deviceCompanyId, BaseApplication.getInstance().getAndroidDevice().getCompanyId());
+
+ } else {
+ camera2.setBrand(fragment_device_right_camera2_brand.getText().toString());
+ camera2.setIp(fragment_device_right_camera2_ip.getText().toString());
+ camera2.setPort(fragment_device_right_camera2_port.getText().toString());
+ camera2.setResolution(fragment_device_right_camera2_resolution.getText().toString());
+ camera2.setUsername(fragment_device_right_camera2_username.getText().toString());
+ camera2.setPassword(fragment_device_right_camera2_password.getText().toString());
+ camera2.setDeviceId(camera2.getDeviceId());
+ }
+ DeviceMng.getInstance().updateCamera(params, camera2);
}
@OnClick(R.id.fragment_device_right_camera1_brand_more)
@@ -311,12 +370,24 @@
}
- public void setCamera1(Device camera1) {
-
+ public void setCamera1(DeviceQueryItem camera1) {
+ this.camera1 = camera1;
+ fragment_device_right_camera1_ip.setText(camera1.getIp());
+ fragment_device_right_camera1_username.setText(camera1.getUsername());
+ fragment_device_right_camera1_password.setText(camera1.getPassword());
+ fragment_device_right_camera1_port.setText(camera1.getPort());
+ fragment_device_right_camera1_brand.setText(camera1.getBrandName());
+ fragment_device_right_camera1_resolution.setText(camera1.getResolution());
}
- public void setCamera2(Device camera2) {
-
+ public void setCamera2(DeviceQueryItem camera2) {
+ this.camera2 = camera2;
+ fragment_device_right_camera2_ip.setText(camera2.getIp());
+ fragment_device_right_camera2_username.setText(camera2.getUsername());
+ fragment_device_right_camera2_password.setText(camera2.getPassword());
+ fragment_device_right_camera2_port.setText(camera2.getPort());
+ fragment_device_right_camera1_brand.setText(camera2.getBrandName());
+ fragment_device_right_camera1_resolution.setText(camera2.getResolution());
}
--
Gitblit v1.8.0