.idea/caches/build_file_checksums.serBinary files differ
.idea/workspace.xml
@@ -2,7 +2,11 @@ <project version="4"> <component name="AndroidLayouts"> <shared> <config /> <config> <device id="Nexus 10" /> <device id="Nexus 7" /> <device id="Nexus 7 2013" /> </config> </shared> </component> <component name="AndroidLogFilters"> @@ -12,84 +16,19 @@ <component name="ChangeListManager"> <list default="true" id="206165bd-5605-435d-8afd-0c9ec0249d83" name="Default" comment=""> <change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/codeStyles/Project.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_core_common_1_1_1_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_lifecycle_common_1_1_1_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_persistence_room_common_1_1_0_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__android_arch_persistence_room_common_1_1_0_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_collections_28_0_0_rc02_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_collections_28_0_0_rc02_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_2_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_1_2_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_rc02_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_android_support_support_annotations_28_0_0_rc02_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_annotations_2_9_0_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_annotations_2_9_0_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_core_2_9_7_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_core_2_9_7_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_databind_2_9_7_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_databind_2_9_7_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_github_bumptech_glide_annotations_4_8_0_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_github_bumptech_glide_annotations_4_8_0_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_github_bumptech_glide_disklrucache_4_8_0_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_github_bumptech_glide_disklrucache_4_8_0_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_2_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_google_code_gson_gson_2_8_2_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_nineoldandroids_library_2_4_0_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_nineoldandroids_library_2_4_0_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_parse_bolts_bolts_tasks_1_4_0_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_parse_bolts_bolts_tasks_1_4_0_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_10_0_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_okhttp3_okhttp_3_10_0_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_okio_okio_1_14_0_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_okio_okio_1_14_0_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_retrofit2_adapter_rxjava_2_4_0_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_retrofit2_adapter_rxjava_2_4_0_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_4_0_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_retrofit2_converter_gson_2_4_0_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_4_0_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__com_squareup_retrofit2_retrofit_2_4_0_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_1_17_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__io_reactivex_rxjava2_rxjava_2_1_17_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__io_reactivex_rxjava_1_3_0_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__io_reactivex_rxjava_1_3_0_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__junit_junit_4_12_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__junit_junit_4_12_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_androidannotations_androidannotations_api_4_5_2_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_androidannotations_androidannotations_api_4_5_2_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_androidannotations_rest_spring_api_4_5_2_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_androidannotations_rest_spring_api_4_5_2_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_apache_http_legacy_android_28.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_apache_http_legacy_android_28.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_apache_httpcomponents_httpclient_android_4_3_5_1_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_apache_httpcomponents_httpclient_android_4_3_5_1_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jsoup_jsoup_1_11_3_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jsoup_jsoup_1_11_3_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_reactivestreams_reactive_streams_1_0_2_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_springframework_android_spring_android_core_2_0_0_M3_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_springframework_android_spring_android_core_2_0_0_M3_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_springframework_android_spring_android_rest_template_2_0_0_M3_jar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_springframework_android_spring_android_rest_template_2_0_0_M3_jar.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Security_alarm.iml" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_deps" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_deps" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/.ninja_log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeCache.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeCache.txt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/TargetDirectories.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/TargetDirectories.txt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/cmake.check_cache" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/cmake.check_cache" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/feature_tests.bin" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/feature_tests.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/feature_tests.c" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/feature_tests.c" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/feature_tests.cxx" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/feature_tests.cxx" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/native-lib.dir/src/main/cpp/native-lib.cpp.o" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/CMakeFiles/native-lib.dir/src/main/cpp/native-lib.cpp.o" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/android_gradle_build.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/android_gradle_build.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/android_gradle_build_mini.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/android_gradle_build_mini.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/build.ninja" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/build.ninja" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/cmake_build_command.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/cmake_build_command.txt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/cmake_build_output.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/cmake_build_output.txt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/cmake_install.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/cmake_install.cmake" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/rules.ninja" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/debug/armeabi-v7a/rules.ninja" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeCache.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeCache.txt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/TargetDirectories.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/TargetDirectories.txt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/cmake.check_cache" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/cmake.check_cache" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/feature_tests.bin" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/feature_tests.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/feature_tests.c" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/feature_tests.c" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/feature_tests.cxx" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/CMakeFiles/feature_tests.cxx" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/android_gradle_build.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/android_gradle_build.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/android_gradle_build_mini.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/android_gradle_build_mini.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/build.ninja" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/build.ninja" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/cmake_build_command.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/cmake_build_command.txt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/cmake_build_output.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/cmake_build_output.txt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/cmake_install.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/cmake_install.cmake" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/rules.ninja" beforeDir="false" afterPath="$PROJECT_DIR$/app/.externalNativeBuild/cmake/release/armeabi-v7a/rules.ninja" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/basic/security/activity/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/basic/security/activity/MainActivity.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/basic/security/dao/DatabaseManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/basic/security/dao/DatabaseManager.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/basic/security/fragment/SettingFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/basic/security/fragment/SettingFragment.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/basic/security/fragment/helper/HomeGridViewAdapter.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/basic/security/fragment/helper/HomeGridViewAdapter.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/basic/security/manager/AlarmManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/basic/security/manager/AlarmManager.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/basic/security/utils/SocketClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/basic/security/utils/SocketClient.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/basic/security/utils/VideoPath.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/basic/security/utils/VideoPath.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/basic/security/manager/SettingManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/basic/security/manager/SettingManager.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/basic/security/model/Alarm.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/basic/security/model/Alarm.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/basic/security/model/Setting.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/basic/security/model/Setting.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/alarm_view.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/alarm_view.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_setting.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_setting.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="SHOW_DIALOG" value="false" /> @@ -118,7 +57,7 @@ <property name="DeviceAndSnapshotComboBoxAction.selectedDevice" value="6FTK3RQX2A" /> <property name="DeviceAndSnapshotComboBoxAction.selectionTime" value="2020-06-17T06:08:59.493Z" /> <property name="android.sdk.path" value="$USER_HOME$/AppData/Local/Android/Sdk" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/../Security_yuyin_outdoor_white" /> <property name="project.structure.last.edited" value="SDK Location" /> <property name="project.structure.proportion" value="0.17" /> <property name="project.structure.side.proportion" value="0.0" /> app/src/main/java/com/basic/security/activity/MainActivity.java
@@ -19,6 +19,7 @@ import com.basic.security.base.BaseFragment; import com.basic.security.fragment.HomeFragment; import com.basic.security.fragment.SettingFragment; import com.basic.security.manager.SettingManager; import com.basic.security.service.KeepLifeService; import com.basic.security.utils.FFmpeg; import com.basic.security.utils.KeyboardUtil; @@ -52,6 +53,8 @@ public VideoView fullscreenVideoView; @ViewById public TextView currentTime; @ViewById public TextView appTitle; @ViewById public ImageView exit_fullscreen; @ViewById @@ -102,6 +105,8 @@ KeyboardUtil.setupUI(fragment_setting.getView()); stopService(new Intent(this, KeepLifeService.class)); startService(new Intent(this, KeepLifeService.class)); appTitle.setText(SettingManager.getAppTitle()); } @Background app/src/main/java/com/basic/security/dao/DatabaseManager.java
@@ -95,6 +95,11 @@ } catch (Exception e) { e.printStackTrace(); } try { DatabaseManager.execSQL("ALTER TABLE alarm ADD COLUMN alarmLevel text"); } catch (Exception e) { e.printStackTrace(); } DatabaseManager.execSQL("CREATE UNIQUE INDEX IF NOT EXISTS idx_alarm ON alarm(id)"); // DatabaseManager.execSQL("CREATE TABLE IF NOT EXISTS setting (\"id\" TEXT, \"name\" TEXT, PRIMARY KEY(id))"); // DatabaseManager.execSQL("CREATE UNIQUE INDEX IF NOT EXISTS idx_setting ON setting (id)"); app/src/main/java/com/basic/security/fragment/SettingFragment.java
@@ -42,6 +42,8 @@ @ViewById public EditText ip; @ViewById public EditText title; @ViewById public EditText port; @ViewById public Spinner second; @@ -97,11 +99,11 @@ public void show() { saved = false; initData(SettingManager.getIpStr(), SettingManager.getSecondStr(), SettingManager.getAlarmAudioStr(), SettingManager.getPortStr(), SettingManager.getKeepTime(), SettingManager.getKeepTimeType()); SettingManager.getAlarmAudioStr(), SettingManager.getPortStr(), SettingManager.getKeepTime(), SettingManager.getKeepTimeType(), SettingManager.getAppTitle()); } @UiThread public void initData(String ipStr, String secondStr, String alarmAudioStr, String portStr, String keepTimeStr, String keepTimeTypeStr) { public void initData(String ipStr, String secondStr, String alarmAudioStr, String portStr, String keepTimeStr, String keepTimeTypeStr, String appTitle) { if (second != null) { second.setSelection(getSelectedIndex(secondArray, secondStr)); } @@ -120,6 +122,9 @@ } if (portStr != null) { port.setText(portStr); } if (appTitle != null) { title.setText(appTitle); } oldPassword.setText(""); newPassword.setText(""); @@ -391,6 +396,7 @@ String keepTimeTypeStr = keepTimeType.getSelectedItem().toString(); String ipStr = ip.getText().toString().trim(); String portStr = port.getText().toString().trim(); String appTitle = title.getText().toString().trim(); String oldPasswordStr = oldPassword.getText().toString().trim(); String newPasswordStr = newPassword.getText().toString().trim(); String newPassword2Str = newPassword2.getText().toString().trim(); @@ -435,6 +441,7 @@ setting.put(Setting.ip, ipStr); setting.put(Setting.second, secondStr); setting.put(Setting.port, portStr); setting.put(Setting.appTitle, appTitle); setting.put(Setting.password, password); setting.put(Setting.keepTime, keepTimeStr); setting.put(Setting.keepTimeType, keepTimeTypeStr); app/src/main/java/com/basic/security/fragment/helper/HomeGridViewAdapter.java
@@ -212,7 +212,7 @@ viewHolder.alarmAddress.setText(alarm.get("alarmAddress")); viewHolder.alarmTime.setText(alarm.get("alarmTime")); viewHolder.property.setText(alarm.get("property")); viewHolder.alarmType.setText("报警类型: "+alarm.get("alarmType")); viewHolder.alarmType.setText(alarm.get("alarmType") + " " + alarm.get("alarmLevel")); viewHolder.matchPersonList.setVisibility(View.INVISIBLE);
@@ -76,9 +76,9 @@ if (sdkType != null) { apiModel.put("alarmType", apiModel.remove("sdkType")); if (sdkType.equals("人脸")) { apiModel.put("property", apiModel.get("gender") + " " + apiModel.get("ageDescription") + " " + apiModel.get("race")); apiModel.put("alarmPerson", apiModel.remove("tableName")+" "+ apiModel.remove("idcard")); // apiModel.put("property", apiModel.get("gender") + " " + apiModel.get("ageDescription") + " " + apiModel.get("race")); apiModel.put("property", apiModel.remove("showLabels")); apiModel.put("alarmPerson", apiModel.remove("tableName") + " " + apiModel.remove("idcard")); } } apiModel.put("alarmVideo", apiModel.get("videoNum")); @@ -153,7 +153,7 @@ } else { alarm.put("alarmLargePictureValid", "false"); } if (alarmTime < keepStartTime ) { if (alarmTime < keepStartTime) { alarm.put("canClose", "true"); } else { alarm.put("canClose", "false"); @@ -162,8 +162,10 @@ } return sqliteAlarmList; } public static Set<String> newAlarmIdSet = new HashSet<>(); public static Lock newAlarmIdSetLock = new ReentrantLock(); public static void putNewAlarmIdSet(Map<String, String> newRemoteAlarm) { newAlarmIdSetLock.lock(); try { @@ -176,6 +178,7 @@ } newAlarmIdSetLock.unlock(); } public static boolean removeNewAlarmIdSet(Map<String, String> alarm) { newAlarmIdSetLock.lock(); boolean success = false; @@ -203,7 +206,7 @@ newRemoteAlarm.put("table", "alarm"); newRemoteAlarm.put("closeAlarm", "false"); newRemoteAlarm.put("mute", "false"); newRemoteAlarm.put("createTime", new Date().getTime()+""); newRemoteAlarm.put("createTime", new Date().getTime() + ""); save(newRemoteAlarm); putNewAlarmIdSet(newRemoteAlarm); savedCount++; @@ -226,9 +229,11 @@ e.printStackTrace(); } } public static List<Map<String, String>> newSqliteAlarmListBackup = new ArrayList<>(); public static void updateVideoUrl() { HomeFragment homeFragment = ((MainActivity)BaseApplication.getApplication().activity).fragment_home; HomeFragment homeFragment = ((MainActivity) BaseApplication.getApplication().activity).fragment_home; if (homeFragment == null) { return; } @@ -276,7 +281,7 @@ String id = alarm.get(Alarm.id); if (!TextUtils.isEmpty(id)) { if (state) { System.out.println("AlarmManager.putAlarmPlaying " + state + " " +id + FrameUtil.getFrames()); System.out.println("AlarmManager.putAlarmPlaying " + state + " " + id + FrameUtil.getFrames()); } alarmPlayingMapLock.lock(); alarmPlayingMap.put(id, state ? Constants.TRUE : Constants.FALSE); app/src/main/java/com/basic/security/manager/SettingManager.java
@@ -31,6 +31,7 @@ setting.put(Setting.keepTime, SettingFragment.keepTimeArray[0]); setting.put(Setting.keepTimeType, SettingFragment.keepTimeTypeArray[0]); setting.put(Setting.password, "basic"); setting.put(Setting.appTitle, "报警系统"); setting.put("table", Setting.table); save(setting); } @@ -55,6 +56,10 @@ return findSetting().get(Setting.ip); } public static String getAppTitle() { return findSetting().get(Setting.appTitle); } public static String getPortStr() { return findSetting().get(Setting.port); } app/src/main/java/com/basic/security/model/Alarm.java
@@ -19,5 +19,6 @@ public static String indeviceid = "indeviceid"; public static String videoReqNum = "videoReqNum"; public static String picDate = "picDate"; public static String alarmLevel = "alarmLevel"; } app/src/main/java/com/basic/security/model/Setting.java
@@ -11,5 +11,6 @@ public static String keepTimeType = "keepTimeType"; public static String password = "password"; public static String table = "Setting"; public static String appTitle = "appTitle"; } app/src/main/res/layout/activity_main.xml
@@ -30,6 +30,7 @@ android:layout_height="wrap_content" /> <TextView android:layout_gravity="center_vertical" android:id="@+id/appTitle" android:layout_marginLeft="@dimen/w30" android:layout_width="wrap_content" android:layout_height="wrap_content" app/src/main/res/layout/alarm_view.xml
@@ -114,7 +114,7 @@ android:layout_height="wrap_content" android:textColor="@color/colorRed" android:textSize="@dimen/h16" android:text="报警类型：人脸" android:text="报警类型：人脸识别" /> <LinearLayout android:id="@+id/matchPersonListParent" @@ -125,7 +125,7 @@ <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="底库: " android:text="" android:textColor="@color/colorRed" android:textSize="@dimen/h16" /> <RelativeLayout @@ -137,7 +137,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:text="底库：" android:text="" android:textColor="@color/colorRed" android:textSize="@dimen/h16" /> <com.basic.security.widget.CustomSpinner2 @@ -161,6 +161,7 @@ </RelativeLayout> </LinearLayout> <RelativeLayout android:visibility="gone" android:layout_width="match_parent" android:layout_height="wrap_content"> <ImageView app/src/main/res/layout/fragment_setting.xml
@@ -5,20 +5,25 @@ android:layout_height="match_parent" android:id="@+id/fragment_setting" > <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:layout_alignParentStart="true" android:layout_alignParentTop="true" android:orientation="vertical"> <LinearLayout android:layout_gravity="center" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center" android:orientation="horizontal"> <Space android:layout_width="1dp" android:layout_height="0dp" android:layout_weight="1"/> android:layout_weight="1" /> <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -53,10 +58,10 @@ android:layout_width="@dimen/w185" android:layout_height="@dimen/h32" android:background="@drawable/spinner_arrow_down" android:dropDownSelector="@color/transparent" android:dropDownVerticalOffset="0dp" android:paddingBottom="2dp" android:dropDownSelector="@color/transparent" android:paddingTop="2dp" android:paddingBottom="2dp" android:spinnerMode="dropdown" /> <TextView @@ -87,12 +92,37 @@ android:layout_width="@dimen/w108" android:layout_height="wrap_content" android:gravity="right" android:text="标题：" android:textColor="@color/black" android:textSize="@dimen/h13" /> <EditText android:id="@+id/title" android:layout_width="@dimen/w185" android:layout_height="@dimen/h33" android:background="@drawable/bg_edittext1" android:paddingLeft="@dimen/w15" android:singleLine="true" android:textColor="@color/black" android:textCursorDrawable="@null" android:textSize="@dimen/h13" /> </LinearLayout> <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/h24" android:orientation="horizontal"> <TextView android:layout_width="@dimen/w108" android:layout_height="wrap_content" android:gravity="right" android:text="IP：" android:textColor="@color/black" android:textSize="@dimen/h13" /> <EditText android:textCursorDrawable="@null" android:id="@+id/ip" android:layout_width="@dimen/w185" android:layout_height="@dimen/h33" @@ -100,6 +130,7 @@ android:paddingLeft="@dimen/w15" android:singleLine="true" android:textColor="@color/black" android:textCursorDrawable="@null" android:textSize="@dimen/h13" /> </LinearLayout> @@ -118,7 +149,6 @@ android:textSize="@dimen/h13" /> <EditText android:textCursorDrawable="@null" android:id="@+id/port" android:layout_width="@dimen/w185" android:layout_height="@dimen/h33" @@ -126,6 +156,7 @@ android:paddingLeft="@dimen/w15" android:singleLine="true" android:textColor="@color/black" android:textCursorDrawable="@null" android:textSize="@dimen/h13" /> </LinearLayout> @@ -146,8 +177,8 @@ <TextView android:layout_width="@dimen/w108" android:layout_gravity="center_vertical" android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:gravity="right" android:text="声音：" android:textColor="@color/black" @@ -158,10 +189,10 @@ android:layout_width="@dimen/w185" android:layout_height="@dimen/h32" android:background="@drawable/spinner_arrow_down" android:dropDownSelector="@color/transparent" android:dropDownVerticalOffset="0dp" android:paddingBottom="2dp" android:dropDownSelector="@color/transparent" android:paddingTop="2dp" android:paddingBottom="2dp" android:spinnerMode="dropdown" /> </LinearLayout> @@ -195,10 +226,10 @@ android:layout_width="@dimen/w90" android:layout_height="@dimen/h32" android:background="@drawable/spinner_arrow_down" android:dropDownSelector="@color/transparent" android:dropDownVerticalOffset="0dp" android:paddingBottom="2dp" android:dropDownSelector="@color/transparent" android:paddingTop="2dp" android:paddingBottom="2dp" android:spinnerMode="dropdown" /> <com.basic.security.widget.CustomSpinner @@ -207,10 +238,10 @@ android:layout_height="@dimen/h32" android:layout_marginLeft="@dimen/w6" android:background="@drawable/spinner_arrow_down" android:dropDownSelector="@color/transparent" android:dropDownVerticalOffset="0dp" android:paddingBottom="2dp" android:dropDownSelector="@color/transparent" android:paddingTop="2dp" android:paddingBottom="2dp" android:spinnerMode="dropdown" /> </LinearLayout> @@ -239,7 +270,6 @@ android:textSize="@dimen/h13" /> <EditText android:textCursorDrawable="@null" android:id="@+id/oldPassword" android:layout_width="@dimen/w185" android:layout_height="@dimen/h33" @@ -248,8 +278,10 @@ android:paddingLeft="@dimen/w15" android:singleLine="true" android:textColor="@color/black" android:textCursorDrawable="@null" android:textSize="@dimen/h13" /> </LinearLayout> <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -265,7 +297,6 @@ android:textSize="@dimen/h13" /> <EditText android:textCursorDrawable="@null" android:id="@+id/newPassword" android:layout_width="@dimen/w185" android:layout_height="@dimen/h33" @@ -274,8 +305,10 @@ android:paddingLeft="@dimen/w15" android:singleLine="true" android:textColor="@color/black" android:textCursorDrawable="@null" android:textSize="@dimen/h13" /> </LinearLayout> <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -291,7 +324,6 @@ android:textSize="@dimen/h13" /> <EditText android:textCursorDrawable="@null" android:id="@+id/newPassword2" android:layout_width="@dimen/w185" android:layout_height="@dimen/h33" @@ -300,26 +332,27 @@ android:paddingLeft="@dimen/w15" android:singleLine="true" android:textColor="@color/black" android:textCursorDrawable="@null" android:textSize="@dimen/h13" /> </LinearLayout> <TextView android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/w34" android:layout_marginTop="@dimen/h63" android:text="授权" android:textColor="@color/black" android:textSize="@dimen/h15" /> android:textSize="@dimen/h15" android:visibility="gone" /> <LinearLayout android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/h24" android:orientation="horizontal"> android:orientation="horizontal" android:visibility="gone"> <TextView android:layout_width="@dimen/w108" @@ -330,7 +363,6 @@ android:textSize="@dimen/h13" /> <EditText android:textCursorDrawable="@null" android:id="@+id/password" android:layout_width="@dimen/w185" android:layout_height="@dimen/h33" @@ -339,6 +371,7 @@ android:paddingLeft="@dimen/w15" android:singleLine="true" android:textColor="@color/black" android:textCursorDrawable="@null" android:textSize="@dimen/h13" /> </LinearLayout> @@ -358,20 +391,22 @@ android:textSize="@dimen/h13" /> <EditText android:textCursorDrawable="@null" android:id="@+id/confirmNewPassword" android:layout_width="@dimen/w185" android:layout_height="@dimen/h33" android:background="@drawable/bg_edittext1" android:paddingLeft="@dimen/w15" android:singleLine="true" android:textCursorDrawable="@null" android:textSize="@dimen/h13" /> </LinearLayout> </LinearLayout> <Space android:layout_width="1dp" android:layout_height="0dp" android:layout_weight="1"/> android:layout_weight="1" /> <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -387,40 +422,42 @@ <CheckBox android:id="@+id/switch_ethernet" android:layout_marginLeft="@dimen/w34" android:layout_marginTop="@dimen/h26" style="@style/setting_checkbox" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/w34" android:layout_marginTop="@dimen/h26" android:layout_marginRight="@dimen/w46" android:text="以太网开关" android:textColor="@color/black" android:textSize="@dimen/h13" /> <RadioGroup android:id="@+id/ip_mode" android:layout_width="wrap_content" android:layout_height="wrap_content"> <RadioButton android:id="@+id/dhcp" android:layout_marginLeft="@dimen/w108" android:layout_marginTop="@dimen/h24" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/w108" android:layout_marginTop="@dimen/h24" android:button="@drawable/radiobutton" android:text="DHCP自动获取地址" android:textColor="@color/black" android:textSize="@dimen/h13" /> android:textSize="@dimen/h13" /> <RadioButton android:id="@+id/staticip" android:layout_marginLeft="@dimen/w108" android:layout_marginTop="@dimen/h24" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="@dimen/w108" android:layout_marginTop="@dimen/h24" android:button="@drawable/radiobutton" android:text="手动设置如下地址" android:textColor="@color/black" android:textSize="@dimen/h13" /> android:textSize="@dimen/h13" /> </RadioGroup> @@ -439,7 +476,6 @@ android:textSize="@dimen/h13" /> <EditText android:textCursorDrawable="@null" android:id="@+id/ip_address" android:layout_width="@dimen/w185" android:layout_height="@dimen/h33" @@ -447,6 +483,7 @@ android:paddingLeft="@dimen/w15" android:singleLine="true" android:textColor="@drawable/bg_edittext1_color" android:textCursorDrawable="@null" android:textSize="@dimen/h13" /> </LinearLayout> @@ -465,7 +502,6 @@ android:textSize="@dimen/h13" /> <EditText android:textCursorDrawable="@null" android:id="@+id/net_mask" android:layout_width="@dimen/w185" android:layout_height="@dimen/h33" @@ -473,6 +509,7 @@ android:paddingLeft="@dimen/w15" android:singleLine="true" android:textColor="@drawable/bg_edittext1_color" android:textCursorDrawable="@null" android:textSize="@dimen/h13" /> </LinearLayout> @@ -491,7 +528,6 @@ android:textSize="@dimen/h13" /> <EditText android:textCursorDrawable="@null" android:id="@+id/gate_way" android:layout_width="@dimen/w185" android:layout_height="@dimen/h33" @@ -499,6 +535,7 @@ android:paddingLeft="@dimen/w15" android:singleLine="true" android:textColor="@drawable/bg_edittext1_color" android:textCursorDrawable="@null" android:textSize="@dimen/h13" /> </LinearLayout> @@ -518,74 +555,82 @@ <EditText android:id="@+id/dns_server" android:textCursorDrawable="@null" android:layout_width="@dimen/w185" android:layout_height="@dimen/h33" android:background="@drawable/bg_edittext1" android:paddingLeft="@dimen/w15" android:singleLine="true" android:textColor="@drawable/bg_edittext1_color" android:textCursorDrawable="@null" android:textSize="@dimen/h13" /> </LinearLayout> <Space android:layout_width="1dp" android:layout_height="0dp" android:layout_weight="1" /> <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_marginBottom="@dimen/h266"> <Button android:id="@+id/goto_home" android:layout_width="@dimen/w65" android:layout_height="@dimen/h40" android:layout_gravity="center" android:background="@drawable/white_button" android:text="返回" android:textColor="#222" android:textSize="@dimen/h13" /> <Button android:id="@+id/save" android:layout_width="@dimen/w65" android:layout_height="@dimen/h40" android:layout_gravity="center" android:layout_marginLeft="@dimen/w28" android:background="@drawable/blue_button" android:text="保存" android:textColor="@color/white" android:textSize="@dimen/h13" /> <Button android:id="@+id/exit" android:layout_width="@dimen/w65" android:layout_height="@dimen/h40" android:layout_gravity="center" android:layout_marginLeft="@dimen/w28" android:background="@drawable/blue_button" android:text="退出" android:textColor="@color/white" android:textSize="@dimen/h13" android:visibility="gone" /> <Button android:id="@+id/open_system_setting" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="center" android:layout_marginLeft="@dimen/w28" android:background="@drawable/white_button" android:text="打开系统设置" android:textColor="#222" android:textSize="@dimen/h13" /> </LinearLayout> </LinearLayout> <Space android:layout_width="1dp" android:layout_height="0dp" android:layout_weight="1"/> </LinearLayout> <Space android:layout_width="0dp" android:layout_height="1dp" android:layout_weight="1"/> <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/h66" android:layout_gravity="center_horizontal"> <Button android:id="@+id/goto_home" android:layout_width="@dimen/w65" android:layout_height="@dimen/h40" android:textSize="@dimen/h13" android:textColor="#222" android:layout_gravity="center" android:background="@drawable/white_button" android:text="返回"/> android:layout_weight="1" /> <Button android:layout_marginLeft="@dimen/w28" android:id="@+id/save" android:layout_width="@dimen/w65" android:layout_height="@dimen/h40" android:textSize="@dimen/h13" android:textColor="@color/white" android:layout_gravity="center" android:background="@drawable/blue_button" android:text="保存"/> <Button android:id="@+id/exit" android:layout_marginLeft="@dimen/w28" android:layout_width="@dimen/w65" android:layout_height="@dimen/h40" android:textSize="@dimen/h13" android:textColor="@color/white" android:layout_gravity="center" android:background="@drawable/blue_button" android:text="退出" android:visibility="gone" /> <Button android:layout_marginLeft="@dimen/w28" android:id="@+id/open_system_setting" android:layout_width="@dimen/w180" android:layout_height="@dimen/h40" android:textSize="@dimen/h13" android:textColor="#222" android:layout_gravity="center" android:background="@drawable/white_button" android:text="打开系统设置"/> </LinearLayout> </LinearLayout> <TextView app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@ <resources> <string name="app_name">北京市羊坊店第五小学报警系统</string> <string name="app_name">智能计算节点安卓报警系统</string> <!-- TODO: Remove or change this placeholder text --> <string name="hello_blank_fragment">Hello blank fragment</string>
