xuxiuxi
2017-08-03 29ea37292f8d9476903c603ba83c4e40afa9f7f3


git-svn-id: http://192.168.1.226/svn/proxy@972 454eff88-639b-444f-9e54-f578c98de674
5个文件已修改
122 ■■■■ 已修改文件
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/DeviceFragment.java 35 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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)
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/fragment/SurveillanceFragment.java
@@ -99,27 +99,29 @@
        }
        if (useNative) {
            try{
                Calendar c = Calendar.getInstance();
                c.set(2017, 4, 1, 12, 34, 56);
                AlarmManager am = (AlarmManager) MainActivity.getInstance().getSystemService(Context.ALARM_SERVICE);
                //am.setTime(c.getTimeInMillis());
                //Process su = Runtime.getRuntime().exec("su");
                //DataOutputStream outputStream = new DataOutputStream(su.getOutputStream());
                //outputStream.writeBytes("busybox ifconfig wlan0 down\n");
                //outputStream.flush();
                //Thread.sleep(5000);
//                outputStream.writeBytes("busybox ifconfig wlan0 hw ether  f4:8b:32:62:4f:89\n");
//                Process su = Runtime.getRuntime().exec("su");
//                Calendar c = Calendar.getInstance();
//                c.set(2017, 4, 1, 12, 34, 56);
//                AlarmManager am = (AlarmManager) MainActivity.getInstance().getSystemService(Context.ALARM_SERVICE);
//
////                am.setTime(c.getTimeInMillis());
//
//                DataOutputStream outputStream = new DataOutputStream(su.getOutputStream());
//
////                outputStream.writeBytes("su 0 toolbox date -s 20170501.235959");
//
//                outputStream.writeBytes("/system/mac.sh");
//                outputStream.flush();
                //outputStream.writeBytes("exit\n");
                //outputStream.flush();
                //su.waitFor();
//                //Thread.sleep(5000);
////                outputStream.writeBytes("busybox ifconfig wlan0 hw ether  f4:8b:32:62:4f:89\n");
////                outputStream.flush();
//
//                outputStream.writeBytes("exit\n");
//                outputStream.flush();
//                su.waitFor();
                /*
                busybox ifconfig wlan0 hw ether  AC:83:F3:42:19:CE
                 */
            }catch(Exception e){
                e.printStackTrace();
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/DeviceMng.java
@@ -247,14 +247,14 @@
        String port = "554";
        DeviceQueryItem camera1 = DeviceFragment.getInstance().getCamera1();
        if (camera1 != null) {
            return "rtsp://admin:admin12345@"+camera1.getIp()+":554/h264/ch1/main/av_stream";
            return "rtsp://admin:a1234567@"+camera1.getIp()+":554/h264/ch1/main/av_stream";
        }
        return "rtsp://admin:a1234567@192.168.1.201:554/h264/ch1/main/av_stream";
    }
    public void updateDevice(RequestParams params, Device camera) {
    public void updateCamera(RequestParams params, Device camera) {
        if (BaseApplication.getInstance().networkAvailable()) {
            params.setUri(AppApi.BASE_URL +AppApi.DEVICE_EDIT);
            params.setUri(AppApi.BASE_URL +AppApi.CAMERA_UPDATE);
            x.http().post(params, new BaseCommonCallBack() {
                @Override
                public void success() {
@@ -263,8 +263,24 @@
                }
            });
        } else {
            DeviceDao.getInstance().updateDevice(camera);
            DeviceDao.getInstance().updateCamera(camera);
        }
    }
    public void updateAndroidDevice(RequestParams params, Device androidDevice) {
        if (BaseApplication.getInstance().networkAvailable()) {
            params.setUri(AppApi.BASE_URL +AppApi.ANDROID_DEVICE_UPDATE);
            x.http().post(params, new BaseCommonCallBack() {
                @Override
                public void success() {
                    SqliteSqlUtil.insert(getExtraList(SqliteSqlBean.class));
                    Toast.makeText(BaseApplication.getInstance(),"修改成功", Toast.LENGTH_SHORT).show();
                }
            });
        } else {
            DeviceDao.getInstance().updateAndroidDevice(androidDevice);
        }
    }
}
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/service/sqlite/DeviceDao.java
@@ -191,11 +191,27 @@
        return c.getInt(0);
    }
    public void updateDevice(Device device) {
        String strFilter = "device_id=" + device.getDeviceId();
    public void updateCamera(Device camera) {
        String strFilter = "device_id=" + camera.getDeviceId();
        ContentValues args = new ContentValues();
        args.put("ip", device.getIp());
        MainActivity.getInstance().db.update("titles", args, strFilter, null);
        args.put("brand", camera.getBrand());
        args.put("brand_id", camera.getBrandId());
        args.put("ip", camera.getIp());
        args.put("port", camera.getPort());
        args.put("resolution", camera.getResolution());
        args.put("resolutionId", camera.getResolutionId());
        args.put("username", camera.getUsername());
        args.put("password", camera.getPassword());
        MainActivity.getInstance().db.update("device", args, strFilter, null);
    }
    public void updateAndroidDevice(Device androidDevice) {
        String strFilter = "device_id=" + androidDevice.getDeviceId();
        ContentValues args = new ContentValues();
        args.put("school_name", androidDevice.getSchoolName());
        args.put("sn", androidDevice.getSn());
        args.put("install_address", androidDevice.getInstallAddress());
        MainActivity.getInstance().db.update("device", args, strFilter, null);
    }
}
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/util/AppApi.java
@@ -30,7 +30,7 @@
    public static final String REGISTER_ADD = "Register/o_add.do";
    //设备修改
    public static final String DEVICE_EDIT = "Device/o_edit.do";
    public static final String CAMERA_UPDATE = "Device/o_update_camera.do";
    //考勤添加
    public static final String ATTENDER_REGISTER_ADD = "Register/o_add_attender.do";
@@ -50,6 +50,7 @@
    //电话呼叫添加
    public static final String PHONE_CALL_ADD = "PhoneCall/o_add.do";
    public static final String ANDROID_DEVICE_UPDATE = "Device/o_update_android_device.do";
    public static class Query {