Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/silence/commonframe/activity/device/activity/context_device/NewContextManagementActivity.java
#	app/src/main/res/values/colors.xml
#	app/src/main/res/values/strings.xml

app/app.iml

@@ -17,7 +17,8 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
@@ -28,14 +29,12 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debugAndroidTest/processDebugAndroidTestResources/r" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
@@ -84,6 +83,8 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
@@ -114,104 +115,106 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: com.amap.api:search:6.9.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.facebook.fresco:drawee-1.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:E.\MyProject\Android_zxyun\app\libs\dewarp.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:interpolator-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.amap.api:location:4.6.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.4.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.amap.api:3dmap:6.9.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:drawerlayout-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:coordinatorlayout-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:cardview-v7-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.airbnb.android:lottie-2.6.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.wx.wheelview:wheelview-1.3.3" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:multidex-1.0.3" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-1.1.3" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:swiperefreshlayout-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.SheHuan:NiceImageView-1.0.3" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:loader:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: cn.jiguang.sdk:jcore:1.2.6@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.airbnb.android:lottie:2.6.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:cursoradapter:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.1.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-compat:28.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.github.bumptech.glide:annotations:4.8.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-1.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:exifinterface-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:versionedparcelable-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.flyco.dialog:FlycoDialog_Lib-1.3.2" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.core:runtime-1.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.contrarywind:Android-PickerView-4.1.6" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support:multidex-instrumentation-1.0.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:loader-28.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.journeyapps:zxing-android-embedded:3.3.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxjava:2.1.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-v4-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.CymChad:BaseRecyclerViewAdapterHelper-2.9.46" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:28.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-gson:2.4.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:gifdecoder-4.8.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:viewpager-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.tencent.mm.opensdk:wechat-sdk-android-with-mta:5.4.0@jar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:support-annotations:28.0.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:E.\MyProject\Android_zxyun\app\libs\commons-lang3-3.1.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.lzy.net:okgo-2.1.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.tencent.mm.opensdk:wechat-sdk-android-with-mta:5.4.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.wx.wheelview:wheelview:1.3.3@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-v4:28.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.3@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.facebook.fresco:animated-base-1.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.PhilJay:MPAndroidChart-v3.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:customview-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.jakewharton:butterknife-8.8.1" level="project" />
-    <orderEntry type="library" name="Gradle: cn.jiguang.sdk:jcore-1.2.6" level="project" />
-    <orderEntry type="library" name="Gradle: com.facebook.fresco:fbcore-1.3.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:glide:4.8.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.code.gson:gson:2.8.5@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.parse.bolts:bolts-tasks:1.4.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.scwang.smartrefresh:SmartRefreshLayout-1.1.0-alpha-14" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:slidingpanelayout-28.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:exifinterface:28.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: org.reactivestreams:reactive-streams:1.0.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel-1.1.1" level="project" />
     <orderEntry type="library" name="Gradle: com.jakewharton:butterknife-annotations:8.8.1@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:glide-4.8.0" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:E.\MyProject\Android_zxyun\app\libs\Core.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.facebook.fresco:fresco-1.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.contrarywind:wheelview-4.0.8" level="project" />
+    <orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxandroid:2.0.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.orhanobut:hawk:1.21@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:asynclayoutinflater:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout:1.1.3@aar" level="project" />
+    <orderEntry type="library" name="Gradle: top.zibin:Luban:1.1.8@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.contrarywind:wheelview:4.0.8@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1@jar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:viewpager:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.facebook.fresco:imagepipeline:1.3.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.10.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:disklrucache:4.8.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Android\Project\Android-zxyun0511\Android-zxyun\app\libs\fastjson-1.2.8.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:customview:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.flyco.dialog:FlycoDialog_Lib:1.3.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.facebook.fresco:animated-gif:1.3.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Android\Project\Android-zxyun0511\Android-zxyun\app\libs\dewarp.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:design:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Android\Project\Android-zxyun0511\Android-zxyun\app\libs\stickygridheaders.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.amap.api:search:6.9.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.facebook.fresco:fresco:1.3.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-fragment:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.facebook.fresco:animated-base:1.3.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel:1.1.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.amap.api:location:4.6.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.facebook.fresco:imagepipeline-base:1.3.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.qianwen:update-app:3.5.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.4.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.amap.api:3dmap:6.9.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.lzy.net:okgo:2.1.4@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:cardview-v7:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.facebook.fresco:drawee:1.3.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Android\Project\Android-zxyun0511\Android-zxyun\app\libs\LibFunSDK.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:D.\Android\Project\Android-zxyun0511\Android-zxyun\app\libs\commons-lang3-3.1.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.jakewharton:butterknife:8.8.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:interpolator:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:transition:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata:1.1.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:drawerlayout:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:gifdecoder:4.8.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.mylhyl:acp:1.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:documentfile:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:slidingpanelayout:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.parse.bolts:bolts-tasks:1.4.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.facebook.fresco:fbcore:1.3.0@aar" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.android.support:multidex-instrumentation:1.0.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.support:collections:28.0.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.yalantis:ucrop-2.2.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.orhanobut:hawk-1.21" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:documentfile-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.mylhyl:acp-1.2.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:design-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-28.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.SheHuan:NiceImageView:1.0.3@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:print:28.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.nostra13.universalimageloader:universal-image-loader:1.9.5@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:cursoradapter-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:asynclayoutinflater-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.facebook.fresco:animated-gif-1.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:E.\MyProject\Android_zxyun\app\libs\LibFunSDK.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:E.\MyProject\Android_zxyun\app\libs\stickygridheaders.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: top.zibin:Luban-1.1.8" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1@jar" level="project" />
-    <orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxandroid-2.0.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.facebook.fresco:imagepipeline-base-1.3.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-alpha-14@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:versionedparcelable:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.zxing:core:3.2.1@jar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.0.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:print-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.10.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.contrarywind:Android-PickerView:4.1.6@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.picasso:picasso:2.5.2@jar" level="project" />
-    <orderEntry type="library" name="Gradle: __local_aars__:E.\MyProject\Android_zxyun\app\libs\fastjson-1.2.8.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:transition-28.0.0" level="project" />
     <orderEntry type="library" name="Gradle: org.greenrobot:eventbus:3.1.1@jar" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-fragment-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.github.bumptech.glide:disklrucache:4.8.0@jar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1@jar" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core-1.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:support-compat-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: cn.jiguang.sdk:jpush-3.1.7" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.facebook.fresco:imagepipeline-1.3.0" level="project" />
-    <orderEntry type="module" module-name="esptouch" />
-    <orderEntry type="module" module-name="nicevideoplayer" />
+    <orderEntry type="library" name="Gradle: com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.46@aar" level="project" />
+    <orderEntry type="library" name="Gradle: cn.jiguang.sdk:jpush:3.1.7@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:coordinatorlayout:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:swiperefreshlayout:28.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:multidex:1.0.3@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.github.PhilJay:MPAndroidChart:v3.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.yalantis:ucrop:2.2.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.lzy.net:okserver:1.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat:28.0.0@aar" level="project" />
     <orderEntry type="module" module-name="photolibrary" />
+    <orderEntry type="module" module-name="nicevideoplayer" />
     <orderEntry type="library" name="Gradle: org.apache.http.legacy-android-28" level="project" />
   </component>
 </module>

app/src/main/java/com/silence/commonframe/activity/MainActivity.java

@@ -25,8 +25,8 @@ import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.bean.JushBean;
 import com.silence.commonframe.bean.VersionBean;
 import com.silence.commonframe.common.constant.BaseConstants;
-import com.silence.commonframe.utils.Logger;
 import com.silence.commonframe.utils.GoSystemSetting;
+import com.silence.commonframe.utils.Logger;
 import com.silence.commonframe.utils.base.BaseUtil;
 import com.vector.update_app.UpdateAppBean;
 import com.vector.update_app.UpdateAppManager;

app/src/main/java/com/silence/commonframe/activity/device/activity/airguard/AirGuardDetailActivity.java

@@ -101,7 +101,7 @@ public class AirGuardDetailActivity extends BaseActivity implements AirGuardDeta
                 presenter.updateDeviceName();
             }
         };
-        new BaseDialog().BaseDialog(this,getResources().getString(R.string.tips),getResources().getString(R.string.dialog_update_name),getResources().getString(R.string.cancle),getResources().getString(R.string.sure),dialogCallBack);
+        new BaseDialog().BaseDialog(this,getResources().getString(R.string.tips),getResources().getString(R.string.dialog_update_name),getResources().getString(R.string.cancel),getResources().getString(R.string.sure),dialogCallBack);
     }
 
     @Override

app/src/main/java/com/silence/commonframe/activity/device/activity/camera/CameraBasicSettingActivity.java

@@ -85,7 +85,7 @@ public class CameraBasicSettingActivity extends BaseActivity implements CameraBa
                     }
                 });
 
-                builder.setNegativeButton(R.string.cancle, new DialogInterface.OnClickListener() {
+                builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
 

app/src/main/java/com/silence/commonframe/activity/home/activity/AdddeviceActivity.java

@@ -93,7 +93,7 @@ public class AdddeviceActivity extends BaseActivity implements AddDeviceListener
                     }
                     @Override
                     public void onDenied(List<String> permissions) {
-                        Toast.makeText(AdddeviceActivity.this, "未开启拍照权限,请手动到设置去开启权限", Toast.LENGTH_LONG).show();
+                        onFile(getResources().getString(R.string.no_camera_permission_need_open));
                     }
                 });
     }
@@ -122,7 +122,7 @@ public class AdddeviceActivity extends BaseActivity implements AddDeviceListener
     @Override
     public void onSuccess(List<DeviceTypeModel.ObjectBean> data) {
         DeviceTypeModel.ObjectBean dataQt = new DeviceTypeModel.ObjectBean();
-        dataQt.setGroupname("其他");
+        dataQt.setGroupname(getResources().getString(R.string.others));
         listData.addAll(data);
 
         if (listData.size() != 0){

app/src/main/java/com/silence/commonframe/activity/home/activity/AdddevicedetailActivity.java

@@ -73,7 +73,7 @@ public class AdddevicedetailActivity extends BaseActivity implements AddDeviceDe
 
     @Override
     public void initView() {
-        setTitle(this,"添加设备","",true);
+        setTitle(this,getResources().getString(R.string.adddevice),"",true);
         Intent intent = getIntent();
         id = intent.getStringExtra("id");
         deviceType = intent.getStringExtra("deviceType");
@@ -109,11 +109,11 @@ public class AdddevicedetailActivity extends BaseActivity implements AddDeviceDe
         avoidDoubleClick(view);
        str1 = devicePlace.getText().toString();
         if (TextUtils.isEmpty(str1)){
-            Toast.makeText(AdddevicedetailActivity.this,"请添加对应的安装位置！",Toast.LENGTH_SHORT).show();
+            onFile(getResources().getString(R.string.please_edit_location));
             return;
         }
-        if ("请选择场所".equals(tv_spinner.getText().toString())){
-            Toast.makeText(AdddevicedetailActivity.this,"请选择场所！",Toast.LENGTH_SHORT).show();
+        if (getResources().getString(R.string.please_choose_site).equals(tv_spinner.getText().toString())){
+            onFile(getResources().getString(R.string.please_choose_site));
             return;
         }
 
@@ -152,7 +152,7 @@ public class AdddevicedetailActivity extends BaseActivity implements AddDeviceDe
         public void onItemClick(AdapterView<?> parent, View view, int position,long id) {
             hideInput();
             mSpinerPopWindow.dismiss();
-            if ("添加场所".equals(listSite.get(position))){
+            if (getResources().getString(R.string.add_site).equals(listSite.get(position))){
                 Intent intent1 = new Intent(AdddevicedetailActivity.this, NewAddSiteActivity.class);
                 intent1.putExtra("type","2");
                 startActivityForResult(intent1,41);
@@ -168,7 +168,7 @@ public class AdddevicedetailActivity extends BaseActivity implements AddDeviceDe
         if (requestCode == 41 && resultCode == 41){
             page = 1;
             presenter.getSite();
-            tv_spinner.setText("请选择场所");
+            tv_spinner.setText(getResources().getString(R.string.please_choose_site));
         }
     }
 
@@ -253,11 +253,11 @@ public class AdddevicedetailActivity extends BaseActivity implements AddDeviceDe
         }
         if (data.getDataList().size() != 0){
             listData.addAll(data.getDataList());
-            listSite.remove("添加场所");
+            listSite.remove(getResources().getString(R.string.add_site));
             for (int i = 0; i < listData.size(); i++){
                 listSite.add(listData.get(i).getDeployment());
             }
-            listSite.add("添加场所");
+            listSite.add(getResources().getString(R.string.add_site));
         }
         mSpinerPopWindow.notifyChange(listSite);
     }

app/src/main/java/com/silence/commonframe/activity/home/activity/DeviceListActivity.java

@@ -50,7 +50,7 @@ public class DeviceListActivity extends BaseActivity implements DeviceListListen
 
     @Override
     public void initView() {
-        setTitle(this,"设备列表","",true);
+        setTitle(this,getResources().getString(R.string.device_list),"",true);
 
         Intent intent = getIntent();
         siteId = intent.getStringExtra("siteId");

app/src/main/java/com/silence/commonframe/activity/home/activity/FirstFragment.java

@@ -2,7 +2,6 @@ package com.silence.commonframe.activity.home.activity;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.Color;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.StaggeredGridLayoutManager;
@@ -25,8 +24,8 @@ import com.silence.commonframe.activity.home.presenter.HomePresenter;
 import com.silence.commonframe.adapter.home.MyAdapter;
 import com.silence.commonframe.base.basemvp.BaseFragment;
 import com.silence.commonframe.bean.TroubleSiteBean;
-import com.silence.commonframe.utils.TitlePopupMenu;
 import com.silence.commonframe.utils.AddDeviceUtils;
+import com.silence.commonframe.utils.TitlePopupMenu;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -128,19 +127,20 @@ public class FirstFragment extends BaseFragment implements HomeInterface.View {
     }
 
     private void setImageAutoProportion(int resourse) {
-        Display display = getActivity().getWindowManager().getDefaultDisplay();
-        DisplayMetrics dm = new DisplayMetrics();
-        display.getMetrics(dm);
-        int width = dm.widthPixels;
-        Bitmap bitmap = BitmapFactory.decodeResource(getResources(), resourse);
-        int bwidth = bitmap.getWidth();
-        int bHeight = bitmap.getHeight();
-        int imageWidth = width;
-        int imageHeight = imageWidth * bHeight / bwidth;
-
-        ViewGroup.LayoutParams para = ivHeader.getLayoutParams();
-        para.height = imageHeight;
-        ivHeader.setLayoutParams(para);
+       if (getActivity() != null){
+           Display display = getActivity().getWindowManager().getDefaultDisplay();
+           DisplayMetrics dm = new DisplayMetrics();
+           display.getMetrics(dm);
+           Bitmap bitmap = BitmapFactory.decodeResource(getResources(), resourse);
+           int bwidth = bitmap.getWidth();
+           int bHeight = bitmap.getHeight();
+           int imageWidth = dm.widthPixels;;
+           int imageHeight = imageWidth * bHeight / bwidth;
+
+           ViewGroup.LayoutParams para = ivHeader.getLayoutParams();
+           para.height = imageHeight;
+           ivHeader.setLayoutParams(para);
+       }
     }
 
     @Override
@@ -158,7 +158,7 @@ public class FirstFragment extends BaseFragment implements HomeInterface.View {
                 if (!"1".equals(troubleListBeans.get(i).getTroubleType())){
                     rvList.setVisibility(View.VISIBLE);
                     ivHeader.setImageResource(R.drawable.home_fault);
-                    llHeader.setBackgroundColor(Color.parseColor("#ff9000"));
+                    llHeader.setBackgroundColor(getResources().getColor(R.color.my_orange));
                     tv_safe.setVisibility(View.GONE);
                     tv_security.setVisibility(View.GONE);
                     setImageAutoProportion(R.drawable.home_fault);   //设置图片自动适配页面
@@ -168,7 +168,7 @@ public class FirstFragment extends BaseFragment implements HomeInterface.View {
                 if ("1".equals(troubleListBeans.get(i).getTroubleType())){
                     rvList.setVisibility(View.VISIBLE);
                     ivHeader.setImageResource(R.drawable.home_fire);
-                    llHeader.setBackgroundColor(Color.parseColor("#f32e2e"));
+                    llHeader.setBackgroundColor(getResources().getColor(R.color.my_orange));
                     tv_safe.setVisibility(View.GONE);
                     tv_security.setVisibility(View.GONE);
                     setImageAutoProportion(R.drawable.home_fire);   //设置图片自动适配页面

app/src/main/java/com/silence/commonframe/activity/home/activity/NewAddSiteActivity.java

@@ -88,7 +88,7 @@ public class NewAddSiteActivity extends BaseActivity implements AddSiteListener.
 
     @Override
     public void initView() {
-        clickTitle(this, "添加场所", "", true);
+        clickTitle(this, getResources().getString(R.string.add_site), "", true);
 
         setResult(41);
         if (Hawk.get(BaseConstants.USER_NAME) != null)
@@ -107,11 +107,11 @@ public class NewAddSiteActivity extends BaseActivity implements AddSiteListener.
                 break;
             case R.id.tv_next:
                 if (TextUtils.isEmpty(etSiteName.getText().toString())){
-                    Toast.makeText(NewAddSiteActivity.this,"场所名称不为空",Toast.LENGTH_SHORT).show();
+                    onFile(getResources().getString(R.string.site_name_cannot_be_null));
                     return;
                 }
                 if (TextUtils.isEmpty(longitude+"")||TextUtils.isEmpty(latitude+"")) {
-                    Toast.makeText(NewAddSiteActivity.this,"定位信息获取失败",Toast.LENGTH_SHORT).show();
+                    onFile(getResources().getString(R.string.fail_to_locate_information));
                     return;
                 }
                 presenter.addSite();
@@ -156,7 +156,7 @@ public class NewAddSiteActivity extends BaseActivity implements AddSiteListener.
 
     @Override
     public void onSuccess(String data) {
-        Toast.makeText(NewAddSiteActivity.this,"场所添加成功",Toast.LENGTH_SHORT).show();
+        onFile(getResources().getString(R.string.success_to_add_site));
         Hawk.put(BaseConstants.NEED_SITE_CHANGE,true);
         BaseDialog.DialogCallBack dialogCallBack = new BaseDialog.DialogCallBack() {
             @Override
@@ -170,7 +170,7 @@ public class NewAddSiteActivity extends BaseActivity implements AddSiteListener.
                 finish();
             }
         };
-        new BaseDialog().BaseDialog(this, "温馨提示:", "是否添加联系人？", "取消", "添加", dialogCallBack);
+        new BaseDialog().BaseDialog(this, getResources().getString(R.string.tips), getResources().getString(R.string.sure_to_add_link_man), getResources().getString(R.string.cancel), getResources().getString(R.string.add), dialogCallBack);
     }
 
     @Override
@@ -219,7 +219,7 @@ public class NewAddSiteActivity extends BaseActivity implements AddSiteListener.
 
                     @Override
                     public void onDenied(List<String> permissions) {
-                        Toast.makeText(NewAddSiteActivity.this, "未开启定位权限,请手动到设置去开启权限", Toast.LENGTH_LONG).show();
+                        onFile(getResources().getString(R.string.no_locate_permission_need_open));
                     }
                 });
     }

app/src/main/java/com/silence/commonframe/activity/home/activity/NewCommonScanActivity.java

@@ -57,7 +57,7 @@ public class NewCommonScanActivity extends BaseActivity implements DecoratedBarc
 
     @Override
     public void initView() {
-        clickTitle(this,"二维码/条形码","",true);
+        clickTitle(this,getResources().getString(R.string.scan_or_barcode),"",true);
         dbView.setTorchListener(this);
         //若没有闪光灯功能，隐藏闪光灯
         if (!hasFlash()){
@@ -126,20 +126,20 @@ public class NewCommonScanActivity extends BaseActivity implements DecoratedBarc
     private void showDialog() {
         CDialog.Builder builder = new CDialog.Builder(this);
         builder.setCancelable(false);
-        builder.setTitle("请输入设备编号");
+        builder.setTitle(getResources().getString(R.string.device_id_hint));
         //    通过LayoutInflater来加载一个xml的布局文件作为一个View对象
         View itemView = LayoutInflater.from(this).inflate(R.layout.item_addsite, null);
         //    设置我们自己定义的布局文件作为弹出框的Content
         builder.setView(itemView);
         final EditText deviceno = (EditText)itemView.findViewById(R.id.deviceno);
-        builder.setPositiveButton("确定", new DialogInterface.OnClickListener()
+        builder.setPositiveButton(getResources().getString(R.string.sure), new DialogInterface.OnClickListener()
         {
             @Override
             public void onClick(DialogInterface dialog, int which)
             {
                 String deviceId = deviceno.getText().toString().trim();
                 if (TextUtils.isEmpty(deviceId)){
-                    Toast.makeText(NewCommonScanActivity.this,"设备编号为空，请输入设备号！",Toast.LENGTH_SHORT).show();
+                    Toast.makeText(NewCommonScanActivity.this,getResources().getString(R.string.id_null_input_again),Toast.LENGTH_SHORT).show();
                     return;
                 }
 
@@ -147,7 +147,7 @@ public class NewCommonScanActivity extends BaseActivity implements DecoratedBarc
                 finish();
             }
         });
-        builder.setNegativeButton("取消", new DialogInterface.OnClickListener()
+        builder.setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener()
         {
             @Override
             public void onClick(DialogInterface dialog, int which)

app/src/main/java/com/silence/commonframe/activity/message/activity/CheckActivity.java

@@ -1,7 +1,6 @@
 package com.silence.commonframe.activity.message.activity;
 
 import android.content.Intent;
-import android.graphics.Color;
 import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.Button;
@@ -15,8 +14,8 @@ import com.silence.commonframe.activity.message.Interface.CheckListener;
 import com.silence.commonframe.activity.message.presenter.CheckPresenter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.bean.BaseBean;
-import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.bean.TroubleDeviceModel;
+import com.silence.commonframe.common.constant.BaseConstants;
 
 import butterknife.BindView;
 
@@ -91,9 +90,17 @@ public class CheckActivity extends BaseActivity implements CheckListener.View {
         tvTemp.setText(mcuTemp);
         tvSmoke.setText(smoke);
 
-        if ("1".equals(dataBean.getTroubleType())) {
-            tvType.setText("火警");
-            tvType.setTextColor(Color.rgb(250, 85, 58));//imageViewfire
+        if ("1".equals(dataBean.getTroubleType())) {//troubleType
+            tvType.setText(getResources().getString(R.string.state_fire));
+            tvType.setTextColor(getResources().getColor(R.color.my_red));
+        }
+        if ("0".equals(dataBean.getTroubleType())) {
+            tvType.setText(getResources().getString(R.string.state_fault));
+            tvType.setTextColor(getResources().getColor(R.color.my_orange));
+        }
+        if ("2".equals(dataBean.getTroubleType())) {
+            tvType.setText(getResources().getString(R.string.others));
+            tvType.setTextColor(getResources().getColor(R.color.myblack));
         }
 
         tvTime.setText(time);
@@ -120,13 +127,13 @@ public class CheckActivity extends BaseActivity implements CheckListener.View {
 
     private void changeType(TextView tvType) {
         btTypetest.setBackgroundResource(R.drawable.bg_corner);
-        btTypetest.setTextColor(Color.rgb(78,105,255));
+        btTypetest.setTextColor(getResources().getColor(R.color.myblue));
         btTypeerror.setBackgroundResource(R.drawable.bg_corner);
-        btTypeerror.setTextColor(Color.rgb(78, 105, 255));
+        btTypeerror.setTextColor(getResources().getColor(R.color.myblue));
         btTypereal.setBackgroundResource(R.drawable.bg_corner);
-        btTypereal.setTextColor(Color.rgb(78, 105, 255));
+        btTypereal.setTextColor(getResources().getColor(R.color.myblue));
         tvType.setBackgroundResource(R.drawable.bg_corner_blue);
-        tvType.setTextColor(Color.rgb(255, 255, 255));
+        tvType.setTextColor(getResources().getColor(R.color.white));
     }
 
     public void click(View view) {

app/src/main/java/com/silence/commonframe/activity/message/activity/FindFragment1.java

@@ -117,6 +117,10 @@ public class FindFragment1 extends BaseFragment implements NewFindListener.View
         }
     }
 
+    /**
+     * 判断搜索类型
+     * @return type
+     */
     private String dealType() {
         if ((type1.equals("ok")) && (type2.equals("ok")) && (type3.equals("ok"))) {
             type = "";

app/src/main/java/com/silence/commonframe/activity/message/activity/NewSubmitActivity.java

@@ -328,7 +328,7 @@ public class NewSubmitActivity extends BaseActivity implements NewSubmitListener
     @Override
     public void onSuccess(String msg) {
         stopLoading();
-        Toast.makeText(NewSubmitActivity.this,"火警信息上报成功", Toast.LENGTH_LONG).show();
+        onFile(getResources().getString(R.string.success_to_submit));
         setResult(2);
         finish();
     }
@@ -423,7 +423,7 @@ public class NewSubmitActivity extends BaseActivity implements NewSubmitListener
 
                     @Override
                     public void onDenied(List<String> permissions) {
-                        Toast.makeText(NewSubmitActivity.this, "未开启录音权限,请手动到设置去开启权限", Toast.LENGTH_LONG).show();
+                        Toast.makeText(NewSubmitActivity.this, getResources().getString(R.string.no_record_permission_need_open), Toast.LENGTH_LONG).show();
                     }
                 });
     }
@@ -440,7 +440,7 @@ public class NewSubmitActivity extends BaseActivity implements NewSubmitListener
 
                     @Override
                     public void onDenied(List<String> permissions) {
-                        Toast.makeText(NewSubmitActivity.this, "未开启读写权限,请手动到设置去开启权限", Toast.LENGTH_LONG).show();
+                        Toast.makeText(NewSubmitActivity.this, getResources().getString(R.string.no_write_read_permission_need_open), Toast.LENGTH_LONG).show();
                     }
                 });
     }
@@ -463,7 +463,7 @@ public class NewSubmitActivity extends BaseActivity implements NewSubmitListener
 
                     @Override
                     public void onDenied(List<String> permissions) {
-                        Toast.makeText(NewSubmitActivity.this, "未开启拍照权限,请手动到设置去开启权限", Toast.LENGTH_LONG).show();
+                        Toast.makeText(NewSubmitActivity.this,  getResources().getString(R.string.no_camera_permission_need_open), Toast.LENGTH_LONG).show();
                     }
                 });
     }
@@ -487,7 +487,7 @@ public class NewSubmitActivity extends BaseActivity implements NewSubmitListener
 
                     @Override
                     public void onDenied(List<String> permissions) {
-                        Toast.makeText(NewSubmitActivity.this, "未开启拍照权限,请手动到设置去开启权限", Toast.LENGTH_LONG).show();
+                        Toast.makeText(NewSubmitActivity.this, getResources().getString(R.string.no_camera_permission_need_open), Toast.LENGTH_LONG).show();
                     }
                 });
     }

app/src/main/java/com/silence/commonframe/activity/message/activity/NewsdetailActivity.java

@@ -1,7 +1,6 @@
 package com.silence.commonframe.activity.message.activity;
 
 import android.content.Intent;
-import android.graphics.Color;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -18,9 +17,9 @@ import com.silence.commonframe.activity.message.presenter.NewsDetailPresenter;
 import com.silence.commonframe.adapter.message.RecheckMsgAdapter;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.bean.NewsDetailByMsgBean;
-import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.bean.RecheckMsgModel;
 import com.silence.commonframe.bean.TroubleDeviceModel;
+import com.silence.commonframe.common.constant.BaseConstants;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,36 +31,36 @@ import butterknife.BindView;
  */
 public class NewsdetailActivity extends BaseActivity implements NewsDetailListener.View {
 
-   @BindView(R.id.tv_sitename)
+    @BindView(R.id.tv_sitename)
     TextView tvSitename;
-   @BindView(R.id.tv_devicetype)
+    @BindView(R.id.tv_devicetype)
     TextView tvDevicetype;
-   @BindView(R.id.tv_no)
+    @BindView(R.id.tv_no)
     TextView tvNo;
-   @BindView(R.id.tv_firetype)
+    @BindView(R.id.tv_firetype)
     TextView tvFiretype;
-   @BindView(R.id.tv_batteryvoltage)
+    @BindView(R.id.tv_batteryvoltage)
     TextView tvBatteryvoltage;
-   @BindView(R.id.tv_signalstrength)
+    @BindView(R.id.tv_signalstrength)
     TextView tvSignalstrength;
-   @BindView(R.id.tv_time)
+    @BindView(R.id.tv_time)
     TextView tvTime;
-   @BindView(R.id.tv_place)
+    @BindView(R.id.tv_place)
     TextView tvPlace;
-   @BindView(R.id.recycle_RecheckMsg)
+    @BindView(R.id.recycle_RecheckMsg)
     RecyclerView RecyclerView_RecheckMsg;
-   @BindView(R.id.tv_no_recheck)
-   TextView tvNoRecheck;
+    @BindView(R.id.tv_no_recheck)
+    TextView tvNoRecheck;
 
-   @BindView(R.id.tv_location)//img_fire
-     TextView tv_location;
-   @BindView(R.id.img_fire)//img_fire
+    @BindView(R.id.tv_location)//img_fire
+    TextView tv_location;
+    @BindView(R.id.img_fire)//img_fire
     ImageView img_fire;
 
-   @BindView(R.id.tv_cputem)
+    @BindView(R.id.tv_cputem)
     TextView tv_cputem;
-   @BindView(R.id.srl_refresh)
-   SmartRefreshLayout srlRefresh;
+    @BindView(R.id.srl_refresh)
+    SmartRefreshLayout srlRefresh;
 
     TroubleDeviceModel.DataBean dataBean;
     List<RecheckMsgModel.DataBean> listDataBean = new ArrayList<>();
@@ -114,18 +113,18 @@ public class NewsdetailActivity extends BaseActivity implements NewsDetailListen
 
             tvDevicetype.setText(dataBean.getDeviceName());
             if ("1".equals(dataBean.getTroubleType())) {//troubleType
-                tvFiretype.setText("火警");
-                tvFiretype.setTextColor(Color.rgb(250, 85, 58));//imageViewfire
+                tvFiretype.setText(getResources().getString(R.string.state_fire));
+                tvFiretype.setTextColor(getResources().getColor(R.color.my_red));
                 img_fire.setImageResource(R.mipmap.redlinght);
-                //     finalImageView.setImageResource(R.drawable.guzhang);
             }
             if ("0".equals(dataBean.getTroubleType())) {
-                tvFiretype.setText("故障");
-                tvFiretype.setTextColor(Color.rgb(255, 153, 51));
+                tvFiretype.setText(getResources().getString(R.string.state_fault));
+                tvFiretype.setTextColor(getResources().getColor(R.color.my_orange));
                 img_fire.setImageResource(R.mipmap.redlinght0);
             }
             if ("2".equals(dataBean.getTroubleType())) {
-                tvFiretype.setText("其他");
+                tvFiretype.setText(getResources().getString(R.string.others));
+                tvFiretype.setTextColor(getResources().getColor(R.color.myblack));
             }
             processId = dataBean.getId();
             msgId = dataBean.getMessageId();

app/src/main/java/com/silence/commonframe/activity/message/activity/NewsdetailActivityShow.java

@@ -140,7 +140,7 @@ public class NewsdetailActivityShow extends BaseActivity implements NewDetailSho
             tvResult.setText("处理结果：" + dataBean.getRecheckName());
         }
         if (TextUtils.isEmpty(dataBean.getRecheckMsg())){
-            tvDescribe.setText("案情描述未填写");
+            tvDescribe.setText(getResources().getString(R.string.no_description_case));
         }else{
             tvDescribe.setText(dataBean.getRecheckMsg()+"");
         }
@@ -173,7 +173,7 @@ public class NewsdetailActivityShow extends BaseActivity implements NewDetailSho
             videoPlayer.setVisibility(View.VISIBLE);
             videoPlayer.setPlayerType(NiceVideoPlayer.TYPE_IJK);
             videoPlayer.setUp(recheckVideo, null);
-            controller.setTitle("视频播放");
+            controller.setTitle(getResources().getString(R.string.video_on));
             Glide.with(NewsdetailActivityShow.this)
                     .load(recheckVideo)
                     .into(controller.imageView());
@@ -239,7 +239,7 @@ public class NewsdetailActivityShow extends BaseActivity implements NewDetailSho
 
                     @Override
                     public void onDenied(List<String> permissions) {
-                        Toast.makeText(NewsdetailActivityShow.this, "未开启读写权限,请手动到设置去开启权限", Toast.LENGTH_LONG).show();
+                        onFile(getResources().getString(R.string.no_write_read_permission_need_open));
                     }
                 });
     }

app/src/main/java/com/silence/commonframe/activity/message/activity/SearchMessageActivity.java

@@ -342,7 +342,7 @@ public class SearchMessageActivity extends BaseActivity {
 
         int j = compare_date(timeStart, timeOver);
         if (j == 1){
-            Toast.makeText(SearchMessageActivity.this,"输入时间有误，请重新确认！",Toast.LENGTH_SHORT).show();
+            Toast.makeText(SearchMessageActivity.this,getResources().getString(R.string.choose_error_time),Toast.LENGTH_SHORT).show();
             return;
         }
 

app/src/main/java/com/silence/commonframe/activity/mine/activity/setup/SetupActivity.java

@@ -68,12 +68,7 @@ public class SetupActivity extends BaseActivity implements SetupListener.View {
         //创建WXAPI
         iwxapi = WXAPIFactory.createWXAPI(this, MyApplication.APP_ID,false);
 
-        startLoading();
-
-        //检查微信是否绑定
-        presenter.checkWXBind();
-
-        //微信是否绑定事件
+        //微信绑定事件
         changeWxBind();
 
         //微信公众号是否推送事件
@@ -86,6 +81,10 @@ public class SetupActivity extends BaseActivity implements SetupListener.View {
             wx_message_connect.setVisibility(View.GONE);
             view_message_connect.setVisibility(View.GONE);
             viewMessageLine.setVisibility(View.GONE);
+        }else {
+            startLoading();
+            //检查微信是否绑定
+            presenter.checkWXBind();
         }
     }
 

app/src/main/java/com/silence/commonframe/activity/mine/activity/setup/WXPublicCodeActivity.java

@@ -105,7 +105,7 @@ public class WXPublicCodeActivity extends BaseActivity {
                 builder.setTitle(getResources().getString(R.string.tips));
                 builder.setMessage(getResources().getString(R.string.save_to_picture));
                 builder.setCancelable(false);
-                builder.setNegativeButton(getResources().getString(R.string.cancle), new DialogInterface.OnClickListener() {
+                builder.setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         dialog.dismiss();

app/src/main/java/com/silence/commonframe/adapter/device/DeviceListAdapter.java

@@ -1,6 +1,5 @@
 package com.silence.commonframe.adapter.device;
 
-import android.graphics.Color;
 import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.LinearLayout;
@@ -39,28 +38,28 @@ public class DeviceListAdapter extends BaseQuickAdapter<DeviceListBean.DataListB
             helper.setText(R.id.item_local,"位置："+item.getDeviceLocation());
             if (item.getTroubleType()!=null&&"1".equals(item.getTroubleType())) {
                 helper.setText(R.id.tv_fire_status,R.string.state_fire);
-                helper.setTextColor(R.id.tv_fire_status,Color.rgb(243, 46, 46));
+                helper.setTextColor(R.id.tv_fire_status,mContext.getResources().getColor(R.color.my_red));
             } else if (item.getTroubleType()!=null&&"2".equals(item.getTroubleType())) {
                 helper.setText(R.id.tv_fire_status,R.string.state_fault);
-                helper.setTextColor(R.id.tv_fire_status,Color.rgb(255, 144, 0));
+                helper.setTextColor(R.id.tv_fire_status,mContext.getResources().getColor(R.color.my_orange));
             }else if (item.getTroubleType()!=null&&"0".equals(item.getTroubleType())) {
                 helper.setText(R.id.tv_fire_status,R.string.state_abnormal);
-                helper.setTextColor(R.id.tv_fire_status,Color.rgb(255, 144, 0));
+                helper.setTextColor(R.id.tv_fire_status,mContext.getResources().getColor(R.color.my_orange));
             }else if (item.getTroubleType()!=null&&"3".equals(item.getTroubleType())) {
                 helper.setText(R.id.tv_fire_status,R.string.state_hidtrouble);
-                helper.setTextColor(R.id.tv_fire_status,Color.rgb(255, 144, 0));
+                helper.setTextColor(R.id.tv_fire_status,mContext.getResources().getColor(R.color.myblack));
             }else{
-                helper.setText(R.id.tv_fire_status,"正常");
-                helper.setTextColor(R.id.tv_fire_status,Color.rgb(78, 105, 255));
+                helper.setText(R.id.tv_fire_status,mContext.getResources().getString(R.string.state_normal));
+                helper.setTextColor(R.id.tv_fire_status,mContext.getResources().getColor(R.color.myblue));
             }
         }else if ("2".equals(item.getDeviceType())){
             helper.setText(R.id.item_local,"位置："+item.getLocation());
-            helper.setText(R.id.tv_fire_status,"1".equals(item.getStatus())?"在线":"离线");
-            helper.setTextColor(R.id.tv_fire_status,"1".equals(item.getStatus())?Color.rgb(78,105,255):Color.rgb(204,204,204));
+            helper.setText(R.id.tv_fire_status,"1".equals(item.getStatus())?mContext.getResources().getString(R.string.state_online):mContext.getResources().getString(R.string.state_outline));
+            helper.setTextColor(R.id.tv_fire_status,"1".equals(item.getStatus())?mContext.getResources().getColor(R.color.myblue):mContext.getResources().getColor(R.color.mygray));
         }else{
             helper.setText(R.id.item_local,"位置："+item.getLocation());
-            helper.setText(R.id.tv_fire_status,"1".equals(item.getStatus())?"在线":"离线");
-            helper.setTextColor(R.id.tv_fire_status,"1".equals(item.getStatus())?Color.rgb(78,105,255):Color.rgb(204,204,204));
+            helper.setText(R.id.tv_fire_status,"1".equals(item.getStatus())?mContext.getResources().getString(R.string.state_online):mContext.getResources().getString(R.string.state_outline));
+            helper.setTextColor(R.id.tv_fire_status,"1".equals(item.getStatus())?mContext.getResources().getColor(R.color.myblue):mContext.getResources().getColor(R.color.mygray));
         }
         itemLayout.setOnClickListener(new View.OnClickListener() {
             @Override

app/src/main/java/com/silence/commonframe/adapter/device/RunningRecordAdapter.java

@@ -1,6 +1,5 @@
 package com.silence.commonframe.adapter.device;
 
-import android.graphics.Color;
 import android.support.annotation.Nullable;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -18,12 +17,15 @@ public class RunningRecordAdapter extends BaseQuickAdapter<DeviceDataChangedBean
     @Override
     protected void convert(BaseViewHolder helper, DeviceDataChangedBean item) {
         helper.setText(R.id.tv_time,item.getInputtime());
-        if (1==item.getDeviceStatus()){
+        if (0==item.getFireAlarm()){
             helper.setText(R.id.tv_status,"状态：正常");
-            helper.setTextColor(R.id.tv_status,Color.rgb(68,68,68));
+            helper.setTextColor(R.id.tv_status,mContext.getResources().getColor(R.color.myblack));
+        }else if (1==item.getFireAlarm()) {
+            helper.setText(R.id.tv_status, "状态：火警");
+            helper.setTextColor(R.id.tv_status, mContext.getResources().getColor(R.color.my_red));
         }else {
-            helper.setText(R.id.tv_status,"状态：火警");
-            helper.setTextColor(R.id.tv_status,Color.rgb(255,85,58));
+            helper.setText(R.id.tv_status,"状态：异常");
+            helper.setTextColor(R.id.tv_status,mContext.getResources().getColor(R.color.my_orange));
         }
         helper.setText(R.id.tv_batteryvoltage,"当前电池电压："+item.getBatteryVoltage()+"V");
         helper.setText(R.id.tv_signalstrength,"信号强度："+item.getSignalStrength());

app/src/main/java/com/silence/commonframe/bean/JushBean.java

@@ -20,8 +20,6 @@ public class JushBean implements Serializable {
 
     public static class DataBean implements Serializable{
         /**
-         * alarmThrdHigh : null
-         * alarmThrdLow : null
          * batteryVoltage : 36
          * deviceId : H000000000000199
          * deviceLocation : 测试安装位置003
@@ -33,10 +31,10 @@ public class JushBean implements Serializable {
          * regionName : 余杭区
          * siteLocation : 浙江省杭州市余杭区中心路1302号靠近天津市建筑工程质量检测中心浙江分中心
          * siteName : 的
+         * token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ7XCJ1c2VySWRcIjpcIjI0MTQ2MmJiZWQ0YzQ1YmZiMGU3NTk5MTlhYjA1MmJmXCIsXCJjbGllbnRJZFwiOlwiRkM6MUE6MTE6NTA6REY6OTRcIixcInR5cGVcIjpcIjJcIn0iLCJpYXQiOjE1NjIzMDUxMzEsImV4cCI6MTU2MjkwOTkzMX0.jiQZd0XMk1GnkXQq18ynnsK5dqHsjbCwCUYwZDazdzO22Y7PzSXT1u37xYH6ydfUHpn8k-96Z6Sq8yIpQrKv2Q
+         * type: 0
          */
 
-        private String alarmThrdHigh;
-        private String alarmThrdLow;
         private String batteryVoltage;
         private String deviceId;
         private String deviceLocation;
@@ -49,6 +47,8 @@ public class JushBean implements Serializable {
         private String mcuTemp;
         private String siteLocation;
         private String siteName;
+        private String token;
+        private String type;
 
         public String getMcuTemp() {
             return mcuTemp;
@@ -58,22 +58,6 @@ public class JushBean implements Serializable {
             this.mcuTemp = mcuTemp;
         }
 
-        public String getAlarmThrdHigh() {
-            return alarmThrdHigh;
-        }
-
-        public void setAlarmThrdHigh(String alarmThrdHigh) {
-            this.alarmThrdHigh = alarmThrdHigh;
-        }
-
-        public String getAlarmThrdLow() {
-            return alarmThrdLow;
-        }
-
-        public void setAlarmThrdLow(String alarmThrdLow) {
-            this.alarmThrdLow = alarmThrdLow;
-        }
-
         public String getBatteryVoltage() {
             return batteryVoltage;
         }
@@ -161,5 +145,21 @@ public class JushBean implements Serializable {
         public void setSiteName(String siteName) {
             this.siteName = siteName;
         }
+
+        public String getToken() {
+            return token;
+        }
+
+        public void setToken(String token) {
+            this.token = token;
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public void setType(String type) {
+            this.type = type;
+        }
     }
 }

app/src/main/java/com/silence/commonframe/jpush/MyReceiver.java

@@ -13,8 +13,10 @@ import android.util.Log;
 import com.google.gson.Gson;
 import com.silence.commonframe.R;
 import com.silence.commonframe.activity.MainActivity;
+import com.silence.commonframe.bean.Data;
 import com.silence.commonframe.bean.JushBean;
 import com.silence.commonframe.bean.TuisongModel;
+import com.silence.tech.ui.MainCompanyActivity;
 
 import cn.jpush.android.api.JPushInterface;
 
@@ -113,9 +115,19 @@ public class MyReceiver extends BroadcastReceiver {
         Log.d(TAG, "[MyReceiver] 用户收到到RICH PUSH CALLBACK: "+ msg );
         TuisongModel tuisongModel = new Gson().fromJson(msg, TuisongModel.class);
         JushBean.DataBean jushBean=new Gson().fromJson(tuisongModel.getData(), JushBean.DataBean.class);
-        Intent intent1 = new Intent(context, MainActivity.class);
-        intent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent1.putExtra("jushBean",jushBean);
-        context.startActivity(intent1);
+        if ("1".equals(jushBean.getType())){
+            Data.setToken(jushBean.getToken());
+            Intent intent1 = new Intent(context, MainCompanyActivity.class);
+            intent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent1.putExtra("jushBean",jushBean);
+            context.startActivity(intent1);
+        }else if ("0".equals(jushBean.getType())){
+            Data.setToken(jushBean.getToken());
+            Intent intent1 = new Intent(context, MainActivity.class);
+            intent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent1.putExtra("jushBean",jushBean);
+            context.startActivity(intent1);
+        }
+
     }
 }

app/src/main/java/com/silence/tech/ui/MainCompanyActivity.java

@@ -2,6 +2,7 @@ package com.silence.tech.ui;
 
 import android.annotation.SuppressLint;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Handler;
 import android.os.Message;
 import android.support.v4.app.Fragment;
@@ -15,17 +16,19 @@ import android.widget.Button;
 import com.orhanobut.hawk.Hawk;
 import com.silence.commonframe.Dialog.BaseDialog;
 import com.silence.commonframe.Dialog.CDialog;
+import com.silence.commonframe.Dialog.FireAlarmActivity;
 import com.silence.commonframe.R;
+import com.silence.commonframe.activity.device.activity.NewDeviceFragment;
 import com.silence.commonframe.activity.mine.activity.MineFragment;
 import com.silence.commonframe.base.basemvp.BaseActivity;
+import com.silence.commonframe.bean.JushBean;
 import com.silence.commonframe.common.constant.BaseConstants;
-import com.silence.commonframe.activity.device.activity.NewDeviceFragment;
 import com.silence.commonframe.lib.funsdk.support.FunSupport;
 import com.silence.commonframe.lib.funsdk.support.OnFunLoginListener;
 import com.silence.commonframe.lib.funsdk.support.models.FunDevice;
 import com.silence.commonframe.lib.funsdk.support.models.FunLoginType;
-import com.silence.commonframe.utils.Logger;
 import com.silence.commonframe.utils.GoSystemSetting;
+import com.silence.commonframe.utils.Logger;
 import com.silence.tech.ui.files.activity.FilesFragment;
 import com.silence.tech.ui.moni.activity.MoniFragment;
 
@@ -54,7 +57,6 @@ public class MainCompanyActivity extends BaseActivity {
     private MineFragment mMineFragment;
     private FragmentManager mFragmentManager;
     private static final int MSG_SET_ALIAS = 101;
-    public static boolean isForeground = false;
 
     @Override
     public int getLayoutId() {
@@ -197,7 +199,22 @@ public class MainCompanyActivity extends BaseActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        isForeground = true;
+        JushBean.DataBean jushBean = (JushBean.DataBean) getIntent().getSerializableExtra("jushBean");
+        if (jushBean != null) {
+            if (mMoniFragment == null) {
+                mMoniFragment = new MoniFragment();
+            }
+            switchFragment(mMoniFragment);
+            switchState(mBtnTabMoni);
+
+            Intent intent = new Intent(MainCompanyActivity.this, FireAlarmActivity.class);
+            intent.putExtra("deviceName1", jushBean.getDeviceName());
+            intent.putExtra("siteName1", jushBean.getSiteName());
+            intent.putExtra("time", jushBean.getEventTime());
+            intent.putExtra("siteLocation", jushBean.getSiteLocation());
+            startActivity(intent);
+            getIntent().removeExtra("jushBean");
+        }
     }
     @SuppressLint("HandlerLeak")
     private final Handler mHandler = new Handler() {

app/src/main/res/values/colors.xml

@@ -17,6 +17,8 @@
     <color name="thinwhite">#f3f3f3</color>
     <color name="gray_333">#333333</color>
     <color name="gray_666">#666666</color>
+    <color name="my_orange">#ff9000</color>
+    <color name="my_red">#f32e2e</color>
 
     <color name="transparent">#00000000</color>
     <color name="text_black">#666666</color><!--正式发布时改成666666-->

app/src/main/res/values/strings.xml

@@ -14,7 +14,9 @@
     <!--<string name="app_name">MyZxing</string>-->
     <string name="submit">提交</string>
     <string name="sure">确定</string>
-    <string name="cancle">取消</string>
+    <string name="cancel">取消</string>
+    <string name="more">更多</string>
+    <string name="add">添加</string>
 
     <string name="name">名称：</string>
     <string name="address">地址：</string>
@@ -24,14 +26,28 @@
     <string name="firemessage_nothing">空空如也</string>
     <string name="no_site">请先添加场所</string>
 
-    <!-- 弹窗 -->
+    <!-- 弹窗/提示 -->
     <string name="tips">提示</string>
     <string name="save_to_picture">保存到相册？</string>
     <string name="login_out">退出登录</string>
+    <string name="sure_to_add_link_man">是否添加联系人？</string>
+    <string name="dialog_update_name">确定修改名称么？</string>
+    <string name="id_null_input_again">设备编号为空，请重新输入！</string>
+    <string name="no_camera_permission_need_open">未开启拍照权限,请手动到设置去开启权限</string>
+    <string name="no_locate_permission_need_open">未开启定位权限,请手动到设置去开启权限</string>
+    <string name="no_write_read_permission_need_open">未开启读写权限,请手动到设置去开启权限</string>
+    <string name="no_record_permission_need_open">未开启读写权限,请手动到设置去开启权限</string>
 
     <!-- 登录 -->
     <string name="other_login">其他方式登录</string>
 
+    <!--微信-->
+    <string name="errcode_success">发送成功</string>
+    <string name="errcode_cancel">发送取消</string>
+    <string name="errcode_deny">发送被拒绝</string>
+    <string name="errcode_unsupported">不支持错误</string>
+    <string name="errcode_unknown">发送返回</string>
+
     <!-- 微信登录 -->
     <string name="wxlogin_code_error">微信code失效，请重新获取</string>
     <string name="wxlogin_need_bindphone">绑定手机号</string>
@@ -65,7 +81,7 @@
         <item>摄像头</item>
         <item>空气卫士</item>
     </string-array>
-    <!-- 设备页面标题栏 -->
+    <!-- 档案页面标题栏 -->
     <string-array name="archives_type">
         <item>火警</item>
         <item>故障</item>
@@ -78,6 +94,8 @@
     <string name="device_camera">摄像头</string>
     <string name="device_smokedetector_number">000001</string>    <!-- 烟感 -->
     <string name="device_camera_number">000002</string>    <!-- 摄像头 -->
+    <string name="device_airguard">空气卫士</string>
+    <string name="others">其他</string>
 
     <!-- 添加设备界面 -->
     <string name="device_list">设备列表</string>
@@ -87,6 +105,7 @@
     <string name="device_name">设备名称：</string>
     <string name="device_id_hint">请输入设备编号</string>
     <string name="scan_or_barcode">二维码/条形码</string>
+    <!-- 添加设备（摄像头） -->
 
     <string name="sweep_to_adddevice">扫码添加设备(推荐)</string>
     <string name="input_to_adddevice">输入设备号添加设备</string>
@@ -100,12 +119,22 @@
     <string name="wifi_password_hint">请输入您的WiFi密码</string>
     <string name="wifi_tips">*请尽可能保持设备，手机，网络之间的距离足够近；长按SET键直到指示灯快闪（部分产品可能需要顶针轻插配置孔）</string>
 
+    <!-- 添加设备详情 -->
+    <string name="add_site">添加场所</string>
+    <string name="please_choose_site">请选择场所</string>
+    <string name="please_edit_location">请添加对应的安装位置</string>
+
     <!-- 设备详情 -->
     <string name="devicedetail">设备详情</string>
     <string name="devicedetail_runningmessage">运行记录</string>
     <string name="devicedetail_associateddevicemessage">关联设备信息</string>
     <string name="devicedetail_associateddevicemanagement">关联设备管理</string>
 
+    <!-- 添加场所 -->
+    <string name="site_name_cannot_be_null">场所名称不为空</string>
+    <string name="fail_to_locate_information">定位信息获取失败</string>
+    <string name="success_to_add_site">场所添加成功</string>
+
     <!-- 关联管理界面 -->
     <string name="devicecontext_management">管理</string>
     <string name="devicecontext_nocamera">还未关联任何摄像头设备</string>
@@ -152,6 +181,16 @@
     <string name="fire_check">火警处理</string>
     <string name="message_submit">信息上报</string>
     <string name="search">搜索</string>
+    <string name="choose_error_time">选择的时间有误，请重新选择</string>
+
+    <!-- 处理详情 -->
+    <string name="no_description_case">案情描述未填写</string>
+    <string name="RecheckMsg_name">复核人员：</string>
+    <string name="RecheckMsg_time">处理时间：</string>
+    <string name="RecheckMsg_result">处理结果：</string>
+    <string name="video_on">视频播放</string>
+    <string name="video_off">播放完毕</string>
+    <string name="success_to_submit">火警信息上报成功</string>
 
     <!-- 我的 -->
     <string name="site_list">场所列表</string>
@@ -166,6 +205,21 @@
     <string name="user_agreement">用户协议</string>
     <string name="privacy_policy">隐私政策</string>
 
+    <!-- 空气卫士 -->
+    <string name="airguard_worktime">工作时间段</string>
+    <string name="airguard_newtime">新建时间段</string>
+    <string name="airguard_timeclock">实时时钟</string>
+    <string name="airguard_detail">设备详情</string>
+    <string name="airguard_gotosetup">去设置 》</string>
+    <string name="airguard_buzzer">蜂鸣器</string>
+    <string name="airguard_power">电源开关</string>
+    <string name="airguard_now_time">当前时间</string>
+    <string name="airguard_syntime">同步网络时间</string>
+    <string name="airguard_id">编号：</string>
+    <string name="airguard_name">名称</string>
+    <string name="wind_speed">风速</string>
+    <string name="airguard_tips_starttime_morethan_endtime">开始时间请小于结束时间</string>
+
 
     <string name="EE_OK">OK</string>
     <string name="EE_OBJ_NOT_EXIST">EE_OBJ_NOT_EXIST</string>
@@ -623,46 +677,10 @@
 
     <!--鱼眼灯泡控制相关字段-->
 
-
     <string name="wake_up_device">唤醒设备</string>
     <string name="talk_by_double_direction">双向对讲开启</string>
 
 
-    <!--微信-->
-    <string name="errcode_success">发送成功</string>
-    <string name="errcode_cancel">发送取消</string>
-    <string name="errcode_deny">发送被拒绝</string>
-    <string name="errcode_unsupported">不支持错误</string>
-    <string name="errcode_unknown">发送返回</string>
-
-
-    <string name="RecheckMsg_name">复核人员：</string>
-    <string name="RecheckMsg_time">处理时间：</string>
-    <string name="RecheckMsg_result">处理结果：</string>
-
-    <!-- 空气卫士 -->
-    <string name="airguard_worktime">工作时间段</string>
-    <string name="airguard_newtime">新建时间段</string>
-    <string name="airguard_timeclock">实时时钟</string>
-    <string name="airguard_detail">设备详情</string>
-    <string name="airguard_gotosetup">去设置 》</string>
-    <string name="airguard_buzzer">蜂鸣器</string>
-    <string name="airguard_power">电源开关</string>
-    <string name="airguard_now_time">当前时间</string>
-    <string name="airguard_syntime">同步网络时间</string>
-    <string name="airguard_id">编号：</string>
-    <string name="airguard_name">名称</string>
-    <string name="wind_speed">风速</string>
-    <string name="airguard_tips_starttime_morethan_endtime">开始时间请小于结束时间</string>
-
-    <string name="more">更多</string>
-    <string name="add">添加</string>
-
-    <!-- 弹窗 -->
-    <string name="dialog_update_name">确定修改名称么？</string>
-    <string name="device_airguard">空气卫士</string>
-
-
     <!-- demo -->
     <string name="menu_item_about">About App</string>
     <string name="about_app_version">App Version: %s</string>