From e4a5e4e814221ca5415628b22079145399e5e42e Mon Sep 17 00:00:00 2001
From: 18142669586 <1669783059@qq.com>
Date: Sat, 7 Oct 2023 15:53:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B5=84=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OneToOne/src/main/AndroidManifest.xml         |  50 +++---
 .../activity/login/CompleteActivity.java      |  25 +++
 .../activity/login/TagselectionActivity.java  |  16 ++
 .../src/main/res/layout/activity_complete.xml | 146 ++++++++++++++++++
 .../main/res/layout/activity_tagselection.xml |  10 ++
 OneToOne/src/main/res/values/strings.xml      |   1 +
 6 files changed, 226 insertions(+), 22 deletions(-)
 create mode 100644 OneToOne/src/main/java/com/shayu/onetoone/activity/login/CompleteActivity.java
 create mode 100644 OneToOne/src/main/java/com/shayu/onetoone/activity/login/TagselectionActivity.java
 create mode 100644 OneToOne/src/main/res/layout/activity_complete.xml
 create mode 100644 OneToOne/src/main/res/layout/activity_tagselection.xml

diff --git a/OneToOne/src/main/AndroidManifest.xml b/OneToOne/src/main/AndroidManifest.xml
index 367ccfff4..a51cd720b 100644
--- a/OneToOne/src/main/AndroidManifest.xml
+++ b/OneToOne/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.shayu.onetoone">
+    package="com.shayu.onetoone" >
 
     <uses-permission
         android:name="android.permission.CALL_PHONE"
@@ -49,8 +50,6 @@
     <uses-permission
         android:name="android.permission.MODIFY_AUDIO_SETTINGS"
         tools:node="remove" />
-
-
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -79,11 +78,11 @@
         tools:ignore="ProtectedPermissions" />
     <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
     <uses-permission android:name="com.android.vending.BILLING" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <!-- Android11新增 -->
-    <!--    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />-->
-    <!--    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />-->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" /> <!-- Android11新增 -->
+    <!-- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" /> -->
+    <!-- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" /> -->
     <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
+
     <application
         android:name=".AppContext"
         android:allowBackup="true"
@@ -94,46 +93,54 @@
         android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        tools:replace="theme,label,icon,allowBackup">
+        tools:replace="theme,label,icon,allowBackup" >
+        <activity
+            android:name=".activity.login.TagselectionActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.login.TagSelection_Activity"
+            android:exported="false"
+            android:label="@string/title_activity_tag_selection"
+            android:theme="@style/AppTheme" />
+        <activity
+            android:name=".activity.login.CompleteActivity"
+            android:exported="false" />
         <activity
             android:name=".activity.LauncherActivity"
-            android:exported="true">
+            android:exported="true" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".activity.login.EntryActivity"
-            android:exported="true"/>
-
+            android:exported="true" />
         <activity
             android:name=".activity.MainActivity"
             android:exported="false" />
         <activity
             android:name=".activity.message.MsgMoreConfigActivity"
             android:exported="false" />
-
         <activity
             android:name=".activity.message.ChatActivity"
-            android:windowSoftInputMode="stateHidden|adjustResize"/>
-
+            android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
             android:name=".activity.login.LoginActivity"
-            android:windowSoftInputMode="stateHidden|adjustResize"/>
+            android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
             android:name=".activity.login.FindPwdActivity"
-            android:windowSoftInputMode="stateHidden|adjustResize"/>
-
+            android:windowSoftInputMode="stateHidden|adjustResize" />
         <activity
             android:name=".activity.login.RegisterActivity"
-            android:windowSoftInputMode="stateHidden|adjustResize"/>
+            android:windowSoftInputMode="stateHidden|adjustResize" />
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="com.shayu.onetoone.fileprovider"
             android:exported="false"
-            android:grantUriPermissions="true">
+            android:grantUriPermissions="true" >
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_paths" />
@@ -153,5 +160,4 @@
             android:value="false" />
     </application>
 
-</manifest>
-
+</manifest>
\ No newline at end of file
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/login/CompleteActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/login/CompleteActivity.java
new file mode 100644
index 000000000..09699190c
--- /dev/null
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/login/CompleteActivity.java
@@ -0,0 +1,25 @@
+package com.shayu.onetoone.activity.login;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+
+import com.shayu.onetoone.R;
+import com.shayu.onetoone.activity.AbsOTOActivity;
+
+/**
+ * 完善个人资料
+ */
+public class CompleteActivity extends AbsOTOActivity {
+
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_complete;
+    }
+
+    @Override
+    protected void main(Bundle savedInstanceState) {
+
+    }
+}
\ No newline at end of file
diff --git a/OneToOne/src/main/java/com/shayu/onetoone/activity/login/TagselectionActivity.java b/OneToOne/src/main/java/com/shayu/onetoone/activity/login/TagselectionActivity.java
new file mode 100644
index 000000000..33bc4cacf
--- /dev/null
+++ b/OneToOne/src/main/java/com/shayu/onetoone/activity/login/TagselectionActivity.java
@@ -0,0 +1,16 @@
+package com.shayu.onetoone.activity.login;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.os.Bundle;
+
+import com.shayu.onetoone.R;
+
+public class TagselectionActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_tagselection);
+    }
+}
\ No newline at end of file
diff --git a/OneToOne/src/main/res/layout/activity_complete.xml b/OneToOne/src/main/res/layout/activity_complete.xml
new file mode 100644
index 000000000..42dcf4ed3
--- /dev/null
+++ b/OneToOne/src/main/res/layout/activity_complete.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@mipmap/bg_login"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="@mipmap/bg_w">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="80dp"
+            android:gravity="center"
+            android:text="完善资料"
+            android:textColor="#FFFFFF"
+            android:textSize="33sp"
+            android:textStyle="bold" />
+
+        <RelativeLayout
+            android:layout_width="90dp"
+            android:layout_height="90dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="10dp">
+
+
+            <ImageView
+                android:layout_width="90dp"
+                android:layout_height="90dp"
+                android:background="@color/red"/>
+
+            <TextView
+                android:layout_width="70dp"
+                android:layout_height="30dp"
+                android:textSize="12sp"
+                android:textColor="#FFFFFF"
+                android:gravity="center"
+                android:layout_alignParentBottom="true"
+                android:layout_centerHorizontal="true"
+                android:background="@drawable/background_8f7cdf"
+                android:text="去选择"/>
+
+        </RelativeLayout>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="昵称"
+            android:textColor="#ff333333"
+            android:layout_marginTop="60dp"
+            android:layout_marginLeft="15dp"
+            android:textSize="16sp"/>
+
+        <EditText
+            android:layout_width="match_parent"
+            android:layout_height="47dp"
+            android:background="@mipmap/ws_ind"
+            android:layout_marginLeft="30dp"
+            android:layout_marginRight="30dp"
+            android:textColor="#999999"
+            android:gravity="center"
+            android:textColorHint="#999999"
+            android:textSize="14sp"/>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="性别"
+            android:textColor="#ff333333"
+            android:layout_marginTop="20dp"
+            android:layout_marginLeft="15dp"
+            android:textSize="16sp"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_width="119dp"
+                android:layout_height="45dp"
+                android:layout_weight="1"
+                android:background="@mipmap/wi_c"
+                android:layout_marginLeft="30dp"
+                android:layout_marginRight="30dp"
+                android:textColor="#999999"
+                android:gravity="center"
+                android:textColorHint="#999999"
+                android:text="女"
+                android:textSize="14sp"/>
+
+            <TextView
+                android:layout_width="119dp"
+                android:layout_height="45dp"
+                android:layout_weight="1"
+                android:background="@mipmap/wi_c"
+                android:layout_marginLeft="30dp"
+                android:layout_marginRight="30dp"
+                android:textColor="#999999"
+                android:gravity="center"
+                android:textColorHint="#999999"
+                android:text="男"
+                android:textSize="14sp"/>
+        </LinearLayout>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="生日"
+            android:textColor="#ff333333"
+            android:layout_marginTop="20dp"
+            android:layout_marginLeft="15dp"
+            android:textSize="16sp"/>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="47dp"
+            android:background="@mipmap/ws_ind"
+            android:layout_marginLeft="30dp"
+            android:layout_marginRight="30dp"
+            android:textColor="#999999"
+            android:gravity="center"
+            android:textColorHint="#999999"
+            android:textSize="14sp"/>
+
+        <Button
+            android:id="@+id/btn_register"
+            android:layout_width="match_parent"
+            android:layout_height="47dp"
+            android:layout_marginLeft="30dp"
+            android:layout_marginRight="30dp"
+            android:layout_marginTop="30dp"
+            android:background="@drawable/background_8f7cdf"
+            android:gravity="center"
+            android:onClick="registerClick"
+            android:text="完成"
+            android:textColor="@color/white"
+            android:textSize="16sp"
+            />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OneToOne/src/main/res/layout/activity_tagselection.xml b/OneToOne/src/main/res/layout/activity_tagselection.xml
new file mode 100644
index 000000000..50dc708d0
--- /dev/null
+++ b/OneToOne/src/main/res/layout/activity_tagselection.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".activity.login.TagselectionActivity">
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OneToOne/src/main/res/values/strings.xml b/OneToOne/src/main/res/values/strings.xml
index 86a32d34f..f0e03ec59 100644
--- a/OneToOne/src/main/res/values/strings.xml
+++ b/OneToOne/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">1v1</string>
+    <string name="title_activity_tag_selection">TagSelection_Activity</string>
 </resources>
\ No newline at end of file