6.29

合并版

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" />
@@ -113,110 +114,110 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <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.android.databinding:library-1.2.1" 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.databinding:adapters-1.2.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:cardview-v7-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:drawerlayout-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.android.support.constraint:constraint-layout-1.1.3" 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: com.scwang.smartrefresh:SmartRefreshHeader:1.1.0-alpha-14@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: com.android.support:exifinterface-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: com.android.support:versionedparcelable-28.0.0" 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: cn.bingoogolapple:bga-refreshlayout:1.1.7@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: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:support-annotations:28.0.0@jar" 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.lzy.net:okgo-2.1.4" level="project" />
+    <orderEntry type="library" name="Gradle: com.wx.wheelview:wheelview:1.3.3@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.android.databinding:baseLibrary:2.2.2@jar" 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: 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.jakewharton:butterknife-8.8.1" 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.scwang.smartrefresh:SmartRefreshLayout-1.1.0-alpha-14" 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.contrarywind:wheelview-4.0.8" level="project" />
-    <orderEntry type="library" name="Gradle: cn.bingoogolapple:bga-baseadapter-1.2.9" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:documentfile-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.android.support:design-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:cursoradapter-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: top.zibin:Luban-1.1.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" name="Gradle: com.facebook.fresco:imagepipeline-base-1.3.0" 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.android.support:transition-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: 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:appcompat-v7-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.facebook.fresco:imagepipeline-1.3.0" 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:drawee-1.3.0" 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.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.squareup.retrofit2:retrofit:2.4.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.databinding:library:1.2.1@aar" 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:coordinatorlayout-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: cn.bingoogolapple:bga-refreshlayout-1.1.7" level="project" />
-    <orderEntry type="library" name="Gradle: com.wx.wheelview:wheelview-1.3.3" level="project" />
-    <orderEntry type="library" name="Gradle: com.youth.banner:banner-1.4.9" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:multidex-1.0.3" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:swiperefreshlayout-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-1.1.1" 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: __local_aars__:D.\Android\Project\Android-zxyun0511\Android-zxyun\app\libs\Core.jar:unspecified@jar" 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: com.android.support:loader-28.0.0" 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:viewpager-28.0.0" 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.facebook.fresco:animated-base-1.3.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:customview-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: cn.jiguang.sdk:jcore-1.2.6" 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: cn.bingoogolapple:bga-baseadapter:1.2.9@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.youth.banner:banner:1.4.9@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:support-core-ui-28.0.0" level="project" />
-    <orderEntry type="library" name="Gradle: com.facebook.fresco:fresco-1.3.0" 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.mylhyl:acp-1.2.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:asynclayoutinflater-28.0.0" 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: 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.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" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.databinding:adapters:1.2.1@aar" 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.scwang.smartrefresh:SmartRefreshHeader-1.1.0-alpha-14" 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: 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: android.arch.lifecycle:livedata-core-1.1.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-28.0.0" level="project" />
-    <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.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/App.java

@@ -1,12 +1,10 @@
 package com.silence.commonframe;
 
-import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.support.multidex.MultiDex;
 
-
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.cache.CacheEntity;
 import com.lzy.okgo.cache.CacheMode;
@@ -29,13 +27,10 @@ import com.silence.commonframe.lib.funsdk.support.FunPath;
 import com.silence.commonframe.lib.funsdk.support.FunSupport;
 import com.silence.commonframe.utils.Engine;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
 
 import cn.jpush.android.api.JPushInterface;
-//import download.XDownloadFileManager;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
 
@@ -47,14 +42,11 @@ public class App extends Application {
     public static SharedPreferences shared;//简单存储
     String APPtype = "zxyg";
 
-
     //AppID
     public static final String APP_ID = "wx043e23f87bef857c";
     public static final String APP_Secret = "b791c2d39c651930d94cbc90aa91444e";
     public static final int PERMISSIONS_REQUEST_STORAGE = 1;
 
-  /*  public static List<Activity> oList;//用于存放所有启动的Activity的集合*/
-
 
     @Override
     public void onCreate() {
@@ -63,13 +55,13 @@ public class App extends Application {
         /**
          * 以下是FunSDK初始化
          */
-   //     FunSupport.getInstance().init(this);
+        FunSupport.getInstance().init(this);
 
         /**
          * 以下是网络图片下载等的本地缓存初始化,可以加速图片显示,和节省用户流量
          * 跟FunSDK无关,只跟com.example.download内容相关
          */
-   /*     String cachePath = FunPath.getCapturePath();
+        String cachePath = FunPath.getCapturePath();
         XDownloadFileManager.setFileManager(
                 cachePath, 				// 缓存目录
                 20 * 1024 * 1024		// 20M的本地缓存空间
@@ -83,8 +75,6 @@ public class App extends Application {
                 .addConverterFactory(GsonConverterFactory.create())
                 .build().create(Engine.class);
 
-        oList = new ArrayList<Activity>();
-
         Hawk.init(this)
                 .setEncryptionMethod(HawkBuilder.EncryptionMethod.MEDIUM)
                 .setStorage(HawkBuilder.newSqliteStorage(this))
@@ -152,9 +142,9 @@ public class App extends Application {
             e.printStackTrace();
         }
 
-        *//**
+        /**
          * 极光推送
-         *//*
+         */
 
         JPushInterface.setDebugMode(false); 	// 设置开启日志,发布时请关闭日志
         JPushInterface.init(this);
@@ -176,7 +166,7 @@ public class App extends Application {
                 //指定为经典Footer，默认是 BallPulseFooter
                 return new ClassicsFooter(context).setDrawableSize(20);
             }
-        });*/
+        });
     }
    @Override
     protected void attachBaseContext(Context base) {

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

@@ -1,12 +1,10 @@
 package com.silence.commonframe.activity;
 
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Build;
-import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.support.v4.app.Fragment;
@@ -19,36 +17,29 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.widget.Button;
 
-import com.google.gson.Gson;
 import com.orhanobut.hawk.Hawk;
-import com.silence.commonframe.App;
 import com.silence.commonframe.Dialog.BaseDialog;
 import com.silence.commonframe.Dialog.CDialog;
 import com.silence.commonframe.R;
+import com.silence.commonframe.activity.message.activity.FindFragment1;
+import com.silence.commonframe.activity.mine.activity.MineFragment;
 import com.silence.commonframe.base.basemvp.BaseActivity;
-import com.silence.commonframe.bean.JsonBean;
 import com.silence.commonframe.bean.JushBean;
 import com.silence.commonframe.common.constant.BaseConstants;
-import com.silence.commonframe.activity.message.activity.FindFragment1;
 import com.silence.commonframe.fragment.FirstFragment;
-import com.silence.commonframe.activity.mine.activity.MineFragment;
 import com.silence.commonframe.fragment.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.model.TuisongModel;
 import com.silence.commonframe.tuisong.Logger;
-import com.silence.commonframe.utils.AtyContainer;
 import com.silence.commonframe.utils1.GoSystemSetting;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 import cn.jpush.android.api.JPushInterface;
 import cn.jpush.android.api.TagAliasCallback;
@@ -69,13 +60,13 @@ public class MainActivity extends BaseActivity implements OnFunLoginListener {
     private FragmentManager mFragmentManager;
     private static final int MSG_SET_ALIAS = 101;
     public static boolean isForeground = false;
-    public List<FunDevice> mLanDeviceList = new ArrayList<>();
+    public static List<FunDevice> mLanDeviceList = new ArrayList<>();
 
     public void setLanDeviceList(List<FunDevice> mLanDeviceList) {
         this.mLanDeviceList = mLanDeviceList;
     }
 
-    public List<FunDevice> getLanDeviceList() {
+    public static List<FunDevice> getLanDeviceList() {
         return mLanDeviceList;
     }
 

app/src/main/java/com/silence/commonframe/activity/login/WelcomeActivity.java

@@ -1,22 +1,16 @@
 package com.silence.commonframe.activity.login;
 
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.Nullable;
 
-import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.orhanobut.hawk.Hawk;
 import com.silence.commonframe.ApiService;
 import com.silence.commonframe.R;
 import com.silence.commonframe.activity.MainActivity;
-import com.silence.commonframe.activity.login.LoginActivity;
-import com.silence.commonframe.activity.login.LoginCompanyActivity;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.common.constant.BaseConstants;
 import com.silence.commonframe.utils.Data;
@@ -79,8 +73,8 @@ public class WelcomeActivity extends BaseActivity {
 
     @Override
     public void initView() {
-       /* sp = this.getSharedPreferences("userinfo", Context.MODE_PRIVATE);
-        init();*/
+        sp = this.getSharedPreferences("userinfo", Context.MODE_PRIVATE);
+        init();
     }
 
     private void init() {

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

@@ -37,13 +37,13 @@ public class DeviceListAdapter extends BaseQuickAdapter<DeviceListBean.DataListB
         helper.setText(R.id.item_content,"编号："+item.getDeviceId());
         if ("1".equals(item.getDeviceType())){
             helper.setText(R.id.item_local,"位置："+item.getDeviceLocation());
-            if (item.getTroubleType()!=null&&"1".equals(item.getTroubleType())) {
+            if (item.getTroubleType()!=null&&"".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));
-            } else if (item.getTroubleType()!=null&&"0".equals(item.getTroubleType())) {
+            } 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));
-            }else if (item.getTroubleType()!=null&&"2".equals(item.getTroubleType())) {
+            }else if (item.getTroubleType()!=null&&"1".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));
             }else{

app/src/main/java/com/silence/commonframe/fragment/NewDeviceFragment.java

@@ -21,11 +21,11 @@ import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
 import com.silence.commonframe.R;
-import com.silence.commonframe.activity.home.activity.AdddeviceActivity;
-import com.silence.commonframe.activity.airguard.activity.AirGuardActivity;
-import com.silence.commonframe.activity.home.activity.CommonScanActivity;
 import com.silence.commonframe.activity.MainActivity;
 import com.silence.commonframe.activity.NewDeviceDetailActivity;
+import com.silence.commonframe.activity.airguard.activity.AirGuardActivity;
+import com.silence.commonframe.activity.home.activity.AdddeviceActivity;
+import com.silence.commonframe.activity.home.activity.CommonScanActivity;
 import com.silence.commonframe.activity.home.activity.NewAddSiteActivity;
 import com.silence.commonframe.adapter.DeviceListAdapter;
 import com.silence.commonframe.adapter.DeviceTitleAdapter;
@@ -51,7 +51,6 @@ import java.util.Arrays;
 import java.util.List;
 
 import butterknife.BindView;
-import butterknife.OnClick;
 
 @SuppressLint("ValidFragment")
 public class NewDeviceFragment extends BaseFragment implements NewDeviceListener.View,DeviceListAdapter.IonSlidingViewClickListener,DeviceListAdapter.ItemClickListener {

app/src/main/java/com/silence/commonframe/utils1/AddDeviceUtils.java

@@ -5,6 +5,7 @@ import android.content.Intent;
 
 import com.silence.commonframe.R;
 import com.silence.commonframe.activity.home.activity.AdddeviceActivity;
+import com.silence.commonframe.activity.home.activity.NewAddSiteActivity;
 import com.silence.commonframe.utils.ManagePopupMenu;
 import com.silence.commonframe.utils.TitlePopupMenu;
 
@@ -16,7 +17,7 @@ public class AddDeviceUtils {
                 if (desc.equals("添加设备")) {
                     mActivity.startActivity(new Intent(mActivity, AdddeviceActivity.class));
                 } else if (desc.equals("添加场所")) {
-                    mActivity.startActivity(new Intent(mActivity, AddSiteActivity.class));
+                    mActivity.startActivity(new Intent(mActivity, NewAddSiteActivity.class));
                 }
             }
         });

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

@@ -1,35 +1,24 @@
 package com.silence.tech.ui;
 
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.content.DialogInterface;
-import android.graphics.Color;
-import android.os.Build;
 import android.os.Handler;
 import android.os.Message;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.app.NotificationManagerCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
 import android.view.KeyEvent;
 import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
 import android.widget.Button;
 
 import com.orhanobut.hawk.Hawk;
-import com.silence.commonframe.App;
 import com.silence.commonframe.Dialog.BaseDialog;
 import com.silence.commonframe.Dialog.CDialog;
 import com.silence.commonframe.R;
-import com.silence.commonframe.activity.MainActivity;
-import com.silence.commonframe.activity.message.activity.FindFragment1;
 import com.silence.commonframe.activity.mine.activity.MineFragment;
 import com.silence.commonframe.base.basemvp.BaseActivity;
 import com.silence.commonframe.common.constant.BaseConstants;
-import com.silence.commonframe.fragment.FirstFragment;
 import com.silence.commonframe.fragment.NewDeviceFragment;
 import com.silence.commonframe.lib.funsdk.support.FunSupport;
 import com.silence.commonframe.lib.funsdk.support.OnFunLoginListener;
@@ -37,10 +26,8 @@ import com.silence.commonframe.lib.funsdk.support.models.FunDevice;
 import com.silence.commonframe.lib.funsdk.support.models.FunLoginType;
 import com.silence.commonframe.tuisong.Logger;
 import com.silence.commonframe.utils1.GoSystemSetting;
-import com.silence.tech.ui.device.activity.DeviceTechFragment;
 import com.silence.tech.ui.files.activity.FilesFragment;
 import com.silence.tech.ui.moni.activity.MoniFragment;
-import com.silence.tech.ui.my.activity.MineTechFragment;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -111,7 +98,6 @@ public class MainCompanyActivity extends BaseActivity implements OnFunLoginListe
         //预加载设备fragment，因为那个页费时
         mFragmentManager.beginTransaction().add(R.id.fragment_container, mDeviceTechFragment).hide(mDeviceTechFragment).commit();
 
-        addActivity(this);
         FunSupportlogin();
 
         mHandler.sendMessage(mHandler.obtainMessage(MSG_SET_ALIAS, Hawk.get(BaseConstants.LOGIN_ID) + ""));//fc9b1aeb8e5c4debb0b8ae79569d99a6
@@ -236,12 +222,6 @@ public class MainCompanyActivity extends BaseActivity implements OnFunLoginListe
         isForeground = true;
     }
 
-    /*** 添加Activity*/
-    public void addActivity(Activity activity) {// 判断当前集合中不存在该Activity
-        if (!App.oList.contains(activity)) {
-            App.oList.add(activity);//把当前Activity添加到集合中}
-        }
-    }
     public void  FunSupportlogin(){
         // 切换到网络访问访问方式
         FunSupport.getInstance().setLoginType(FunLoginType.LOGIN_BY_INTENTT);

app/src/main/res/drawable/spinner_selector.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="true">
-        <layer-list>
-            <item>
-                <shape>
-                    <padding android:right="5dp"></padding>
-                </shape>
-            </item>
-            <item  android:gravity="center_vertical|right">
-                <bitmap android:gravity="center_vertical|right" android:src="@drawable/ic_pack_up"/>
-            </item>
-        </layer-list>
-    </item>
-
-    <item>
-        <layer-list>
-            <item>
-                <shape>
-                    <padding android:right="5dp"></padding>
-                </shape>
-            </item>
-            <item>
-                <bitmap android:gravity="center_vertical|right" android:src="@drawable/ic_pack_down"/>
-            </item>
-        </layer-list>
-    </item>
-</selector>

app/src/main/res/drawable/spinner_selector2.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="true">
-        <layer-list>
-            <item>
-                <shape>
-                    <padding android:left="10dp"></padding>
-                </shape>
-            </item>
-            <item  android:gravity="center_vertical|right">
-                <bitmap android:gravity="center_vertical|right" android:src="@drawable/ic_pack_up"/>
-            </item>
-        </layer-list>
-    </item>
-
-    <item>
-        <layer-list>
-            <item>
-                <shape>
-                    <padding android:left="10dp"></padding>
-                </shape>
-            </item>
-            <item>
-                <bitmap android:gravity="center_vertical|right" android:src="@drawable/ic_pack_down"/>
-            </item>
-        </layer-list>
-    </item>
-</selector>

app/src/main/res/layout/item_spinner.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:text="1"
-    android:textColor="#444"
-    android:textSize="14sp"
-    android:paddingTop="5dp"
-    android:paddingBottom="5dp"
-    android:paddingLeft="5dp"
-    android:layout_marginRight="30dp"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@drawable/bg_spinner_textview"
-    >
-
-</TextView>
-
-
-
-

app/src/main/res/layout/recyclerview_item_layout.xml

@@ -5,11 +5,12 @@
     android:layout_height="55dp"
     android:descendantFocusability="blocksDescendants"
     android:orientation="horizontal">
+
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="55dp"
-        android:gravity="center"
-        >
+        android:gravity="center">
+
         <LinearLayout
             android:id="@+id/item_layout"
             android:layout_width="match_parent"
@@ -17,8 +18,7 @@
             android:background="#ffffff"
             android:orientation="horizontal"
             android:gravity="center_vertical"
-            android:layout_centerVertical="true"
-            >
+            android:layout_centerVertical="true">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -53,7 +53,7 @@
                     android:id="@+id/tv_fire_status"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_weight="0.5"
+
                     android:gravity="center"
                     android:textColor="#fa5656"
                     android:textSize="16sp" />

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

@@ -204,16 +204,6 @@
         <item name="android:button">@null</item>
     </style>
 
-
-    <style name="spinner_style" parent="Base.Widget.AppCompat.Spinner">
-        <item name="android:background">@drawable/spinner_selector</item>
-    </style>
-
-    <style name="spinner_style2" parent="Base.Widget.AppCompat.Spinner">
-        <item name="android:background">@drawable/spinner_selector2</item>
-    </style>
-
-
     <!--<style name="picture.default.style" parent="Theme.AppCompat.Light.DarkActionBar">-->
         <!--&lt;!&ndash; Customize your theme here. &ndash;&gt;-->
         <!--&lt;!&ndash;标题栏背景色&ndash;&gt;-->