diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4da7b85..aa2fbba 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -28,6 +28,7 @@
         <entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/fragment_main3.xml" value="0.3614583333333333" />
         <entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/item_discovery.xml" value="0.3614583333333333" />
         <entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/layout_history_record.xml" value="0.3614583333333333" />
+        <entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/welcome_image.xml" value="0.3614583333333333" />
       </map>
     </option>
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index ad00e28..3154dc1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,8 +38,8 @@ android {
         minSdkVersion 21
         targetSdkVersion 29
 //        multiDexEnabled true
-        versionCode 2
-        versionName "1.1.3"
+        versionCode 5
+        versionName "1.1.5"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         ndk {
 
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 6f06e1b..d317e3c 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 2,
-      "versionName": "1.1.3",
+      "versionCode": 5,
+      "versionName": "1.1.5",
       "outputFile": "app-release.apk"
     }
   ]
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 576c17b..e4672ec 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -118,7 +118,7 @@
         </provider>
 
         <activity
-            android:name="com.sl.house_property.MainActivity"
+            android:name="com.sl.house_property.LogoActivity"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
             android:screenOrientation="portrait"
             >
@@ -156,7 +156,7 @@
             android:screenOrientation="portrait"
             android:theme="@style/TAppTheme" />
         <activity
-            android:name="com.sl.house_property.LogoActivity"
+            android:name="com.sl.house_property.MainActivity"
             android:screenOrientation="portrait"
             android:exported="false"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
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 de31a0e..95c7be4 100644
--- a/app/src/main/java/com/sl/house_property/LogoActivity.java
+++ b/app/src/main/java/com/sl/house_property/LogoActivity.java
@@ -24,9 +24,10 @@ import com.tencent.bugly.Bugly;
 
 import cn.jpush.android.api.JPushInterface;
 import tools.Config;
+import utils.ConfigTitiles;
 
 
-public class LogoActivity extends Activity{
+public class LogoActivity extends Activity {
 
 
     int delaytime = 2000;
@@ -35,11 +36,11 @@ public class LogoActivity extends Activity{
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_logo);
-        RelativeLayout imaloder= findViewById(R.id.imaloder);
+        RelativeLayout imaloder = findViewById(R.id.imaloder);
         ImageView tipImage = findViewById(R.id.tip_image);
         RelativeLayout.LayoutParams tipLP = (RelativeLayout.LayoutParams) tipImage.getLayoutParams();
         int screenHigh = ScreenUtils.getScreenHeight();
-        tipLP.topMargin = (int) (screenHigh*0.28);
+        tipLP.topMargin = (int) (screenHigh * 0.28);
         tipImage.setLayoutParams(tipLP);
 
 
@@ -47,17 +48,18 @@ public class LogoActivity extends Activity{
             imaloder.postDelayed(new Runnable() {
                 @Override
                 public void run() {
+                    onceOrNot();
                     finish();
-                    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));
-                    }
+//                    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);
+            }, delaytime);
 
         } else {
             startDialog();
@@ -65,6 +67,30 @@ public class LogoActivity extends Activity{
 
     }
 
+    private void onceOrNot() {
+//        // TODO Auto-generated method stub
+//        int once = Config.getInstance(LogoActivity.this).getInt(ConfigTitiles.ONCEORNOT, 0);
+//        if (once == 0) {
+//            Config.getInstance(getApplicationContext()).put(ConfigTitiles.ONCEORNOT, 1);
+//            startActivity(new Intent(LogoActivity.this, MainActivity.class));
+//
+//        } else {
+//            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));
+//            }
+//
+//
+//        }
+        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));
+        }
+    }
 
     private void startDialog() {
         AlertDialog alertDialog = new AlertDialog.Builder(this).create();
@@ -131,15 +157,10 @@ public class LogoActivity extends Activity{
 
                     getSharedPreferences("first", Context.MODE_PRIVATE).edit().putInt("first", 1).apply();
                     JPushInterface.init(getApplication());
-                    Bugly.init(getApplication(),"d45325664f",false);
+                    Bugly.init(getApplication(), "d45325664f", false);
                     alertDialog.cancel();
+                    onceOrNot();
                     finish();
-                    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));
-                    }
                 }
             });
         }
diff --git a/app/src/main/java/com/sl/house_property/MainActivity.java b/app/src/main/java/com/sl/house_property/MainActivity.java
index 3b88cdf..d255811 100644
--- a/app/src/main/java/com/sl/house_property/MainActivity.java
+++ b/app/src/main/java/com/sl/house_property/MainActivity.java
@@ -94,7 +94,7 @@ public class MainActivity extends Activity {
             return;
         } else {
             //onceStart();
-            otherStart();
+      //      otherStart();
             return;
         }
 
@@ -162,8 +162,12 @@ public class MainActivity extends Activity {
         image2.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(new Intent(MainActivity.this, LogoActivity.class));
-                finish();
+                if ((Config.getInstance(MainActivity.this).getUser() == null)) {
+                    Intent intent = new Intent(MainActivity.this, LoginActivity.class);
+                    startActivity(intent);
+                } else {
+                    startActivity(new Intent(MainActivity.this, MainTabActivity.class));
+                }
             }
         });
         ArrayList<View> viewlist = new ArrayList<View>();
@@ -231,12 +235,6 @@ public class MainActivity extends Activity {
 
     }
 
-    private void otherStart() {
-        // TODO Auto-generated method stub
-        Intent intent = new Intent(MainActivity.this, LogoActivity.class);
-        startActivity(intent);
-        finish();
-    }
 
     @Override
     public boolean dispatchTouchEvent(MotionEvent ev) {//分发事件
diff --git a/app/src/main/java/com/sl/house_property/discovery/AddDiscoveryActivity.java b/app/src/main/java/com/sl/house_property/discovery/AddDiscoveryActivity.java
index 97cb94e..aa5655b 100644
--- a/app/src/main/java/com/sl/house_property/discovery/AddDiscoveryActivity.java
+++ b/app/src/main/java/com/sl/house_property/discovery/AddDiscoveryActivity.java
@@ -200,6 +200,7 @@ public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBindi
             @Override
             public void onAdditionItemClick() {
                 //
+                Log.e("xxxxx","onAdditionItemClick");
                 checkAlbumPermission(REQUEST_CODE_SELECT_PICTURE, additionImageWrapper.getRemainCount());
             }
 
@@ -268,9 +269,9 @@ public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBindi
             }
         }
     }
+    ArrayList<File> files = new ArrayList<>();
 
     private void goToSelect() {
-        ArrayList<File> files = new ArrayList<>();
         int postType = PictureMimeType.ofAll();
         if (additionImageWrapper.getImageList().size() > 0) {
             postType = PictureMimeType.ofImage();
@@ -278,7 +279,7 @@ public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBindi
             postType = PictureMimeType.ofAll();
         }
         PictureSelector create = PictureSelector.create(this);
-        if (postType == 0) {
+        if (postType == 1||postType==0) {
             create.openGallery(postType)
                     .isCamera(true)
                     .isWeChatStyle(true)
@@ -287,7 +288,7 @@ public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBindi
                     .isPreviewVideo(true)
                     .isCompress(true)
                     .videoMaxSecond(20)
-                    .videoMinSecond(2)
+                    .videoMinSecond(3)
                     .recordVideoSecond(15)
                     .imageEngine(GlideEngine.createGlideEngine())
                     .isWithVideoImage(false)
@@ -304,6 +305,7 @@ public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBindi
                                         files.add(new File(item.getRealPath()));
                                     }
                                 }
+
                                 additionImageWrapper.setData(files);
                             }
                         }
diff --git a/app/src/main/java/com/sl/house_property/user/AddAnewGranteeActivity.java b/app/src/main/java/com/sl/house_property/user/AddAnewGranteeActivity.java
index 6242e7b..720d2e0 100644
--- a/app/src/main/java/com/sl/house_property/user/AddAnewGranteeActivity.java
+++ b/app/src/main/java/com/sl/house_property/user/AddAnewGranteeActivity.java
@@ -430,7 +430,7 @@ public class AddAnewGranteeActivity extends BaseActivity<ActivityAddAnewGranteeB
         overridePendingTransition(R.anim.slide_from_bottom,
                 R.anim.slide_out_bottom);
     }
-
+private String userHomeId="";
     private void getGankList(String myurl, Map<String, String> map, String msg, final int requstecode) {
         progressDialog.setMessage(msg);
         progressDialog.setCancelable(false);
@@ -466,6 +466,8 @@ public class AddAnewGranteeActivity extends BaseActivity<ActivityAddAnewGranteeB
                             @Override
                             public void onOptionsSelect(int position, int option2, int options3) {
                                 address = list.get(position).getAddress();
+                                userHomeId = list.get(position).getUser_home_id();
+
                                 mDataBinding.address.setText(list.get(position).getAddress());
                             }
                         });
@@ -605,7 +607,7 @@ public class AddAnewGranteeActivity extends BaseActivity<ActivityAddAnewGranteeB
                     return;
                 }
                 if (mDataBinding.content.getText().toString().trim().length() < 3) {
-                    setToast("请输入保修详情");
+                    setToast("请输入报修详情");
                     return;
                 }
 
@@ -667,6 +669,7 @@ public class AddAnewGranteeActivity extends BaseActivity<ActivityAddAnewGranteeB
         map.put("serve_address", mDataBinding.address.getText().toString().trim());
         map.put("repair_user_name", mDataBinding.user.getText().toString().trim());
         map.put("repair_describe", mDataBinding.content.getText().toString().trim());
+        map.put("user_home_id",userHomeId);
         map.put("repair_type", type + "");
         int a = topRecleList.size() - 1;
         map.put("repair_img_count", a + "");
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index cb51dfb..024fc11 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -156,63 +156,7 @@
                         android:text="@string/forgetpsw" />
                 </RelativeLayout>
 
-                <LinearLayout
-                    android:id="@+id/lyfuwu"
-                    android:layout_width="match_parent"
-                    android:layout_height="40dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginLeft="16dip"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal">
-                    <CheckBox
-                        android:id="@+id/agreewhitemeg"
-                        android:button="@drawable/checkbox_style"
-                        android:layout_width="wrap_content"
-                        android:checked="false"
-                        android:layout_height="wrap_content" />
-                    <TextView
-                        android:layout_marginStart="10dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:paddingBottom="8dp"
-                        android:paddingTop="8dp"
-                        android:textColor="#333333"
-                        android:onClick="agreementEvent"
-                        android:layout_gravity="center_vertical"
-                        android:gravity="center_vertical"
-                        android:text="@string/agreewhitemeg1"
-                        android:textSize="16sp"/>
 
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/lyyinsi"
-                    android:layout_width="match_parent"
-                    android:layout_height="40dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginLeft="16dip"
-                    android:gravity="center_vertical"
-                    android:orientation="horizontal">
-                    <CheckBox
-                        android:id="@+id/agreewhitemegy"
-                        android:button="@drawable/checkbox_style"
-                        android:layout_width="wrap_content"
-                        android:checked="false"
-                        android:layout_height="wrap_content" />
-                    <TextView
-                        android:layout_marginStart="10dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:paddingBottom="8dp"
-                        android:paddingTop="8dp"
-                        android:textColor="#333333"
-                        android:onClick="yinagreementEvent"
-                        android:layout_gravity="center_vertical"
-                        android:gravity="center_vertical"
-                        android:text="@string/agreewhitemeg2"
-                        android:textSize="16sp"/>
-
-                </LinearLayout>
 
             </LinearLayout>
         </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 3b274cd..df59366 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,7 +6,6 @@
 <RelativeLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
     >
 
     <androidx.viewpager.widget.ViewPager