Skip to content

Commit f89acd9

Browse files
UCodeUStoryUCodeUStory
committed
更新代码
1 parent 6439ba7 commit f89acd9

File tree

7 files changed

+421
-745
lines changed

7 files changed

+421
-745
lines changed

‎.gitignore‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
.iml
2+
.gradle
3+
.idea
4+
/local.properties
5+
.DS_Store
6+
build/
7+
/captures
8+
.externalNativeBuild
9+
apk/

‎.idea/gradle.xml‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/workspace.xml‎

Lines changed: 330 additions & 737 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
- [求最大不重复子串](https://github.com/UCodeUStory/DataStructure/blob/master/app/src/main/java/com/wangpos/datastructure/other/MaxSubStringActivity.java)
4040
- [死锁](https://github.com/UCodeUStory/DataStructure/blob/master/app/src/main/java/com/wangpos/datastructure/java/DeadLockDemo.java)
4141
- [两个线程交替输出1010](https://github.com/UCodeUStory/DataStructure/blob/master/app/src/main/java/com/wangpos/datastructure/java/ThreadOneZero.java)
42-
- 两个排序数组的中值it
42+
- [贪婪算法之找零钱问题](https://github.com/UCodeUStory/DataStructure/blob/master/app/src/main/java/com/wangpos/datastructure/algorithm/Greedy.java)
43+
- [贪婪算法之01背包问题](https://github.com/UCodeUStory/DataStructure/blob/master/app/src/main/java/com/wangpos/datastructure/algorithm/Greedy01Bag.java)
4344

4445
#### Java
4546
- [Java 基础面试题](https://github.com/UCodeUStory/DataStructure/blob/master/sources/javabasic.md)

‎app/app.iml‎

Lines changed: 69 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1818
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1919
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
20-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
20+
<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" />
2121
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2222
</configuration>
2323
</facet>
@@ -28,14 +28,12 @@
2828
<exclude-output />
2929
<content url="file://$MODULE_DIR$">
3030
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
31-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3231
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3332
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3433
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3534
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3635
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3736
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
38-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3937
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4038
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4139
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
@@ -84,10 +82,13 @@
8482
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
8583
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8684
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
9090
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes-jar" />
9192
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/data-binding-info" />
9293
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
9394
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
@@ -188,5 +189,70 @@
188189
<orderEntry type="library" name="Gradle: com.android.support:design-theme-28.0.0-alpha1" level="project" />
189190
<orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager-28.0.0-alpha1" level="project" />
190191
<orderEntry type="module" module-name="codeview" />
192+
<orderEntry type="library" name="Gradle: com.android.support:design-transformation:28.0.0-alpha1@aar" level="project" />
193+
<orderEntry type="library" name="Gradle: com.android.support:design-chip:28.0.0-alpha1@aar" level="project" />
194+
<orderEntry type="library" name="Gradle: com.android.support:design-typography:28.0.0-alpha1@aar" level="project" />
195+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:livedata-core:1.1.0@aar" level="project" />
196+
<orderEntry type="library" name="Gradle: com.android.support:print:28.0.0-alpha1@aar" level="project" />
197+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime:1.1.0@aar" level="project" />
198+
<orderEntry type="library" name="Gradle: android.arch.lifecycle:viewmodel:1.1.0@aar" level="project" />
199+
<orderEntry type="library" name="Gradle: com.android.support:design-shape:28.0.0-alpha1@aar" level="project" />
200+
<orderEntry type="library" name="Gradle: com.android.support:design-widget:28.0.0-alpha1@aar" level="project" />
201+
<orderEntry type="library" name="Gradle: com.android.support:design-expandable:28.0.0-alpha1@aar" level="project" />
202+
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core:2.2.2@aar" level="project" />
203+
<orderEntry type="library" name="Gradle: android.arch.core:runtime:1.1.0@aar" level="project" />
204+
<orderEntry type="library" name="Gradle: com.android.support:design-theme:28.0.0-alpha1@aar" level="project" />
205+
<orderEntry type="library" name="Gradle: com.android.support:documentfile:28.0.0-alpha1@aar" level="project" />
206+
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project" />
207+
<orderEntry type="library" name="Gradle: com.android.support:design-snackbar:28.0.0-alpha1@aar" level="project" />
208+
<orderEntry type="library" name="Gradle: com.android.support:swiperefreshlayout:28.0.0-alpha1@aar" level="project" />
209+
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:28.0.0-alpha1@aar" level="project" />
210+
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:28.0.0-alpha1@aar" level="project" />
211+
<orderEntry type="library" name="Gradle: com.android.support:design-circularreveal-coordinatorlayout:28.0.0-alpha1@aar" level="project" />
212+
<orderEntry type="library" name="Gradle: com.android.support:design-textfield:28.0.0-alpha1@aar" level="project" />
213+
<orderEntry type="library" name="Gradle: com.android.support:design-animation:28.0.0-alpha1@aar" level="project" />
214+
<orderEntry type="library" name="Gradle: com.android.support:cardview-v7:28.0.0-alpha1@aar" level="project" />
215+
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout:1.0.2@aar" level="project" />
216+
<orderEntry type="library" name="Gradle: com.android.support:coordinatorlayout:28.0.0-alpha1@aar" level="project" />
217+
<orderEntry type="library" name="Gradle: com.android.support:design-floatingactionbutton:28.0.0-alpha1@aar" level="project" />
218+
<orderEntry type="library" name="Gradle: com.android.support:slidingpanelayout:28.0.0-alpha1@aar" level="project" />
219+
<orderEntry type="library" name="Gradle: com.android.support:viewpager:28.0.0-alpha1@aar" level="project" />
220+
<orderEntry type="library" name="Gradle: com.android.support:design-drawable:28.0.0-alpha1@aar" level="project" />
221+
<orderEntry type="library" name="Gradle: com.android.support:design-color:28.0.0-alpha1@aar" level="project" />
222+
<orderEntry type="library" name="Gradle: com.android.support:support-compat:28.0.0-alpha1@aar" level="project" />
223+
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar" level="project" />
224+
<orderEntry type="library" name="Gradle: com.android.support:drawerlayout:28.0.0-alpha1@aar" level="project" />
225+
<orderEntry type="library" name="Gradle: com.android.support:interpolator:28.0.0-alpha1@aar" level="project" />
226+
<orderEntry type="library" name="Gradle: com.android.support:customview:28.0.0-alpha1@aar" level="project" />
227+
<orderEntry type="library" name="Gradle: com.android.support:design-card:28.0.0-alpha1@aar" level="project" />
228+
<orderEntry type="library" name="Gradle: com.android.support:design-stateful:28.0.0-alpha1@aar" level="project" />
229+
<orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager:28.0.0-alpha1@aar" level="project" />
230+
<orderEntry type="library" name="Gradle: com.android.support:loader:28.0.0-alpha1@aar" level="project" />
231+
<orderEntry type="library" name="Gradle: com.android.support:asynclayoutinflater:28.0.0-alpha1@aar" level="project" />
232+
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils:28.0.0-alpha1@aar" level="project" />
233+
<orderEntry type="library" name="Gradle: com.android.support:transition:28.0.0-alpha1@aar" level="project" />
234+
<orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7:28.0.0-alpha1@aar" level="project" />
235+
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:28.0.0-alpha1@aar" level="project" />
236+
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:rules:0.5@aar" level="project" />
237+
<orderEntry type="library" name="Gradle: com.android.support:design-canvas:28.0.0-alpha1@aar" level="project" />
238+
<orderEntry type="library" name="Gradle: com.android.support:support-fragment:28.0.0-alpha1@aar" level="project" />
239+
<orderEntry type="library" name="Gradle: com.android.support:design-navigation:28.0.0-alpha1@aar" level="project" />
240+
<orderEntry type="library" name="Gradle: com.android.support:design-resources:28.0.0-alpha1@aar" level="project" />
241+
<orderEntry type="library" name="Gradle: com.android.support:design-circularreveal-cardview:28.0.0-alpha1@aar" level="project" />
242+
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:0.5@aar" level="project" />
243+
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui:28.0.0-alpha1@aar" level="project" />
244+
<orderEntry type="library" name="Gradle: com.android.support:design-bottomappbar:28.0.0-alpha1@aar" level="project" />
245+
<orderEntry type="library" name="Gradle: com.android.support:design-ripple:28.0.0-alpha1@aar" level="project" />
246+
<orderEntry type="library" name="Gradle: com.android.support:design-dialog:28.0.0-alpha1@aar" level="project" />
247+
<orderEntry type="library" name="Gradle: com.android.support:design-math:28.0.0-alpha1@aar" level="project" />
248+
<orderEntry type="library" name="Gradle: com.android.support:design-circularreveal:28.0.0-alpha1@aar" level="project" />
249+
<orderEntry type="library" name="Gradle: com.android.support:design-internal:28.0.0-alpha1@aar" level="project" />
250+
<orderEntry type="library" name="Gradle: com.android.support:design-bottomsheet:28.0.0-alpha1@aar" level="project" />
251+
<orderEntry type="library" name="Gradle: com.android.support:design:28.0.0-alpha1@aar" level="project" />
252+
<orderEntry type="library" name="Gradle: com.android.support:design-bottomnavigation:28.0.0-alpha1@aar" level="project" />
253+
<orderEntry type="library" name="Gradle: com.android.support:design-button:28.0.0-alpha1@aar" level="project" />
254+
<orderEntry type="library" name="Gradle: com.android.support:cursoradapter:28.0.0-alpha1@aar" level="project" />
255+
<orderEntry type="library" name="Gradle: com.android.support:design-tabs:28.0.0-alpha1@aar" level="project" />
256+
<orderEntry type="module" module-name="codeview" />
191257
</component>
192258
</module>

‎codeview/codeview.iml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1818
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1919
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
20-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
20+
<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" />
2121
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2222
<option name="PROJECT_TYPE" value="1" />
2323
</configuration>
@@ -29,14 +29,12 @@
2929
<exclude-output />
3030
<content url="file://$MODULE_DIR$">
3131
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
32-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3332
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3433
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3534
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3635
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3736
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3837
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
4038
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4139
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4240
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
@@ -85,6 +83,8 @@
8583
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
8684
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8785
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
9090
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
@@ -115,5 +115,9 @@
115115
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-23.4.0" level="project" />
116116
<orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.9.2@jar" level="project" />
117117
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-23.4.0" level="project" />
118+
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable:23.4.0@aar" level="project" />
119+
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable:23.4.0@aar" level="project" />
120+
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7:23.4.0@aar" level="project" />
121+
<orderEntry type="library" name="Gradle: com.android.support:support-v4:23.4.0@aar" level="project" />
118122
</component>
119123
</module>

0 commit comments

Comments
 (0)