整合代码

master
zhenghaoyuan20 2 years ago
parent f1cc818eb5
commit 68e68e3d50

@ -1,75 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="NONE" />
</component>
<component name="ChangeListManager">
<list default="true" id="b46a3cfd-0868-4be6-8954-5e3661183a15" name="变更" comment="" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../../.." />
</component>
<component name="ProblemsViewState">
<option name="selectedIndex" value="1" />
</component>
<component name="ProjectId" id="2RDdrqZaIPSy4oNQkPQm740bxxG" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="ASKED_MARK_IGNORED_FILES_AS_EXCLUDED" value="true" />
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="RunOnceActivity.cidr.known.project.marker" value="true" />
<property name="cidr.known.project.marker" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/.." />
<property name="project.structure.last.edited" value="Modules" />
<property name="project.structure.proportion" value="0.17" />
<property name="project.structure.side.proportion" value="0.2" />
<property name="settings.editor.selected.configurable" value="configurable.group.build" />
</component>
<component name="RunManager">
<configuration default="true" type="JetRunConfigurationType">
<module name="app" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="KotlinStandaloneScriptRunConfigurationType">
<module name="app" />
<option name="filePath" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="默认任务">
<changelist id="b46a3cfd-0868-4be6-8954-5e3661183a15" name="变更" comment="" />
<created>1686788787021</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1686788787021</updated>
</task>
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State />
</value>
</entry>
</map>
</option>
<option name="oldMeFiltersMigrated" value="true" />
</component>
</project>

@ -28,7 +28,7 @@
android:name=".SettingActivity"
android:exported="false"
android:screenOrientation="landscape"
android:theme="@style/AppTheme"/>
android:theme="@style/TransparentTheme"/>
<activity
android:name=".ControlActivity"
android:exported="false"
@ -53,6 +53,11 @@
android:exported="true"
android:label="@string/app_name"
android:theme="@style/Theme.AppCompat">
</activity>
<activity
android:name=".LoginActivity"
android:exported="true"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Loading…
Cancel
Save