xuxiuxi

2017-05-05 0fb71a3ade434e50dce77d31c42059cf5f973af9

git-svn-id: http://192.168.1.226/svn/proxy@604 454eff88-639b-444f-9e54-f578c98de674

 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/CommonVariables.java

@@ -89,4 +89,12 @@
        public static final int UPLOAD_PHOTO = 2;

    }



    public static class DeviceSharedPreferences {

        public static final String LAN = "device_lan";

        public static final String WIFI = "device_wifi";

        public static final String SCHOOL = "device_school";

        public static final String CAMERA1 = "device_camera1";

        public static final String CAMERA2 = "device_camera2";

    }



}


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java

@@ -1,28 +1,23 @@
package cn.com.basic.face.fragment;



import android.os.Bundle;

import android.support.v4.app.Fragment;

import android.support.v4.app.FragmentManager;

import android.view.LayoutInflater;

import android.view.View;

import android.widget.CheckBox;

import android.widget.EditText;

import android.widget.FrameLayout;

import android.widget.RadioButton;

import android.widget.RelativeLayout;

import android.widget.TextView;

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.service.DeviceMng;



import com.lidroid.xutils.ViewUtils;

import com.lidroid.xutils.view.annotation.ViewInject;

import com.lidroid.xutils.view.annotation.event.OnClick;



import java.util.ArrayList;

import java.util.List;

import java.util.HashMap;

import java.util.Map;



public class DeviceFragment extends LeftRightBaseFragment {



@@ -60,6 +55,38 @@
    private EditText fragment_device_right_camera1_brand;

    @ViewInject(R.id.fragment_device_right_camera1_ip)

    private EditText fragment_device_right_camera1_ip;

    @ViewInject(R.id.fragment_device_right_camera1_port)

    private EditText fragment_device_right_camera1_port;

    @ViewInject(R.id.fragment_device_right_camera1_resolution)

    private EditText fragment_device_right_camera1_resolution;

    @ViewInject(R.id.fragment_device_right_camera1_username)

    private EditText fragment_device_right_camera1_username;

    @ViewInject(R.id.fragment_device_right_camera1_password)

    private EditText fragment_device_right_camera1_password;



    @ViewInject(R.id.fragment_device_right_camera2_brand)

    private EditText fragment_device_right_camera2_brand;

    @ViewInject(R.id.fragment_device_right_camera2_ip)

    private EditText fragment_device_right_camera2_ip;

    @ViewInject(R.id.fragment_device_right_camera2_port)

    private EditText fragment_device_right_camera2_port;

    @ViewInject(R.id.fragment_device_right_camera2_resolution)

    private EditText fragment_device_right_camera2_resolution;

    @ViewInject(R.id.fragment_device_right_camera2_username)

    private EditText fragment_device_right_camera2_username;

    @ViewInject(R.id.fragment_device_right_camera2_password)

    private EditText fragment_device_right_camera2_password;



    @ViewInject(R.id.fragment_device_right_lan_ip)

    private EditText fragment_device_right_lan_ip;

    @ViewInject(R.id.fragment_device_right_lan_port)

    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;

    @ViewInject(R.id.fragment_device_right_device_info_device_address)

    private EditText fragment_device_right_school_device_address;



    private View wifiView;

    private View lanView;

@@ -81,7 +108,7 @@
        super.initViews(view, savedInstanceState);

        wifiView = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_device_right_wifi, null);

        lanView = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_device_right_lan, null);

        schoolView = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_device_right_school, null);

        schoolView = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_device_right_device_info, null);

        camera1View = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_device_right_camera1, null);

        camera2View = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_device_right_camera2, null);

        ViewUtils.inject(this, wifiView);

@@ -89,6 +116,7 @@
        ViewUtils.inject(this, schoolView);

        ViewUtils.inject(this, camera1View);

        ViewUtils.inject(this, camera2View);

        fragment_device_left_wifi_check_box.setChecked(true);

    }



    @OnClick(R.id.fragment_device_left_wifi_check_box)

@@ -145,9 +173,28 @@


    }



    @OnClick(R.id.fragment_device_right_save)

    public void fragment_device_right_save_click(View view) {

    @OnClick(R.id.fragment_device_right_lan_save)

    public void fragment_device_right_lan_save_click(View view) {

        Map<String, String> fields = new HashMap<>();

        DeviceMng.getInstance().saveLanSetting(fields);

    }



    @OnClick(R.id.fragment_device_right_school_save)

    public void fragment_device_right_school_save_click(View view) {

        Map<String, String> fields = new HashMap<>();

        DeviceMng.getInstance().saveSchoolSetting(fields);

    }



    @OnClick(R.id.fragment_device_right_camera1_save)

    public void fragment_device_right_camera1_save_click(View view) {

        Map<String, String> fields = new HashMap<>();

        DeviceMng.getInstance().saveCamera1Setting(fields);

    }



    @OnClick(R.id.fragment_device_right_camera2_save)

    public void fragment_device_right_camera2_save_click(View view) {

        Map<String, String> fields = new HashMap<>();

        DeviceMng.getInstance().saveCamera2Setting(fields);

    }



}


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java

@@ -3,15 +3,18 @@
import android.widget.Toast;



import cn.com.basic.face.base.BaseApplication;

import cn.com.basic.face.discern.common.CommonVariables;

import cn.com.basic.face.util.AppApi;



import org.xutils.http.RequestParams;

import org.xutils.x;



import java.util.List;

import java.util.Map;



import cn.com.basic.face.discern.common.BaseCommonCallBack;

import cn.com.basic.face.discern.entity.Device;

import cn.com.basic.face.util.SharedPreferencesUtils;



public class DeviceMng {

    public static DeviceMng instance = new DeviceMng();

@@ -62,4 +65,24 @@
        }

    }



    public void saveWifiSetting(Map<String, String> fields) {

        SharedPreferencesUtils.save(CommonVariables.DeviceSharedPreferences.WIFI, fields);

    }



    public void saveLanSetting(Map<String, String> fields) {

        SharedPreferencesUtils.save(CommonVariables.DeviceSharedPreferences.LAN, fields);

    }



    public void saveSchoolSetting(Map<String, String> fields) {

        SharedPreferencesUtils.save(CommonVariables.DeviceSharedPreferences.SCHOOL, fields);

    }



    public void saveCamera1Setting(Map<String, String> fields) {

        SharedPreferencesUtils.save(CommonVariables.DeviceSharedPreferences.CAMERA1, fields);

    }



    public void saveCamera2Setting(Map<String, String> fields) {

        SharedPreferencesUtils.save(CommonVariables.DeviceSharedPreferences.CAMERA2, fields);

    }



}


 VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/SharedPreferencesUtils.java

New file
@@ -0,0 +1,25 @@
package cn.com.basic.face.util;



import java.util.Map;



import android.content.Context;

import android.content.SharedPreferences;



import cn.com.basic.face.base.MainActivity;

import cn.com.basic.face.discern.common.CommonVariables;



public class SharedPreferencesUtils {



    public static boolean save(String name,

                                          Map<String, String> map) {

        SharedPreferences sharedPreferences = MainActivity.getInstance().getSharedPreferences(name, Context.MODE_PRIVATE);

        SharedPreferences.Editor editor = sharedPreferences.edit();

        for (Map.Entry<String, String> entry : map.entrySet()) {

            editor.putString(entry.getKey(), entry.getValue());

        }



        boolean commit = editor.commit();

        return commit;

    }



}


 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_left.xml

@@ -31,6 +31,7 @@
            android:textColorHint="@color/colorSearch"

            android:background="@drawable/visitor_register_search_et"

            android:textSize="@dimen/w14dp"/>



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="match_parent"

@@ -205,8 +206,8 @@
                    android:layout_width="match_parent"

                    android:layout_height="@dimen/h56dp"

                    android:orientation="vertical"

                    android:layout_marginLeft="@dimen/w20dp"

                    android:layout_marginRight="@dimen/w20dp"

                    android:layout_marginLeft="@dimen/w30dp"

                    android:layout_marginRight="@dimen/w30dp"

                    android:layout_toRightOf="@id/fragment_device_left_camera2_check_box">

                    <TextView

                        android:layout_width="wrap_content"


 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera1.xml

@@ -13,7 +13,7 @@
                android:gravity="right|center_vertical"

                android:orientation="horizontal">

                <TextView

                    android:id="@+id/fragment_device_right_delete"

                    android:id="@+id/fragment_device_right_camera1_delete"

                    android:layout_width="@dimen/w40dp"

                    android:layout_height="@dimen/h36dp"

                    android:gravity="center"

@@ -21,7 +21,7 @@
                    android:background="@drawable/u194"

                    android:text=""/>

                <TextView

                    android:id="@+id/fragment_device_right_add"

                    android:id="@+id/fragment_device_right_camera1_add"

                    android:layout_width="@dimen/w40dp"

                    android:layout_height="@dimen/h36dp"

                    android:gravity="center"

@@ -30,7 +30,7 @@
                    android:background="@drawable/u249"

                    android:text=""/>

                <TextView

                    android:id="@+id/fragment_device_right_save"

                    android:id="@+id/fragment_device_right_camera1_save"

                    android:layout_width="@dimen/w40dp"

                    android:layout_height="@dimen/h36dp"

                    android:gravity="center"

@@ -42,11 +42,13 @@
            </LinearLayout>

            <ScrollView

                android:layout_width="match_parent"

                android:layout_height="wrap_content">

                android:layout_height="wrap_content"

                >

            <LinearLayout

                android:orientation="vertical"

                android:layout_width="@dimen/w596dp"

                android:layout_height="wrap_content"

                    android:layout_gravity="center_horizontal"

                >

                <LinearLayout

                    android:layout_width="@dimen/w611dp"

@@ -146,6 +148,7 @@
                        android:text="端口"

                        />

                    <EditText

                            android:id="@+id/fragment_device_right_camera1_port"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:background="@null"

@@ -176,6 +179,7 @@
                        android:text="分辨率"

                        />

                    <EditText

                            android:id="@+id/fragment_device_right_camera1_resolution"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:background="@null"

@@ -206,6 +210,7 @@
                        android:text="用户名"

                        />

                    <EditText

                            android:id="@+id/fragment_device_right_camera1_username"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:background="@null"

@@ -236,6 +241,7 @@
                        android:text="密码"

                        />

                    <EditText

                            android:id="@+id/fragment_device_right_camera1_password"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:background="@null"


 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_camera2.xml

@@ -2,9 +2,6 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:orientation="vertical" android:layout_width="match_parent"

    android:layout_height="match_parent">

    <ScrollView

        android:layout_width="match_parent"

        android:layout_height="match_parent">

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="match_parent"

@@ -16,7 +13,7 @@
                android:gravity="right|center_vertical"

                android:orientation="horizontal">

                <TextView

                    android:id="@+id/fragment_device_right_delete"

                android:id="@+id/fragment_device_right_camera2_delete"

                    android:layout_width="@dimen/w40dp"

                    android:layout_height="@dimen/h36dp"

                    android:gravity="center"

@@ -24,7 +21,7 @@
                    android:background="@drawable/u194"

                    android:text=""/>

                <TextView

                    android:id="@+id/fragment_device_right_add"

                android:id="@+id/fragment_device_right_camera2_add"

                    android:layout_width="@dimen/w40dp"

                    android:layout_height="@dimen/h36dp"

                    android:gravity="center"

@@ -33,7 +30,7 @@
                    android:background="@drawable/u249"

                    android:text=""/>

                <TextView

                    android:id="@+id/fragment_device_right_save"

                android:id="@+id/fragment_device_right_camera2_save"

                    android:layout_width="@dimen/w40dp"

                    android:layout_height="@dimen/h36dp"

                    android:gravity="center"

@@ -43,10 +40,15 @@
                    android:background="@drawable/u208"

                    android:text=""/>

            </LinearLayout>

        <ScrollView

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            >

            <LinearLayout

                android:orientation="vertical"

                android:layout_width="@dimen/w596dp"

                android:layout_height="wrap_content"

                android:layout_gravity="center_horizontal"

                >

                <LinearLayout

                    android:layout_width="@dimen/w611dp"

@@ -84,7 +86,7 @@
                        android:text="摄像机品牌"

                        />

                    <EditText

                        android:id="@+id/fragment_check_in_right_visitor_reason"

                        android:id="@+id/fragment_device_right_camera2_brand"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:background="@null"

@@ -115,6 +117,7 @@
                        android:text="IP"

                        />

                    <EditText

                        android:id="@+id/fragment_device_right_camera2_ip"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:background="@null"

@@ -145,6 +148,7 @@
                        android:text="端口"

                        />

                    <EditText

                        android:id="@+id/fragment_device_right_camera2_port"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:background="@null"

@@ -175,6 +179,7 @@
                        android:text="分辨率"

                        />

                    <EditText

                        android:id="@+id/fragment_device_right_camera2_resolution"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:background="@null"

@@ -205,6 +210,7 @@
                        android:text="用户名"

                        />

                    <EditText

                        android:id="@+id/fragment_device_right_camera2_username"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:background="@null"

@@ -235,6 +241,7 @@
                        android:text="密码"

                        />

                    <EditText

                        android:id="@+id/fragment_device_right_camera2_password"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:background="@null"

@@ -251,6 +258,6 @@
                        android:background="@color/colorText_b"/>

                </LinearLayout>

            </LinearLayout>

        </LinearLayout>

    </ScrollView>

</LinearLayout>
</LinearLayout>

 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_device_info.xml

File was renamed from VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_school.xml
@@ -16,7 +16,7 @@
                android:gravity="right|center_vertical"

                android:orientation="horizontal">

                <TextView

                    android:id="@+id/fragment_device_right_delete"

                    android:id="@+id/fragment_device_right_device_info_delete"

                    android:layout_width="@dimen/w40dp"

                    android:layout_height="@dimen/h36dp"

                    android:gravity="center"

@@ -24,7 +24,7 @@
                    android:background="@drawable/u194"

                    android:text=""/>

                <TextView

                    android:id="@+id/fragment_device_right_add"

                    android:id="@+id/fragment_device_right_device_info_add"

                    android:layout_width="@dimen/w40dp"

                    android:layout_height="@dimen/h36dp"

                    android:gravity="center"

@@ -33,7 +33,7 @@
                    android:background="@drawable/u249"

                    android:text=""/>

                <TextView

                    android:id="@+id/fragment_device_right_save"

                    android:id="@+id/fragment_device_right_school_save"

                    android:layout_width="@dimen/w40dp"

                    android:layout_height="@dimen/h36dp"

                    android:gravity="center"

@@ -48,7 +48,6 @@
                android:layout_width="@dimen/w596dp"

                android:layout_height="wrap_content"

                >



                <LinearLayout

                    android:layout_width="@dimen/w611dp"

                    android:layout_height="wrap_content"

@@ -60,8 +59,7 @@
                        android:textColor="@color/colorPrimary"

                        android:textStyle="bold"

                        android:textSize="@dimen/w16dp"

                        android:text="所有学校设置"

                        android:id="@+id/fragment_check_in_right_visitor_reason_text_view"

                        android:text="所属学校设置"

                        android:layout_marginBottom="@dimen/h20dp"

                        />

                    <View

@@ -85,7 +83,7 @@
                        android:text="学校名称"

                        />

                    <EditText

                        android:id="@+id/fragment_check_in_right_visitor_reason"

                        android:id="@+id/fragment_device_right_device_info_school_name"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:background="@null"

@@ -116,6 +114,7 @@
                        android:text="设备序列号"

                        />

                    <EditText

                        android:id="@+id/fragment_device_right_device_info_sn"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:background="@null"

@@ -146,6 +145,7 @@
                        android:text="设备地点"

                        />

                    <EditText

                        android:id="@+id/fragment_device_right_device_info_device_address"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:background="@null"


 VisitFace/DemoForBsk/app/src/main/res/layout/fragment_device_right_lan.xml

@@ -16,7 +16,7 @@
                android:gravity="right|center_vertical"

                android:orientation="horizontal">

                <TextView

                    android:id="@+id/fragment_device_right_delete"

                    android:id="@+id/fragment_device_right_lan_delete"

                    android:layout_width="@dimen/w40dp"

                    android:layout_height="@dimen/h36dp"

                    android:gravity="center"

@@ -24,7 +24,7 @@
                    android:background="@drawable/u194"

                    android:text=""/>

                <TextView

                    android:id="@+id/fragment_device_right_add"

                    android:id="@+id/fragment_device_right_lan_add"

                    android:layout_width="@dimen/w40dp"

                    android:layout_height="@dimen/h36dp"

                    android:gravity="center"

@@ -33,7 +33,7 @@
                    android:background="@drawable/u249"

                    android:text=""/>

                <TextView

                    android:id="@+id/fragment_device_right_save"

                    android:id="@+id/fragment_device_right_lan_save"

                    android:layout_width="@dimen/w40dp"

                    android:layout_height="@dimen/h36dp"

                    android:gravity="center"

@@ -48,7 +48,6 @@
                android:layout_width="@dimen/w596dp"

                android:layout_height="wrap_content"

                >



                <LinearLayout

                    android:layout_width="@dimen/w611dp"

                    android:layout_height="wrap_content"

@@ -61,7 +60,6 @@
                        android:textStyle="bold"

                        android:textSize="@dimen/w16dp"

                        android:text="有线网络设置"

                        android:id="@+id/fragment_check_in_right_visitor_reason_text_view"

                        android:layout_marginBottom="@dimen/h20dp"

                        />

                    <View

@@ -85,7 +83,7 @@
                        android:text="服务器IP"

                        />

                    <EditText

                        android:id="@+id/fragment_check_in_right_visitor_reason"

                        android:id="@+id/fragment_device_right_lan_ip"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:background="@null"

@@ -116,6 +114,7 @@
                        android:text="服务器端口"

                        />

                    <EditText

                        android:id="@+id/fragment_device_right_lan_port"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:background="@null"

@@ -146,6 +145,7 @@
                        android:text="通讯"

                        />

                    <EditText

                        android:id="@+id/fragment_device_right_lan_protocol"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:background="@null"