From 86b429bfbb783c2190c06cf7a623ccef8fff1527 Mon Sep 17 00:00:00 2001
From: renjianbo0118 <18133922183>
Date: Tue, 20 Apr 2021 22:38:19 +0800
Subject: [PATCH] d

---
 .../com/sl/house_property/LogoActivity.java   | 11 ++++-
 .../com/sl/house_property/Main4Fragment.java  |  6 +++
 .../sl/house_property/SettingActivity.java    |  5 ++-
 app/src/main/res/layout/activity_login.xml    |  4 +-
 app/src/main/res/layout/fragment_main4.xml    | 41 +++++++++++++++++++
 5 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/sl/house_property/LogoActivity.java b/app/src/main/java/com/sl/house_property/LogoActivity.java
index 33234b8..cbe80b6 100644
--- a/app/src/main/java/com/sl/house_property/LogoActivity.java
+++ b/app/src/main/java/com/sl/house_property/LogoActivity.java
@@ -7,6 +7,9 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 
 import com.cutil.ScreenUtils;
+import com.sl.house_property.f2.FeeActivity;
+
+import tools.Config;
 
 
 public class LogoActivity extends Activity{
@@ -29,7 +32,13 @@ public class LogoActivity extends Activity{
             @Override
             public void run() {
                 finish();
-              startActivity( new Intent(LogoActivity.this, MainTabActivity.class));
+                if( (Config.getInstance(LogoActivity.this).getUser()==null)){
+                    Intent intent =new Intent(LogoActivity.this,LoginActivity.class);
+                    startActivity(intent);
+                }else {
+                    startActivity( new Intent(LogoActivity.this, MainTabActivity.class));
+                }
+
 
             }
         },delaytime);
diff --git a/app/src/main/java/com/sl/house_property/Main4Fragment.java b/app/src/main/java/com/sl/house_property/Main4Fragment.java
index 8c8511d..222f682 100644
--- a/app/src/main/java/com/sl/house_property/Main4Fragment.java
+++ b/app/src/main/java/com/sl/house_property/Main4Fragment.java
@@ -126,6 +126,12 @@ public class Main4Fragment extends BaseFragment<FragmentMain4Binding> implements
                 WebActivitytwo.runActivity(getActivity(), "", "https://wy.dou1.net/articlemobile/index/detail?article_id=19");
             }
         });
+        mDataBinding.ll6.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                WebActivitytwo.runActivity(getActivity(), "", "https://wy.dou1.net/articlemobile/index/detail?article_id=1");
+            }
+        });
         //mDataBinding.myRecyView;
         mDataBinding.userImage.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/app/src/main/java/com/sl/house_property/SettingActivity.java b/app/src/main/java/com/sl/house_property/SettingActivity.java
index 62f238a..1a2a3e0 100644
--- a/app/src/main/java/com/sl/house_property/SettingActivity.java
+++ b/app/src/main/java/com/sl/house_property/SettingActivity.java
@@ -77,8 +77,9 @@ public class SettingActivity extends BaseActivity<ActivitySettingBinding> implem
                 startActivity(intent);
                 break;
             case R.id.id3:
-                intent = new Intent(SettingActivity.this, AboutusActivity.class);
-                startActivity(intent);
+//                intent = new Intent(SettingActivity.this, AboutusActivity.class);
+//                startActivity(intent);
+                WebActivitytwo.runActivity(SettingActivity.this, "关于我们", "https://wy.dou1.net/articlemobile/index/detail?article_id=3");
                 break;
             case R.id.id2:
                 intent = new Intent(SettingActivity.this, AdeviseActivity.class);
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 14454bb..0b3fee9 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -159,7 +159,7 @@
                         android:id="@+id/agreewhitemeg"
                         android:button="@drawable/checkbox_style"
                         android:layout_width="wrap_content"
-                        android:checked="true"
+                        android:checked="false"
                         android:layout_height="wrap_content" />
                     <TextView
                         android:layout_marginStart="10dp"
@@ -189,7 +189,7 @@
                         android:id="@+id/agreewhitemegy"
                         android:button="@drawable/checkbox_style"
                         android:layout_width="wrap_content"
-                        android:checked="true"
+                        android:checked="false"
                         android:layout_height="wrap_content" />
                     <TextView
                         android:layout_marginStart="10dp"
diff --git a/app/src/main/res/layout/fragment_main4.xml b/app/src/main/res/layout/fragment_main4.xml
index 8dac1c4..16164de 100644
--- a/app/src/main/res/layout/fragment_main4.xml
+++ b/app/src/main/res/layout/fragment_main4.xml
@@ -291,6 +291,47 @@
                     android:layout_height="1dp"
 
 
+                    android:background="@color/light" />
+                <LinearLayout
+                    android:id="@+id/ll_6"
+                    android:background="@color/white"
+                    android:layout_width="match_parent"
+                    android:orientation="horizontal"
+                    android:layout_height="50dp">
+                    <ImageView
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="16dp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@mipmap/fangchan"
+                        />
+                    <TextView
+
+                        android:layout_marginLeft="16dp"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:textSize="16sp"
+                        android:textColor="#000"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:text="用户协议"
+
+                        />
+                    <ImageView
+                        android:layout_marginRight="16dp"
+                        android:layout_gravity="center_vertical"
+                        android:layout_width="15dp"
+                        android:layout_height="15dp"
+                        android:src="@mipmap/returnme"
+
+                        />
+
+                </LinearLayout>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+
+
                     android:background="@color/light" />
 
                 <LinearLayout