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 | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 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 d2eb97a..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
@@ -244,12 +244,29 @@
@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)
@@ -264,6 +281,7 @@
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());
@@ -274,7 +292,7 @@
camera1.setPassword(fragment_device_right_camera1_password.getText().toString());
camera1.setDeviceId(camera1.getDeviceId());
}
- DeviceMng.getInstance().updateDevice(params, camera1);
+ DeviceMng.getInstance().updateCamera(params, camera1);
}
@OnClick(R.id.fragment_device_right_camera2_save)
@@ -289,6 +307,7 @@
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());
@@ -299,7 +318,7 @@
camera2.setPassword(fragment_device_right_camera2_password.getText().toString());
camera2.setDeviceId(camera2.getDeviceId());
}
- DeviceMng.getInstance().updateDevice(params, camera2);
+ DeviceMng.getInstance().updateCamera(params, camera2);
}
@OnClick(R.id.fragment_device_right_camera1_brand_more)
--
Gitblit v1.8.0