From c28371cf0a7e9e1de06d030d9033eb97e925c579 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 05 五月 2017 14:58:23 +0800
Subject: [PATCH] 

---
 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml               |   77 ++++++++--
 VisitFace/DemoForBsk/app/src/main/res/drawable/u51.png                                       |    0 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java              |   10 +
 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml               |   76 ++++++++--
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SelectDialog.java            |   27 +++
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java |    3 
 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml                   |   38 ++++-
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java          |   42 ++++++
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java                  |    3 
 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java        |  112 +++++++++++++++
 10 files changed, 337 insertions(+), 51 deletions(-)

diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SelectDialog.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SelectDialog.java
index 18166fe..a472ff4 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SelectDialog.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/dialog/SelectDialog.java
@@ -47,6 +47,9 @@
     public static List genderList = new ArrayList();
     public static List idTypeList = new ArrayList();
     public static List visitReasonList = new ArrayList();
+    private static List<String> resolutionList = new ArrayList();
+    private static List<String> protocolList = new ArrayList();
+    private static List<String> cameraBrandList = new ArrayList();
 
     public static void setVisitorTypeList(List visitorTypeList) {
         SelectDialog.visitorTypeList = visitorTypeList;
@@ -167,6 +170,18 @@
                 tile = "璇烽�夋嫨璁块棶浜嬬敱";
                 list = visitReasonList;
                 break;
+            case Constant.DialogSelectType.RESOLUTION:
+                tile = "璇烽�夋嫨鍒嗚鲸鐜�";
+                list = resolutionList;
+                break;
+            case Constant.DialogSelectType.PROTOCOL:
+                tile = "璇烽�夋嫨閫氳";
+                list = protocolList;
+                break;
+            case Constant.DialogSelectType.CAMERA_BRAND:
+                tile = "璇烽�夋嫨鎽勫儚鏈哄搧鐗�";
+                list = cameraBrandList;
+                break;
         }
         dialog_select_title.setText(tile);
     }
@@ -186,6 +201,18 @@
         SelectDialog.visitReasonList = visitReasonList;
     }
 
+    public static void setResolutionList(List<String> resolutionList) {
+        SelectDialog.resolutionList = resolutionList;
+    }
+
+    public static void setProtocolList(List<String> protocolList) {
+        SelectDialog.protocolList = protocolList;
+    }
+
+    public static void setCameraBrandList(List<String> cameraBrandList) {
+        SelectDialog.cameraBrandList = cameraBrandList;
+    }
+
 
     public static class WheelAdapter extends BaseWheelAdapter<String> {
         private Context mContext;
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
index a559a68..58f4648 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java
@@ -50,6 +50,9 @@
         public static final String COUNTRY = "country";
         public static final String VISIT_REASON = "visit_reason";
         public static final String VISIT_TYPE = "visit_type";
+        public static final String RESOLUTION = "resolution";
+        public static final String PROTOCOL = "protocol";
+        public static final String CAMERA_BRAND = "camera_brand";
     }
 
     public static class Page {
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 e2b5778..c39ace0 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
@@ -1,16 +1,22 @@
 package cn.com.basic.face.fragment;
 
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.RadioButton;
+import android.widget.Toast;
 
 import com.bsk.zhangbo.demoforbsk.R;
 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.service.DeviceMng;
+import cn.com.basic.face.util.Constant;
+import cn.com.basic.face.util.OkClickedListener;
 
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
@@ -83,10 +89,13 @@
     private EditText fragment_device_right_lan_port;
     @ViewInject(R.id.fragment_device_right_lan_protocol)
     private EditText fragment_device_right_lan_protocol;
+
     @ViewInject(R.id.fragment_device_right_device_info_sn)
-    private EditText fragment_device_right_school_sn;
+    private EditText fragment_device_right_device_info_sn;
     @ViewInject(R.id.fragment_device_right_device_info_device_address)
-    private EditText fragment_device_right_school_device_address;
+    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;
 
     private View wifiView;
     private View lanView;
@@ -117,6 +126,37 @@
         ViewUtils.inject(this, camera1View);
         ViewUtils.inject(this, camera2View);
         fragment_device_left_wifi_check_box.setChecked(true);
+        loadSharedPreferenceValues();
+    }
+
+    private void loadSharedPreferenceValues() {
+        SharedPreferences wifiMap = DeviceMng.getInstance().loadSharedPreferences(CommonVariables.DeviceSharedPreferences.WIFI);
+
+        SharedPreferences lanMap = DeviceMng.getInstance().loadSharedPreferences(CommonVariables.DeviceSharedPreferences.LAN);
+        fragment_device_right_lan_ip.setText(DeviceMng.getInstance().get(lanMap, "fragment_device_right_lan_ip"));
+        fragment_device_right_lan_port.setText(DeviceMng.getInstance().get(lanMap, "fragment_device_right_lan_port"));
+        fragment_device_right_lan_protocol.setText(DeviceMng.getInstance().get(lanMap, "fragment_device_right_lan_protocol"));
+
+        SharedPreferences schoolMap = DeviceMng.getInstance().loadSharedPreferences(CommonVariables.DeviceSharedPreferences.SCHOOL);
+        fragment_device_right_device_info_sn.setText(DeviceMng.getInstance().get(schoolMap, "fragment_device_right_device_info_sn"));
+        fragment_device_right_device_info_device_address.setText(DeviceMng.getInstance().get(schoolMap, "fragment_device_right_device_info_device_address"));
+        fragment_device_right_device_info_school_name.setText(DeviceMng.getInstance().get(schoolMap, "fragment_device_right_device_info_school_name"));
+
+        SharedPreferences camera1Map = DeviceMng.getInstance().loadSharedPreferences(CommonVariables.DeviceSharedPreferences.CAMERA1);
+        fragment_device_right_camera1_brand.setText(DeviceMng.getInstance().get(camera1Map, "fragment_device_right_camera1_brand"));
+        fragment_device_right_camera1_ip.setText(DeviceMng.getInstance().get(camera1Map, "fragment_device_right_camera1_ip"));
+        fragment_device_right_camera1_port.setText(DeviceMng.getInstance().get(camera1Map, "fragment_device_right_camera1_port"));
+        fragment_device_right_camera1_resolution.setText(DeviceMng.getInstance().get(camera1Map, "fragment_device_right_camera1_resolution"));
+        fragment_device_right_camera1_username.setText(DeviceMng.getInstance().get(camera1Map, "fragment_device_right_camera1_username"));
+        fragment_device_right_camera1_password.setText(DeviceMng.getInstance().get(camera1Map, "fragment_device_right_camera1_password"));
+
+        SharedPreferences camera2Map = DeviceMng.getInstance().loadSharedPreferences(CommonVariables.DeviceSharedPreferences.CAMERA2);
+        fragment_device_right_camera2_brand.setText(DeviceMng.getInstance().get(camera2Map, "fragment_device_right_camera2_brand"));
+        fragment_device_right_camera2_ip.setText(DeviceMng.getInstance().get(camera2Map, "fragment_device_right_camera2_ip"));
+        fragment_device_right_camera2_port.setText(DeviceMng.getInstance().get(camera2Map, "fragment_device_right_camera2_port"));
+        fragment_device_right_camera2_resolution.setText(DeviceMng.getInstance().get(camera2Map, "fragment_device_right_camera2_resolution"));
+        fragment_device_right_camera2_username.setText(DeviceMng.getInstance().get(camera2Map, "fragment_device_right_camera2_username"));
+        fragment_device_right_camera2_password.setText(DeviceMng.getInstance().get(camera2Map, "fragment_device_right_camera2_password"));
     }
 
     @OnClick(R.id.fragment_device_left_wifi_check_box)
@@ -176,25 +216,93 @@
     @OnClick(R.id.fragment_device_right_lan_save)
     public void fragment_device_right_lan_save_click(View view) {
         Map<String, String> fields = new HashMap<>();
+        fields.put("fragment_device_right_lan_ip", fragment_device_right_lan_ip.getText().toString());
+        fields.put("fragment_device_right_lan_port", fragment_device_right_lan_port.getText().toString());
+        fields.put("fragment_device_right_lan_protocol", fragment_device_right_lan_protocol.getText().toString());
         DeviceMng.getInstance().saveLanSetting(fields);
+        Toast.makeText(MainActivity.getInstance(), "淇濆瓨鎴愬姛", Toast.LENGTH_SHORT).show();
     }
 
     @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();
     }
 
     @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();
     }
 
     @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();
     }
 
+    @OnClick(R.id.fragment_device_right_camera1_brand_more)
+    public void fragment_device_right_camera1_brand_click(View view) {
+        new SelectDialog(getFrameView(), Constant.DialogSelectType.CAMERA_BRAND, new OkClickedListener() {
+            public void onSelected(String value) {
+                fragment_device_right_camera1_brand.setText(value);
+            }
+        });
+    }
+
+    @OnClick(R.id.fragment_device_right_camera2_brand_more)
+    public void fragment_device_right_camera2_brand_click(View view) {
+        new SelectDialog(getFrameView(), Constant.DialogSelectType.CAMERA_BRAND, new OkClickedListener() {
+            public void onSelected(String value) {
+                fragment_device_right_camera2_brand.setText(value);
+            }
+        });
+    }
+
+    @OnClick(R.id.fragment_device_right_camera1_resolution_more)
+    public void fragment_device_right_camera1_resolution_click(View view) {
+        new SelectDialog(getFrameView(), Constant.DialogSelectType.RESOLUTION, new OkClickedListener() {
+            public void onSelected(String value) {
+                fragment_device_right_camera1_resolution.setText(value);
+            }
+        });
+    }
+
+    @OnClick(R.id.fragment_device_right_camera2_resolution_more)
+    public void fragment_device_right_camera2_resolution_click(View view) {
+        new SelectDialog(getFrameView(), Constant.DialogSelectType.RESOLUTION, new OkClickedListener() {
+            public void onSelected(String value) {
+                fragment_device_right_camera2_resolution.setText(value);
+            }
+        });
+    }
+
+    @OnClick(R.id.fragment_device_right_lan_protocol_more)
+    public void fragment_device_right_lan_protocol_click(View view) {
+        new SelectDialog(getFrameView(), Constant.DialogSelectType.PROTOCOL, new OkClickedListener() {
+            public void onSelected(String value) {
+                fragment_device_right_lan_protocol.setText(value);
+            }
+        });
+    }
+
+
 }
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
index aa022ae..43e2be7 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
@@ -1,8 +1,11 @@
 package cn.com.basic.face.service;
 
+import android.content.Context;
+import android.content.SharedPreferences;
 import android.widget.Toast;
 
 import cn.com.basic.face.base.BaseApplication;
+import cn.com.basic.face.base.MainActivity;
 import cn.com.basic.face.discern.common.CommonVariables;
 import cn.com.basic.face.util.AppApi;
 
@@ -85,4 +88,11 @@
         SharedPreferencesUtils.save(CommonVariables.DeviceSharedPreferences.CAMERA2, fields);
     }
 
+    public SharedPreferences loadSharedPreferences(String name) {
+        return MainActivity.getInstance().getSharedPreferences(name, Context.MODE_PRIVATE);
+    }
+
+    public String get(SharedPreferences sharedPreferences, String key) {
+        return sharedPreferences.getString(key, "");
+    }
 }
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java
index 06b5789..f00c020 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DictionaryMng.java
@@ -45,6 +45,9 @@
         loadGenderList();
         loadVisitReasonList();
         loadVisitorTypeList();
+        loadResolutionList();
+        loadProtocolList();
+        loadCameraBrandList();
     }
 
     public void loadCountries() {
@@ -140,6 +143,45 @@
         });
     }
 
+    public void loadResolutionList() {
+        if (!BaseApplication.deviceAvailable) {
+            return;
+        }
+        RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
+        params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.RESOLUTION);
+        x.http().get(params, new BaseCommonCallBack() {
+            public void success() {
+                SelectDialog.setResolutionList(getDictionaryNameList(getList(Dictionary.class)));
+            }
+        });
+    }
+
+    public void loadProtocolList() {
+        if (!BaseApplication.deviceAvailable) {
+            return;
+        }
+        RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
+        params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.PROTOCOL);
+        x.http().get(params, new BaseCommonCallBack() {
+            public void success() {
+                SelectDialog.setProtocolList(getDictionaryNameList(getList(Dictionary.class)));
+            }
+        });
+    }
+
+    public void loadCameraBrandList() {
+        if (!BaseApplication.deviceAvailable) {
+            return;
+        }
+        RequestParams params = new RequestParams(AppApi.BASE_URL +AppApi.Query.DICTIONARY_QUERY);
+        params.addParameter(DictionaryQueryCondition.FieldNames.type, CommonVariables.DictionaryType.CAMERA_BRAND);
+        x.http().get(params, new BaseCommonCallBack() {
+            public void success() {
+                SelectDialog.setCameraBrandList(getDictionaryNameList(getList(Dictionary.class)));
+            }
+        });
+    }
+
     public List<String> getDictionaryNameList(List<Dictionary> dictionaryList) {
         List nameList = new ArrayList();
         for (Dictionary dictionary : dictionaryList) {
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java
index 0f70cc3..714b0ca 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/Constant.java
@@ -29,6 +29,9 @@
         public static final int VISITOR_TYPE = 3;
         public static final int VISIT_REASON = 4;
         public static final int VISIT_REASON_ADD = 5;
+        public static final int RESOLUTION = 6;
+        public static final int PROTOCOL = 7;
+        public static final int CAMERA_BRAND = 8;
     }
 
     public static class TabType {
diff --git a/VisitFace/DemoForBsk/app/src/main/res/drawable/u51.png b/VisitFace/DemoForBsk/app/src/main/res/drawable/u51.png
new file mode 100644
index 0000000..c7e0fc4
--- /dev/null
+++ b/VisitFace/DemoForBsk/app/src/main/res/drawable/u51.png
Binary files differ
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml
index d2658fe..0b48827 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml
@@ -40,6 +40,7 @@
                     android:background="@drawable/u208"
                     android:text=""/>
             </LinearLayout>
+
             <ScrollView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -85,18 +86,36 @@
                             android:layout_marginBottom="@dimen/h6dp"
                             android:text="鎽勫儚鏈哄搧鐗�"
                             />
-                        <EditText
-                            android:id="@+id/fragment_device_right_camera1_brand"
+                        <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:background="@null"
-                            android:layout_marginBottom="@dimen/h12dp"
-                            android:text=""
-                            android:hint="澶у崕"
-                            android:textColorHint="@color/colorText_b"
-                            android:textSize="@dimen/w14dp"
-                            android:textColor="@color/colorText_b"
+                            android:orientation="horizontal"
+                            >
+                            <EditText
+                                android:id="@+id/fragment_device_right_camera1_brand"
+                                android:layout_width="@dimen/w580dp"
+                                android:layout_height="wrap_content"
+                                android:background="@null"
+                                android:layout_marginBottom="@dimen/h12dp"
+                                android:text=""
+                                android:hint="澶у崕"
+                                android:editable="false"
+                                android:textColorHint="@color/colorText_b"
+                                android:textSize="@dimen/w14dp"
+                                android:textColor="@color/colorText_b"
+                                />
+                            <ImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:background="@drawable/u51"
+                                android:id="@+id/fragment_device_right_camera1_brand_more"
+                                />
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text=" "
                             />
+                        </LinearLayout>
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/view_size_1"
@@ -178,18 +197,37 @@
                             android:layout_marginBottom="@dimen/h6dp"
                             android:text="鍒嗚鲸鐜�"
                             />
-                        <EditText
-                            android:id="@+id/fragment_device_right_camera1_resolution"
+                        <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:background="@null"
-                            android:layout_marginBottom="@dimen/h12dp"
-                            android:text=""
-                            android:hint="704*480"
-                            android:textSize="@dimen/w14dp"
-                            android:textColorHint="@color/colorText_b"
-                            android:textColor="@color/colorText_b"
-                            />
+                            android:orientation="horizontal"
+                            >
+                            <EditText
+                                android:id="@+id/fragment_device_right_camera1_resolution"
+                                android:layout_width="@dimen/w580dp"
+                                android:layout_height="wrap_content"
+                                android:background="@null"
+                                android:layout_marginBottom="@dimen/h12dp"
+                                android:text=""
+                                android:hint="704*480"
+                                android:editable="false"
+                                android:textSize="@dimen/w14dp"
+                                android:textColorHint="@color/colorText_b"
+                                android:textColor="@color/colorText_b"
+                                />
+                            <ImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:background="@drawable/u51"
+                                android:id="@+id/fragment_device_right_camera1_resolution_more"
+                                />
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text=" "
+                                />
+                        </LinearLayout>
+
                         <View
                             android:layout_width="match_parent"
                             android:layout_height="@dimen/view_size_1"
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml
index 1bb17ba..0603511 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml
@@ -85,18 +85,36 @@
                         android:layout_marginBottom="@dimen/h6dp"
                         android:text="鎽勫儚鏈哄搧鐗�"
                         />
-                    <EditText
-                        android:id="@+id/fragment_device_right_camera2_brand"
+                    <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:background="@null"
-                        android:layout_marginBottom="@dimen/h12dp"
-                        android:text=""
-                        android:hint="娴峰悍"
-                        android:textColorHint="@color/colorText_b"
-                        android:textSize="@dimen/w14dp"
-                        android:textColor="@color/colorText_b"
-                        />
+                        android:orientation="horizontal"
+                        >
+                        <EditText
+                            android:id="@+id/fragment_device_right_camera2_brand"
+                            android:layout_width="@dimen/w580dp"
+                            android:layout_height="wrap_content"
+                            android:background="@null"
+                            android:layout_marginBottom="@dimen/h12dp"
+                            android:text=""
+                            android:hint="娴峰悍"
+                            android:editable="false"
+                            android:textColorHint="@color/colorText_b"
+                            android:textSize="@dimen/w14dp"
+                            android:textColor="@color/colorText_b"
+                            />
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/u51"
+                            android:id="@+id/fragment_device_right_camera2_brand_more"
+                            />
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text=" "
+                            />
+                    </LinearLayout>
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/view_size_1"
@@ -178,18 +196,37 @@
                         android:layout_marginBottom="@dimen/h6dp"
                         android:text="鍒嗚鲸鐜�"
                         />
-                    <EditText
-                        android:id="@+id/fragment_device_right_camera2_resolution"
+                    <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:background="@null"
-                        android:layout_marginBottom="@dimen/h12dp"
-                        android:text=""
-                        android:hint="704*480"
-                        android:textSize="@dimen/w14dp"
-                        android:textColorHint="@color/colorText_b"
-                        android:textColor="@color/colorText_b"
-                        />
+                        android:orientation="horizontal"
+                        >
+                        <EditText
+                            android:id="@+id/fragment_device_right_camera2_resolution"
+                            android:layout_width="@dimen/w580dp"
+                            android:layout_height="wrap_content"
+                            android:background="@null"
+                            android:layout_marginBottom="@dimen/h12dp"
+                            android:text=""
+                            android:hint="704*480"
+                            android:textSize="@dimen/w14dp"
+                            android:textColorHint="@color/colorText_b"
+                            android:textColor="@color/colorText_b"
+                            android:editable="false"
+                            />
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/u51"
+                            android:id="@+id/fragment_device_right_camera2_resolution_more"
+                            />
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text=" "
+                            />
+                    </LinearLayout>
+
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/view_size_1"
diff --git a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml
index 9bf3c4b..cb20c99 100644
--- a/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml
+++ b/VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml
@@ -144,18 +144,36 @@
                         android:layout_marginBottom="@dimen/h6dp"
                         android:text="閫氳"
                         />
-                    <EditText
-                        android:id="@+id/fragment_device_right_lan_protocol"
+                    <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:background="@null"
-                        android:layout_marginBottom="@dimen/h12dp"
-                        android:text=""
-                        android:hint="TCP"
-                        android:textSize="@dimen/w14dp"
-                        android:textColorHint="@color/colorText_b"
-                        android:textColor="@color/colorText_b"
-                        />
+                        android:orientation="horizontal"
+                        >
+                        <EditText
+                            android:id="@+id/fragment_device_right_lan_protocol"
+                            android:layout_width="@dimen/w580dp"
+                            android:layout_height="wrap_content"
+                            android:background="@null"
+                            android:layout_marginBottom="@dimen/h12dp"
+                            android:text=""
+                            android:hint="TCP"
+                            android:editable="false"
+                            android:textSize="@dimen/w14dp"
+                            android:textColorHint="@color/colorText_b"
+                            android:textColor="@color/colorText_b"
+                            />
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@drawable/u51"
+                            android:id="@+id/fragment_device_right_lan_protocol_more"
+                            />
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text=" "
+                            />
+                    </LinearLayout>
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/view_size_1"

--
Gitblit v1.8.0