From 49e6423ca261ea965b69c5e795a845ecc91de119 Mon Sep 17 00:00:00 2001
From: jianbo <263303411@qq.com>
Date: Sat, 8 May 2021 11:08:38 +0800
Subject: [PATCH] d

---
 .idea/runConfigurations.xml                    |  1 -
 .../com/sl/house_property/LoginActivity.java   | 18 +++++++++---------
 .../sl/house_property/RegisterActivity.java    | 13 +++++++++++++
 app/src/main/res/layout/activity_login.xml     |  1 -
 app/src/main/res/layout/dialog_bind_house.xml  |  6 +-----
 5 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index e497da9..7f68460 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,7 +3,6 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/app/src/main/java/com/sl/house_property/LoginActivity.java b/app/src/main/java/com/sl/house_property/LoginActivity.java
index 7ff7e76..b069786 100644
--- a/app/src/main/java/com/sl/house_property/LoginActivity.java
+++ b/app/src/main/java/com/sl/house_property/LoginActivity.java
@@ -62,15 +62,15 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding> implements
         //获取当前日期
         String gettimetwo = DateUtilss.gettimetwo();
         Log.e("当前日期",gettimetwo);
-        if(gettimetwo.equals("2021年04月02日")||gettimetwo.equals("2021年04月03日")||gettimetwo.equals("2021年04月04日")||gettimetwo.equals("2021年04月05日")||gettimetwo.equals("2021年04月06日")){
-            mDataBinding.rlzhuce.setVisibility(View.GONE);
-            mDataBinding.lyfuwu.setVisibility(View.VISIBLE);
-            mDataBinding.lyyinsi.setVisibility(View.VISIBLE);
-        }else {
-            mDataBinding.rlzhuce.setVisibility(View.GONE);
-            mDataBinding.lyfuwu.setVisibility(View.VISIBLE);
-            mDataBinding.lyyinsi.setVisibility(View.VISIBLE);
-        }
+//        if(gettimetwo.equals("2021年04月02日")||gettimetwo.equals("2021年04月03日")||gettimetwo.equals("2021年04月04日")||gettimetwo.equals("2021年04月05日")||gettimetwo.equals("2021年04月06日")){
+//            mDataBinding.rlzhuce.setVisibility(View.GONE);
+//            mDataBinding.lyfuwu.setVisibility(View.VISIBLE);
+//            mDataBinding.lyyinsi.setVisibility(View.VISIBLE);
+//        }else {
+//            mDataBinding.rlzhuce.setVisibility(View.GONE);
+//            mDataBinding.lyfuwu.setVisibility(View.VISIBLE);
+//            mDataBinding.lyyinsi.setVisibility(View.VISIBLE);
+//        }
     }
 
     @Override
diff --git a/app/src/main/java/com/sl/house_property/RegisterActivity.java b/app/src/main/java/com/sl/house_property/RegisterActivity.java
index d13d050..0cb1bfc 100644
--- a/app/src/main/java/com/sl/house_property/RegisterActivity.java
+++ b/app/src/main/java/com/sl/house_property/RegisterActivity.java
@@ -51,6 +51,19 @@ public class RegisterActivity extends BaseActivity<ActivityRegisterBinding> impl
         mDataBinding.getcode.setOnClickListener(this);
 
         mDataBinding.register.setOnClickListener(this);
+
+//        BindHouseDialog bindHouseDialog = new BindHouseDialog(RegisterActivity.this);
+//        bindHouseDialog.setUserId("1");
+//        bindHouseDialog.setOnBindHouseListener(new BindHouseDialog.OnBindHouseListener() {
+//            @Override
+//            public void onSubmit() {
+//
+//                setToast("提交成功");
+//                finish();
+//            }
+//        });
+//        new XPopup.Builder(RegisterActivity.this).asCustom(bindHouseDialog).show();
+
     }
 
     @Override
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 0b3fee9..b51b0b4 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -119,7 +119,6 @@
                     android:layout_marginRight="20dip"
                     android:layout_marginTop="16dp"
                     android:gravity="center"
-                    android:visibility="gone"
                     android:textColor="@color/white">
 
                     <TextView
diff --git a/app/src/main/res/layout/dialog_bind_house.xml b/app/src/main/res/layout/dialog_bind_house.xml
index 2859f8b..fcfda85 100644
--- a/app/src/main/res/layout/dialog_bind_house.xml
+++ b/app/src/main/res/layout/dialog_bind_house.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="300dp"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:background="@drawable/_xpopup_round3_bg"
     android:orientation="vertical">
 
@@ -39,7 +39,6 @@
             android:background="@null"
             android:gravity="center_vertical"
             android:hint="请选择小区"
-            android:text="@{myentity.string1}"
             android:textColor="#333333"
             android:textSize="14sp" />
 
@@ -83,7 +82,6 @@
             android:background="@null"
             android:gravity="center_vertical"
             android:hint="请选择楼号"
-            android:text="@{myentity.string2}"
             android:textColor="#333333"
             android:textSize="14sp" />
 
@@ -127,7 +125,6 @@
             android:background="@null"
             android:gravity="center_vertical"
             android:hint="请选择单元"
-            android:text="@{myentity.string3}"
             android:textColor="#333333"
             android:textSize="14sp" />
 
@@ -171,7 +168,6 @@
             android:background="@null"
             android:gravity="center_vertical"
             android:hint="请选择房号"
-            android:text="@{myentity.string4}"
             android:textColor="#333333"
             android:textSize="14sp" />