From 74810e5586c5469b5703b15ebffc760b4ab0ae5a Mon Sep 17 00:00:00 2001 From: hayden <2867571834@qq.com> Date: Mon, 27 Mar 2023 11:35:53 +0800 Subject: [PATCH] vision2 --- .idea/vcs.xml | 6 + app/build.gradle | 2 + app/src/main/AndroidManifest.xml | 17 +- .../example/myapplication/LoginActivity.java | 21 ++- .../example/myapplication/MineActivity.java | 15 +- .../myapplication/RigsterActivity.java | 158 ++++++++++++++---- app/src/main/res/drawable/app_icon.jpg | Bin 0 -> 32804 bytes app/src/main/res/layout/user_login.xml | 12 +- app/src/main/res/layout/user_rigster.xml | 3 +- gradle.properties | 3 +- settings.gradle | 13 ++ 11 files changed, 196 insertions(+), 54 deletions(-) create mode 100644 .idea/vcs.xml create mode 100644 app/src/main/res/drawable/app_icon.jpg diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index dcf189d..d524d30 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,5 +36,7 @@ dependencies { testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + implementation 'liji.library.dev:citypickerview:1.1.0' + } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c03b389..c919e0b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,18 +6,21 @@ android:allowBackup="true" android:dataExtractionRules="@xml/data_extraction_rules" android:fullBackupContent="@xml/backup_rules" - android:icon="@mipmap/ic_launcher" + android:icon="@drawable/app_icon" + android:roundIcon="@drawable/app_icon" android:label="@string/app_name" android:supportsRtl="true" - android:theme="@style/Theme.MyApplication" + android:theme="@style/AppTheme" tools:targetApi="31"> + + - + @@ -25,21 +28,13 @@ - - - - - - - - diff --git a/app/src/main/java/com/example/myapplication/LoginActivity.java b/app/src/main/java/com/example/myapplication/LoginActivity.java index 8763851..45f72f8 100644 --- a/app/src/main/java/com/example/myapplication/LoginActivity.java +++ b/app/src/main/java/com/example/myapplication/LoginActivity.java @@ -1,12 +1,31 @@ package com.example.myapplication; +import android.annotation.SuppressLint; import android.app.Activity; +import android.app.AlertDialog; +import android.content.Intent; import android.os.Bundle; +import android.view.View; + +import androidx.appcompat.app.AppCompatActivity; + +public class LoginActivity extends AppCompatActivity implements View.OnClickListener{ -public class LoginActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.user_login); + findViewById(R.id.login).setOnClickListener(this); + findViewById(R.id.rigster).setOnClickListener(this); + } + + + @Override + public void onClick(View view) { + if(view.getId() == R.id.rigster){ + startActivity(new Intent(this,RigsterActivity.class)); + }else{ + startActivity(new Intent(this,MineActivity.class)); + } } } diff --git a/app/src/main/java/com/example/myapplication/MineActivity.java b/app/src/main/java/com/example/myapplication/MineActivity.java index d691c9f..10eee42 100644 --- a/app/src/main/java/com/example/myapplication/MineActivity.java +++ b/app/src/main/java/com/example/myapplication/MineActivity.java @@ -2,16 +2,25 @@ package com.example.myapplication; import androidx.appcompat.app.AppCompatActivity; +import android.content.Intent; import android.os.Bundle; +import android.view.View; import android.widget.TextView; -public class MineActivity extends AppCompatActivity { +public class MineActivity extends AppCompatActivity implements View.OnClickListener{ @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.mine); + findViewById(R.id.outload).setOnClickListener(this); } - -} \ No newline at end of file + @Override + public void onClick(View view) { + if(view.getId() == R.id.outload){ + //待修改，因為這樣數據還在 + finish(); + } + } +} diff --git a/app/src/main/java/com/example/myapplication/RigsterActivity.java b/app/src/main/java/com/example/myapplication/RigsterActivity.java index d8f2542..689e221 100644 --- a/app/src/main/java/com/example/myapplication/RigsterActivity.java +++ b/app/src/main/java/com/example/myapplication/RigsterActivity.java @@ -2,45 +2,145 @@ package com.example.myapplication; import android.app.Activity; import android.app.AppComponentFactory; +import android.content.Intent; +import android.graphics.Color; import android.os.Bundle; import android.view.View; +import android.widget.Button; +import android.widget.EditText; +import android.widget.RadioGroup; import android.widget.TextView; +import android.widget.Toast; import androidx.appcompat.app.AppCompatActivity; -public class RigsterActivity extends Activity { +import com.lljjcoder.citypickerview.widget.CityPicker; + +public class RigsterActivity extends AppCompatActivity implements View.OnClickListener, RadioGroup.OnCheckedChangeListener { + private EditText usernameEdit,passEdit,surePasswordEdit; + private TextView cityText; + private CityPicker cityPicker; + private Button regButton; + private RadioGroup sexGroup; + private String sexStr = "男"; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.user_rigster); + init(); + } + + private void init(){ + cityText = findViewById(R.id.ri_province); + cityText.setOnClickListener(this); + usernameEdit = findViewById(R.id.rig_username); + passEdit = findViewById(R.id.rig_password); + surePasswordEdit = findViewById(R.id.re_password); + regButton = findViewById(R.id.re_register); + regButton.setOnClickListener(this); + sexGroup = findViewById(R.id.sex); + sexGroup.setOnCheckedChangeListener(this); + } + + + + @Override + public void onClick(View v) { + switch(v.getId()){ + case R.id.ri_province: + initCityPicker(); + cityPicker.show(); + break; + case R.id.re_register: + //注册验证方法 + validateRegister(); + break; + } } -} -// //界面组件初始化 -// private void init(){ -// cityText = findViewById(R.id.ri_province); -// cityText.setOnClickListener(this); -// } -// -// @Override -// public void onClick(View v) { -// switch(v.getId()){ -// case R.id.ri_province: -// initCityPicker(); -// cityPicker.show(); -// break; -// } -// } // -// //初始化城市选择器 -// private void initCityPicker() { -// cityPicker = new CityPicker.Builder(RigsterActivity.this) -// .textSize(16) -// .title("地址选择") -// .backgroundPop(0xa0000000) -// .title -// } -//} - - - //初始化城市选择爱 + //初始化城市选择器 + private void initCityPicker() { + cityPicker = new CityPicker.Builder(RigsterActivity.this) + .textSize(16) + .title("地址选择") + .backgroundPop(0xa0000000) + .titleBackgroundColor("#EfB81c") + .titleTextColor("#000000") + .backgroundPop(0xa0000000) + .confirTextColor("#000000") + .cancelTextColor("#000000") + .province("湖南省") + .city("长沙市") + .district("雨花区") + .textColor(Color.parseColor("#000000")) + .provinceCyclic(true) + .cityCyclic(false) + .districtCyclic(false) + .visibleItemsCount(7) + .itemPadding(10) + .onlyShowProvinceAndCity(false).build(); + cityPicker.setOnCityItemClickListener(new CityPicker.OnCityItemClickListener(){ + @Override + public void onSelected(String...strings){ + String province = strings[0]; + String city = strings[1]; + String district = strings[2]; + cityText.setText(String.format("%s %s %s",province,city,district)); + } + @Override + public void onCancel() { + + } + }); + } + + + //注册验证 + public void validateRegister(){ + Intent intent = new Intent(RigsterActivity.this,LoginActivity.class); + String username = usernameEdit.getText().toString(); + String password = passEdit.getText().toString(); + String surePassword = surePasswordEdit.getText().toString(); + String city = cityText.getText().toString(); + //判断两次密码是否一致 + if(password.equals(surePassword)){ + if(!username.equals("") || !password.equals("")) { + if (!city.equals("")) { + Bundle bundle = new Bundle(); + bundle.putString("username", username); + bundle.putString("password", password); + bundle.putString("sex", sexStr); + bundle.putString("city", city); + intent.putExtras(bundle); + startActivity(intent); + } else { + Toast.makeText(RigsterActivity.this, "请选择地址", + Toast.LENGTH_SHORT).show(); + } + }else { + Toast.makeText(RigsterActivity.this,"账号或密码未填写", + Toast.LENGTH_SHORT).show(); + } + }else { + Toast.makeText(RigsterActivity.this,"两次密码输入不一致", + Toast.LENGTH_SHORT).show(); + } + Toast.makeText(RigsterActivity.this,"注册成功",Toast.LENGTH_SHORT).show(); + } + + @Override + public void onCheckedChanged(RadioGroup group,int checkedId){ +// 根据用户的选择来改变性别 + sexStr = checkedId == R.id.rig_man?"男":"女"; + } + +} + + + + + + + diff --git a/app/src/main/res/drawable/app_icon.jpg b/app/src/main/res/drawable/app_icon.jpg new file mode 100644 index 0000000000000000000000000000000000000000..08498415a4e52d4de917e4262ef6328367122b26 GIT binary patch literal 32804 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 Ljt)@my#D_HAFvK$ literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/user_login.xml b/app/src/main/res/layout/user_login.xml index 94b8611..bcb5439 100644 --- a/app/src/main/res/layout/user_login.xml +++ b/app/src/main/res/layout/user_login.xml @@ -5,11 +5,11 @@ android:layout_height="match_parent" android:orientation="vertical" android:background="@color/white"> - + @@ -95,7 +95,7 @@ android:textSize="18sp" />