From 5f12988a77d078a5e5155c9a301e45bfd288d7e5 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 11 八月 2017 16:02:50 +0800
Subject: [PATCH]
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java | 66 +++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 11 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..ef53c46 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
@@ -6,6 +6,7 @@
import android.view.View;
import android.widget.EditText;
import android.widget.FrameLayout;
+import android.widget.LinearLayout;
import android.widget.RadioButton;
import android.widget.Toast;
@@ -102,6 +103,11 @@
private EditText fragment_device_right_device_info_device_address;
@ViewInject(R.id.fragment_device_right_device_info_school_name)
private EditText fragment_device_right_device_info_school_name;
+ @ViewInject(R.id.fragment_device_left_parent)
+ private LinearLayout fragment_device_left_parent;
+ @ViewInject(R.id.fragment_device_right_parent)
+ private LinearLayout fragment_device_right_parent;
+
private View wifiView;
private View lanView;
@@ -111,6 +117,7 @@
private DeviceQueryItem camera1;
private DeviceQueryItem camera2;
+ private Device androidDevice;
public DeviceQueryItem getCamera2() {
return camera2;
@@ -144,8 +151,23 @@
ViewUtils.inject(this, camera2View);
fragment_device_left_wifi_check_box.setChecked(true);
loadSharedPreferenceValues();
- setupUI(getLeftView());
- setupUI(getRightView());
+ setupUI(fragment_device_left_parent);
+ setupUI(fragment_device_right_parent);
+ setupUI(wifiView);
+ setupUI(lanView);
+ setupUI(schoolView);
+ setupUI(camera1View);
+ setupUI(camera2View);
+ }
+
+ @OnClick(R.id.fragment_device_left_parent)
+ public void fragment_device_left_parent_click(View view) {
+ System.out.println("aa");
+ }
+
+ @OnClick(R.id.fragment_device_right_parent)
+ public void fragment_device_right_parent_click(View view) {
+ System.out.println("aa");
}
private void loadSharedPreferenceValues() {
@@ -244,12 +266,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 +303,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 +314,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 +329,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 +340,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)
@@ -348,7 +389,10 @@
}
public void setAndroidDevice(Device androidDevice) {
-
+ this.androidDevice = androidDevice;
+ fragment_device_right_device_info_school_name.setText(androidDevice.getSchoolName());
+ fragment_device_right_device_info_sn.setText(androidDevice.getSn());
+ fragment_device_right_device_info_device_address.setText(androidDevice.getInstallAddress());
}
public void setCamera1(DeviceQueryItem camera1) {
--
Gitblit v1.8.0