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 | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 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 4ce84c5..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() {
@@ -367,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