新增加热棒功能

This commit is contained in:
Long-PC\Long 2018-10-16 02:52:13 +08:00
parent 472ea2df38
commit ac3c1f18a4
422 changed files with 19404 additions and 18124 deletions

View File

@ -0,0 +1,10 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="AndroidLintAppCompatCustomView" enabled="false" level="ERROR" enabled_by_default="false" />
<inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
<option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
<option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
</inspection_tool>
</profile>
</component>

View File

@ -0,0 +1,7 @@
<component name="InspectionProjectProfileManager">
<settings>
<option name="PROJECT_PROFILE" value="Project Default" />
<option name="USE_PROJECT_PROFILE" value="true" />
<version value="1.0" />
</settings>
</component>

View File

@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="android-android-25">
<CLASSES>
<root url="jar://$USER_HOME$/AppData/Local/Android/sdk/platforms/android-25/android.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

View File

@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="mina-core-2.0.17">
<CLASSES>
<root url="jar://$PROJECT_DIR$/iFish7/libs/mina-core-2.0.17.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

View File

@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="mina-core-2.0.7">
<CLASSES>
<root url="jar://$PROJECT_DIR$/iFish7/libs/mina-core-2.0.7.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

File diff suppressed because it is too large Load Diff

View File

@ -83,10 +83,8 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />

View File

@ -1 +1 @@
#Sun Sep 02 17:38:21 CST 2018
#Tue Oct 16 02:51:13 CST 2018

View File

@ -1 +1 @@
#Sun Sep 02 17:38:21 CST 2018
#Tue Oct 16 02:51:13 CST 2018

View File

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

View File

@ -84,10 +84,8 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />

View File

@ -19,14 +19,14 @@
"merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\color-v23\\abc_tint_btn_checkable.xml",
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color-v23\\abc_tint_btn_checkable.xml"
},
{
"merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\color-v23\\abc_tint_switch_thumb.xml",
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color-v23\\abc_tint_switch_thumb.xml"
},
{
"merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\color-v23\\abc_btn_colored_borderless_text_material.xml",
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color-v23\\abc_btn_colored_borderless_text_material.xml"
},
{
"merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\color-v23\\abc_tint_switch_thumb.xml",
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color-v23\\abc_tint_switch_thumb.xml"
},
{
"merged": "C:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\color-v23\\abc_tint_switch_track.xml",
"source": "C:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color-v23\\abc_tint_switch_track.xml"

View File

@ -1,4 +1,4 @@
#Sun Sep 02 17:38:23 CST 2018
#Tue Oct 16 02:51:16 CST 2018
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color-v23\\abc_tint_spinner.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\color-v23\\abc_tint_spinner.xml
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_star_black_48dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_star_black_48dp.png

View File

@ -1,4 +1,4 @@
#Sun Sep 02 17:38:22 CST 2018
#Tue Oct 16 02:51:14 CST 2018
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\color-v23\\abc_tint_spinner.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\color-v23\\abc_tint_spinner.xml
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png
C\:\\Users\\Administrator\\.android\\build-cache\\abe1e7455da99c377bcc6db1b53e7b06418d29e5\\output\\res\\drawable-hdpi-v4\\abc_ic_star_black_48dp.png=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_ic_star_black_48dp.png

View File

@ -1,4 +1,4 @@
#Sun Sep 02 17:38:22 CST 2018
#Tue Oct 16 02:51:15 CST 2018
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_bottom_seek_progress.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_bottom_seek_progress.xml
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_click_play_selector.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_click_play_selector.xml
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_seek_thumb_pressed.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_seek_thumb_pressed.xml

View File

@ -1,4 +1,4 @@
#Sun Sep 02 17:38:24 CST 2018
#Tue Oct 16 02:51:16 CST 2018
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_bottom_seek_progress.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_bottom_seek_progress.xml
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_click_play_selector.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_click_play_selector.xml
C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_seek_thumb_pressed.xml=C\:\\beifen\\ifish\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_seek_thumb_pressed.xml

Some files were not shown because too many files have changed in this diff Show More