Skip to content

HBHAndroid
HBHAndroid
Commit 4fd1ece5 authored by 小费同学阿's avatar 小费同学阿 💬
Browse files
Options

环渤海-页面交互

parent 40238768
Hide whitespace changes
Inline Side-by-side
Showing with 1683 additions and 0 deletions
.idea/.name 0 → 100644
View file @ 4fd1ece5
HBHFurniture
\ No newline at end of file
.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/shelved.patch 0 → 100644
View file @ 4fd1ece5
Index: app/src/main/java/com/example/merchanthbh/ui/login/LoginActivity.kt
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+>package com.example.merchanthbh.ui.login\r\n\r\nimport android.os.Bundle\r\nimport com.example.merchanthbh.BR\r\nimport com.example.merchanthbh.R\r\nimport com.example.merchanthbh.databinding.ActivityLoginBinding\r\nimport com.example.merchanthbh.http.data.LoginModel\r\nimport me.goldze.mvvmhabit.base.BaseActivity\r\n\r\nclass LoginActivity() : BaseActivity<ActivityLoginBinding, LoginViewModel>() {\r\n\r\n\r\n override fun initContentView(savedInstanceState: Bundle?): Int {\r\n\r\n return R.layout.activity_login\r\n\r\n }\r\n\r\n override fun initVariableId(): Int {\r\n return BR.loginViewModel\r\n }\r\n\r\n override fun initData() {\r\n super.initData()\r\n }\r\n\r\n override fun initViewObservable() {\r\n super.initViewObservable()\r\n }\r\n\r\n override fun initViewModel(): LoginViewModel {\r\n val lm:LoginModel= LoginModel()\r\n return LoginViewModel(application,lm)\r\n }\r\n}
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/src/main/java/com/example/merchanthbh/ui/login/LoginActivity.kt b/app/src/main/java/com/example/merchanthbh/ui/login/LoginActivity.kt
--- a/app/src/main/java/com/example/merchanthbh/ui/login/LoginActivity.kt (revision 5f710ddce9dd58d90f79ee61cea5bd78ca56183e)
+++ b/app/src/main/java/com/example/merchanthbh/ui/login/LoginActivity.kt (date 1688539367459)
@@ -1,6 +1,10 @@
package com.example.merchanthbh.ui.login
+import android.content.ContentValues.TAG
+import android.content.Intent
import android.os.Bundle
+import android.util.Log
+import android.widget.Button
import com.example.merchanthbh.BR
import com.example.merchanthbh.R
import com.example.merchanthbh.databinding.ActivityLoginBinding
@@ -14,6 +18,7 @@
return R.layout.activity_login
+
}
override fun initVariableId(): Int {
Index: app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+>package com.example.merchanthbh.ui.login;\r\n\r\nimport static me.goldze.mvvmhabit.utils.Utils.Interceptor_TOKEN;\r\n\r\nimport android.app.Application;\r\nimport android.text.TextUtils;\r\n\r\nimport androidx.annotation.NonNull;\r\nimport androidx.databinding.ObservableField;\r\n\r\nimport com.example.merchanthbh.http.data.LoginModel;\r\nimport com.example.merchanthbh.ui.merchantenter.MerchantEnterActivity;\r\n\r\nimport io.reactivex.rxjava3.disposables.Disposable;\r\nimport io.reactivex.rxjava3.functions.Consumer;\r\nimport me.goldze.mvvmhabit.base.BaseViewModel;\r\nimport me.goldze.mvvmhabit.binding.command.BindingAction;\r\nimport me.goldze.mvvmhabit.binding.command.BindingCommand;\r\nimport me.goldze.mvvmhabit.http.ApiDisposableObserver;\r\nimport me.goldze.mvvmhabit.utils.RxUtils;\r\nimport me.goldze.mvvmhabit.utils.ToastUtils;\r\n\r\npublic class LoginViewModel extends BaseViewModel<LoginModel> {\r\n\r\n //用户名的绑定\r\n public ObservableField<String> userName = new ObservableField<>(\"\");\r\n //密码的绑定\r\n public ObservableField<String> password = new ObservableField<>(\"\");\r\n\r\n public LoginViewModel(@NonNull Application application, LoginModel model) {\r\n super(application, model);\r\n }\r\n\r\n //跳转开店页面\r\n public BindingCommand goMerchantEnter = new BindingCommand(new BindingAction() {\r\n @Override\r\n public void call() {\r\n startActivity(MerchantEnterActivity.class);\r\n }\r\n });\r\n\r\n\r\n //登陆\r\n public BindingCommand login = new BindingCommand(new BindingAction() {\r\n @Override\r\n public void call() {\r\n if (TextUtils.isEmpty(userName.get().toString())) {\r\n ToastUtils.showShort(\"请输入账号！\");\r\n\r\n }else if (TextUtils.isEmpty(password.get().toString())) {\r\n ToastUtils.showShort(\"请输入密码！\");\r\n }else {\r\n model.Login(userName.get().toString(), password.get().toString())\r\n .compose(RxUtils.schedulersTransformer()) //线程调度\r\n// .compose(RxUtils.exceptionTransformer()) // 网络错误的异常转换, 这里可以换成自己的ExceptionHandle\r\n .doOnSubscribe(LoginViewModel.this)\r\n .doOnSubscribe (new Consumer<Disposable>() {\r\n @Override\r\n public void accept(Disposable disposable) throws Exception {\r\n showDialog(\"正在请求...\");\r\n }\r\n }).subscribeWith(new ApiDisposableObserver<String>() {\r\n @Override\r\n public void onSuccess(String resultBean) {\r\n //是指token\r\n Interceptor_TOKEN=resultBean;\r\n dismissDialog();\r\n }\r\n\r\n @Override\r\n public void onError(String Error) {\r\n dismissDialog();\r\n }\r\n\r\n\r\n });\r\n }\r\n }\r\n });\r\n\r\n}\r\n\r\n\r\n
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java b/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java
--- a/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java (revision 5f710ddce9dd58d90f79ee61cea5bd78ca56183e)
+++ b/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java (date 1688540177860)
@@ -38,6 +38,13 @@
startActivity(MerchantEnterActivity.class);
}
});
+ //(临时使用)跳转首页
+ public BindingCommand goHome = new BindingCommand(new BindingAction() {
+ @Override
+ public void call() {
+ startActivity(HomeActivity.class);
+ }
+ });
//登陆
Index: app/src/main/res/layout/activity_login.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+><?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n<layout xmlns:android=\"http://schemas.android.com/apk/res/android\"\r\n xmlns:app=\"http://schemas.android.com/apk/res-auto\"\r\n xmlns:tools=\"http://schemas.android.com/tools\"\r\n xmlns:binding=\"http://schemas.android.com/apk/res-auto\">\r\n <data>\r\n\r\n <variable\r\n name=\"loginViewModel\"\r\n type=\"com.example.merchanthbh.ui.login.LoginViewModel\" />\r\n </data>\r\n <androidx.constraintlayout.widget.ConstraintLayout\r\n android:layout_width=\"match_parent\"\r\n android:layout_height=\"match_parent\"\r\n android:fitsSystemWindows=\"true\"\r\n tools:context=\".MainActivity\">\r\n\r\n <!-- 背景-->\r\n <ImageView\r\n android:layout_width=\"match_parent\"\r\n android:layout_height=\"192dp\"\r\n android:src=\"@mipmap/login_img_bg1\"\r\n android:scaleType=\"fitEnd\"\r\n android:fitsSystemWindows=\"true\"\r\n app:layout_constraintTop_toTopOf=\"parent\"/>\r\n <ImageView\r\n android:layout_width=\"match_parent\"\r\n android:layout_height=\"164dp\"\r\n android:src=\"@mipmap/login_img_bg2\"\r\n android:scaleType=\"fitXY\"\r\n app:layout_constraintBottom_toBottomOf=\"parent\"/>\r\n\r\n <!--主体-->\r\n <androidx.constraintlayout.widget.ConstraintLayout\r\n android:layout_width=\"match_parent\"\r\n android:paddingLeft=\"31dp\"\r\n android:paddingRight=\"30dp\"\r\n android:layout_height=\"match_parent\">\r\n\r\n <TextView\r\n android:id=\"@+id/tv_login_enter\"\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"wrap_content\"\r\n android:layout_marginTop=\"57dp\"\r\n android:text=\"我要开店\"\r\n android:textColor=\"@color/text_foreground\"\r\n android:textSize=\"16sp\"\r\n binding:onClickCommand=\"@{loginViewModel.goMerchantEnter}\"\r\n app:layout_constraintRight_toRightOf=\"parent\"\r\n app:layout_constraintTop_toTopOf=\"parent\" />\r\n\r\n <ImageView\r\n android:layout_width=\"66dp\"\r\n android:layout_height=\"44dp\"\r\n android:src=\"@mipmap/login_logo\"\r\n android:layout_marginTop=\"121dp\"\r\n app:layout_constraintLeft_toLeftOf=\"parent\"\r\n app:layout_constraintTop_toTopOf=\"parent\"/>\r\n\r\n <TextView\r\n android:id=\"@+id/tv_login_wel\"\r\n style=\"@style/BaseWrapView\"\r\n app:layout_constraintLeft_toLeftOf=\"parent\"\r\n app:layout_constraintTop_toTopOf=\"parent\"\r\n android:layout_marginTop=\"201dp\"\r\n android:text=\"欢迎登陆！\"\r\n android:textColor=\"@color/black\"\r\n android:textStyle=\"bold\"\r\n android:textSize=\"24sp\"/>\r\n <TextView\r\n style=\"@style/BaseWrapView\"\r\n app:layout_constraintLeft_toLeftOf=\"parent\"\r\n app:layout_constraintTop_toBottomOf=\"@id/tv_login_wel\"\r\n android:layout_marginTop=\"17dp\"\r\n android:text=\"在这里开启新的彼岸\"\r\n android:textColor=\"@color/text_grey\"\r\n android:textSize=\"16sp\"/>\r\n\r\n <EditText\r\n android:layout_width=\"match_parent\"\r\n style=\"@style/CommEdit\"\r\n android:id=\"@+id/et_login_username\"\r\n android:hint=\"请输入账号\"\r\n android:text=\"@={loginViewModel.userName}\"\r\n app:layout_constraintTop_toBottomOf=\"@+id/tv_login_wel\"\r\n android:layout_marginTop=\"89dp\"\r\n android:background=\"@null\"/>\r\n <View\r\n android:layout_width=\"match_parent\"\r\n android:layout_height=\"1dp\"\r\n android:layout_marginTop=\"16dp\"\r\n android:background=\"@color/line_grey\"\r\n app:layout_constraintTop_toBottomOf=\"@+id/et_login_username\"\r\n />\r\n <EditText\r\n android:layout_width=\"match_parent\"\r\n style=\"@style/CommEdit\"\r\n android:id=\"@+id/et_login_pwd\"\r\n android:hint=\"请输入密码\"\r\n app:layout_constraintTop_toBottomOf=\"@+id/et_login_username\"\r\n android:layout_marginTop=\"34dp\"\r\n android:maxLength=\"18\"\r\n android:text=\"@={loginViewModel.password}\"\r\n android:inputType=\"textPassword\"\r\n android:background=\"#00aaaaaa\"/>\r\n <View\r\n android:layout_width=\"match_parent\"\r\n android:layout_height=\"1dp\"\r\n android:layout_marginTop=\"16dp\"\r\n android:background=\"@color/line_grey\"\r\n app:layout_constraintTop_toBottomOf=\"@+id/et_login_pwd\"\r\n />\r\n\r\n <TextView\r\n style=\"@style/BaseWrapView\"\r\n app:layout_constraintRight_toRightOf=\"parent\"\r\n app:layout_constraintTop_toBottomOf=\"@id/et_login_pwd\"\r\n android:layout_marginTop=\"34dp\"\r\n android:text=\"忘记密码\"\r\n android:id=\"@+id/tv_login_forget\"\r\n android:textColor=\"@color/text_grey\"\r\n android:textSize=\"16sp\"/>\r\n <androidx.appcompat.widget.AppCompatButton\r\n android:id=\"@+id/btn_login\"\r\n android:layout_width=\"match_parent\"\r\n android:layout_height=\"48dp\"\r\n android:background=\"@drawable/bg_forground_radius_24\"\r\n app:layout_constraintTop_toBottomOf=\"@+id/tv_login_forget\"\r\n android:layout_marginTop=\"36dp\"\r\n android:textColor=\"@color/white\"\r\n binding:onClickCommand=\"@{loginViewModel.login}\"\r\n android:text=\"登录\"\r\n android:textSize=\"16sp\"\r\n android:textStyle=\"bold\"\r\n />\r\n <ImageView\r\n android:layout_width=\"18dp\"\r\n android:layout_height=\"18dp\"\r\n android:id=\"@+id/iv_login_agreement\"\r\n app:layout_constraintTop_toBottomOf=\"@+id/btn_login\"\r\n android:layout_marginTop=\"21dp\"\r\n android:src=\"@drawable/select_login_agreement\"\r\n app:layout_constraintLeft_toLeftOf=\"parent\"/>\r\n <TextView\r\n android:layout_width=\"0dp\"\r\n android:layout_height=\"wrap_content\"\r\n android:textSize=\"14sp\"\r\n android:text=\"我已阅读并同意《用户协议》、《隐私条款》以及《中国移动认证服务条款》\"\r\n app:layout_constraintLeft_toRightOf=\"@+id/iv_login_agreement\"\r\n android:layout_marginLeft=\"7dp\"\r\n app:layout_constraintRight_toRightOf=\"parent\"\r\n app:layout_constraintTop_toTopOf=\"@+id/iv_login_agreement\"/>\r\n\r\n\r\n\r\n\r\n </androidx.constraintlayout.widget.ConstraintLayout>\r\n </androidx.constraintlayout.widget.ConstraintLayout>\r\n</layout>
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
--- a/app/src/main/res/layout/activity_login.xml (revision 5f710ddce9dd58d90f79ee61cea5bd78ca56183e)
+++ b/app/src/main/res/layout/activity_login.xml (date 1688538960963)
@@ -63,6 +63,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="201dp"
+ binding:onClickCommand="@{loginViewModel.goHome}"
android:text="欢迎登陆！"
android:textColor="@color/black"
android:textStyle="bold"
Index: app/src/main/res/layout/activity_home.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
new file mode 100644
--- /dev/null (date 1688527791996)
+++ b/app/src/main/res/layout/activity_home.xml (date 1688527791996)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:orientation="vertical">
+ <!-- 点击事件-->
+ <Button
+ android:id="@+id/bt_yz"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="跳转按钮"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="这是首页啊啊啊"/>
+
+</LinearLayout>
\ No newline at end of file
Index: app/src/main/java/com/example/merchanthbh/MainActivity.kt
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+>package com.example.merchanthbh\r\n\r\nimport androidx.appcompat.app.AppCompatActivity\r\nimport android.os.Bundle\r\n\r\nclass MainActivity : AppCompatActivity() {\r\n override fun onCreate(savedInstanceState: Bundle?) {\r\n super.onCreate(savedInstanceState)\r\n setContentView(R.layout.activity_merchant_enter)\r\n }\r\n}
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/src/main/java/com/example/merchanthbh/MainActivity.kt b/app/src/main/java/com/example/merchanthbh/MainActivity.kt
--- a/app/src/main/java/com/example/merchanthbh/MainActivity.kt (revision 5f710ddce9dd58d90f79ee61cea5bd78ca56183e)
+++ b/app/src/main/java/com/example/merchanthbh/MainActivity.kt (date 1688534597682)
@@ -6,6 +6,7 @@
class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
+// setContentView(R.layout.activity_merchant_enter)
setContentView(R.layout.activity_merchant_enter)
}
}
\ No newline at end of file
Index: local.properties
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+>## This file is automatically generated by Android Studio.\r\n# Do not modify this file -- YOUR CHANGES WILL BE ERASED!\r\n#\r\n# This file should *NOT* be checked into Version Control Systems,\r\n# as it contains information specific to your local configuration.\r\n#\r\n# Location of the SDK. This is only used by Gradle.\r\n# For customization when using a Version Control System, please read the\r\n# header note.\r\nsdk.dir=D\\:\\\\workSoft\\\\SDK
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>ISO-8859-1
===================================================================
diff --git a/local.properties b/local.properties
--- a/local.properties (revision 5f710ddce9dd58d90f79ee61cea5bd78ca56183e)
+++ b/local.properties (date 1688524983858)
@@ -1,10 +1,8 @@
-## This file is automatically generated by Android Studio.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file should *NOT* be checked into Version Control Systems,
+## This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
-sdk.dir=D\:\\workSoft\\SDK
\ No newline at end of file
+#Wed Jul 05 10:43:03 CST 2023
+sdk.dir=C\:\\AndroidSDK
Index: app/src/main/res/drawable/bg_red_radius_4.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+><?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n<shape xmlns:android=\"http://schemas.android.com/apk/res/android\">\r\n\r\n <solid android:color=\"#C8382A\"/>\r\n <corners android:radius=\"4dp\"/>\r\n</shape>
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/src/main/res/drawable/bg_red_radius_4.xml b/app/src/main/res/drawable/bg_red_radius_4.xml
--- a/app/src/main/res/drawable/bg_red_radius_4.xml (revision 5f710ddce9dd58d90f79ee61cea5bd78ca56183e)
+++ b/app/src/main/res/drawable/bg_red_radius_4.xml (date 1688526305111)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
-
<solid android:color="#C8382A"/>
<corners android:radius="4dp"/>
</shape>
\ No newline at end of file
Index: app/src/main/java/com/example/merchanthbh/ui/home/HomeActivity.kt
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/src/main/java/com/example/merchanthbh/ui/home/HomeActivity.kt b/app/src/main/java/com/example/merchanthbh/ui/home/HomeActivity.kt
new file mode 100644
--- /dev/null (date 1688540874228)
+++ b/app/src/main/java/com/example/merchanthbh/ui/home/HomeActivity.kt (date 1688540874228)
@@ -0,0 +1,7 @@
+package com.example.merchanthbh.ui.home
+
+import androidx.appcompat.app.AppCompatActivity
+
+class HomeActivity : AppCompatActivity(){
+override fun onCreate
+}
\ No newline at end of file
Index: .idea/workspace.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<project version=\"4\">\r\n <component name=\"AndroidLayouts\">\r\n <shared>\r\n <config />\r\n </shared>\r\n </component>\r\n <component name=\"AutoImportSettings\">\r\n <option name=\"autoReloadType\" value=\"NONE\" />\r\n </component>\r\n <component name=\"ChangeListManager\">\r\n <list default=\"true\" id=\"1610d094-2fe0-4efc-9eff-ac55fbf06aaf\" name=\"Changes\" comment=\"\" />\r\n <option name=\"SHOW_DIALOG\" value=\"false\" />\r\n <option name=\"HIGHLIGHT_CONFLICTS\" value=\"true\" />\r\n <option name=\"HIGHLIGHT_NON_ACTIVE_CHANGELIST\" value=\"false\" />\r\n <option name=\"LAST_RESOLUTION\" value=\"IGNORE\" />\r\n </component>\r\n <component name=\"ExecutionTargetManager\" SELECTED_TARGET=\"device_and_snapshot_combo_box_target[XPL0219C19001938]\" />\r\n <component name=\"ExternalProjectsData\">\r\n <projectState path=\"$PROJECT_DIR$\">\r\n <ProjectState />\r\n </projectState>\r\n </component>\r\n <component name=\"ExternalProjectsManager\">\r\n <system id=\"GRADLE\">\r\n <state>\r\n <projects_view>\r\n <tree_state>\r\n <expand>\r\n <path>\r\n <item name=\"\" type=\"6a2764b6:ExternalProjectsStructure$RootNode\" />\r\n <item name=\"HBHFurniture\" type=\"f1a62948:ProjectNode\" />\r\n </path>\r\n </expand>\r\n <select />\r\n </tree_state>\r\n </projects_view>\r\n </state>\r\n </system>\r\n </component>\r\n <component name=\"FileTemplateManagerImpl\">\r\n <option name=\"RECENT_TEMPLATES\">\r\n <list>\r\n <option value=\"resourceFile\" />\r\n <option value=\"Kotlin Class\" />\r\n <option value=\"Class\" />\r\n </list>\r\n </option>\r\n </component>\r\n <component name=\"Git.Settings\">\r\n <option name=\"RECENT_GIT_ROOT_PATH\" value=\"$PROJECT_DIR$\" />\r\n </component>\r\n <component name=\"HighlightingSettingsPerFile\">\r\n <setting file=\"file://$USER_HOME$/.gradle/caches/transforms-3/2c1521edf2dcac9fbf1437a2d73e6dba/transformed/cardview-1.0.0/res/values/values.xml\" root0=\"SKIP_INSPECTION\" />\r\n <setting file=\"file://$USER_HOME$/.gradle/caches/transforms-3/5edeb6b2f97c50671381949df04f034e/transformed/appcompat-1.4.1/res/values/values.xml\" root0=\"SKIP_INSPECTION\" />\r\n </component>\r\n <component name=\"MarkdownSettingsMigration\">\r\n <option name=\"stateVersion\" value=\"1\" />\r\n </component>\r\n <component name=\"ProjectId\" id=\"2RPpnV8z4IMISQ7dwfKHrG3L5ml\" />\r\n <component name=\"ProjectLevelVcsManager\" settingsEditedManually=\"true\" />\r\n <component name=\"ProjectViewState\">\r\n <option name=\"hideEmptyMiddlePackages\" value=\"true\" />\r\n <option name=\"showLibraryContents\" value=\"true\" />\r\n </component>\r\n <component name=\"PropertiesComponent\"><![CDATA[{\r\n \"keyToString\": {\r\n \"DEBUGGABLE_DEVICE\": \"huawei-tas_an00-XPL0219C19001938\",\r\n \"DEBUGGABLE_PROCESS\": \"com.example.merchanthbh\",\r\n \"DEBUGGER_ID\": \"Auto\",\r\n \"RunOnceActivity.OpenProjectViewOnStart\": \"true\",\r\n \"RunOnceActivity.ShowReadmeOnStart\": \"true\",\r\n \"RunOnceActivity.cidr.known.project.marker\": \"true\",\r\n \"SHOW_ALL_PROCESSES\": \"false\",\r\n \"android-custom-viewC:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.appcompat/appcompat/1.4.1/f9e48179ea0c6ac0080a277b9383f74523f56aa2/appcompat-1.4.1-sources.jar!/androidx/appcompat/widget/Toolbar.java_SELECTED\": \"Toolbar\",\r\n \"android-custom-viewD:/androidProJect/HBHFurniture/xxviewlibrary/src/main/java/com/example/xxviewlibrary/witget/XxBar.kt_SELECTED\": \"XxBar\",\r\n \"cidr.known.project.marker\": \"true\",\r\n \"dart.analysis.tool.window.visible\": \"false\",\r\n \"last_directory_selection\": \"D:/androidProJect/HBHFurniture/app/src/main/res/mipmap-xhdpi\",\r\n \"last_opened_file_path\": \"D:/androidProJect/HBHFurniture\",\r\n \"project.structure.last.edited\": \"Dependencies\",\r\n \"project.structure.proportion\": \"0.17\",\r\n \"project.structure.side.proportion\": \"0.2\",\r\n \"settings.editor.selected.configurable\": \"preferences.pluginManager\",\r\n \"show.migrate.to.gradle.popup\": \"false\"\r\n }\r\n}]]></component>\r\n <component name=\"PsdUISettings\">\r\n <option name=\"MODULE_TAB\" value=\"Signing Configs\" />\r\n <option name=\"LAST_EDITED_SIGNING_CONFIG\" value=\"debug\" />\r\n <option name=\"LAST_EDITED_BUILD_TYPE\" value=\"release\" />\r\n </component>\r\n <component name=\"RecentsManager\">\r\n <key name=\"CopyFile.RECENT_KEYS\">\r\n <recent name=\"D:\\androidProJect\\HBHFurniture\\app\\src\\main\\res\\xml\" />\r\n <recent name=\"D:\\androidProJect\\HBHFurniture\\app\\src\\main\\java\\com\\example\\merchanthbh\\app\" />\r\n <recent name=\"D:\\androidProJect\\HBHFurniture\\app\\src\\main\\java\\com\\example\\merchanthbh\" />\r\n <recent name=\"D:\\androidProJect\\HBHFurniture\\app\\src\\main\\res\\mipmap-xhdpi\" />\r\n <recent name=\"D:\\androidProJect\\HBHFurniture\\xxviewlibrary\\src\\main\\res\" />\r\n </key>\r\n <key name=\"MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY\">\r\n <recent name=\"com.example.merchanthbh.ui.merchantenter\" />\r\n <recent name=\"com.example.merchanthbh.http.data\" />\r\n </key>\r\n <key name=\"CopyClassDialog.RECENTS_KEY\">\r\n <recent name=\"me.goldze.mvvmhabit.http\" />\r\n <recent name=\"com.example.merchanthbh.http\" />\r\n <recent name=\"com.example.merchanthbh.app\" />\r\n </key>\r\n </component>\r\n <component name=\"RunManager\">\r\n <configuration name=\"app\" type=\"AndroidRunConfigurationType\" factoryName=\"Android App\">\r\n <module name=\"HBHFurniture.app.main\" />\r\n <option name=\"DEPLOY\" value=\"true\" />\r\n <option name=\"DEPLOY_APK_FROM_BUNDLE\" value=\"false\" />\r\n <option name=\"DEPLOY_AS_INSTANT\" value=\"false\" />\r\n <option name=\"ARTIFACT_NAME\" value=\"\" />\r\n <option name=\"PM_INSTALL_OPTIONS\" value=\"\" />\r\n <option name=\"ALL_USERS\" value=\"false\" />\r\n <option name=\"ALWAYS_INSTALL_WITH_PM\" value=\"false\" />\r\n <option name=\"CLEAR_APP_STORAGE\" value=\"false\" />\r\n <option name=\"DYNAMIC_FEATURES_DISABLED_LIST\" value=\"\" />\r\n <option name=\"ACTIVITY_EXTRA_FLAGS\" value=\"\" />\r\n <option name=\"MODE\" value=\"default_activity\" />\r\n <option name=\"CLEAR_LOGCAT\" value=\"false\" />\r\n <option name=\"SHOW_LOGCAT_AUTOMATICALLY\" value=\"false\" />\r\n <option name=\"INSPECTION_WITHOUT_ACTIVITY_RESTART\" value=\"false\" />\r\n <option name=\"TARGET_SELECTION_MODE\" value=\"DEVICE_AND_SNAPSHOT_COMBO_BOX\" />\r\n <option name=\"SELECTED_CLOUD_MATRIX_CONFIGURATION_ID\" value=\"-1\" />\r\n <option name=\"SELECTED_CLOUD_MATRIX_PROJECT_ID\" value=\"\" />\r\n <option name=\"DEBUGGER_TYPE\" value=\"Auto\" />\r\n <Auto>\r\n <option name=\"USE_JAVA_AWARE_DEBUGGER\" value=\"false\" />\r\n <option name=\"SHOW_STATIC_VARS\" value=\"true\" />\r\n <option name=\"WORKING_DIR\" value=\"\" />\r\n <option name=\"TARGET_LOGGING_CHANNELS\" value=\"lldb process:gdb-remote packets\" />\r\n <option name=\"SHOW_OPTIMIZED_WARNING\" value=\"true\" />\r\n </Auto>\r\n <Hybrid>\r\n <option name=\"USE_JAVA_AWARE_DEBUGGER\" value=\"false\" />\r\n <option name=\"SHOW_STATIC_VARS\" value=\"true\" />\r\n <option name=\"WORKING_DIR\" value=\"\" />\r\n <option name=\"TARGET_LOGGING_CHANNELS\" value=\"lldb process:gdb-remote packets\" />\r\n <option name=\"SHOW_OPTIMIZED_WARNING\" value=\"true\" />\r\n </Hybrid>\r\n <Java />\r\n <Native>\r\n <option name=\"USE_JAVA_AWARE_DEBUGGER\" value=\"false\" />\r\n <option name=\"SHOW_STATIC_VARS\" value=\"true\" />\r\n <option name=\"WORKING_DIR\" value=\"\" />\r\n <option name=\"TARGET_LOGGING_CHANNELS\" value=\"lldb process:gdb-remote packets\" />\r\n <option name=\"SHOW_OPTIMIZED_WARNING\" value=\"true\" />\r\n </Native>\r\n <Profilers>\r\n <option name=\"ADVANCED_PROFILING_ENABLED\" value=\"false\" />\r\n <option name=\"STARTUP_PROFILING_ENABLED\" value=\"false\" />\r\n <option name=\"STARTUP_CPU_PROFILING_ENABLED\" value=\"false\" />\r\n <option name=\"STARTUP_CPU_PROFILING_CONFIGURATION_NAME\" value=\"Java/Kotlin Method Sample (legacy)\" />\r\n <option name=\"STARTUP_NATIVE_MEMORY_PROFILING_ENABLED\" value=\"false\" />\r\n <option name=\"NATIVE_MEMORY_SAMPLE_RATE_BYTES\" value=\"2048\" />\r\n </Profilers>\r\n <option name=\"DEEP_LINK\" value=\"\" />\r\n <option name=\"ACTIVITY_CLASS\" value=\"\" />\r\n <option name=\"SEARCH_ACTIVITY_IN_GLOBAL_SCOPE\" value=\"false\" />\r\n <option name=\"SKIP_ACTIVITY_VALIDATION\" value=\"false\" />\r\n <method v=\"2\">\r\n <option name=\"Android.Gradle.BeforeRunTask\" enabled=\"true\" />\r\n </method>\r\n </configuration>\r\n </component>\r\n <component name=\"SpellCheckerSettings\" RuntimeDictionaries=\"0\" Folders=\"0\" CustomDictionaries=\"0\" DefaultDictionary=\"application-level\" UseSingleDictionary=\"true\" transferred=\"true\" />\r\n <component name=\"TaskManager\">\r\n <task active=\"true\" id=\"Default\" summary=\"Default task\">\r\n <changelist id=\"1610d094-2fe0-4efc-9eff-ac55fbf06aaf\" name=\"Changes\" comment=\"\" />\r\n <created>1687161738436</created>\r\n <option name=\"number\" value=\"Default\" />\r\n <option name=\"presentableId\" value=\"Default\" />\r\n <updated>1687161738436</updated>\r\n </task>\r\n <servers />\r\n </component>\r\n <component name=\"Vcs.Log.Tabs.Properties\">\r\n <option name=\"TAB_STATES\">\r\n <map>\r\n <entry key=\"MAIN\">\r\n <value>\r\n <State />\r\n </value>\r\n </entry>\r\n </map>\r\n </option>\r\n </component>\r\n <component name=\"XDebuggerManager\">\r\n <breakpoint-manager>\r\n <breakpoints>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/http/ApiDisposableObserver.java</url>\r\n <line>23</line>\r\n <option name=\"timeStamp\" value=\"11\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java</url>\r\n <line>61</line>\r\n <option name=\"timeStamp\" value=\"15\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java</url>\r\n <line>67</line>\r\n <option name=\"timeStamp\" value=\"17\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java</url>\r\n <line>71</line>\r\n <option name=\"timeStamp\" value=\"18\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex.rxjava3/rxjava/3.0.4/615c91aa196b925c3ff725cbc7b9cc2880dc33bf/rxjava-3.0.4-sources.jar!/io/reactivex/rxjava3/observers/DisposableObserver.java</url>\r\n <line>73</line>\r\n <option name=\"timeStamp\" value=\"21\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/utils/RxUtils.java</url>\r\n <line>79</line>\r\n <option name=\"timeStamp\" value=\"22\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/utils/RxUtils.java</url>\r\n <line>78</line>\r\n <option name=\"timeStamp\" value=\"23\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/utils/RxUtils.java</url>\r\n <line>94</line>\r\n <option name=\"timeStamp\" value=\"24\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/utils/RxUtils.java</url>\r\n <line>95</line>\r\n <option name=\"timeStamp\" value=\"25\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/utils/RxUtils.java</url>\r\n <line>96</line>\r\n <option name=\"timeStamp\" value=\"26\" />\r\n </line-breakpoint>\r\n </breakpoints>\r\n </breakpoint-manager>\r\n </component>\r\n</project>
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
--- a/.idea/workspace.xml (revision 5f710ddce9dd58d90f79ee61cea5bd78ca56183e)
+++ b/.idea/workspace.xml (date 1688540178239)
@@ -9,13 +9,35 @@
<option name="autoReloadType" value="NONE" />
</component>
<component name="ChangeListManager">
- <list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="" />
+ <list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="">
+ <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/home/HomeActivity.kt" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_home.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/8.0/checksums/checksums.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/checksums/checksums.lock" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/8.0/checksums/md5-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/checksums/md5-checksums.bin" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/8.0/checksums/sha1-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/checksums/sha1-checksums.bin" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.bin" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.lock" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/8.0/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/fileHashes/resourceHashesCache.bin" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/file-system.probe" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/file-system.probe" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/MainActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/MainActivity.kt" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginActivity.kt" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/res/drawable/bg_red_radius_4.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/bg_red_radius_4.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_login.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_login.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
+ </list>
<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="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[XPL0219C19001938]" />
+ <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\11194\.android\avd\Pixel_6_Pro_API_34.avd]" />
<component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$">
<ProjectState />
@@ -42,8 +64,8 @@
<option name="RECENT_TEMPLATES">
<list>
<option value="resourceFile" />
- <option value="Kotlin Class" />
<option value="Class" />
+ <option value="Kotlin Class" />
</list>
</option>
</component>
@@ -56,6 +78,9 @@
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
+ </component>
+ <component name="ProblemsViewState">
+ <option name="selectedTabId" value="CurrentFile" />
</component>
<component name="ProjectId" id="2RPpnV8z4IMISQ7dwfKHrG3L5ml" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@@ -77,11 +102,12 @@
"cidr.known.project.marker": "true",
"dart.analysis.tool.window.visible": "false",
"last_directory_selection": "D:/androidProJect/HBHFurniture/app/src/main/res/mipmap-xhdpi",
- "last_opened_file_path": "D:/androidProJect/HBHFurniture",
+ "last_opened_file_path": "C:/AndroidStudioProjects/hbhandroid/app/src/main/res/layout",
"project.structure.last.edited": "Dependencies",
"project.structure.proportion": "0.17",
"project.structure.side.proportion": "0.2",
- "settings.editor.selected.configurable": "preferences.pluginManager",
+ "settings.editor.selected.configurable": "configuration.execution",
+ "show.do.not.copy.http.proxy.settings.to.gradle": "true",
"show.migrate.to.gradle.popup": "false"
}
}]]></component>
@@ -92,15 +118,18 @@
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
+ <recent name="C:\AndroidStudioProjects\hbhandroid\app\src\main\res\layout" />
<recent name="D:\androidProJect\HBHFurniture\app\src\main\res\xml" />
<recent name="D:\androidProJect\HBHFurniture\app\src\main\java\com\example\merchanthbh\app" />
<recent name="D:\androidProJect\HBHFurniture\app\src\main\java\com\example\merchanthbh" />
<recent name="D:\androidProJect\HBHFurniture\app\src\main\res\mipmap-xhdpi" />
- <recent name="D:\androidProJect\HBHFurniture\xxviewlibrary\src\main\res" />
</key>
<key name="MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY">
<recent name="com.example.merchanthbh.ui.merchantenter" />
<recent name="com.example.merchanthbh.http.data" />
+ </key>
+ <key name="CopyKotlinDeclarationDialog.RECENTS_KEY">
+ <recent name="com.example.merchanthbh.ui.home" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="me.goldze.mvvmhabit.http" />
@@ -200,17 +229,12 @@
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java</url>
- <line>61</line>
- <option name="timeStamp" value="15" />
- </line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java</url>
- <line>67</line>
+ <line>74</line>
<option name="timeStamp" value="17" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java</url>
- <line>71</line>
+ <line>78</line>
<option name="timeStamp" value="18" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09__Changes_.xml 0 → 100644
View file @ 4fd1ece5
<changelist name="Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]" date="1688612958396" recycled="false" toDelete="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/shelved.patch" />
<option name="DESCRIPTION" value="Uncommitted changes before Update at 2023/7/6 11:09 [Changes]" />
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/checksums/md5-checksums.bin" />
<option name="AFTER_PATH" value=".gradle/8.0/checksums/md5-checksums.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/md5-checksums.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/fileHashes/resourceHashesCache.bin" />
<option name="AFTER_PATH" value=".gradle/8.0/fileHashes/resourceHashesCache.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/resourceHashesCache.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/buildOutputCleanup/buildOutputCleanup.lock" />
<option name="AFTER_PATH" value=".gradle/buildOutputCleanup/buildOutputCleanup.lock" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/buildOutputCleanup.lock" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/checksums/sha1-checksums.bin" />
<option name="AFTER_PATH" value=".gradle/8.0/checksums/sha1-checksums.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/sha1-checksums.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/checksums/checksums.lock" />
<option name="AFTER_PATH" value=".gradle/8.0/checksums/checksums.lock" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/checksums.lock" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/executionHistory/executionHistory.bin" />
<option name="AFTER_PATH" value=".gradle/8.0/executionHistory/executionHistory.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/executionHistory.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/fileHashes/fileHashes.bin" />
<option name="AFTER_PATH" value=".gradle/8.0/fileHashes/fileHashes.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/fileHashes.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/file-system.probe" />
<option name="AFTER_PATH" value=".gradle/file-system.probe" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/file-system.probe" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/buildOutputCleanup/outputFiles.bin" />
<option name="AFTER_PATH" value=".gradle/buildOutputCleanup/outputFiles.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/outputFiles.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/fileHashes/fileHashes.lock" />
<option name="AFTER_PATH" value=".gradle/8.0/fileHashes/fileHashes.lock" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/fileHashes.lock" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/executionHistory/executionHistory.lock" />
<option name="AFTER_PATH" value=".gradle/8.0/executionHistory/executionHistory.lock" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_11_09_[Changes]/executionHistory.lock" />
</binary>
</changelist>
\ No newline at end of file
.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52_[Changes]/shelved.patch 0 → 100644
View file @ 4fd1ece5
Index: local.properties
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+>## This file is automatically generated by Android Studio.\r\n# Do not modify this file -- YOUR CHANGES WILL BE ERASED!\r\n#\r\n# This file should *NOT* be checked into Version Control Systems,\r\n# as it contains information specific to your local configuration.\r\n#\r\n# Location of the SDK. This is only used by Gradle.\r\n# For customization when using a Version Control System, please read the\r\n# header note.\r\nsdk.dir=D\\:\\\\workSoft\\\\SDK
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>ISO-8859-1
===================================================================
diff --git a/local.properties b/local.properties
--- a/local.properties (revision 5f710ddce9dd58d90f79ee61cea5bd78ca56183e)
+++ b/local.properties (date 1688613342366)
@@ -1,10 +1,8 @@
-## This file is automatically generated by Android Studio.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file should *NOT* be checked into Version Control Systems,
+## This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
-sdk.dir=D\:\\workSoft\\SDK
\ No newline at end of file
+#Thu Jul 06 11:15:42 CST 2023
+sdk.dir=C\:\\AndroidSDK
Index: .idea/workspace.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<project version=\"4\">\r\n <component name=\"AndroidLayouts\">\r\n <shared>\r\n <config />\r\n </shared>\r\n </component>\r\n <component name=\"AutoImportSettings\">\r\n <option name=\"autoReloadType\" value=\"NONE\" />\r\n </component>\r\n <component name=\"ChangeListManager\">\r\n <list default=\"true\" id=\"1610d094-2fe0-4efc-9eff-ac55fbf06aaf\" name=\"Changes\" comment=\"\" />\r\n <option name=\"SHOW_DIALOG\" value=\"false\" />\r\n <option name=\"HIGHLIGHT_CONFLICTS\" value=\"true\" />\r\n <option name=\"HIGHLIGHT_NON_ACTIVE_CHANGELIST\" value=\"false\" />\r\n <option name=\"LAST_RESOLUTION\" value=\"IGNORE\" />\r\n </component>\r\n <component name=\"ExecutionTargetManager\" SELECTED_TARGET=\"device_and_snapshot_combo_box_target[XPL0219C19001938]\" />\r\n <component name=\"ExternalProjectsData\">\r\n <projectState path=\"$PROJECT_DIR$\">\r\n <ProjectState />\r\n </projectState>\r\n </component>\r\n <component name=\"ExternalProjectsManager\">\r\n <system id=\"GRADLE\">\r\n <state>\r\n <projects_view>\r\n <tree_state>\r\n <expand>\r\n <path>\r\n <item name=\"\" type=\"6a2764b6:ExternalProjectsStructure$RootNode\" />\r\n <item name=\"HBHFurniture\" type=\"f1a62948:ProjectNode\" />\r\n </path>\r\n </expand>\r\n <select />\r\n </tree_state>\r\n </projects_view>\r\n </state>\r\n </system>\r\n </component>\r\n <component name=\"FileTemplateManagerImpl\">\r\n <option name=\"RECENT_TEMPLATES\">\r\n <list>\r\n <option value=\"resourceFile\" />\r\n <option value=\"Kotlin Class\" />\r\n <option value=\"Class\" />\r\n </list>\r\n </option>\r\n </component>\r\n <component name=\"Git.Settings\">\r\n <option name=\"RECENT_GIT_ROOT_PATH\" value=\"$PROJECT_DIR$\" />\r\n </component>\r\n <component name=\"HighlightingSettingsPerFile\">\r\n <setting file=\"file://$USER_HOME$/.gradle/caches/transforms-3/2c1521edf2dcac9fbf1437a2d73e6dba/transformed/cardview-1.0.0/res/values/values.xml\" root0=\"SKIP_INSPECTION\" />\r\n <setting file=\"file://$USER_HOME$/.gradle/caches/transforms-3/5edeb6b2f97c50671381949df04f034e/transformed/appcompat-1.4.1/res/values/values.xml\" root0=\"SKIP_INSPECTION\" />\r\n </component>\r\n <component name=\"MarkdownSettingsMigration\">\r\n <option name=\"stateVersion\" value=\"1\" />\r\n </component>\r\n <component name=\"ProjectId\" id=\"2RPpnV8z4IMISQ7dwfKHrG3L5ml\" />\r\n <component name=\"ProjectLevelVcsManager\" settingsEditedManually=\"true\" />\r\n <component name=\"ProjectViewState\">\r\n <option name=\"hideEmptyMiddlePackages\" value=\"true\" />\r\n <option name=\"showLibraryContents\" value=\"true\" />\r\n </component>\r\n <component name=\"PropertiesComponent\"><![CDATA[{\r\n \"keyToString\": {\r\n \"DEBUGGABLE_DEVICE\": \"huawei-tas_an00-XPL0219C19001938\",\r\n \"DEBUGGABLE_PROCESS\": \"com.example.merchanthbh\",\r\n \"DEBUGGER_ID\": \"Auto\",\r\n \"RunOnceActivity.OpenProjectViewOnStart\": \"true\",\r\n \"RunOnceActivity.ShowReadmeOnStart\": \"true\",\r\n \"RunOnceActivity.cidr.known.project.marker\": \"true\",\r\n \"SHOW_ALL_PROCESSES\": \"false\",\r\n \"android-custom-viewC:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.appcompat/appcompat/1.4.1/f9e48179ea0c6ac0080a277b9383f74523f56aa2/appcompat-1.4.1-sources.jar!/androidx/appcompat/widget/Toolbar.java_SELECTED\": \"Toolbar\",\r\n \"android-custom-viewD:/androidProJect/HBHFurniture/xxviewlibrary/src/main/java/com/example/xxviewlibrary/witget/XxBar.kt_SELECTED\": \"XxBar\",\r\n \"cidr.known.project.marker\": \"true\",\r\n \"dart.analysis.tool.window.visible\": \"false\",\r\n \"last_directory_selection\": \"D:/androidProJect/HBHFurniture/app/src/main/res/mipmap-xhdpi\",\r\n \"last_opened_file_path\": \"D:/androidProJect/HBHFurniture\",\r\n \"project.structure.last.edited\": \"Dependencies\",\r\n \"project.structure.proportion\": \"0.17\",\r\n \"project.structure.side.proportion\": \"0.2\",\r\n \"settings.editor.selected.configurable\": \"preferences.pluginManager\",\r\n \"show.migrate.to.gradle.popup\": \"false\"\r\n }\r\n}]]></component>\r\n <component name=\"PsdUISettings\">\r\n <option name=\"MODULE_TAB\" value=\"Signing Configs\" />\r\n <option name=\"LAST_EDITED_SIGNING_CONFIG\" value=\"debug\" />\r\n <option name=\"LAST_EDITED_BUILD_TYPE\" value=\"release\" />\r\n </component>\r\n <component name=\"RecentsManager\">\r\n <key name=\"CopyFile.RECENT_KEYS\">\r\n <recent name=\"D:\\androidProJect\\HBHFurniture\\app\\src\\main\\res\\xml\" />\r\n <recent name=\"D:\\androidProJect\\HBHFurniture\\app\\src\\main\\java\\com\\example\\merchanthbh\\app\" />\r\n <recent name=\"D:\\androidProJect\\HBHFurniture\\app\\src\\main\\java\\com\\example\\merchanthbh\" />\r\n <recent name=\"D:\\androidProJect\\HBHFurniture\\app\\src\\main\\res\\mipmap-xhdpi\" />\r\n <recent name=\"D:\\androidProJect\\HBHFurniture\\xxviewlibrary\\src\\main\\res\" />\r\n </key>\r\n <key name=\"MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY\">\r\n <recent name=\"com.example.merchanthbh.ui.merchantenter\" />\r\n <recent name=\"com.example.merchanthbh.http.data\" />\r\n </key>\r\n <key name=\"CopyClassDialog.RECENTS_KEY\">\r\n <recent name=\"me.goldze.mvvmhabit.http\" />\r\n <recent name=\"com.example.merchanthbh.http\" />\r\n <recent name=\"com.example.merchanthbh.app\" />\r\n </key>\r\n </component>\r\n <component name=\"RunManager\">\r\n <configuration name=\"app\" type=\"AndroidRunConfigurationType\" factoryName=\"Android App\">\r\n <module name=\"HBHFurniture.app.main\" />\r\n <option name=\"DEPLOY\" value=\"true\" />\r\n <option name=\"DEPLOY_APK_FROM_BUNDLE\" value=\"false\" />\r\n <option name=\"DEPLOY_AS_INSTANT\" value=\"false\" />\r\n <option name=\"ARTIFACT_NAME\" value=\"\" />\r\n <option name=\"PM_INSTALL_OPTIONS\" value=\"\" />\r\n <option name=\"ALL_USERS\" value=\"false\" />\r\n <option name=\"ALWAYS_INSTALL_WITH_PM\" value=\"false\" />\r\n <option name=\"CLEAR_APP_STORAGE\" value=\"false\" />\r\n <option name=\"DYNAMIC_FEATURES_DISABLED_LIST\" value=\"\" />\r\n <option name=\"ACTIVITY_EXTRA_FLAGS\" value=\"\" />\r\n <option name=\"MODE\" value=\"default_activity\" />\r\n <option name=\"CLEAR_LOGCAT\" value=\"false\" />\r\n <option name=\"SHOW_LOGCAT_AUTOMATICALLY\" value=\"false\" />\r\n <option name=\"INSPECTION_WITHOUT_ACTIVITY_RESTART\" value=\"false\" />\r\n <option name=\"TARGET_SELECTION_MODE\" value=\"DEVICE_AND_SNAPSHOT_COMBO_BOX\" />\r\n <option name=\"SELECTED_CLOUD_MATRIX_CONFIGURATION_ID\" value=\"-1\" />\r\n <option name=\"SELECTED_CLOUD_MATRIX_PROJECT_ID\" value=\"\" />\r\n <option name=\"DEBUGGER_TYPE\" value=\"Auto\" />\r\n <Auto>\r\n <option name=\"USE_JAVA_AWARE_DEBUGGER\" value=\"false\" />\r\n <option name=\"SHOW_STATIC_VARS\" value=\"true\" />\r\n <option name=\"WORKING_DIR\" value=\"\" />\r\n <option name=\"TARGET_LOGGING_CHANNELS\" value=\"lldb process:gdb-remote packets\" />\r\n <option name=\"SHOW_OPTIMIZED_WARNING\" value=\"true\" />\r\n </Auto>\r\n <Hybrid>\r\n <option name=\"USE_JAVA_AWARE_DEBUGGER\" value=\"false\" />\r\n <option name=\"SHOW_STATIC_VARS\" value=\"true\" />\r\n <option name=\"WORKING_DIR\" value=\"\" />\r\n <option name=\"TARGET_LOGGING_CHANNELS\" value=\"lldb process:gdb-remote packets\" />\r\n <option name=\"SHOW_OPTIMIZED_WARNING\" value=\"true\" />\r\n </Hybrid>\r\n <Java />\r\n <Native>\r\n <option name=\"USE_JAVA_AWARE_DEBUGGER\" value=\"false\" />\r\n <option name=\"SHOW_STATIC_VARS\" value=\"true\" />\r\n <option name=\"WORKING_DIR\" value=\"\" />\r\n <option name=\"TARGET_LOGGING_CHANNELS\" value=\"lldb process:gdb-remote packets\" />\r\n <option name=\"SHOW_OPTIMIZED_WARNING\" value=\"true\" />\r\n </Native>\r\n <Profilers>\r\n <option name=\"ADVANCED_PROFILING_ENABLED\" value=\"false\" />\r\n <option name=\"STARTUP_PROFILING_ENABLED\" value=\"false\" />\r\n <option name=\"STARTUP_CPU_PROFILING_ENABLED\" value=\"false\" />\r\n <option name=\"STARTUP_CPU_PROFILING_CONFIGURATION_NAME\" value=\"Java/Kotlin Method Sample (legacy)\" />\r\n <option name=\"STARTUP_NATIVE_MEMORY_PROFILING_ENABLED\" value=\"false\" />\r\n <option name=\"NATIVE_MEMORY_SAMPLE_RATE_BYTES\" value=\"2048\" />\r\n </Profilers>\r\n <option name=\"DEEP_LINK\" value=\"\" />\r\n <option name=\"ACTIVITY_CLASS\" value=\"\" />\r\n <option name=\"SEARCH_ACTIVITY_IN_GLOBAL_SCOPE\" value=\"false\" />\r\n <option name=\"SKIP_ACTIVITY_VALIDATION\" value=\"false\" />\r\n <method v=\"2\">\r\n <option name=\"Android.Gradle.BeforeRunTask\" enabled=\"true\" />\r\n </method>\r\n </configuration>\r\n </component>\r\n <component name=\"SpellCheckerSettings\" RuntimeDictionaries=\"0\" Folders=\"0\" CustomDictionaries=\"0\" DefaultDictionary=\"application-level\" UseSingleDictionary=\"true\" transferred=\"true\" />\r\n <component name=\"TaskManager\">\r\n <task active=\"true\" id=\"Default\" summary=\"Default task\">\r\n <changelist id=\"1610d094-2fe0-4efc-9eff-ac55fbf06aaf\" name=\"Changes\" comment=\"\" />\r\n <created>1687161738436</created>\r\n <option name=\"number\" value=\"Default\" />\r\n <option name=\"presentableId\" value=\"Default\" />\r\n <updated>1687161738436</updated>\r\n </task>\r\n <servers />\r\n </component>\r\n <component name=\"Vcs.Log.Tabs.Properties\">\r\n <option name=\"TAB_STATES\">\r\n <map>\r\n <entry key=\"MAIN\">\r\n <value>\r\n <State />\r\n </value>\r\n </entry>\r\n </map>\r\n </option>\r\n </component>\r\n <component name=\"XDebuggerManager\">\r\n <breakpoint-manager>\r\n <breakpoints>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/http/ApiDisposableObserver.java</url>\r\n <line>23</line>\r\n <option name=\"timeStamp\" value=\"11\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java</url>\r\n <line>61</line>\r\n <option name=\"timeStamp\" value=\"15\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java</url>\r\n <line>67</line>\r\n <option name=\"timeStamp\" value=\"17\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java</url>\r\n <line>71</line>\r\n <option name=\"timeStamp\" value=\"18\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex.rxjava3/rxjava/3.0.4/615c91aa196b925c3ff725cbc7b9cc2880dc33bf/rxjava-3.0.4-sources.jar!/io/reactivex/rxjava3/observers/DisposableObserver.java</url>\r\n <line>73</line>\r\n <option name=\"timeStamp\" value=\"21\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/utils/RxUtils.java</url>\r\n <line>79</line>\r\n <option name=\"timeStamp\" value=\"22\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/utils/RxUtils.java</url>\r\n <line>78</line>\r\n <option name=\"timeStamp\" value=\"23\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/utils/RxUtils.java</url>\r\n <line>94</line>\r\n <option name=\"timeStamp\" value=\"24\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/utils/RxUtils.java</url>\r\n <line>95</line>\r\n <option name=\"timeStamp\" value=\"25\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/utils/RxUtils.java</url>\r\n <line>96</line>\r\n <option name=\"timeStamp\" value=\"26\" />\r\n </line-breakpoint>\r\n </breakpoints>\r\n </breakpoint-manager>\r\n </component>\r\n</project>
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
--- a/.idea/workspace.xml (revision 5f710ddce9dd58d90f79ee61cea5bd78ca56183e)
+++ b/.idea/workspace.xml (date 1688629049728)
@@ -9,13 +9,33 @@
<option name="autoReloadType" value="NONE" />
</component>
<component name="ChangeListManager">
- <list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="" />
+ <list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="">
+ <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/http/data/HomeModel.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/Home/HomeActivity.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/Home/HomeViewModel.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/bg_green_radius_1.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_home.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.bin" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.lock" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/8.0/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/fileHashes/resourceHashesCache.bin" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/file-system.probe" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/file-system.probe" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_login.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_login.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
+ </list>
<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="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[XPL0219C19001938]" />
+ <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\11194\.android\avd\Pixel_6_Pro_API_34.avd]" />
<component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$">
<ProjectState />
@@ -57,6 +77,9 @@
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
+ <component name="ProblemsViewState">
+ <option name="selectedTabId" value="CurrentFile" />
+ </component>
<component name="ProjectId" id="2RPpnV8z4IMISQ7dwfKHrG3L5ml" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectViewState">
@@ -77,11 +100,12 @@
"cidr.known.project.marker": "true",
"dart.analysis.tool.window.visible": "false",
"last_directory_selection": "D:/androidProJect/HBHFurniture/app/src/main/res/mipmap-xhdpi",
- "last_opened_file_path": "D:/androidProJect/HBHFurniture",
+ "last_opened_file_path": "C:/AndroidStudioProjects/hbhandroid/app/src/main/res/drawable",
"project.structure.last.edited": "Dependencies",
"project.structure.proportion": "0.17",
"project.structure.side.proportion": "0.2",
"settings.editor.selected.configurable": "preferences.pluginManager",
+ "show.do.not.copy.http.proxy.settings.to.gradle": "true",
"show.migrate.to.gradle.popup": "false"
}
}]]></component>
@@ -91,18 +115,22 @@
<option name="LAST_EDITED_BUILD_TYPE" value="release" />
</component>
<component name="RecentsManager">
+ <key name="CreateClassDialog.RecentsKey">
+ <recent name="com.example.merchanthbh.ui.Home" />
+ </key>
<key name="CopyFile.RECENT_KEYS">
+ <recent name="C:\AndroidStudioProjects\hbhandroid\app\src\main\res\drawable" />
<recent name="D:\androidProJect\HBHFurniture\app\src\main\res\xml" />
<recent name="D:\androidProJect\HBHFurniture\app\src\main\java\com\example\merchanthbh\app" />
<recent name="D:\androidProJect\HBHFurniture\app\src\main\java\com\example\merchanthbh" />
<recent name="D:\androidProJect\HBHFurniture\app\src\main\res\mipmap-xhdpi" />
- <recent name="D:\androidProJect\HBHFurniture\xxviewlibrary\src\main\res" />
</key>
<key name="MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY">
<recent name="com.example.merchanthbh.ui.merchantenter" />
<recent name="com.example.merchanthbh.http.data" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
+ <recent name="com.example.merchanthbh.ui.Home" />
<recent name="me.goldze.mvvmhabit.http" />
<recent name="com.example.merchanthbh.http" />
<recent name="com.example.merchanthbh.app" />
@@ -197,21 +225,6 @@
<url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/http/ApiDisposableObserver.java</url>
<line>23</line>
<option name="timeStamp" value="11" />
- </line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java</url>
- <line>61</line>
- <option name="timeStamp" value="15" />
- </line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java</url>
- <line>67</line>
- <option name="timeStamp" value="17" />
- </line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java</url>
- <line>71</line>
- <option name="timeStamp" value="18" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex.rxjava3/rxjava/3.0.4/615c91aa196b925c3ff725cbc7b9cc2880dc33bf/rxjava-3.0.4-sources.jar!/io/reactivex/rxjava3/observers/DisposableObserver.java</url>
.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52__Changes_.xml 0 → 100644
View file @ 4fd1ece5
<changelist name="Uncommitted_changes_before_Update_at_2023_7_6_19_52_[Changes]" date="1688644345440" recycled="false" toDelete="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52_[Changes]/shelved.patch" />
<option name="DESCRIPTION" value="Uncommitted changes before Update at 2023/7/6 19:52 [Changes]" />
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/executionHistory/executionHistory.bin" />
<option name="AFTER_PATH" value=".gradle/8.0/executionHistory/executionHistory.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52_[Changes]/executionHistory.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/fileHashes/resourceHashesCache.bin" />
<option name="AFTER_PATH" value=".gradle/8.0/fileHashes/resourceHashesCache.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52_[Changes]/resourceHashesCache.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/buildOutputCleanup/buildOutputCleanup.lock" />
<option name="AFTER_PATH" value=".gradle/buildOutputCleanup/buildOutputCleanup.lock" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52_[Changes]/buildOutputCleanup.lock" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/file-system.probe" />
<option name="AFTER_PATH" value=".gradle/file-system.probe" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52_[Changes]/file-system.probe" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/fileHashes/fileHashes.bin" />
<option name="AFTER_PATH" value=".gradle/8.0/fileHashes/fileHashes.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52_[Changes]/fileHashes.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/buildOutputCleanup/outputFiles.bin" />
<option name="AFTER_PATH" value=".gradle/buildOutputCleanup/outputFiles.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52_[Changes]/outputFiles.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/fileHashes/fileHashes.lock" />
<option name="AFTER_PATH" value=".gradle/8.0/fileHashes/fileHashes.lock" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52_[Changes]/fileHashes.lock" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/executionHistory/executionHistory.lock" />
<option name="AFTER_PATH" value=".gradle/8.0/executionHistory/executionHistory.lock" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_6_19_52_[Changes]/executionHistory.lock" />
</binary>
</changelist>
\ No newline at end of file
.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_16_30_[Changes]/shelved.patch 0 → 100644
View file @ 4fd1ece5
Index: local.properties
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+>## This file is automatically generated by Android Studio.\r\n# Do not modify this file -- YOUR CHANGES WILL BE ERASED!\r\n#\r\n# This file should *NOT* be checked into Version Control Systems,\r\n# as it contains information specific to your local configuration.\r\n#\r\n# Location of the SDK. This is only used by Gradle.\r\n# For customization when using a Version Control System, please read the\r\n# header note.\r\nsdk.dir=D\\:\\\\workSoft\\\\SDK
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>ISO-8859-1
===================================================================
diff --git a/local.properties b/local.properties
--- a/local.properties (revision 84f58c0ba0b53c6621a2e9fa4d72a42232bc187d)
+++ b/local.properties (date 1688718608970)
@@ -1,10 +1,8 @@
-## This file is automatically generated by Android Studio.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file should *NOT* be checked into Version Control Systems,
+## This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
-sdk.dir=D\:\\workSoft\\SDK
\ No newline at end of file
+#Fri Jul 07 15:48:49 CST 2023
+sdk.dir=C\:\\AndroidSDK
.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_16_30__Changes_.xml 0 → 100644
View file @ 4fd1ece5
<changelist name="Uncommitted_changes_before_Update_at_2023_7_7_16_30_[Changes]" date="1688718630826" recycled="false" toDelete="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_16_30_[Changes]/shelved.patch" />
<option name="DESCRIPTION" value="Uncommitted changes before Update at 2023/7/7 16:30 [Changes]" />
</changelist>
\ No newline at end of file
.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_17_21_[Changes]/shelved.patch 0 → 100644
View file @ 4fd1ece5
Index: app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+>package com.example.merchanthbh.ui.login;\r\n\r\nimport static me.goldze.mvvmhabit.utils.Utils.Interceptor_TOKEN;\r\n\r\nimport android.app.Application;\r\nimport android.text.TextUtils;\r\n\r\nimport androidx.annotation.NonNull;\r\nimport androidx.databinding.ObservableField;\r\n\r\nimport com.example.merchanthbh.http.data.LoginModel;\r\nimport com.example.merchanthbh.ui.Home.HomeActivity;\r\nimport com.example.merchanthbh.ui.merchantenter.MerchantEnterActivity;\r\n\r\nimport io.reactivex.rxjava3.disposables.Disposable;\r\nimport io.reactivex.rxjava3.functions.Consumer;\r\nimport me.goldze.mvvmhabit.base.BaseViewModel;\r\nimport me.goldze.mvvmhabit.binding.command.BindingAction;\r\nimport me.goldze.mvvmhabit.binding.command.BindingCommand;\r\nimport me.goldze.mvvmhabit.http.ApiDisposableObserver;\r\nimport me.goldze.mvvmhabit.utils.RxUtils;\r\nimport me.goldze.mvvmhabit.utils.ToastUtils;\r\n\r\npublic class LoginViewModel extends BaseViewModel<LoginModel> {\r\n\r\n //用户名的绑定\r\n public ObservableField<String> userName = new ObservableField<>(\"\");\r\n //密码的绑定\r\n public ObservableField<String> password = new ObservableField<>(\"\");\r\n\r\n public LoginViewModel(@NonNull Application application, LoginModel model) {\r\n super(application, model);\r\n }\r\n\r\n //跳转开店页面\r\n public BindingCommand goMerchantEnter = new BindingCommand(new BindingAction() {\r\n @Override\r\n public void call() {\r\n startActivity(MerchantEnterActivity.class);\r\n }\r\n });\r\n //跳转首页\r\n public BindingCommand goHome = new BindingCommand(new BindingAction() {\r\n @Override\r\n public void call() {\r\n startActivity(HomeActivity.class);\r\n }\r\n\r\n });\r\n\r\n\r\n //登陆\r\n public BindingCommand login = new BindingCommand(new BindingAction() {\r\n @Override\r\n public void call() {\r\n if (TextUtils.isEmpty(userName.get().toString())) {\r\n ToastUtils.showShort(\"请输入账号！\");\r\n\r\n }else if (TextUtils.isEmpty(password.get().toString())) {\r\n ToastUtils.showShort(\"请输入密码！\");\r\n }else {\r\n model.Login(userName.get().toString(), password.get().toString())\r\n .compose(RxUtils.schedulersTransformer()) //线程调度\r\n// .compose(RxUtils.exceptionTransformer()) // 网络错误的异常转换, 这里可以换成自己的ExceptionHandle\r\n .doOnSubscribe(LoginViewModel.this)\r\n .doOnSubscribe (new Consumer<Disposable>() {\r\n @Override\r\n public void accept(Disposable disposable) throws Exception {\r\n showDialog(\"正在请求...\");\r\n }\r\n }).subscribeWith(new ApiDisposableObserver<String>() {\r\n @Override\r\n public void onSuccess(String resultBean) {\r\n //是指token\r\n Interceptor_TOKEN=resultBean;\r\n dismissDialog();\r\n }\r\n\r\n @Override\r\n public void onError(String Error) {\r\n dismissDialog();\r\n }\r\n\r\n\r\n });\r\n }\r\n }\r\n });\r\n\r\n}\r\n\r\n\r\n
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java b/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java
--- a/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java (revision 84f58c0ba0b53c6621a2e9fa4d72a42232bc187d)
+++ b/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java (date 1688721715351)
@@ -1,8 +1,13 @@
package com.example.merchanthbh.ui.login;
+import static androidx.constraintlayout.helper.widget.MotionEffect.TAG;
import static me.goldze.mvvmhabit.utils.Utils.Interceptor_TOKEN;
-
+import static me.goldze.mvvmhabit.utils.Utils.getContext;
+import android.content.Intent;
+import android.annotation.SuppressLint;
import android.app.Application;
+import android.content.Context;
+import android.content.Intent;
import android.text.TextUtils;
import androidx.annotation.NonNull;
@@ -19,7 +24,8 @@
import me.goldze.mvvmhabit.binding.command.BindingCommand;
import me.goldze.mvvmhabit.http.ApiDisposableObserver;
import me.goldze.mvvmhabit.utils.RxUtils;
-import me.goldze.mvvmhabit.utils.ToastUtils;
+import me.goldze.mvvmhabit.utils.ToastUtils;import android.content.Intent;import android.content.Intent;
+import android.util.Log;
public class LoginViewModel extends BaseViewModel<LoginModel> {
@@ -56,14 +62,14 @@
if (TextUtils.isEmpty(userName.get().toString())) {
ToastUtils.showShort("请输入账号！");
- }else if (TextUtils.isEmpty(password.get().toString())) {
+ } else if (TextUtils.isEmpty(password.get().toString())) {
ToastUtils.showShort("请输入密码！");
- }else {
+ } else {
model.Login(userName.get().toString(), password.get().toString())
.compose(RxUtils.schedulersTransformer()) //线程调度
// .compose(RxUtils.exceptionTransformer()) // 网络错误的异常转换, 这里可以换成自己的ExceptionHandle
.doOnSubscribe(LoginViewModel.this)
- .doOnSubscribe (new Consumer<Disposable>() {
+ .doOnSubscribe(new Consumer<Disposable>() {
@Override
public void accept(Disposable disposable) throws Exception {
showDialog("正在请求...");
@@ -72,8 +78,18 @@
@Override
public void onSuccess(String resultBean) {
//是指token
- Interceptor_TOKEN=resultBean;
+ Interceptor_TOKEN = resultBean;
+ Log.d(TAG, "登录返参 ");
dismissDialog();
+
+ // 在方法中获取上下文对象 context
+ Context context = getContext();
+ /*添加事件*/
+ Intent intent = new Intent(context, HomeActivity.class);
+ // 添加需要传递的参数
+ intent.putExtra("token", Interceptor_TOKEN);
+ /*跳转到首页*/
+ startActivity(intent);
}
@Override
Index: .idea/workspace.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<project version=\"4\">\r\n <component name=\"AndroidLayouts\">\r\n <shared>\r\n <config />\r\n </shared>\r\n </component>\r\n <component name=\"AutoImportSettings\">\r\n <option name=\"autoReloadType\" value=\"NONE\" />\r\n </component>\r\n <component name=\"ChangeListManager\">\r\n <list default=\"true\" id=\"1610d094-2fe0-4efc-9eff-ac55fbf06aaf\" name=\"Changes\" comment=\"环渤海-我的页面创建\">\r\n <change afterPath=\"$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/Home/HomeFragment.java\" afterDir=\"false\" />\r\n <change afterPath=\"$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/mine/MineFragment.java\" afterDir=\"false\" />\r\n <change afterPath=\"$PROJECT_DIR$/app/src/main/res/layout/fragment_home.xml\" afterDir=\"false\" />\r\n <change afterPath=\"$PROJECT_DIR$/app/src/main/res/layout/fragment_mine.xml\" afterDir=\"false\" />\r\n <change afterPath=\"$PROJECT_DIR$/app/src/main/res/menu/bottom_nav_menu.xml\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.bin\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.bin\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.lock\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.lock\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/.gradle/8.0/fileHashes/resourceHashesCache.bin\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/.gradle/8.0/fileHashes/resourceHashesCache.bin\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/.gradle/file-system.probe\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/.gradle/file-system.probe\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/.idea/workspace.xml\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/.idea/workspace.xml\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/Home/HomeActivity.java\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/Home/HomeActivity.java\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/app/src/main/res/layout/activity_home.xml\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/app/src/main/res/layout/activity_home.xml\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/app/src/main/res/layout/activity_mine.xml\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/app/src/main/res/layout/activity_mine.xml\" afterDir=\"false\" />\r\n <change beforePath=\"$PROJECT_DIR$/local.properties\" beforeDir=\"false\" afterPath=\"$PROJECT_DIR$/local.properties\" afterDir=\"false\" />\r\n </list>\r\n <option name=\"SHOW_DIALOG\" value=\"false\" />\r\n <option name=\"HIGHLIGHT_CONFLICTS\" value=\"true\" />\r\n <option name=\"HIGHLIGHT_NON_ACTIVE_CHANGELIST\" value=\"false\" />\r\n <option name=\"LAST_RESOLUTION\" value=\"IGNORE\" />\r\n </component>\r\n <component name=\"ExecutionTargetManager\" SELECTED_TARGET=\"device_and_snapshot_combo_box_target[C:\\Users\\11194\\.android\\avd\\Pixel_6_Pro_API_34.avd]\" />\r\n <component name=\"ExternalProjectsData\">\r\n <projectState path=\"$PROJECT_DIR$\">\r\n <ProjectState />\r\n </projectState>\r\n </component>\r\n <component name=\"ExternalProjectsManager\">\r\n <system id=\"GRADLE\">\r\n <state>\r\n <projects_view>\r\n <tree_state>\r\n <expand>\r\n <path>\r\n <item name=\"\" type=\"6a2764b6:ExternalProjectsStructure$RootNode\" />\r\n <item name=\"HBHFurniture\" type=\"f1a62948:ProjectNode\" />\r\n </path>\r\n </expand>\r\n <select />\r\n </tree_state>\r\n </projects_view>\r\n </state>\r\n </system>\r\n </component>\r\n <component name=\"FileTemplateManagerImpl\">\r\n <option name=\"RECENT_TEMPLATES\">\r\n <list>\r\n <option value=\"Kotlin Class\" />\r\n <option value=\"resourceFile\" />\r\n <option value=\"Class\" />\r\n </list>\r\n </option>\r\n </component>\r\n <component name=\"Git.Settings\">\r\n <option name=\"RECENT_GIT_ROOT_PATH\" value=\"$PROJECT_DIR$\" />\r\n </component>\r\n <component name=\"HighlightingSettingsPerFile\">\r\n <setting file=\"file://$USER_HOME$/.gradle/caches/transforms-3/2c1521edf2dcac9fbf1437a2d73e6dba/transformed/cardview-1.0.0/res/values/values.xml\" root0=\"SKIP_INSPECTION\" />\r\n <setting file=\"file://$USER_HOME$/.gradle/caches/transforms-3/5edeb6b2f97c50671381949df04f034e/transformed/appcompat-1.4.1/res/values/values.xml\" root0=\"SKIP_INSPECTION\" />\r\n </component>\r\n <component name=\"MarkdownSettingsMigration\">\r\n <option name=\"stateVersion\" value=\"1\" />\r\n </component>\r\n <component name=\"ProblemsViewState\">\r\n <option name=\"selectedTabId\" value=\"CurrentFile\" />\r\n </component>\r\n <component name=\"ProjectId\" id=\"2RPpnV8z4IMISQ7dwfKHrG3L5ml\" />\r\n <component name=\"ProjectLevelVcsManager\" settingsEditedManually=\"true\" />\r\n <component name=\"ProjectViewState\">\r\n <option name=\"hideEmptyMiddlePackages\" value=\"true\" />\r\n <option name=\"showLibraryContents\" value=\"true\" />\r\n </component>\r\n <component name=\"PropertiesComponent\"><![CDATA[{\r\n \"keyToString\": {\r\n \"DEBUGGABLE_DEVICE\": \"huawei-tas_an00-XPL0219C19001938\",\r\n \"DEBUGGABLE_PROCESS\": \"com.example.merchanthbh\",\r\n \"DEBUGGER_ID\": \"Auto\",\r\n \"RunOnceActivity.OpenProjectViewOnStart\": \"true\",\r\n \"RunOnceActivity.ShowReadmeOnStart\": \"true\",\r\n \"RunOnceActivity.cidr.known.project.marker\": \"true\",\r\n \"SHOW_ALL_PROCESSES\": \"false\",\r\n \"android-custom-viewC:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.appcompat/appcompat/1.4.1/f9e48179ea0c6ac0080a277b9383f74523f56aa2/appcompat-1.4.1-sources.jar!/androidx/appcompat/widget/Toolbar.java_SELECTED\": \"Toolbar\",\r\n \"android-custom-viewD:/androidProJect/HBHFurniture/xxviewlibrary/src/main/java/com/example/xxviewlibrary/witget/XxBar.kt_SELECTED\": \"XxBar\",\r\n \"cidr.known.project.marker\": \"true\",\r\n \"dart.analysis.tool.window.visible\": \"false\",\r\n \"last_directory_selection\": \"C:/AndroidStudioProjects/hbhandroid/app/src/main/res/mipmap-hdpi\",\r\n \"last_opened_file_path\": \"C:/AndroidStudioProjects/hbhandroid/app/src/main/res/layout\",\r\n \"project.structure.last.edited\": \"Dependencies\",\r\n \"project.structure.proportion\": \"0.17\",\r\n \"project.structure.side.proportion\": \"0.2\",\r\n \"settings.editor.selected.configurable\": \"preferences.pluginManager\",\r\n \"show.do.not.copy.http.proxy.settings.to.gradle\": \"true\",\r\n \"show.migrate.to.gradle.popup\": \"false\"\r\n }\r\n}]]></component>\r\n <component name=\"PsdUISettings\">\r\n <option name=\"MODULE_TAB\" value=\"Signing Configs\" />\r\n <option name=\"LAST_EDITED_SIGNING_CONFIG\" value=\"debug\" />\r\n <option name=\"LAST_EDITED_BUILD_TYPE\" value=\"release\" />\r\n </component>\r\n <component name=\"RecentsManager\">\r\n <key name=\"CreateClassDialog.RecentsKey\">\r\n <recent name=\"com.example.merchanthbh.ui.Home\" />\r\n </key>\r\n <key name=\"CopyFile.RECENT_KEYS\">\r\n <recent name=\"C:\\AndroidStudioProjects\\hbhandroid\\app\\src\\main\\res\\layout\" />\r\n <recent name=\"C:\\AndroidStudioProjects\\hbhandroid\\app\\src\\main\\res\" />\r\n <recent name=\"C:\\AndroidStudioProjects\\hbhandroid\\app\\src\\main\\res\\drawable\" />\r\n <recent name=\"C:\\AndroidStudioProjects\\hbhandroid\\app\\src\\main\\res\\mipmap-hdpi\" />\r\n <recent name=\"C:\\AndroidStudioProjects\\hbhandroid\\app\\src\\main\\res\\mipmap\\home\" />\r\n </key>\r\n <key name=\"MoveFile.RECENT_KEYS\">\r\n <recent name=\"C:\\AndroidStudioProjects\\hbhandroid\\app\\src\\main\\res\\mipmap-hdpi\" />\r\n </key>\r\n <key name=\"MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY\">\r\n <recent name=\"com.example.merchanthbh.ui.merchantenter\" />\r\n <recent name=\"com.example.merchanthbh.http.data\" />\r\n </key>\r\n <key name=\"CopyClassDialog.RECENTS_KEY\">\r\n <recent name=\"com.example.merchanthbh.ui.mine\" />\r\n <recent name=\"me.goldze.mvvmhabit.http\" />\r\n <recent name=\"com.example.merchanthbh.http\" />\r\n <recent name=\"com.example.merchanthbh.app\" />\r\n </key>\r\n </component>\r\n <component name=\"RunManager\">\r\n <configuration name=\"app\" type=\"AndroidRunConfigurationType\" factoryName=\"Android App\">\r\n <module name=\"HBHFurniture.app.main\" />\r\n <option name=\"DEPLOY\" value=\"true\" />\r\n <option name=\"DEPLOY_APK_FROM_BUNDLE\" value=\"false\" />\r\n <option name=\"DEPLOY_AS_INSTANT\" value=\"false\" />\r\n <option name=\"ARTIFACT_NAME\" value=\"\" />\r\n <option name=\"PM_INSTALL_OPTIONS\" value=\"\" />\r\n <option name=\"ALL_USERS\" value=\"false\" />\r\n <option name=\"ALWAYS_INSTALL_WITH_PM\" value=\"false\" />\r\n <option name=\"CLEAR_APP_STORAGE\" value=\"false\" />\r\n <option name=\"DYNAMIC_FEATURES_DISABLED_LIST\" value=\"\" />\r\n <option name=\"ACTIVITY_EXTRA_FLAGS\" value=\"\" />\r\n <option name=\"MODE\" value=\"default_activity\" />\r\n <option name=\"CLEAR_LOGCAT\" value=\"false\" />\r\n <option name=\"SHOW_LOGCAT_AUTOMATICALLY\" value=\"false\" />\r\n <option name=\"INSPECTION_WITHOUT_ACTIVITY_RESTART\" value=\"false\" />\r\n <option name=\"TARGET_SELECTION_MODE\" value=\"DEVICE_AND_SNAPSHOT_COMBO_BOX\" />\r\n <option name=\"SELECTED_CLOUD_MATRIX_CONFIGURATION_ID\" value=\"-1\" />\r\n <option name=\"SELECTED_CLOUD_MATRIX_PROJECT_ID\" value=\"\" />\r\n <option name=\"DEBUGGER_TYPE\" value=\"Auto\" />\r\n <Auto>\r\n <option name=\"USE_JAVA_AWARE_DEBUGGER\" value=\"false\" />\r\n <option name=\"SHOW_STATIC_VARS\" value=\"true\" />\r\n <option name=\"WORKING_DIR\" value=\"\" />\r\n <option name=\"TARGET_LOGGING_CHANNELS\" value=\"lldb process:gdb-remote packets\" />\r\n <option name=\"SHOW_OPTIMIZED_WARNING\" value=\"true\" />\r\n </Auto>\r\n <Hybrid>\r\n <option name=\"USE_JAVA_AWARE_DEBUGGER\" value=\"false\" />\r\n <option name=\"SHOW_STATIC_VARS\" value=\"true\" />\r\n <option name=\"WORKING_DIR\" value=\"\" />\r\n <option name=\"TARGET_LOGGING_CHANNELS\" value=\"lldb process:gdb-remote packets\" />\r\n <option name=\"SHOW_OPTIMIZED_WARNING\" value=\"true\" />\r\n </Hybrid>\r\n <Java />\r\n <Native>\r\n <option name=\"USE_JAVA_AWARE_DEBUGGER\" value=\"false\" />\r\n <option name=\"SHOW_STATIC_VARS\" value=\"true\" />\r\n <option name=\"WORKING_DIR\" value=\"\" />\r\n <option name=\"TARGET_LOGGING_CHANNELS\" value=\"lldb process:gdb-remote packets\" />\r\n <option name=\"SHOW_OPTIMIZED_WARNING\" value=\"true\" />\r\n </Native>\r\n <Profilers>\r\n <option name=\"ADVANCED_PROFILING_ENABLED\" value=\"false\" />\r\n <option name=\"STARTUP_PROFILING_ENABLED\" value=\"false\" />\r\n <option name=\"STARTUP_CPU_PROFILING_ENABLED\" value=\"false\" />\r\n <option name=\"STARTUP_CPU_PROFILING_CONFIGURATION_NAME\" value=\"Java/Kotlin Method Sample (legacy)\" />\r\n <option name=\"STARTUP_NATIVE_MEMORY_PROFILING_ENABLED\" value=\"false\" />\r\n <option name=\"NATIVE_MEMORY_SAMPLE_RATE_BYTES\" value=\"2048\" />\r\n </Profilers>\r\n <option name=\"DEEP_LINK\" value=\"\" />\r\n <option name=\"ACTIVITY_CLASS\" value=\"\" />\r\n <option name=\"SEARCH_ACTIVITY_IN_GLOBAL_SCOPE\" value=\"false\" />\r\n <option name=\"SKIP_ACTIVITY_VALIDATION\" value=\"false\" />\r\n <method v=\"2\">\r\n <option name=\"Android.Gradle.BeforeRunTask\" enabled=\"true\" />\r\n </method>\r\n </configuration>\r\n </component>\r\n <component name=\"SpellCheckerSettings\" RuntimeDictionaries=\"0\" Folders=\"0\" CustomDictionaries=\"0\" DefaultDictionary=\"application-level\" UseSingleDictionary=\"true\" transferred=\"true\" />\r\n <component name=\"TaskManager\">\r\n <task active=\"true\" id=\"Default\" summary=\"Default task\">\r\n <changelist id=\"1610d094-2fe0-4efc-9eff-ac55fbf06aaf\" name=\"Changes\" comment=\"\" />\r\n <created>1687161738436</created>\r\n <option name=\"number\" value=\"Default\" />\r\n <option name=\"presentableId\" value=\"Default\" />\r\n <updated>1687161738436</updated>\r\n </task>\r\n <task id=\"LOCAL-00001\" summary=\"环渤海-我的页面创建\">\r\n <created>1688715086532</created>\r\n <option name=\"number\" value=\"00001\" />\r\n <option name=\"presentableId\" value=\"LOCAL-00001\" />\r\n <option name=\"project\" value=\"LOCAL\" />\r\n <updated>1688715086532</updated>\r\n </task>\r\n <option name=\"localTasksCounter\" value=\"2\" />\r\n <servers />\r\n </component>\r\n <component name=\"Vcs.Log.Tabs.Properties\">\r\n <option name=\"TAB_STATES\">\r\n <map>\r\n <entry key=\"MAIN\">\r\n <value>\r\n <State />\r\n </value>\r\n </entry>\r\n </map>\r\n </option>\r\n </component>\r\n <component name=\"VcsManagerConfiguration\">\r\n <MESSAGE value=\"环渤海-我的页面创建\" />\r\n <option name=\"LAST_COMMIT_MESSAGE\" value=\"环渤海-我的页面创建\" />\r\n </component>\r\n <component name=\"XDebuggerManager\">\r\n <breakpoint-manager>\r\n <breakpoints>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/http/ApiDisposableObserver.java</url>\r\n <line>23</line>\r\n <option name=\"timeStamp\" value=\"11\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java</url>\r\n <line>61</line>\r\n <option name=\"timeStamp\" value=\"15\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java</url>\r\n <line>67</line>\r\n <option name=\"timeStamp\" value=\"17\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java</url>\r\n <line>71</line>\r\n <option name=\"timeStamp\" value=\"18\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex.rxjava3/rxjava/3.0.4/615c91aa196b925c3ff725cbc7b9cc2880dc33bf/rxjava-3.0.4-sources.jar!/io/reactivex/rxjava3/observers/DisposableObserver.java</url>\r\n <line>73</line>\r\n <option name=\"timeStamp\" value=\"21\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/utils/RxUtils.java</url>\r\n <line>79</line>\r\n <option name=\"timeStamp\" value=\"22\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/utils/RxUtils.java</url>\r\n <line>78</line>\r\n <option name=\"timeStamp\" value=\"23\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/utils/RxUtils.java</url>\r\n <line>94</line>\r\n <option name=\"timeStamp\" value=\"24\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/utils/RxUtils.java</url>\r\n <line>95</line>\r\n <option name=\"timeStamp\" value=\"25\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/utils/RxUtils.java</url>\r\n <line>96</line>\r\n <option name=\"timeStamp\" value=\"26\" />\r\n </line-breakpoint>\r\n </breakpoints>\r\n </breakpoint-manager>\r\n </component>\r\n</project>
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
--- a/.idea/workspace.xml (revision 84f58c0ba0b53c6621a2e9fa4d72a42232bc187d)
+++ b/.idea/workspace.xml (date 1688721715444)
@@ -9,25 +9,9 @@
<option name="autoReloadType" value="NONE" />
</component>
<component name="ChangeListManager">
- <list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="环渤海-我的页面创建">
- <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/Home/HomeFragment.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/mine/MineFragment.java" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_home.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_mine.xml" afterDir="false" />
- <change afterPath="$PROJECT_DIR$/app/src/main/res/menu/bottom_nav_menu.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.bin" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.lock" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.gradle/8.0/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/fileHashes/resourceHashesCache.bin" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.gradle/file-system.probe" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/file-system.probe" afterDir="false" />
+ <list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="环渤海-页面交互">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/Home/HomeActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/Home/HomeActivity.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_home.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_home.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_mine.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_mine.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -67,6 +51,11 @@
</option>
</component>
<component name="Git.Settings">
+ <option name="RECENT_BRANCH_BY_REPOSITORY">
+ <map>
+ <entry key="$PROJECT_DIR$" value="master" />
+ </map>
+ </option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="HighlightingSettingsPerFile">
@@ -214,7 +203,14 @@
<option name="project" value="LOCAL" />
<updated>1688715086532</updated>
</task>
- <option name="localTasksCounter" value="2" />
+ <task id="LOCAL-00002" summary="环渤海-页面交互">
+ <created>1688718570959</created>
+ <option name="number" value="00002" />
+ <option name="presentableId" value="LOCAL-00002" />
+ <option name="project" value="LOCAL" />
+ <updated>1688718570959</updated>
+ </task>
+ <option name="localTasksCounter" value="3" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
@@ -230,7 +226,8 @@
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="环渤海-我的页面创建" />
- <option name="LAST_COMMIT_MESSAGE" value="环渤海-我的页面创建" />
+ <MESSAGE value="环渤海-页面交互" />
+ <option name="LAST_COMMIT_MESSAGE" value="环渤海-页面交互" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@@ -242,17 +239,17 @@
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java</url>
- <line>61</line>
+ <line>67</line>
<option name="timeStamp" value="15" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java</url>
- <line>67</line>
+ <line>73</line>
<option name="timeStamp" value="17" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java</url>
- <line>71</line>
+ <line>77</line>
<option name="timeStamp" value="18" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_17_21__Changes_.xml 0 → 100644
View file @ 4fd1ece5
<changelist name="Uncommitted_changes_before_Update_at_2023_7_7_17_21_[Changes]" date="1688721717548" recycled="false" toDelete="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_17_21_[Changes]/shelved.patch" />
<option name="DESCRIPTION" value="Uncommitted changes before Update at 2023/7/7 17:21 [Changes]" />
</changelist>
\ No newline at end of file
.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/shelved.patch 0 → 100644
View file @ 4fd1ece5
Index: app/src/main/res/layout/activity_home.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+><?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n<layout xmlns:android=\"http://schemas.android.com/apk/res/android\"\r\n xmlns:app=\"http://schemas.android.com/apk/res-auto\"\r\n xmlns:tools=\"http://schemas.android.com/tools\">\r\n\r\n <data>\r\n\r\n <variable\r\n name=\"viewModel\"\r\n type=\"com.example.merchanthbh.ui.merchantenter.MerchantEnterViewModel\" />\r\n\r\n </data>\r\n\r\n <androidx.constraintlayout.widget.ConstraintLayout\r\n android:layout_width=\"match_parent\"\r\n android:layout_height=\"match_parent\"\r\n android:background=\"@color/white\"\r\n android:fitsSystemWindows=\"true\">\r\n\r\n\r\n <com.example.xxviewlibrary.witget.XxBar\r\n android:id=\"@+id/bar\"\r\n android:layout_width=\"match_parent\"\r\n android:layout_height=\"55dp\"\r\n app:layout_constraintTop_toTopOf=\"parent\"\r\n app:title=\"欧派家居\" />\r\n <!-- 滚动轮-->\r\n <androidx.core.widget.NestedScrollView\r\n android:layout_width=\"match_parent\"\r\n android:layout_height=\"0dp\"\r\n android:background=\"@color/bg_grey\"\r\n app:layout_constraintTop_toBottomOf=\"@+id/bar\">\r\n\r\n <LinearLayout\r\n android:layout_width=\"match_parent\"\r\n android:layout_height=\"match_parent\"\r\n android:orientation=\"vertical\"\r\n android:padding=\"17dp\">\r\n <!--今日卡片-->\r\n <androidx.constraintlayout.widget.ConstraintLayout\r\n android:layout_width=\"match_parent\"\r\n android:layout_height=\"180dp\"\r\n android:background=\"@drawable/bg_green_radius_1\"\r\n android:padding=\"13dp\">\r\n <!--今日卡片-上半部分-->\r\n <!--今日成交-->\r\n <TextView\r\n style=\"@style/CommText\"\r\n android:layout_marginLeft=\"16dp\"\r\n android:text=\"今日成交(元)\"\r\n android:textColor=\"@color/white\"\r\n android:textSize=\"15sp\"\r\n android:textStyle=\"bold\"\r\n app:layout_constraintLeft_toRightOf=\"@+id/tv_ame_num1\"\r\n app:layout_constraintTop_toTopOf=\"parent\"\r\n tools:ignore=\"UnknownIdInLayout\" />\r\n <!--今日成交数-->\r\n <TextView\r\n android:layout_width=\"0dp\"\r\n android:layout_height=\"wrap_content\"\r\n android:layout_marginTop=\"13dp\"\r\n android:layout_marginEnd=\"11dp\"\r\n android:paddingTop=\"25sp\"\r\n android:text=\"27587.68\"\r\n android:textColor=\"#FFFFFF\"\r\n android:textSize=\"30sp\"\r\n app:layout_constraintLeft_toLeftOf=\"parent\"\r\n tools:ignore=\"MissingConstraints\" />\r\n <!--今日卡片-下半部分-->\r\n <LinearLayout\r\n android:layout_width=\"match_parent\"\r\n android:layout_height=\"wrap_content\"\r\n android:orientation=\"horizontal\"\r\n tools:ignore=\"MissingConstraints\">\r\n <!--今日订单模块-->\r\n <LinearLayout\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"match_parent\"\r\n android:orientation=\"vertical\"\r\n android:paddingTop=\"80sp\"\r\n tools:ignore=\"MissingConstraints\">\r\n <!--今日订单-->\r\n <TextView\r\n style=\"@style/CommText\"\r\n android:text=\"今日订单(个)\"\r\n android:textColor=\"@color/white\"\r\n android:textSize=\"15sp\"\r\n android:textStyle=\"bold\" />\r\n <!--今日订单数-->\r\n <TextView\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"wrap_content\"\r\n android:layout_marginTop=\"10dp\"\r\n android:text=\"795\"\r\n android:textColor=\"#FFFFFF\"\r\n android:textSize=\"15sp\" />\r\n\r\n </LinearLayout>\r\n <!--今日下单用户模块-->\r\n <LinearLayout\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"match_parent\"\r\n android:layout_marginLeft=\"25sp\"\r\n android:orientation=\"vertical\"\r\n android:paddingTop=\"80sp\"\r\n tools:ignore=\"MissingConstraints\">\r\n <!--今日下单用户-->\r\n <TextView\r\n style=\"@style/CommText\"\r\n android:text=\"今日下单用户(位)\"\r\n android:textColor=\"@color/white\"\r\n android:textSize=\"15sp\"\r\n android:textStyle=\"bold\" />\r\n <!--今日下单用户数-->\r\n <TextView\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"wrap_content\"\r\n android:layout_marginTop=\"10dp\"\r\n android:text=\"795\"\r\n android:textColor=\"#FFFFFF\"\r\n android:textSize=\"15sp\" />\r\n\r\n </LinearLayout>\r\n <!--电费余额模块-->\r\n <LinearLayout\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"match_parent\"\r\n android:layout_marginLeft=\"25sp\"\r\n android:orientation=\"vertical\"\r\n android:paddingTop=\"80sp\"\r\n tools:ignore=\"MissingConstraints\">\r\n <!--今日下单用户-->\r\n <TextView\r\n style=\"@style/CommText\"\r\n android:text=\"电费余额(元)\"\r\n android:textColor=\"@color/white\"\r\n android:textSize=\"15sp\"\r\n android:textStyle=\"bold\" />\r\n <!--今日下单用户数-->\r\n <TextView\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"wrap_content\"\r\n android:layout_marginTop=\"10dp\"\r\n android:text=\"795.00\"\r\n android:textColor=\"#FFFFFF\"\r\n android:textSize=\"15sp\" />\r\n\r\n </LinearLayout>\r\n </LinearLayout>\r\n </androidx.constraintlayout.widget.ConstraintLayout>\r\n <!--中间-导航栏(店铺信息,店铺积分,店员管理)-->\r\n <androidx.constraintlayout.widget.ConstraintLayout\r\n android:layout_width=\"fill_parent\"\r\n android:layout_height=\"101dp\"\r\n android:layout_marginTop=\"13dp\"\r\n android:background=\"@drawable/bg_white_radius_12\"\r\n android:padding=\"13dp\">\r\n <GridLayout\r\n android:layout_width=\"match_parent\"\r\n android:layout_height=\"wrap_content\"\r\n android:columnCount=\"6\"\r\n android:orientation=\"horizontal\"\r\n android:rowCount=\"1\"\r\n tools:ignore=\"MissingConstraints\">\r\n <!--店铺信息模块-->\r\n <LinearLayout\r\n android:layout_columnSpan=\"2\"\r\n android:layout_gravity=\"fill\"\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"match_parent\"\r\n android:orientation=\"vertical\"\r\n android:gravity=\"center\"\r\n tools:ignore=\"MissingConstraints\">\r\n <!--店铺信息-图标-->\r\n <ImageView\r\n android:id=\"@+id/iv_ame_img2\"\r\n android:layout_width=\"40dp\"\r\n android:layout_height=\"40dp\"\r\n android:src=\"@mipmap/ruzhucailiao_img_zhizhao\"\r\n app:layout_constraintBottom_toBottomOf=\"parent\"\r\n app:layout_constraintRight_toRightOf=\"parent\"\r\n app:layout_constraintTop_toTopOf=\"parent\" />\r\n <!--店铺信息-文字-->\r\n <TextView\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"wrap_content\"\r\n android:layout_marginTop=\"10dp\"\r\n android:text=\"店铺信息\"\r\n android:textStyle=\"bold\"\r\n android:textColor=\"#5A5A5A\"\r\n android:textSize=\"15sp\" />\r\n\r\n </LinearLayout>\r\n <!--店铺积分模块-->\r\n <LinearLayout\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"match_parent\"\r\n android:layout_columnSpan=\"2\"\r\n android:layout_gravity=\"fill\"\r\n android:gravity=\"center\"\r\n android:orientation=\"vertical\"\r\n tools:ignore=\"MissingConstraints\">\r\n <!--店铺积分-图标-->\r\n <ImageView\r\n android:id=\"@+id/iv_ame_img8\"\r\n android:layout_width=\"40dp\"\r\n android:layout_height=\"40dp\"\r\n android:src=\"@mipmap/ruzhucailiao_img_zhizhao\"\r\n app:layout_constraintBottom_toBottomOf=\"parent\"\r\n app:layout_constraintRight_toRightOf=\"parent\"\r\n app:layout_constraintTop_toTopOf=\"parent\" />\r\n <!--店铺积分-文字-->\r\n <TextView\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"wrap_content\"\r\n android:layout_marginTop=\"10dp\"\r\n android:text=\"店铺积分\"\r\n android:textColor=\"#5A5A5A\"\r\n android:textSize=\"15sp\"\r\n android:textStyle=\"bold\" />\r\n\r\n </LinearLayout>\r\n <!--店员管理模块-->\r\n <LinearLayout\r\n android:layout_columnSpan=\"2\"\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"match_parent\"\r\n android:orientation=\"vertical\"\r\n android:gravity=\"center\"\r\n tools:ignore=\"MissingConstraints\">\r\n <!--店员管理-图标-->\r\n <ImageView\r\n android:id=\"@+id/iv_ame_img4\"\r\n android:layout_width=\"40dp\"\r\n android:layout_height=\"40dp\"\r\n android:src=\"@mipmap/ruzhucailiao_img_zhizhao\"\r\n app:layout_constraintBottom_toBottomOf=\"parent\"\r\n app:layout_constraintRight_toRightOf=\"parent\"\r\n app:layout_constraintTop_toTopOf=\"parent\" />\r\n <!--店员管理-文字-->\r\n <TextView\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"wrap_content\"\r\n android:layout_marginTop=\"10dp\"\r\n android:text=\"店员管理\"\r\n android:textStyle=\"bold\"\r\n android:textColor=\"#5A5A5A\"\r\n android:textSize=\"15sp\" />\r\n </LinearLayout>\r\n </GridLayout>\r\n </androidx.constraintlayout.widget.ConstraintLayout>\r\n <!--下方-导航栏(添加商品...)-->\r\n <androidx.constraintlayout.widget.ConstraintLayout\r\n android:layout_width=\"fill_parent\"\r\n android:layout_height=\"wrap_content\"\r\n android:layout_marginTop=\"13dp\"\r\n android:background=\"@drawable/bg_white_radius_12\"\r\n android:paddingTop=\"13dp\"\r\n android:paddingBottom=\"13dp\">\r\n <GridLayout\r\n android:layout_width=\"match_parent\"\r\n android:layout_height=\"wrap_content\"\r\n android:columnCount=\"4\"\r\n android:orientation=\"horizontal\"\r\n android:rowCount=\"2\"\r\n tools:ignore=\"MissingConstraints\">\r\n <!--店铺信息模块-->\r\n <LinearLayout\r\n android:layout_columnSpan=\"1\"\r\n android:layout_columnWeight=\"1\"\r\n android:layout_gravity=\"center\"\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"match_parent\"\r\n android:orientation=\"vertical\"\r\n android:gravity=\"center\"\r\n tools:ignore=\"MissingConstraints\">\r\n <!--店铺信息-图标-->\r\n <ImageView\r\n android:id=\"@+id/iv_ame_img29\"\r\n android:layout_width=\"40dp\"\r\n android:layout_height=\"40dp\"\r\n android:src=\"@mipmap/ruzhucailiao_img_zhizhao\"\r\n app:layout_constraintBottom_toBottomOf=\"parent\"\r\n app:layout_constraintRight_toRightOf=\"parent\"\r\n app:layout_constraintTop_toTopOf=\"parent\" />\r\n <!--店铺信息-文字-->\r\n <TextView\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"wrap_content\"\r\n android:layout_marginTop=\"10dp\"\r\n android:text=\"添加商品\"\r\n android:textStyle=\"bold\"\r\n android:textColor=\"#5A5A5A\"\r\n android:textSize=\"15sp\" />\r\n\r\n </LinearLayout>\r\n <!--店铺积分模块-->\r\n <LinearLayout\r\n android:layout_columnWeight=\"1\"\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"match_parent\"\r\n android:layout_columnSpan=\"1\"\r\n android:layout_gravity=\"center\"\r\n android:gravity=\"center\"\r\n android:orientation=\"vertical\"\r\n tools:ignore=\"MissingConstraints\">\r\n <!--店铺积分-图标-->\r\n <ImageView\r\n android:id=\"@+id/iv_ame_img83\"\r\n android:layout_width=\"40dp\"\r\n android:layout_height=\"40dp\"\r\n android:src=\"@mipmap/ruzhucailiao_img_zhizhao\"\r\n app:layout_constraintBottom_toBottomOf=\"parent\"\r\n app:layout_constraintRight_toRightOf=\"parent\"\r\n app:layout_constraintTop_toTopOf=\"parent\" />\r\n <!--店铺积分-文字-->\r\n <TextView\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"wrap_content\"\r\n android:layout_marginTop=\"10dp\"\r\n android:text=\"商品管理\"\r\n android:textColor=\"#5A5A5A\"\r\n android:textSize=\"15sp\"\r\n android:textStyle=\"bold\" />\r\n\r\n </LinearLayout>\r\n <!--店员管理模块-->\r\n <LinearLayout\r\n android:layout_columnWeight=\"1\"\r\n android:layout_columnSpan=\"1\"\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"match_parent\"\r\n android:orientation=\"vertical\"\r\n android:layout_gravity=\"center\"\r\n android:gravity=\"center\"\r\n tools:ignore=\"MissingConstraints\">\r\n <!--店员管理-图标-->\r\n <ImageView\r\n android:id=\"@+id/iv_ame_img\"\r\n android:layout_width=\"40dp\"\r\n android:layout_height=\"40dp\"\r\n android:src=\"@mipmap/ruzhucailiao_img_zhizhao\"\r\n app:layout_constraintBottom_toBottomOf=\"parent\"\r\n app:layout_constraintRight_toRightOf=\"parent\"\r\n app:layout_constraintTop_toTopOf=\"parent\" />\r\n <!--店员管理-文字-->\r\n <TextView\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"wrap_content\"\r\n android:layout_marginTop=\"10dp\"\r\n android:text=\"创建订单\"\r\n android:textStyle=\"bold\"\r\n android:textColor=\"#5A5A5A\"\r\n android:textSize=\"15sp\" />\r\n </LinearLayout>\r\n <!--店员管理模块-->\r\n <LinearLayout\r\n android:layout_columnWeight=\"1\"\r\n android:layout_columnSpan=\"1\"\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"match_parent\"\r\n android:orientation=\"vertical\"\r\n android:layout_gravity=\"center\"\r\n android:gravity=\"center\"\r\n tools:ignore=\"MissingConstraints\">\r\n <!--店员管理-图标-->\r\n <ImageView\r\n android:id=\"@+id/iv_ame_img97\"\r\n android:layout_width=\"40dp\"\r\n android:layout_height=\"40dp\"\r\n android:src=\"@mipmap/ruzhucailiao_img_zhizhao\"\r\n app:layout_constraintBottom_toBottomOf=\"parent\"\r\n app:layout_constraintRight_toRightOf=\"parent\"\r\n app:layout_constraintTop_toTopOf=\"parent\" />\r\n <!--店员管理-文字-->\r\n <TextView\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"wrap_content\"\r\n android:layout_marginTop=\"10dp\"\r\n android:text=\"订单管理\"\r\n android:textStyle=\"bold\"\r\n android:textColor=\"#5A5A5A\"\r\n android:textSize=\"15sp\" />\r\n </LinearLayout>\r\n <!--店铺积分模块-->\r\n <LinearLayout\r\n android:layout_columnWeight=\"1\"\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"match_parent\"\r\n android:layout_columnSpan=\"1\"\r\n android:layout_gravity=\"center\"\r\n android:gravity=\"center\"\r\n android:paddingTop=\"15dp\"\r\n android:orientation=\"vertical\"\r\n tools:ignore=\"MissingConstraints\">\r\n <!--店铺积分-图标-->\r\n <ImageView\r\n android:id=\"@+id/iv_ame_img83\"\r\n android:layout_width=\"40dp\"\r\n android:layout_height=\"40dp\"\r\n android:src=\"@mipmap/ruzhucailiao_img_zhizhao\"\r\n app:layout_constraintBottom_toBottomOf=\"parent\"\r\n app:layout_constraintRight_toRightOf=\"parent\"\r\n app:layout_constraintTop_toTopOf=\"parent\" />\r\n <!--店铺积分-文字-->\r\n <TextView\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"wrap_content\"\r\n android:layout_marginTop=\"10dp\"\r\n android:text=\"诉求反馈\"\r\n android:textColor=\"#5A5A5A\"\r\n android:textSize=\"15sp\"\r\n android:textStyle=\"bold\" />\r\n\r\n </LinearLayout>\r\n <!--店员管理模块-->\r\n <LinearLayout\r\n android:layout_columnWeight=\"1\"\r\n android:layout_columnSpan=\"1\"\r\n android:paddingTop=\"15dp\"\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"match_parent\"\r\n android:orientation=\"vertical\"\r\n android:layout_gravity=\"center\"\r\n android:gravity=\"center\"\r\n tools:ignore=\"MissingConstraints\">\r\n <!--店员管理-图标-->\r\n <ImageView\r\n android:id=\"@+id/iv_ame_img\"\r\n android:layout_width=\"40dp\"\r\n android:layout_height=\"40dp\"\r\n android:src=\"@mipmap/ruzhucailiao_img_zhizhao\"\r\n app:layout_constraintBottom_toBottomOf=\"parent\"\r\n app:layout_constraintRight_toRightOf=\"parent\"\r\n app:layout_constraintTop_toTopOf=\"parent\" />\r\n <!--店员管理-文字-->\r\n <TextView\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"wrap_content\"\r\n android:layout_marginTop=\"10dp\"\r\n android:text=\"转发统计\"\r\n android:textStyle=\"bold\"\r\n android:textColor=\"#5A5A5A\"\r\n android:textSize=\"15sp\" />\r\n </LinearLayout>\r\n <!--店员管理模块-->\r\n <LinearLayout\r\n android:layout_columnWeight=\"1\"\r\n android:layout_columnSpan=\"1\"\r\n android:paddingTop=\"15dp\"\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"match_parent\"\r\n android:orientation=\"vertical\"\r\n android:layout_gravity=\"center\"\r\n android:gravity=\"center\"\r\n tools:ignore=\"MissingConstraints\">\r\n <!--店员管理-图标-->\r\n <ImageView\r\n android:id=\"@+id/iv_ame_img9\"\r\n android:layout_width=\"40dp\"\r\n android:layout_height=\"40dp\"\r\n android:src=\"@mipmap/ruzhucailiao_img_zhizhao\"\r\n app:layout_constraintBottom_toBottomOf=\"parent\"\r\n app:layout_constraintRight_toRightOf=\"parent\"\r\n app:layout_constraintTop_toTopOf=\"parent\" />\r\n <!--店员管理-文字-->\r\n <TextView\r\n android:layout_width=\"wrap_content\"\r\n android:layout_height=\"wrap_content\"\r\n android:layout_marginTop=\"10dp\"\r\n android:text=\"人才招聘\"\r\n android:textStyle=\"bold\"\r\n android:textColor=\"#5A5A5A\"\r\n android:textSize=\"15sp\" />\r\n </LinearLayout>\r\n </GridLayout>\r\n </androidx.constraintlayout.widget.ConstraintLayout>\r\n\r\n </LinearLayout>\r\n </androidx.core.widget.NestedScrollView>\r\n </androidx.constraintlayout.widget.ConstraintLayout>\r\n</layout>
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
--- a/app/src/main/res/layout/activity_home.xml (revision 867f5e4eef1028af81f2ee42d729289811891fc6)
+++ b/app/src/main/res/layout/activity_home.xml (date 1688659680342)
@@ -306,7 +306,7 @@
tools:ignore="MissingConstraints">
<!--店铺积分-图标-->
<ImageView
- android:id="@+id/iv_ame_img83"
+ android:id="@+id/iv_ame_img833"
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@mipmap/ruzhucailiao_img_zhizhao"
@@ -336,7 +336,7 @@
tools:ignore="MissingConstraints">
<!--店员管理-图标-->
<ImageView
- android:id="@+id/iv_ame_img"
+ android:id="@+id/iv_ame_img23"
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@mipmap/ruzhucailiao_img_zhizhao"
@@ -478,5 +478,17 @@
</LinearLayout>
</androidx.core.widget.NestedScrollView>
+
+ <com.google.android.material.bottomnavigation.BottomNavigationView
+ android:id="@+id/bottomNavigationView"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ app:menu="@menu/menu"
+ tools:ignore="MissingConstraints"
+ tools:layout_editor_absoluteX="0dp"
+ tools:layout_editor_absoluteY="650dp" />
+
+
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
Index: app/src/main/java/com/example/merchanthbh/ui/Home/HomeActivity.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+>package com.example.merchanthbh.ui.Home;\r\n\r\nimport android.content.Intent;\r\nimport android.os.Bundle;\r\nimport android.view.View;\r\nimport android.widget.Button;\r\n\r\nimport androidx.appcompat.app.AppCompatActivity;\r\n\r\nimport com.example.merchanthbh.R;\r\n\r\npublic class HomeActivity extends AppCompatActivity {\r\n @Override\r\n protected void onCreate(Bundle savedInstanceState) {\r\n super.onCreate(savedInstanceState);\r\n setContentView(R.layout.activity_home);\r\n\r\n }\r\n\r\n}\r\n
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/src/main/java/com/example/merchanthbh/ui/Home/HomeActivity.java b/app/src/main/java/com/example/merchanthbh/ui/Home/HomeActivity.java
--- a/app/src/main/java/com/example/merchanthbh/ui/Home/HomeActivity.java (revision 867f5e4eef1028af81f2ee42d729289811891fc6)
+++ b/app/src/main/java/com/example/merchanthbh/ui/Home/HomeActivity.java (date 1688692096086)
@@ -2,19 +2,38 @@
import android.content.Intent;
import android.os.Bundle;
+import android.view.MenuItem;
import android.view.View;
import android.widget.Button;
+import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
import com.example.merchanthbh.R;
+import com.example.merchanthbh.ui.Mine.MineActivity;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
public class HomeActivity extends AppCompatActivity {
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_home);
-
+// 先将导航栏引进来
+ BottomNavigationView bottomNavigationView = findViewById(R.id.bottomNavigationView);
+ bottomNavigationView.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
+ @Override
+ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
+ switch (item.getItemId()) {
+ case R.id.navigation_mine:
+ // 启动一个新的 Activity
+ startActivity(new Intent(HomeActivity.this, MineActivity.class));
+ return true;
+ }
+ return false;
+ }
+ });
}
}
Index: app/src/main/res/drawable/bg_white_radius_24.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/src/main/res/drawable/bg_white_radius_24.xml b/app/src/main/res/drawable/bg_white_radius_24.xml
new file mode 100644
--- /dev/null (date 1688654905765)
+++ b/app/src/main/res/drawable/bg_white_radius_24.xml (date 1688654905765)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <solid android:color="@color/white"/>
+
+ <corners android:radius="24dp"/>
+</shape>
\ No newline at end of file
Index: app/src/main/res/drawable/rounded_corner.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/src/main/res/drawable/rounded_corner.xml b/app/src/main/res/drawable/rounded_corner.xml
new file mode 100644
--- /dev/null (date 1688652138597)
+++ b/app/src/main/res/drawable/rounded_corner.xml (date 1688652138597)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <corners android:radius="12dp" />
+</shape>
\ No newline at end of file
Index: app/src/main/res/drawable/bg_mid_white_radius_12.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/src/main/res/drawable/bg_mid_white_radius_12.xml b/app/src/main/res/drawable/bg_mid_white_radius_12.xml
new file mode 100644
--- /dev/null (date 1688654075121)
+++ b/app/src/main/res/drawable/bg_mid_white_radius_12.xml (date 1688654075121)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <solid android:color="@color/white"/>
+
+ <corners android:topLeftRadius="12dp"
+ android:topRightRadius="12dp"
+ android:bottomLeftRadius="0dp"
+ android:bottomRightRadius="0dp"/>
+</shape>
\ No newline at end of file
Index: app/src/main/res/drawable/bg_midbottom_white_radius_12.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/src/main/res/drawable/bg_midbottom_white_radius_12.xml b/app/src/main/res/drawable/bg_midbottom_white_radius_12.xml
new file mode 100644
--- /dev/null (date 1688654452597)
+++ b/app/src/main/res/drawable/bg_midbottom_white_radius_12.xml (date 1688654452597)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <solid android:color="@color/white"/>
+
+ <corners android:topLeftRadius="0dp"
+ android:topRightRadius="0dp"
+ android:bottomLeftRadius="12dp"
+ android:bottomRightRadius="12dp"/>
+</shape>
\ No newline at end of file
Index: app/src/main/res/drawable/bg_midmid_white_radius_12.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/src/main/res/drawable/bg_midmid_white_radius_12.xml b/app/src/main/res/drawable/bg_midmid_white_radius_12.xml
new file mode 100644
--- /dev/null (date 1688654544550)
+++ b/app/src/main/res/drawable/bg_midmid_white_radius_12.xml (date 1688654544550)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <solid android:color="@color/white"/>
+
+ <corners android:topLeftRadius="0dp"
+ android:topRightRadius="0dp"
+ android:bottomLeftRadius="0dp"
+ android:bottomRightRadius="0dp"/>
+</shape>
\ No newline at end of file
Index: .idea/workspace.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<project version=\"4\">\r\n <component name=\"AndroidLayouts\">\r\n <shared>\r\n <config />\r\n </shared>\r\n </component>\r\n <component name=\"AutoImportSettings\">\r\n <option name=\"autoReloadType\" value=\"NONE\" />\r\n </component>\r\n <component name=\"ChangeListManager\">\r\n <list default=\"true\" id=\"1610d094-2fe0-4efc-9eff-ac55fbf06aaf\" name=\"Changes\" comment=\"\" />\r\n <option name=\"SHOW_DIALOG\" value=\"false\" />\r\n <option name=\"HIGHLIGHT_CONFLICTS\" value=\"true\" />\r\n <option name=\"HIGHLIGHT_NON_ACTIVE_CHANGELIST\" value=\"false\" />\r\n <option name=\"LAST_RESOLUTION\" value=\"IGNORE\" />\r\n </component>\r\n <component name=\"ExecutionTargetManager\" SELECTED_TARGET=\"device_and_snapshot_combo_box_target[XPL0219C19001938]\" />\r\n <component name=\"ExternalProjectsData\">\r\n <projectState path=\"$PROJECT_DIR$\">\r\n <ProjectState />\r\n </projectState>\r\n </component>\r\n <component name=\"ExternalProjectsManager\">\r\n <system id=\"GRADLE\">\r\n <state>\r\n <projects_view>\r\n <tree_state>\r\n <expand>\r\n <path>\r\n <item name=\"\" type=\"6a2764b6:ExternalProjectsStructure$RootNode\" />\r\n <item name=\"HBHFurniture\" type=\"f1a62948:ProjectNode\" />\r\n </path>\r\n </expand>\r\n <select />\r\n </tree_state>\r\n </projects_view>\r\n </state>\r\n </system>\r\n </component>\r\n <component name=\"FileTemplateManagerImpl\">\r\n <option name=\"RECENT_TEMPLATES\">\r\n <list>\r\n <option value=\"resourceFile\" />\r\n <option value=\"Kotlin Class\" />\r\n <option value=\"Class\" />\r\n </list>\r\n </option>\r\n </component>\r\n <component name=\"Git.Settings\">\r\n <option name=\"RECENT_GIT_ROOT_PATH\" value=\"$PROJECT_DIR$\" />\r\n </component>\r\n <component name=\"HighlightingSettingsPerFile\">\r\n <setting file=\"file://$USER_HOME$/.gradle/caches/transforms-3/2c1521edf2dcac9fbf1437a2d73e6dba/transformed/cardview-1.0.0/res/values/values.xml\" root0=\"SKIP_INSPECTION\" />\r\n <setting file=\"file://$USER_HOME$/.gradle/caches/transforms-3/5edeb6b2f97c50671381949df04f034e/transformed/appcompat-1.4.1/res/values/values.xml\" root0=\"SKIP_INSPECTION\" />\r\n </component>\r\n <component name=\"MarkdownSettingsMigration\">\r\n <option name=\"stateVersion\" value=\"1\" />\r\n </component>\r\n <component name=\"ProjectId\" id=\"2RPpnV8z4IMISQ7dwfKHrG3L5ml\" />\r\n <component name=\"ProjectLevelVcsManager\" settingsEditedManually=\"true\" />\r\n <component name=\"ProjectViewState\">\r\n <option name=\"hideEmptyMiddlePackages\" value=\"true\" />\r\n <option name=\"showLibraryContents\" value=\"true\" />\r\n </component>\r\n <component name=\"PropertiesComponent\"><![CDATA[{\r\n \"keyToString\": {\r\n \"DEBUGGABLE_DEVICE\": \"huawei-tas_an00-XPL0219C19001938\",\r\n \"DEBUGGABLE_PROCESS\": \"com.example.merchanthbh\",\r\n \"DEBUGGER_ID\": \"Auto\",\r\n \"RunOnceActivity.OpenProjectViewOnStart\": \"true\",\r\n \"RunOnceActivity.ShowReadmeOnStart\": \"true\",\r\n \"RunOnceActivity.cidr.known.project.marker\": \"true\",\r\n \"SHOW_ALL_PROCESSES\": \"false\",\r\n \"android-custom-viewC:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.appcompat/appcompat/1.4.1/f9e48179ea0c6ac0080a277b9383f74523f56aa2/appcompat-1.4.1-sources.jar!/androidx/appcompat/widget/Toolbar.java_SELECTED\": \"Toolbar\",\r\n \"android-custom-viewD:/androidProJect/HBHFurniture/xxviewlibrary/src/main/java/com/example/xxviewlibrary/witget/XxBar.kt_SELECTED\": \"XxBar\",\r\n \"cidr.known.project.marker\": \"true\",\r\n \"dart.analysis.tool.window.visible\": \"false\",\r\n \"last_directory_selection\": \"D:/androidProJect/HBHFurniture/app/src/main/res/mipmap-xhdpi\",\r\n \"last_opened_file_path\": \"D:/androidProJect/HBHFurniture\",\r\n \"project.structure.last.edited\": \"Dependencies\",\r\n \"project.structure.proportion\": \"0.17\",\r\n \"project.structure.side.proportion\": \"0.2\",\r\n \"settings.editor.selected.configurable\": \"preferences.pluginManager\",\r\n \"show.migrate.to.gradle.popup\": \"false\"\r\n }\r\n}]]></component>\r\n <component name=\"PsdUISettings\">\r\n <option name=\"MODULE_TAB\" value=\"Signing Configs\" />\r\n <option name=\"LAST_EDITED_SIGNING_CONFIG\" value=\"debug\" />\r\n <option name=\"LAST_EDITED_BUILD_TYPE\" value=\"release\" />\r\n </component>\r\n <component name=\"RecentsManager\">\r\n <key name=\"CopyFile.RECENT_KEYS\">\r\n <recent name=\"D:\\androidProJect\\HBHFurniture\\app\\src\\main\\res\\xml\" />\r\n <recent name=\"D:\\androidProJect\\HBHFurniture\\app\\src\\main\\java\\com\\example\\merchanthbh\\app\" />\r\n <recent name=\"D:\\androidProJect\\HBHFurniture\\app\\src\\main\\java\\com\\example\\merchanthbh\" />\r\n <recent name=\"D:\\androidProJect\\HBHFurniture\\app\\src\\main\\res\\mipmap-xhdpi\" />\r\n <recent name=\"D:\\androidProJect\\HBHFurniture\\xxviewlibrary\\src\\main\\res\" />\r\n </key>\r\n <key name=\"MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY\">\r\n <recent name=\"com.example.merchanthbh.ui.merchantenter\" />\r\n <recent name=\"com.example.merchanthbh.http.data\" />\r\n </key>\r\n <key name=\"CopyClassDialog.RECENTS_KEY\">\r\n <recent name=\"me.goldze.mvvmhabit.http\" />\r\n <recent name=\"com.example.merchanthbh.http\" />\r\n <recent name=\"com.example.merchanthbh.app\" />\r\n </key>\r\n </component>\r\n <component name=\"RunManager\">\r\n <configuration name=\"app\" type=\"AndroidRunConfigurationType\" factoryName=\"Android App\">\r\n <module name=\"HBHFurniture.app.main\" />\r\n <option name=\"DEPLOY\" value=\"true\" />\r\n <option name=\"DEPLOY_APK_FROM_BUNDLE\" value=\"false\" />\r\n <option name=\"DEPLOY_AS_INSTANT\" value=\"false\" />\r\n <option name=\"ARTIFACT_NAME\" value=\"\" />\r\n <option name=\"PM_INSTALL_OPTIONS\" value=\"\" />\r\n <option name=\"ALL_USERS\" value=\"false\" />\r\n <option name=\"ALWAYS_INSTALL_WITH_PM\" value=\"false\" />\r\n <option name=\"CLEAR_APP_STORAGE\" value=\"false\" />\r\n <option name=\"DYNAMIC_FEATURES_DISABLED_LIST\" value=\"\" />\r\n <option name=\"ACTIVITY_EXTRA_FLAGS\" value=\"\" />\r\n <option name=\"MODE\" value=\"default_activity\" />\r\n <option name=\"CLEAR_LOGCAT\" value=\"false\" />\r\n <option name=\"SHOW_LOGCAT_AUTOMATICALLY\" value=\"false\" />\r\n <option name=\"INSPECTION_WITHOUT_ACTIVITY_RESTART\" value=\"false\" />\r\n <option name=\"TARGET_SELECTION_MODE\" value=\"DEVICE_AND_SNAPSHOT_COMBO_BOX\" />\r\n <option name=\"SELECTED_CLOUD_MATRIX_CONFIGURATION_ID\" value=\"-1\" />\r\n <option name=\"SELECTED_CLOUD_MATRIX_PROJECT_ID\" value=\"\" />\r\n <option name=\"DEBUGGER_TYPE\" value=\"Auto\" />\r\n <Auto>\r\n <option name=\"USE_JAVA_AWARE_DEBUGGER\" value=\"false\" />\r\n <option name=\"SHOW_STATIC_VARS\" value=\"true\" />\r\n <option name=\"WORKING_DIR\" value=\"\" />\r\n <option name=\"TARGET_LOGGING_CHANNELS\" value=\"lldb process:gdb-remote packets\" />\r\n <option name=\"SHOW_OPTIMIZED_WARNING\" value=\"true\" />\r\n </Auto>\r\n <Hybrid>\r\n <option name=\"USE_JAVA_AWARE_DEBUGGER\" value=\"false\" />\r\n <option name=\"SHOW_STATIC_VARS\" value=\"true\" />\r\n <option name=\"WORKING_DIR\" value=\"\" />\r\n <option name=\"TARGET_LOGGING_CHANNELS\" value=\"lldb process:gdb-remote packets\" />\r\n <option name=\"SHOW_OPTIMIZED_WARNING\" value=\"true\" />\r\n </Hybrid>\r\n <Java />\r\n <Native>\r\n <option name=\"USE_JAVA_AWARE_DEBUGGER\" value=\"false\" />\r\n <option name=\"SHOW_STATIC_VARS\" value=\"true\" />\r\n <option name=\"WORKING_DIR\" value=\"\" />\r\n <option name=\"TARGET_LOGGING_CHANNELS\" value=\"lldb process:gdb-remote packets\" />\r\n <option name=\"SHOW_OPTIMIZED_WARNING\" value=\"true\" />\r\n </Native>\r\n <Profilers>\r\n <option name=\"ADVANCED_PROFILING_ENABLED\" value=\"false\" />\r\n <option name=\"STARTUP_PROFILING_ENABLED\" value=\"false\" />\r\n <option name=\"STARTUP_CPU_PROFILING_ENABLED\" value=\"false\" />\r\n <option name=\"STARTUP_CPU_PROFILING_CONFIGURATION_NAME\" value=\"Java/Kotlin Method Sample (legacy)\" />\r\n <option name=\"STARTUP_NATIVE_MEMORY_PROFILING_ENABLED\" value=\"false\" />\r\n <option name=\"NATIVE_MEMORY_SAMPLE_RATE_BYTES\" value=\"2048\" />\r\n </Profilers>\r\n <option name=\"DEEP_LINK\" value=\"\" />\r\n <option name=\"ACTIVITY_CLASS\" value=\"\" />\r\n <option name=\"SEARCH_ACTIVITY_IN_GLOBAL_SCOPE\" value=\"false\" />\r\n <option name=\"SKIP_ACTIVITY_VALIDATION\" value=\"false\" />\r\n <method v=\"2\">\r\n <option name=\"Android.Gradle.BeforeRunTask\" enabled=\"true\" />\r\n </method>\r\n </configuration>\r\n </component>\r\n <component name=\"SpellCheckerSettings\" RuntimeDictionaries=\"0\" Folders=\"0\" CustomDictionaries=\"0\" DefaultDictionary=\"application-level\" UseSingleDictionary=\"true\" transferred=\"true\" />\r\n <component name=\"TaskManager\">\r\n <task active=\"true\" id=\"Default\" summary=\"Default task\">\r\n <changelist id=\"1610d094-2fe0-4efc-9eff-ac55fbf06aaf\" name=\"Changes\" comment=\"\" />\r\n <created>1687161738436</created>\r\n <option name=\"number\" value=\"Default\" />\r\n <option name=\"presentableId\" value=\"Default\" />\r\n <updated>1687161738436</updated>\r\n </task>\r\n <servers />\r\n </component>\r\n <component name=\"Vcs.Log.Tabs.Properties\">\r\n <option name=\"TAB_STATES\">\r\n <map>\r\n <entry key=\"MAIN\">\r\n <value>\r\n <State />\r\n </value>\r\n </entry>\r\n </map>\r\n </option>\r\n </component>\r\n <component name=\"XDebuggerManager\">\r\n <breakpoint-manager>\r\n <breakpoints>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/http/ApiDisposableObserver.java</url>\r\n <line>23</line>\r\n <option name=\"timeStamp\" value=\"11\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java</url>\r\n <line>61</line>\r\n <option name=\"timeStamp\" value=\"15\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java</url>\r\n <line>67</line>\r\n <option name=\"timeStamp\" value=\"17\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java</url>\r\n <line>71</line>\r\n <option name=\"timeStamp\" value=\"18\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex.rxjava3/rxjava/3.0.4/615c91aa196b925c3ff725cbc7b9cc2880dc33bf/rxjava-3.0.4-sources.jar!/io/reactivex/rxjava3/observers/DisposableObserver.java</url>\r\n <line>73</line>\r\n <option name=\"timeStamp\" value=\"21\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/utils/RxUtils.java</url>\r\n <line>79</line>\r\n <option name=\"timeStamp\" value=\"22\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/utils/RxUtils.java</url>\r\n <line>78</line>\r\n <option name=\"timeStamp\" value=\"23\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/utils/RxUtils.java</url>\r\n <line>94</line>\r\n <option name=\"timeStamp\" value=\"24\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/utils/RxUtils.java</url>\r\n <line>95</line>\r\n <option name=\"timeStamp\" value=\"25\" />\r\n </line-breakpoint>\r\n <line-breakpoint enabled=\"true\" type=\"java-line\">\r\n <url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/utils/RxUtils.java</url>\r\n <line>96</line>\r\n <option name=\"timeStamp\" value=\"26\" />\r\n </line-breakpoint>\r\n </breakpoints>\r\n </breakpoint-manager>\r\n </component>\r\n</project>
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
--- a/.idea/workspace.xml (revision 867f5e4eef1028af81f2ee42d729289811891fc6)
+++ b/.idea/workspace.xml (date 1688659298008)
@@ -9,13 +9,46 @@
<option name="autoReloadType" value="NONE" />
</component>
<component name="ChangeListManager">
- <list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="" />
+ <list default="true" id="1610d094-2fe0-4efc-9eff-ac55fbf06aaf" name="Changes" comment="">
+ <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/http/data/MineModel.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/Mine/MineActivity.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/Mine/MineViewModel.java" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/bg_mid_white_radius_12.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/bg_midbottom_white_radius_12.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/bg_midmid_white_radius_12.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/bg_white_radius_24.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/rounded_corner.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/tab_icon_home_default.png" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/tab_icon_huanbohai_default.png" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/tab_icon_wode_selected.png" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/wode_icon_genghuan.png" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/wode_icon_gengxin.png" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/wode_icon_qingchu.png" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/wode_icon_xieyi.png" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/wode_icon_xiugaimima.png" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/wode_img_bg.png" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/wode_img_female.png" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_mine.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/app/src/main/res/menu/menu.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.bin" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.lock" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/8.0/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/fileHashes/resourceHashesCache.bin" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.gradle/file-system.probe" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/file-system.probe" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/Home/HomeActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/Home/HomeActivity.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_home.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_home.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
+ </list>
<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="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[XPL0219C19001938]" />
+ <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\11194\.android\avd\Pixel_6_Pro_API_34.avd]" />
<component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$">
<ProjectState />
@@ -41,9 +74,9 @@
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
- <option value="resourceFile" />
<option value="Kotlin Class" />
<option value="Class" />
+ <option value="resourceFile" />
</list>
</option>
</component>
@@ -72,16 +105,18 @@
"RunOnceActivity.ShowReadmeOnStart": "true",
"RunOnceActivity.cidr.known.project.marker": "true",
"SHOW_ALL_PROCESSES": "false",
+ "android-custom-viewC:/AndroidStudioProjects/hbhandroid/xxviewlibrary/src/main/java/com/example/xxviewlibrary/witget/XxBar.kt_SELECTED": "XxBar",
"android-custom-viewC:/Users/Administrator/.gradle/caches/modules-2/files-2.1/androidx.appcompat/appcompat/1.4.1/f9e48179ea0c6ac0080a277b9383f74523f56aa2/appcompat-1.4.1-sources.jar!/androidx/appcompat/widget/Toolbar.java_SELECTED": "Toolbar",
"android-custom-viewD:/androidProJect/HBHFurniture/xxviewlibrary/src/main/java/com/example/xxviewlibrary/witget/XxBar.kt_SELECTED": "XxBar",
"cidr.known.project.marker": "true",
"dart.analysis.tool.window.visible": "false",
- "last_directory_selection": "D:/androidProJect/HBHFurniture/app/src/main/res/mipmap-xhdpi",
- "last_opened_file_path": "D:/androidProJect/HBHFurniture",
+ "last_directory_selection": "C:/AndroidStudioProjects/hbhandroid/app/src/main/res/drawable",
+ "last_opened_file_path": "C:/AndroidStudioProjects/hbhandroid/app/src/main/res/drawable",
"project.structure.last.edited": "Dependencies",
"project.structure.proportion": "0.17",
"project.structure.side.proportion": "0.2",
"settings.editor.selected.configurable": "preferences.pluginManager",
+ "show.do.not.copy.http.proxy.settings.to.gradle": "true",
"show.migrate.to.gradle.popup": "false"
}
}]]></component>
@@ -92,17 +127,19 @@
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
+ <recent name="C:\AndroidStudioProjects\hbhandroid\app\src\main\res\drawable" />
+ <recent name="C:\AndroidStudioProjects\hbhandroid\app\src\main\res" />
+ <recent name="C:\AndroidStudioProjects\hbhandroid\app\src\main\res\layout" />
<recent name="D:\androidProJect\HBHFurniture\app\src\main\res\xml" />
<recent name="D:\androidProJect\HBHFurniture\app\src\main\java\com\example\merchanthbh\app" />
- <recent name="D:\androidProJect\HBHFurniture\app\src\main\java\com\example\merchanthbh" />
- <recent name="D:\androidProJect\HBHFurniture\app\src\main\res\mipmap-xhdpi" />
- <recent name="D:\androidProJect\HBHFurniture\xxviewlibrary\src\main\res" />
</key>
<key name="MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY">
<recent name="com.example.merchanthbh.ui.merchantenter" />
<recent name="com.example.merchanthbh.http.data" />
</key>
<key name="CopyClassDialog.RECENTS_KEY">
+ <recent name="com.example.merchanthbh.ui.Mine" />
+ <recent name="com.example.merchanthbh.http.data" />
<recent name="me.goldze.mvvmhabit.http" />
<recent name="com.example.merchanthbh.http" />
<recent name="com.example.merchanthbh.app" />
@@ -177,6 +214,14 @@
<option name="presentableId" value="Default" />
<updated>1687161738436</updated>
</task>
+ <task id="LOCAL-00001" summary="环渤海-首页创建">
+ <created>1688644339702</created>
+ <option name="number" value="00001" />
+ <option name="presentableId" value="LOCAL-00001" />
+ <option name="project" value="LOCAL" />
+ <updated>1688644339702</updated>
+ </task>
+ <option name="localTasksCounter" value="2" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
@@ -190,6 +235,10 @@
</map>
</option>
</component>
+ <component name="VcsManagerConfiguration">
+ <MESSAGE value="环渤海-首页创建" />
+ <option name="LAST_COMMIT_MESSAGE" value="环渤海-首页创建" />
+ </component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
@@ -197,21 +246,6 @@
<url>file://$PROJECT_DIR$/mvvmhabit/src/main/java/me/goldze/mvvmhabit/http/ApiDisposableObserver.java</url>
<line>23</line>
<option name="timeStamp" value="11" />
- </line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java</url>
- <line>61</line>
- <option name="timeStamp" value="15" />
- </line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java</url>
- <line>67</line>
- <option name="timeStamp" value="17" />
- </line-breakpoint>
- <line-breakpoint enabled="true" type="java-line">
- <url>file://$PROJECT_DIR$/app/src/main/java/com/example/merchanthbh/ui/login/LoginViewModel.java</url>
- <line>71</line>
- <option name="timeStamp" value="18" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.reactivex.rxjava3/rxjava/3.0.4/615c91aa196b925c3ff725cbc7b9cc2880dc33bf/rxjava-3.0.4-sources.jar!/io/reactivex/rxjava3/observers/DisposableObserver.java</url>
Index: app/src/main/res/menu/menu.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml
new file mode 100644
--- /dev/null (date 1688657692867)
+++ b/app/src/main/res/menu/menu.xml (date 1688657692867)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:id="@+id/navigation_home"
+ android:icon="@drawable/tab_icon_home_default"
+ android:title="首页" />
+
+ <item
+ android:id="@+id/navigation_huanbohai"
+ android:icon="@drawable/tab_icon_huanbohai_default"
+ android:title="环渤海" />
+
+ <item
+ android:id="@+id/navigation_mine"
+ android:icon="@drawable/tab_icon_wode_selected"
+ android:title="我的" />
+</menu>
\ No newline at end of file
Index: local.properties
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
<+>## This file is automatically generated by Android Studio.\r\n# Do not modify this file -- YOUR CHANGES WILL BE ERASED!\r\n#\r\n# This file should *NOT* be checked into Version Control Systems,\r\n# as it contains information specific to your local configuration.\r\n#\r\n# Location of the SDK. This is only used by Gradle.\r\n# For customization when using a Version Control System, please read the\r\n# header note.\r\nsdk.dir=D\\:\\\\workSoft\\\\SDK
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>ISO-8859-1
===================================================================
diff --git a/local.properties b/local.properties
--- a/local.properties (revision 867f5e4eef1028af81f2ee42d729289811891fc6)
+++ b/local.properties (date 1688651975530)
@@ -1,10 +1,8 @@
-## This file is automatically generated by Android Studio.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file should *NOT* be checked into Version Control Systems,
+## This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
-sdk.dir=D\:\\workSoft\\SDK
\ No newline at end of file
+#Thu Jul 06 21:59:35 CST 2023
+sdk.dir=C\:\\AndroidSDK
Index: app/src/main/java/com/example/merchanthbh/ui/Mine/MineActivity.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/src/main/java/com/example/merchanthbh/ui/Mine/MineActivity.java b/app/src/main/java/com/example/merchanthbh/ui/Mine/MineActivity.java
new file mode 100644
--- /dev/null (date 1688655434723)
+++ b/app/src/main/java/com/example/merchanthbh/ui/Mine/MineActivity.java (date 1688655434723)
@@ -0,0 +1,17 @@
+package com.example.merchanthbh.ui.Mine;
+
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.example.merchanthbh.R;
+
+public class MineActivity extends AppCompatActivity {
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_mine);
+
+ }
+
+}
Index: app/src/main/java/com/example/merchanthbh/ui/Mine/MineViewModel.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/src/main/java/com/example/merchanthbh/ui/Mine/MineViewModel.java b/app/src/main/java/com/example/merchanthbh/ui/Mine/MineViewModel.java
new file mode 100644
--- /dev/null (date 1688647249760)
+++ b/app/src/main/java/com/example/merchanthbh/ui/Mine/MineViewModel.java (date 1688647249760)
@@ -0,0 +1,18 @@
+package com.example.merchanthbh.ui.Mine;
+
+import android.app.Application;
+
+import androidx.annotation.NonNull;
+
+import com.example.merchanthbh.http.data.LoginModel;
+
+import me.goldze.mvvmhabit.base.BaseViewModel;
+
+
+public class MineViewModel extends BaseViewModel<LoginModel> {
+ public MineViewModel(@NonNull Application application, LoginModel model) {
+ super(application, model);
+ }
+}
+
+
Index: app/src/main/res/layout/activity_mine.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/src/main/res/layout/activity_mine.xml b/app/src/main/res/layout/activity_mine.xml
new file mode 100644
--- /dev/null (date 1688655434731)
+++ b/app/src/main/res/layout/activity_mine.xml (date 1688655434731)
@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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">
+
+ <data>
+
+ <variable
+ name="viewModel"
+ type="com.example.merchanthbh.ui.Mine.MineViewModel" />
+
+ </data>
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/white"
+ android:fitsSystemWindows="true">
+
+ <!-- 滚动轮-->
+ <androidx.core.widget.NestedScrollView
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:background="@color/bg_grey"
+ app:layout_constraintTop_toBottomOf="@+id/bar">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ >
+ <!--个人信息卡片-->
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="173dp"
+ android:background="#6db9b1"
+ android:padding="13dp">
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:paddingTop="40dp"
+ android:paddingBottom="20dp"
+ android:layout_height="match_parent"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:id="@+id/iv_ame_img1"
+ android:layout_width="78dp"
+ android:layout_height="78dp"
+ android:background="@drawable/rounded_corner"
+ android:src="@mipmap/ruzhucailiao_img_logo"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintLeft_toLeftOf="parent"
+
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingLeft="7dp"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:gravity="center"
+ tools:ignore="MissingConstraints">
+
+ <TextView
+ style="@style/CommText"
+ android:layout_marginLeft="16dp"
+ android:paddingRight="11dp"
+ android:text="王小丫"
+ android:textColor="@color/black"
+ android:textSize="20sp"
+ android:textStyle="bold"
+ app:layout_constraintLeft_toLeftOf="@+id/tv_ame_num1"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ android:id="@+id/tv_ame_num1"
+ android:layout_width="38dp"
+ android:layout_height="20dp"
+ android:background="@drawable/bg_red_radius_4"
+ android:gravity="center"
+ android:text="店长"
+ android:textColor="@color/white"
+ android:textSize="11sp"
+ android:textStyle="bold"
+ app:layout_constraintRight_toRightOf="parent" />
+ </LinearLayout>
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="13dp"
+ android:layout_marginRight="11dp"
+ android:text="创建日期：2022-12-12"
+ android:textColor="#757575"
+ android:textSize="14sp"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintRight_toLeftOf="@+id/iv_ame_img1"
+ app:layout_constraintTop_toBottomOf="@+id/tv_ame_num1" />
+
+
+ </LinearLayout>
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:padding="17dp"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+ <!--中间-导航栏(修改密码)-->
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="fill_parent"
+ android:layout_height="64dp"
+ android:layout_marginTop="13dp"
+ android:background="@drawable/bg_mid_white_radius_12"
+ android:padding="13dp">
+
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:gravity="center"
+ tools:ignore="MissingConstraints">
+
+ <ImageView
+ android:id="@+id/iv_ame_img83"
+ android:layout_width="40dp"
+ android:layout_height="40dp"
+ android:src="@mipmap/ruzhucailiao_img_zhizhao"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ style="@style/CommText"
+ android:layout_marginLeft="16dp"
+ android:paddingRight="11dp"
+ android:text="修改密码"
+ android:textColor="@color/black"
+ android:textSize="16sp"
+ app:layout_constraintLeft_toLeftOf="@+id/tv_ame_num1"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ </LinearLayout>
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="fill_parent"
+ android:layout_height="64dp"
+ android:background="@drawable/bg_midbottom_white_radius_12"
+ android:padding="13dp">
+
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:gravity="center"
+ tools:ignore="MissingConstraints">
+
+ <ImageView
+ android:id="@+id/iv_ame_img83"
+ android:layout_width="40dp"
+ android:layout_height="40dp"
+ android:src="@mipmap/ruzhucailiao_img_zhizhao"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ style="@style/CommText"
+ android:layout_marginLeft="16dp"
+ android:paddingRight="11dp"
+ android:text="更换手机号"
+ android:textColor="@color/black"
+ android:textSize="16sp"
+ app:layout_constraintLeft_toLeftOf="@+id/tv_ame_num1"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ </LinearLayout>
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ <!--下方-导航栏(添加商品...)-->
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="fill_parent"
+ android:layout_height="64dp"
+ android:layout_marginTop="13dp"
+ android:background="@drawable/bg_mid_white_radius_12"
+ android:padding="13dp">
+
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:gravity="center"
+ tools:ignore="MissingConstraints">
+
+ <ImageView
+ android:id="@+id/iv_ame_img83"
+ android:layout_width="40dp"
+ android:layout_height="40dp"
+ android:src="@mipmap/ruzhucailiao_img_zhizhao"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ style="@style/CommText"
+ android:layout_marginLeft="16dp"
+ android:paddingRight="11dp"
+ android:text="隐私协议"
+ android:textColor="@color/black"
+ android:textSize="16sp"
+ app:layout_constraintLeft_toLeftOf="@+id/tv_ame_num1"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ </LinearLayout>
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="fill_parent"
+ android:layout_height="64dp"
+ android:background="@drawable/bg_midmid_white_radius_12"
+ android:padding="13dp">
+
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:gravity="center"
+ tools:ignore="MissingConstraints">
+
+ <ImageView
+ android:id="@+id/iv_ame_img83"
+ android:layout_width="40dp"
+ android:layout_height="40dp"
+ android:src="@mipmap/ruzhucailiao_img_zhizhao"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ style="@style/CommText"
+ android:layout_marginLeft="16dp"
+ android:paddingRight="11dp"
+ android:text="清除缓存"
+ android:textColor="@color/black"
+ android:textSize="16sp"
+ app:layout_constraintLeft_toLeftOf="@+id/tv_ame_num1"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ </LinearLayout>
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="fill_parent"
+ android:layout_height="64dp"
+ android:layout_marginBottom="31dp"
+ android:background="@drawable/bg_midbottom_white_radius_12"
+ android:padding="13dp">
+
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:gravity="center"
+ tools:ignore="MissingConstraints">
+
+ <ImageView
+ android:id="@+id/iv_ame_img83"
+ android:layout_width="40dp"
+ android:layout_height="40dp"
+ android:src="@mipmap/ruzhucailiao_img_zhizhao"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <TextView
+ style="@style/CommText"
+ android:layout_marginLeft="16dp"
+ android:paddingRight="11dp"
+ android:text="检查更新"
+ android:textColor="@color/black"
+ android:textSize="16sp"
+ app:layout_constraintLeft_toLeftOf="@+id/tv_ame_num1"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ </LinearLayout>
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ <androidx.appcompat.widget.AppCompatButton
+ android:layout_width="165dp"
+ android:layout_height="48dp"
+ android:layout_gravity="center"
+ android:background="@drawable/bg_white_radius_24"
+ android:text="退出登录"
+ android:textColor="#5971A4"
+ android:textSize="16sp"/>
+ </LinearLayout>
+ </LinearLayout>
+ </androidx.core.widget.NestedScrollView>
+ </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
Index: app/src/main/java/com/example/merchanthbh/http/data/MineModel.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/src/main/java/com/example/merchanthbh/http/data/MineModel.java b/app/src/main/java/com/example/merchanthbh/http/data/MineModel.java
new file mode 100644
--- /dev/null (date 1688647249768)
+++ b/app/src/main/java/com/example/merchanthbh/http/data/MineModel.java (date 1688647249768)
@@ -0,0 +1,3 @@
+package com.example.merchanthbh.http.data;
+public class MineModel {
+}
.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08__Changes_.xml 0 → 100644
View file @ 4fd1ece5
<changelist name="Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]" date="1688692122650" recycled="false" toDelete="true">
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/shelved.patch" />
<option name="DESCRIPTION" value="Uncommitted changes before Update at 2023/7/7 9:08 [Changes]" />
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/fileHashes/resourceHashesCache.bin" />
<option name="AFTER_PATH" value=".gradle/8.0/fileHashes/resourceHashesCache.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/resourceHashesCache.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" />
<option name="AFTER_PATH" value="app/src/main/res/drawable/wode_img_bg.png" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/wode_img_bg.png" />
</binary>
<binary>
<option name="BEFORE_PATH" />
<option name="AFTER_PATH" value="app/src/main/res/drawable/tab_icon_home_default.png" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/tab_icon_home_default.png" />
</binary>
<binary>
<option name="BEFORE_PATH" />
<option name="AFTER_PATH" value="app/src/main/res/drawable/tab_icon_wode_selected.png" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/tab_icon_wode_selected.png" />
</binary>
<binary>
<option name="BEFORE_PATH" />
<option name="AFTER_PATH" value="app/src/main/res/drawable/wode_icon_xieyi.png" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/wode_icon_xieyi.png" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/file-system.probe" />
<option name="AFTER_PATH" value=".gradle/file-system.probe" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/file-system.probe" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/fileHashes/fileHashes.bin" />
<option name="AFTER_PATH" value=".gradle/8.0/fileHashes/fileHashes.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/fileHashes.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/buildOutputCleanup/outputFiles.bin" />
<option name="AFTER_PATH" value=".gradle/buildOutputCleanup/outputFiles.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/outputFiles.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" />
<option name="AFTER_PATH" value="app/src/main/res/drawable/wode_icon_qingchu.png" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/wode_icon_qingchu.png" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/executionHistory/executionHistory.lock" />
<option name="AFTER_PATH" value=".gradle/8.0/executionHistory/executionHistory.lock" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/executionHistory.lock" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/buildOutputCleanup/buildOutputCleanup.lock" />
<option name="AFTER_PATH" value=".gradle/buildOutputCleanup/buildOutputCleanup.lock" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/buildOutputCleanup.lock" />
</binary>
<binary>
<option name="BEFORE_PATH" />
<option name="AFTER_PATH" value="app/src/main/res/drawable/tab_icon_huanbohai_default.png" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/tab_icon_huanbohai_default.png" />
</binary>
<binary>
<option name="BEFORE_PATH" />
<option name="AFTER_PATH" value="app/src/main/res/drawable/wode_icon_gengxin.png" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/wode_icon_gengxin.png" />
</binary>
<binary>
<option name="BEFORE_PATH" />
<option name="AFTER_PATH" value="app/src/main/res/drawable/wode_img_female.png" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/wode_img_female.png" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/executionHistory/executionHistory.bin" />
<option name="AFTER_PATH" value=".gradle/8.0/executionHistory/executionHistory.bin" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/executionHistory.bin" />
</binary>
<binary>
<option name="BEFORE_PATH" />
<option name="AFTER_PATH" value="app/src/main/res/drawable/wode_icon_genghuan.png" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/wode_icon_genghuan.png" />
</binary>
<binary>
<option name="BEFORE_PATH" />
<option name="AFTER_PATH" value="app/src/main/res/drawable/wode_icon_xiugaimima.png" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/wode_icon_xiugaimima.png" />
</binary>
<binary>
<option name="BEFORE_PATH" value=".gradle/8.0/fileHashes/fileHashes.lock" />
<option name="AFTER_PATH" value=".gradle/8.0/fileHashes/fileHashes.lock" />
<option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_2023_7_7_9_08_[Changes]/fileHashes.lock" />
</binary>
</changelist>
\ No newline at end of file
app/src/main/res/drawable/image/backup_rules.xml 0 → 100644
View file @ 4fd1ece5
<?xml version="1.0" encoding="utf-8"?><!--
Sample backup rules file; uncomment and customize as necessary.
See https://developer.android.com/guide/topics/data/autobackup
for details.
Note: This file is ignored for devices older that API 31
See https://developer.android.com/about/versions/12/backup-restore
-->
<full-backup-content>
<!--
<include domain="sharedpref" path="."/>
<exclude domain="sharedpref" path="device.xml"/>
-->
</full-backup-content>
\ No newline at end of file
app/src/main/res/drawable/image/data_extraction_rules.xml 0 → 100644
View file @ 4fd1ece5
<?xml version="1.0" encoding="utf-8"?><!--
Sample data extraction rules file; uncomment and customize as necessary.
See https://developer.android.com/about/versions/12/backup-restore#xml-changes
for details.
-->
<data-extraction-rules>
<cloud-backup>
<!-- TODO: Use <include> and <exclude> to control what is backed up.
<include .../>
<exclude .../>
-->
</cloud-backup>
<!--
<device-transfer>
<include .../>
<exclude .../>
</device-transfer>
-->
</data-extraction-rules>
\ No newline at end of file
app/src/main/res/drawable/image/network_config.xml 0 → 100644
View file @ 4fd1ece5
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
<base-config cleartextTrafficPermitted="true" >
</base-config>
</network-security-config>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment