课程设计

.idea/misc.xml

@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+=======
+<?xml version="1.0" encoding="UTF-8"?>
+>>>>>>> 7de82cb39d5be1fea7ad528111283dc9b1a67fdb
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">

app/src/main/AndroidManifest.xml

@@ -14,9 +14,12 @@
         tools:targetApi="31">
         <activity
             android:name=".MainActivity"
+<<<<<<< HEAD
             android:exported="false" />
         <activity
             android:name=".Login"
+=======
+>>>>>>> 7de82cb39d5be1fea7ad528111283dc9b1a67fdb
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/com/huncm/c202208040227/MainActivity.java

@@ -1,6 +1,7 @@
 package com.huncm.c202208040227;
 
 import androidx.appcompat.app.AppCompatActivity;
+<<<<<<< HEAD
 import androidx.constraintlayout.widget.ConstraintLayout;
 
 import android.content.Intent;
@@ -13,10 +14,18 @@ public class MainActivity extends AppCompatActivity {
     RoomFragment roomFragment =new RoomFragment();
     AiFragment aiFragment = new AiFragment();
     MyFragment myFragment = new MyFragment();
+=======
+
+import android.os.Bundle;
+
+public class MainActivity extends AppCompatActivity {
+
+>>>>>>> 7de82cb39d5be1fea7ad528111283dc9b1a67fdb
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+<<<<<<< HEAD
         getSupportFragmentManager().beginTransaction()
                 .add(R.id.Layout,usuallyFragment).commit();
         getSupportFragmentManager().beginTransaction()
@@ -60,5 +69,7 @@ public class MainActivity extends AppCompatActivity {
             }
         });
 
+=======
+>>>>>>> 7de82cb39d5be1fea7ad528111283dc9b1a67fdb
     }
 }

app/src/main/res/layout/activity_main.xml

@@ -6,6 +6,7 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+<<<<<<< HEAD
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -102,4 +103,15 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
+=======
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Hello World!"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+>>>>>>> 7de82cb39d5be1fea7ad528111283dc9b1a67fdb
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/strings.xml

@@ -1,5 +1,8 @@
 <resources>
     <string name="app_name">PenGYan</string>
+<<<<<<< HEAD
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
+=======
+>>>>>>> 7de82cb39d5be1fea7ad528111283dc9b1a67fdb
 </resources>