Merge branch 'test_MogoAP_eagle-220_211207_8.0.15.2'

This commit is contained in:
donghongyu
2022-01-14 14:47:32 +08:00
19 changed files with 357 additions and 553 deletions

View File

@@ -31,7 +31,7 @@
android:textSize="@dimen/dp_34"
android:textStyle="bold" />
<LinearLayout
<!-- <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
@@ -50,7 +50,7 @@
android:format24Hour="yyyy年MM月dd日 EEEE aa HH:mm:ss"
android:textColor="#000"
android:textSize="@dimen/dp_36" />
</LinearLayout>
</LinearLayout>-->
<TextView
android:id="@+id/tvAppInfo"

View File

@@ -11,7 +11,7 @@
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
<application>
<!--保活用-->
<!-- &lt;!&ndash;保活用&ndash;&gt;
<service
android:name="com.zhidao.boot.persistent.lib.PersistentAliveService"
android:enabled="true"
@@ -26,7 +26,7 @@
android:resizeableActivity="false"
android:screenOrientation="landscape"
android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-->
<activity
android:name=".MainLauncherActivity"
android:clearTaskOnLaunch="true"