jj97181818/Ch06_EnergyCalculator
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

finish the java code

Browse Source
This commit is contained in:
jj97181818
2018-11-14 13:51:20 +08:00
parent 6e8cdacbdf
commit e99c91fa9f
11 changed files with 127 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
.idea/workspace.xml generated
View File

@ -11,7 +11,12 @@
</configurations>
</component>
<component name="ChangeListManager">
<list default="true" id="ffe541c7-79a8-445f-85b8-7e7a4dd61741" name="Default" comment="" />
<list default="true" id="ffe541c7-79a8-445f-85b8-7e7a4dd61741" name="Default" comment="">
<change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/me/jj97181818/ch06_energycalculator/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/me/jj97181818/ch06_energycalculator/MainActivity.java" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@ -32,13 +37,13 @@
</system>
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="activity_main.xml" pinned="false" current-in-tab="true">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="activity_main.xml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
<provider editor-type-id="text-editor">
<provider selected="true" editor-type-id="android-designer2">
<state />
</provider>
<provider selected="true" editor-type-id="android-designer2">
<provider editor-type-id="text-editor">
<state />
</provider>
</entry>
@ -52,17 +57,20 @@
</provider>
</entry>
</file>
<file leaf-file-name="MainActivity.java" pinned="false" current-in-tab="false">
<file leaf-file-name="MainActivity.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/me/jj97181818/ch06_energycalculator/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="1" selection-start-line="12" selection-start-column="1" selection-end-line="12" selection-end-column="1" />
<state relative-caret-position="412">
<caret line="51" column="37" lean-forward="true" selection-start-line="51" selection-start-column="37" selection-end-line="51" selection-end-column="37" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="GradleLocalSettings">
<option name="myGradleHomes">
<map>
@ -2324,20 +2332,22 @@
<list>
<option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" />
<option value="$PROJECT_DIR$/app/src/main/java/me/jj97181818/ch06_energycalculator/MainActivity.java" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="y" value="41" />
<component name="ProjectFrameBounds">
<option name="y" value="23" />
<option name="width" value="1440" />
<option name="height" value="808" />
<option name="height" value="811" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="ProjectPane" />
<pane id="Scope" />
<pane id="AndroidView">
<subPane>
<expand>
@ -2360,8 +2370,8 @@
<select />
</subPane>
</pane>
<pane id="ProjectPane" />
<pane id="PackagesPane" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@ -2495,48 +2505,63 @@
<servers />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="811" extended-state="6" />
<frame x="0" y="23" width="1440" height="811" extended-state="0" />
<editor active="true" />
<layout>
<window_info anchor="bottom" id="Android Profiler" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Android Profiler" />
<window_info anchor="right" id="Palette&#9;" />
<window_info id="Image Layers" />
<window_info id="Build Variants" side_tool="true" />
<window_info anchor="right" id="Capture Analysis" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="right" id="Palette&#9;" order="3" />
<window_info id="Image Layers" order="2" />
<window_info id="Build Variants" order="2" side_tool="true" />
<window_info anchor="right" id="Capture Analysis" order="3" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
<window_info anchor="bottom" id="Terminal" />
<window_info anchor="bottom" id="Logcat" />
<window_info anchor="bottom" id="Version Control" order="7" />
<window_info anchor="bottom" id="Terminal" order="7" />
<window_info anchor="bottom" id="Logcat" order="7" />
<window_info id="Captures" order="2" weight="0.25" />
<window_info id="Capture Tool" />
<window_info id="Designer" />
<window_info id="Capture Tool" order="2" />
<window_info id="Designer" order="2" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24964234" />
<window_info anchor="bottom" id="Build" visible="true" weight="0.11484594" />
<window_info anchor="right" id="Gradle" />
<window_info anchor="bottom" id="Build" order="7" weight="0.11484594" />
<window_info anchor="right" id="Gradle" order="3" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="right" id="Theme Preview" />
<window_info anchor="right" id="Device File Explorer" order="3" side_tool="true" />
<window_info anchor="right" id="Theme Preview" order="3" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info id="Favorites" side_tool="true" />
<window_info anchor="right" id="Device File Explorer" side_tool="true" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Find" order="1" />
</layout>
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
<provider selected="true" editor-type-id="android-designer2">
<state />
</provider>
<provider editor-type-id="text-editor">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" column="23" selection-start-line="5" selection-start-column="23" selection-end-line="5" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/me/jj97181818/ch06_energycalculator/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="1" selection-start-line="12" selection-start-column="1" selection-end-line="12" selection-end-column="1" />
<state relative-caret-position="885">
<caret line="59" column="19" selection-start-line="59" selection-start-column="19" selection-end-line="59" selection-end-column="19" />
</state>
</provider>
</entry>
@ -2548,11 +2573,18 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml">
<provider selected="true" editor-type-id="android-designer2">
<state />
</provider>
<provider editor-type-id="text-editor">
<state />
</provider>
<provider selected="true" editor-type-id="android-designer2">
<state />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/me/jj97181818/ch06_energycalculator/MainActivity.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="412">
<caret line="51" column="37" lean-forward="true" selection-start-line="51" selection-start-column="37" selection-end-line="51" selection-end-column="37" />
</state>
</provider>
</entry>
</component>