设备热点连接和恢复出厂设置更新

BageView/build/intermediates/blame/res/androidTest/debug/multi/values.json

@@ -1,6 +1,6 @@
 [
     {
-        "outputFile": "C:\\ifish\\BageView\\build\\intermediates\\incremental\\mergeDebugAndroidTestResources\\merged.dir\\values\\values.xml",
+        "outputFile": "C:\\beifen\\ifish\\ifish\\BageView\\build\\intermediates\\incremental\\mergeDebugAndroidTestResources\\merged.dir\\values\\values.xml",
         "map": []
     }
 ]

BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties

@@ -1 +1 @@
-#Tue Apr 24 16:44:46 CST 2018
+#Sun Sep 02 17:38:21 CST 2018

BageView/build/intermediates/incremental/mergeDebugAndroidTestResources/merger.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="debug$Generated" generated="true"><source path="C:\ifish\BageView\build\intermediates\bundles\debug\res"/></dataSet><dataSet config="main$Generated" generated="true"><source path="C:\ifish\BageView\src\androidTest\res"/><source path="C:\ifish\BageView\build\generated\res\rs\androidTest\debug"/><source path="C:\ifish\BageView\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet config="debug" from-dependency="true" generated-set="debug$Generated"><source path="C:\ifish\BageView\build\intermediates\bundles\debug\res"><file path="C:\ifish\BageView\build\intermediates\bundles\debug\res\values\values.xml" qualifiers=""><declare-styleable name="BGABadgeView"><attr format="reference|color" name="badge_bgColor"/><attr format="reference|color" name="badge_textColor"/><attr format="reference|dimension" name="badge_textSize"/><attr format="reference|dimension" name="badge_verticalMargin"/><attr format="reference|dimension" name="badge_horizontalMargin"/><attr format="reference|dimension" name="badge_padding"/><attr format="enum" name="badge_gravity">
+<merger version="3"><dataSet config="debug$Generated" generated="true"><source path="C:\beifen\ifish\ifish\BageView\build\intermediates\bundles\debug\res"/></dataSet><dataSet config="main$Generated" generated="true"><source path="C:\beifen\ifish\ifish\BageView\src\androidTest\res"/><source path="C:\beifen\ifish\ifish\BageView\build\generated\res\rs\androidTest\debug"/><source path="C:\beifen\ifish\ifish\BageView\build\generated\res\resValues\androidTest\debug"/></dataSet><dataSet config="debug" from-dependency="true" generated-set="debug$Generated"><source path="C:\beifen\ifish\ifish\BageView\build\intermediates\bundles\debug\res"><file path="C:\beifen\ifish\ifish\BageView\build\intermediates\bundles\debug\res\values\values.xml" qualifiers=""><declare-styleable name="BGABadgeView"><attr format="reference|color" name="badge_bgColor"/><attr format="reference|color" name="badge_textColor"/><attr format="reference|dimension" name="badge_textSize"/><attr format="reference|dimension" name="badge_verticalMargin"/><attr format="reference|dimension" name="badge_horizontalMargin"/><attr format="reference|dimension" name="badge_padding"/><attr format="enum" name="badge_gravity">
             <enum name="rightTop" value="0"/>
             <enum name="rightCenter" value="1"/>
             <enum name="rightBottom" value="2"/>
-        </attr><attr format="boolean" name="badge_dragable"/><attr format="boolean" name="badge_isResumeTravel"/><attr format="reference|dimension" name="badge_borderWidth"/><attr format="reference|color" name="badge_borderColor"/><attr format="reference|dimension" name="badge_dragExtra"/></declare-styleable></file></source></dataSet><dataSet config="main" generated-set="main$Generated"><source path="C:\ifish\BageView\src\androidTest\res"/><source path="C:\ifish\BageView\build\generated\res\rs\androidTest\debug"/><source path="C:\ifish\BageView\build\generated\res\resValues\androidTest\debug"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="BGABadgeView"><attr format="reference|color" name="badge_bgColor"/><attr format="reference|color" name="badge_textColor"/><attr format="reference|dimension" name="badge_textSize"/><attr format="reference|dimension" name="badge_verticalMargin"/><attr format="reference|dimension" name="badge_horizontalMargin"/><attr format="reference|dimension" name="badge_padding"/><attr format="enum" name="badge_gravity">
+        </attr><attr format="boolean" name="badge_dragable"/><attr format="boolean" name="badge_isResumeTravel"/><attr format="reference|dimension" name="badge_borderWidth"/><attr format="reference|color" name="badge_borderColor"/><attr format="reference|dimension" name="badge_dragExtra"/></declare-styleable></file></source></dataSet><dataSet config="main" generated-set="main$Generated"><source path="C:\beifen\ifish\ifish\BageView\src\androidTest\res"/><source path="C:\beifen\ifish\ifish\BageView\build\generated\res\rs\androidTest\debug"/><source path="C:\beifen\ifish\ifish\BageView\build\generated\res\resValues\androidTest\debug"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="BGABadgeView"><attr format="reference|color" name="badge_bgColor"/><attr format="reference|color" name="badge_textColor"/><attr format="reference|dimension" name="badge_textSize"/><attr format="reference|dimension" name="badge_verticalMargin"/><attr format="reference|dimension" name="badge_horizontalMargin"/><attr format="reference|dimension" name="badge_padding"/><attr format="enum" name="badge_gravity">
             <enum name="rightTop" value="0"/>
             <enum name="rightCenter" value="1"/>
             <enum name="rightBottom" value="2"/>

BageView/build/intermediates/incremental/mergeDebugAssets/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main"><source path="C:\ifish\BageView\src\main\assets"/><source path="C:\ifish\BageView\build\generated\assets\shaders\debug"/></dataSet><dataSet config="debug"><source path="C:\ifish\BageView\src\debug\assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main"><source path="C:\beifen\ifish\ifish\BageView\src\main\assets"/><source path="C:\beifen\ifish\ifish\BageView\build\generated\assets\shaders\debug"/></dataSet><dataSet config="debug"><source path="C:\beifen\ifish\ifish\BageView\src\debug\assets"/></dataSet></merger>

BageView/build/intermediates/incremental/mergeDebugShaders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main"><source path="C:\ifish\BageView\src\main\shaders"/></dataSet><dataSet config="debug"><source path="C:\ifish\BageView\src\debug\shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main"><source path="C:\beifen\ifish\ifish\BageView\src\main\shaders"/></dataSet><dataSet config="debug"><source path="C:\beifen\ifish\ifish\BageView\src\debug\shaders"/></dataSet></merger>

BageView/build/intermediates/incremental/mergeReleaseAssets/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main"><source path="C:\ifish\BageView\src\main\assets"/><source path="C:\ifish\BageView\build\generated\assets\shaders\release"/></dataSet><dataSet config="release"><source path="C:\ifish\BageView\src\release\assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main"><source path="C:\beifen\ifish\ifish\BageView\src\main\assets"/><source path="C:\beifen\ifish\ifish\BageView\build\generated\assets\shaders\release"/></dataSet><dataSet config="release"><source path="C:\beifen\ifish\ifish\BageView\src\release\assets"/></dataSet></merger>

BageView/build/intermediates/incremental/mergeReleaseShaders/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main"><source path="C:\ifish\BageView\src\main\shaders"/></dataSet><dataSet config="release"><source path="C:\ifish\BageView\src\release\shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main"><source path="C:\beifen\ifish\ifish\BageView\src\main\shaders"/></dataSet><dataSet config="release"><source path="C:\beifen\ifish\ifish\BageView\src\release\shaders"/></dataSet></merger>

BageView/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1 +1 @@
-#Tue Apr 24 16:44:44 CST 2018
+#Sun Sep 02 17:38:21 CST 2018

BageView/build/intermediates/incremental/packageDebugResources/merger.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main$Generated" generated="true"><source path="C:\ifish\BageView\src\main\res"/><source path="C:\ifish\BageView\build\generated\res\rs\debug"/><source path="C:\ifish\BageView\build\generated\res\resValues\debug"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="C:\ifish\BageView\src\debug\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="C:\ifish\BageView\src\main\res"><file path="C:\ifish\BageView\src\main\res\values\attrs.xml" qualifiers=""><declare-styleable name="BGABadgeView">
+<merger version="3"><dataSet config="main$Generated" generated="true"><source path="C:\beifen\ifish\ifish\BageView\src\main\res"/><source path="C:\beifen\ifish\ifish\BageView\build\generated\res\rs\debug"/><source path="C:\beifen\ifish\ifish\BageView\build\generated\res\resValues\debug"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="C:\beifen\ifish\ifish\BageView\src\debug\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="C:\beifen\ifish\ifish\BageView\src\main\res"><file path="C:\beifen\ifish\ifish\BageView\src\main\res\values\attrs.xml" qualifiers=""><declare-styleable name="BGABadgeView">
         
         <attr format="reference|color" name="badge_bgColor"/>
         
@@ -28,7 +28,7 @@
         <attr format="reference|color" name="badge_borderColor"/>
         
         <attr format="reference|dimension" name="badge_dragExtra"/>
-    </declare-styleable></file></source><source path="C:\ifish\BageView\build\generated\res\rs\debug"/><source path="C:\ifish\BageView\build\generated\res\resValues\debug"/></dataSet><dataSet config="debug" generated-set="debug$Generated"><source path="C:\ifish\BageView\src\debug\res"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="BGABadgeView"><attr format="reference|color" name="badge_bgColor"/><attr format="reference|color" name="badge_textColor"/><attr format="reference|dimension" name="badge_textSize"/><attr format="reference|dimension" name="badge_verticalMargin"/><attr format="reference|dimension" name="badge_horizontalMargin"/><attr format="reference|dimension" name="badge_padding"/><attr format="enum" name="badge_gravity">
+    </declare-styleable></file></source><source path="C:\beifen\ifish\ifish\BageView\build\generated\res\rs\debug"/><source path="C:\beifen\ifish\ifish\BageView\build\generated\res\resValues\debug"/></dataSet><dataSet config="debug" generated-set="debug$Generated"><source path="C:\beifen\ifish\ifish\BageView\src\debug\res"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="BGABadgeView"><attr format="reference|color" name="badge_bgColor"/><attr format="reference|color" name="badge_textColor"/><attr format="reference|dimension" name="badge_textSize"/><attr format="reference|dimension" name="badge_verticalMargin"/><attr format="reference|dimension" name="badge_horizontalMargin"/><attr format="reference|dimension" name="badge_padding"/><attr format="enum" name="badge_gravity">
             <enum name="rightTop" value="0"/>
             <enum name="rightCenter" value="1"/>
             <enum name="rightBottom" value="2"/>

BageView/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties

@@ -1 +1 @@
-#Tue Apr 24 16:45:02 CST 2018
+#Sun Sep 02 17:38:24 CST 2018

BageView/build/intermediates/incremental/packageReleaseResources/merger.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main$Generated" generated="true"><source path="C:\ifish\BageView\src\main\res"/><source path="C:\ifish\BageView\build\generated\res\rs\release"/><source path="C:\ifish\BageView\build\generated\res\resValues\release"/></dataSet><dataSet config="release$Generated" generated="true"><source path="C:\ifish\BageView\src\release\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="C:\ifish\BageView\src\main\res"><file path="C:\ifish\BageView\src\main\res\values\attrs.xml" qualifiers=""><declare-styleable name="BGABadgeView">
+<merger version="3"><dataSet config="main$Generated" generated="true"><source path="C:\beifen\ifish\ifish\BageView\src\main\res"/><source path="C:\beifen\ifish\ifish\BageView\build\generated\res\rs\release"/><source path="C:\beifen\ifish\ifish\BageView\build\generated\res\resValues\release"/></dataSet><dataSet config="release$Generated" generated="true"><source path="C:\beifen\ifish\ifish\BageView\src\release\res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="C:\beifen\ifish\ifish\BageView\src\main\res"><file path="C:\beifen\ifish\ifish\BageView\src\main\res\values\attrs.xml" qualifiers=""><declare-styleable name="BGABadgeView">
         
         <attr format="reference|color" name="badge_bgColor"/>
         
@@ -28,7 +28,7 @@
         <attr format="reference|color" name="badge_borderColor"/>
         
         <attr format="reference|dimension" name="badge_dragExtra"/>
-    </declare-styleable></file></source><source path="C:\ifish\BageView\build\generated\res\rs\release"/><source path="C:\ifish\BageView\build\generated\res\resValues\release"/></dataSet><dataSet config="release" generated-set="release$Generated"><source path="C:\ifish\BageView\src\release\res"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="BGABadgeView"><attr format="reference|color" name="badge_bgColor"/><attr format="reference|color" name="badge_textColor"/><attr format="reference|dimension" name="badge_textSize"/><attr format="reference|dimension" name="badge_verticalMargin"/><attr format="reference|dimension" name="badge_horizontalMargin"/><attr format="reference|dimension" name="badge_padding"/><attr format="enum" name="badge_gravity">
+    </declare-styleable></file></source><source path="C:\beifen\ifish\ifish\BageView\build\generated\res\rs\release"/><source path="C:\beifen\ifish\ifish\BageView\build\generated\res\resValues\release"/></dataSet><dataSet config="release" generated-set="release$Generated"><source path="C:\beifen\ifish\ifish\BageView\src\release\res"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="BGABadgeView"><attr format="reference|color" name="badge_bgColor"/><attr format="reference|color" name="badge_textColor"/><attr format="reference|dimension" name="badge_textSize"/><attr format="reference|dimension" name="badge_verticalMargin"/><attr format="reference|dimension" name="badge_horizontalMargin"/><attr format="reference|dimension" name="badge_padding"/><attr format="enum" name="badge_gravity">
             <enum name="rightTop" value="0"/>
             <enum name="rightCenter" value="1"/>
             <enum name="rightBottom" value="2"/>