Skip to content

Commit 3c793c4

Browse files
AnMokotoAnMokoto
committed
fix
1 parent 1b3d420 commit 3c793c4

File tree

9 files changed

+20
-145
lines changed

9 files changed

+20
-145
lines changed

‎.idea/gradle.xml

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

‎.idea/modules.xml

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

‎FacebookSDK/Firebase/Firebase.iml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,23 @@
7777
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
7878
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
7979
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
8081
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8182
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8284
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
8387
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
8488
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
8589
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8690
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8791
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
8892
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
8994
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9097
</content>
9198
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
9299
<orderEntry type="sourceFolder" forTests="false" />

‎Helper/src/main/java/com/goav/helper/media/MediaHelper.java

Lines changed: 0 additions & 126 deletions
This file was deleted.

‎Helper/src/main/java/com/goav/helper/sys/ContextHelper.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,12 @@
2727
public final class ContextHelper {
2828

2929

30-
public static Context get() {
31-
return BeautyLiveApplication.getContextInstance();
32-
}
33-
3430
/**
3531
* @param context
3632
* @return {@link Context#getApplicationContext()}
3733
*/
3834
public static Context basicContext(Context context) {
39-
if (context == null) {
40-
return BeautyLiveApplication.getContextInstance();
41-
} else {
4235
return context.getApplicationContext();
43-
}
4436
}
4537

4638

@@ -73,8 +65,4 @@ public static void startActivity21Impl(Activity activity, View translaView) {
7365
}
7466
ActivityCompat.startActivity(activity, null, bundle);
7567
}
76-
77-
public static void allDestroy() {
78-
ContextHelper.get().sendBroadcast(new Intent(Const.LIVE_FINISH_BROADCAST_ACTION));
79-
}
8068
}

‎Model/MVP/MVP.iml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,20 @@
7979
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8080
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8181
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8283
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
8386
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
8487
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
8588
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8689
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8790
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
8891
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
8993
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9096
</content>
9197
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
9298
<orderEntry type="sourceFolder" forTests="false" />

‎Model/ModelParser/ModelParser.iml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,17 @@
7878
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7979
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8080
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8182
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
8284
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
8385
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
8486
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8587
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8688
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
8789
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
8890
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8992
</content>
9093
<orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
9194
<orderEntry type="sourceFolder" forTests="false" />
@@ -106,5 +109,6 @@
106109
<orderEntry type="library" exported="" name="auto-value-1.3" level="project" />
107110
<orderEntry type="library" exported="" name="logger-1.15" level="project" />
108111
<orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
112+
<orderEntry type="module" module-name="MVP" exported="" />
109113
</component>
110114
</module>

‎Model/ModelParser/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ dependencies {
4545
compile 'com.squareup.okhttp3:logging-interceptor:3.2.0'
4646

4747
compile 'com.orhanobut:logger:1.15'
48-
// compile project(':MVP')
48+
compile project(':Model:MVP')
4949
// compile 'com.squareup.okio:okio:1.7.0'
5050
}

‎settings.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include ':FacebookSDK:Firebase',
2-
':Google',
3-
':Helper',
2+
// ':Google',
3+
// ':Helper',
44
':Model:ModelParser',
55
':Model:MVP'
66
//':FacebookSDK:Facebook',

0 commit comments

Comments
 (0)