Merge remote-tracking branch 'origin/master' into toKotlin
# Conflicts: # app/src/main/java/com/dahe/examine/base/App.java
This commit is contained in:
commit
38b66d2717
@ -26,6 +26,8 @@ public class App extends Application {
|
|||||||
@Override
|
@Override
|
||||||
public void onCreate() {
|
public void onCreate() {
|
||||||
super.onCreate();
|
super.onCreate();
|
||||||
|
System.out.println("我是master");
|
||||||
|
System.out.println("我是master22");
|
||||||
mApplication = this;
|
mApplication = this;
|
||||||
System.out.println("woshikotlin");
|
System.out.println("woshikotlin");
|
||||||
CommonBaseLibrary.getInstance().init(this, Api.BASE_URL);
|
CommonBaseLibrary.getInstance().init(this, Api.BASE_URL);
|
||||||
|
Loading…
Reference in New Issue
Block a user