denghuan/examine
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: denghuan:toKotlin
Branches Tags
denghuan:master
denghuan:newpath
denghuan:toKotlin
...
pull from: denghuan:master
Branches Tags
denghuan:newpath
denghuan:master
denghuan:toKotlin

5 Commits
toKotlin ... master

Author SHA1 Message Date
lijia
ecc900a227 主分支信息删除 2024-11-21 11:27:52 +08:00
lijia
edb44f8983 Merge branch 'newpath' 
# Conflicts:
#	app/src/main/java/com/dahe/examine/base/App.java
 2024-11-21 11:21:53 +08:00
lijia
65e563b264 主分支提交 2024-11-21 11:14:56 +08:00
lijia
a97ddc7527 新分支提交 2024-11-21 11:13:23 +08:00
lijia
4428449bdd 合并测试7 2024-11-21 11:12:20 +08:00
4 changed files with 10 additions and 8 deletions
Show Stats Expand all files Collapse all files

4
.idea/gradle.xml
View File

@ -4,9 +4,8 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
@ -14,6 +13,7 @@
<option value="$PROJECT_DIR$/mylibrary" />
</set>
</option>
<option name="resolveExternalAnnotations" value="false" />
</GradleProjectSettings>
</option>
</component>

7
.idea/misc.xml
View File

@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DesignSurface">
<option name="filePathToZoomLevelMap">
@ -6,9 +5,15 @@
<entry key="..\:/2022work/Examine/app/src/main/res/drawable/bg_splash.xml" value="0.148" />
<entry key="..\:/2022work/Examine/app/src/main/res/drawable/select_pass.xml" value="0.148" />
<entry key="..\:/2022work/Examine/app/src/main/res/drawable/select_read.xml" value="0.148" />
<entry key="..\:/2022work/Examine/app/src/main/res/drawable/shape_blue_bg16.xml" value="0.246" />
<entry key="..\:/2022work/Examine/app/src/main/res/drawable/shape_blue_bg6.xml" value="0.246" />
<entry key="..\:/2022work/Examine/app/src/main/res/drawable/shape_blue_bg8.xml" value="0.246" />
<entry key="..\:/2022work/Examine/app/src/main/res/drawable/shape_btn_bg4.xml" value="0.148" />
<entry key="..\:/2022work/Examine/app/src/main/res/drawable/shape_c_bg18.xml" value="0.246" />
<entry key="..\:/2022work/Examine/app/src/main/res/drawable/shape_code.xml" value="0.148" />
<entry key="..\:/2022work/Examine/app/src/main/res/drawable/shape_count_downbg.xml" value="0.148" />
<entry key="..\:/2022work/Examine/app/src/main/res/drawable/shape_gray_bg11.xml" value="0.246" />
<entry key="..\:/2022work/Examine/app/src/main/res/drawable/shape_green_bg25.xml" value="0.246" />
<entry key="..\:/2022work/Examine/app/src/main/res/drawable/shape_mine_bg20.xml" value="0.148" />
<entry key="..\:/2022work/Examine/app/src/main/res/layout/activity_add_go.xml" value="0.3515625" />
<entry key="..\:/2022work/Examine/app/src/main/res/layout/activity_apply.xml" value="0.3515625" />

3
app/src/main/java/com/dahe/examine/base/App.java
View File

@ -26,10 +26,7 @@ public class App extends Application {
@Override
public void onCreate() {
super.onCreate();
System.out.println("我是master2");
mApplication = this;
System.out.println("woshikotlin2");
System.out.println("woshikotlin3");
CommonBaseLibrary.getInstance().init(this, Api.BASE_URL);
// if (BuildConfig.DEBUG){
// CrashHandler.getInstance().init(this);

4
app/src/main/res/layout/activity_launcher.xml
View File

@ -9,8 +9,8 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/splash"
android:scaleType="centerCrop"></ImageView>
android:scaleType="centerCrop"
android:src="@drawable/splash"></ImageView>
<LinearLayout
android:id="@+id/llCount"