From 963f37010e52059a5abb916f20cbfa183f048b65 Mon Sep 17 00:00:00 2001
From: renjianbo <18691577328@qq.com>
Date: Wed, 7 Jan 2026 11:13:33 +0800
Subject: [PATCH] fist commit

---
 .idea/compiler.xml                            |   10 +-
 .idea/deploymentTargetSelector.xml            |   10 +
 .idea/kotlinc.xml                             |    6 +
 .idea/migrations.xml                          |   10 +
 .idea/misc.xml                                |    2 +-
 .idea/modules.xml                             |   24 +-
 .idea/runConfigurations.xml                   |   17 +
 .vscode/settings.json                         |    3 +
 app/build.gradle                              |  377 +-
 .../sl/house_property/AboutusActivity.java    |  207 +-
 .../sl/house_property/AdeviseActivity.java    |  295 +-
 .../sl/house_property/ForgetPwdActivity.java  |  434 ++-
 .../com/sl/house_property/LoginActivity.java  |  693 ++--
 .../com/sl/house_property/Main1Fragment.java  |  788 ++--
 .../com/sl/house_property/Main2Fragment.java  |  407 +--
 .../com/sl/house_property/MainFragment.java   | 3175 ++++++++---------
 .../sl/house_property/MainTabActivity.java    |  742 ++--
 .../sl/house_property/MakeErrorActivity.java  |  168 +-
 .../MarkingFinishAwardDialong.java            |  127 +-
 .../sl/house_property/ModifyPswdActivity.java |  338 +-
 .../sl/house_property/NewsDetailActivity.java |  237 +-
 .../sl/house_property/RegisterActivity.java   |  595 ++-
 .../RegisterAgreementActivity.java            |  211 +-
 .../sl/house_property/SettingActivity.java    |  285 +-
 .../com/sl/house_property/WebActivitytwo.java |  217 +-
 .../discovery/AddDiscoveryActivity.java       | 1132 +++---
 .../discovery/DiscoveryFragment.java          | 2236 ++++++------
 .../sl/house_property/f1/AddAcarActivity.java |  445 ++-
 .../f3/HousekeepingActivity.java              |  909 +++--
 .../user/AddAnewGranteeActivity.java          | 1429 ++++----
 .../sl/house_property/user/MyUserMessage.java | 1210 ++++---
 .../user/MyshopEditAcitivity.java             | 1035 +++---
 .../user/MyshopModifyAcitivity.java           |  999 +++---
 .../java/my_view/ConfirmCarmoneyDialog.java   | 1086 +++---
 app/src/main/java/my_view/ConfirmDialog.java  |  200 +-
 .../ConfirmForGaranteeDetailDialog.java       |  194 +-
 .../main/java/my_view/ConfirmViewDialog.java  |  210 +-
 app/src/main/java/my_view/MyRadioButton.java  |  180 +-
 .../java/utils/SelectPicDanimicActivity.java  | 1051 +++---
 .../drawable/picture_image_placeholder.xml    |    9 +
 app/src/main/res/values/attr.xml              |   82 +-
 app/src/main/res/values/dimen.xml             |    7 +-
 app/src/main/res/values/styles.xml            |  283 +-
 build.gradle                                  |   32 +-
 gradle.properties                             |   45 +-
 gradle/wrapper/gradle-wrapper.properties      |   12 +-
 ninegridview/build.gradle                     |   67 +-
 当前项目配置环境.txt                          |  452 +++
 项目点评.txt                                  |  382 ++
 49 files changed, 11948 insertions(+), 11117 deletions(-)
 create mode 100644 .idea/deploymentTargetSelector.xml
 create mode 100644 .idea/kotlinc.xml
 create mode 100644 .idea/migrations.xml
 create mode 100644 .idea/runConfigurations.xml
 create mode 100644 .vscode/settings.json
 create mode 100644 app/src/main/res/drawable/picture_image_placeholder.xml
 create mode 100644 当前项目配置环境.txt
 create mode 100644 项目点评.txt

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130..8b3f102 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="21" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644
index 0000000..0d46093
--- /dev/null
+++ b/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..356aa17
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.9.0" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644
index 0000000..48052b2
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1fc0df0..463777f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -44,7 +44,7 @@
     <option name="priority" value="Medium" />
     <option name="excludeFilter" value="" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index bcff911..dbe9801 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1,10 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/HouseProperty.iml" filepath="$PROJECT_DIR$/.idea/modules/HouseProperty.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/HouseProperty.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/HouseProperty.app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/ninegridview/HouseProperty.ninegridview.iml" filepath="$PROJECT_DIR$/.idea/modules/ninegridview/HouseProperty.ninegridview.iml" />
-    </modules>
-  </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/HouseProperty.iml" filepath="$PROJECT_DIR$/.idea/modules/HouseProperty.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/HouseProperty.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/HouseProperty.app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/HouseProperty.app.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/HouseProperty.app.androidTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/HouseProperty.app.main.iml" filepath="$PROJECT_DIR$/.idea/modules/app/HouseProperty.app.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/HouseProperty.app.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/app/HouseProperty.app.unitTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/ninegridview/HouseProperty.ninegridview.iml" filepath="$PROJECT_DIR$/.idea/modules/ninegridview/HouseProperty.ninegridview.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/ninegridview/HouseProperty.ninegridview.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/ninegridview/HouseProperty.ninegridview.androidTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/ninegridview/HouseProperty.ninegridview.main.iml" filepath="$PROJECT_DIR$/.idea/modules/ninegridview/HouseProperty.ninegridview.main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/ninegridview/HouseProperty.ninegridview.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/ninegridview/HouseProperty.ninegridview.unitTest.iml" />
+    </modules>
+  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..5bd6771
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..0d73912
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "interactive"
+}
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 332354a..d992aa0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,179 +1,198 @@
-apply plugin: 'com.android.application'
-
-android {
-
-    packagingOptions {
-        exclude 'META-INF/DEPENDENCIES'
-        exclude 'META-INF/NOTICE'
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/NOTICE.txt'
-    }
-
-    signingConfigs {
-        defaultSignature {
-            keyAlias 'key0'
-            keyPassword 'haotian'
-            storeFile file('haotian.jks')
-            storePassword 'haotian'
-        }
-    }
-    lintOptions {
-        abortOnError false
-    }
-    dataBinding {
-        enabled = true
-    }
-
-    compileSdkVersion 30
-    buildToolsVersion '30.0.0'
-    aaptOptions.cruncherEnabled = false
-    aaptOptions.useNewCruncher = false
-    defaultConfig {
-
-//        multiDexEnabled true
-        javaCompileOptions { annotationProcessorOptions { includeCompileClasspath = true } }
-//        multiDexEnabled true
-        applicationId "com.sl.HouseProperty"
-        minSdkVersion 21
-        targetSdkVersion 29
-//        multiDexEnabled true
-        versionCode 119
-        versionName "1.1.9"
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
-        ndk {
-
-            //选择要添加的对应cpu类型的.so库。
-            abiFilters  'armeabi-v7a'
-
-        }
-        manifestPlaceholders = [
-                JPUSH_PKGNAME : applicationId,
-                JPUSH_APPKEY : "4b6e03f9cc9466efbc0b2528", //JPush 上注册的包名对应的 Appkey.
-                JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可.
-        ]
-
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            //  signingConfig signingConfigs.defaultSignature
-        }
-        debug {
-            signingConfig signingConfigs.defaultSignature
-        }
-    }
-
-    repositories {
-        flatDir {
-            dirs 'libs'
-        }
-    }
-    sourceSets {
-        main {
-            assets.srcDirs = ['src/main/assets', 'src/main/assets/']
-            jniLibs.srcDirs = ['libs']
-        }
-    }
-
-    dependencies {
-
-        implementation fileTree(dir: 'libs', include: ['*.jar'])
-        androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
-            exclude group: 'com.android.support', module: 'support-annotations'
-        })
-        implementation 'com.zhy:percent-support-extends:1.0.1'
-        implementation 'com.arialyy.aria:Aria:3.1.1'
-        implementation 'com.jcodecraeer:xrecyclerview:1.3.2'
-        implementation 'com.youth.banner:banner:1.4.10'
-//        implementation 'com.github.bumptech.glide:glide:3.7.0'
-        implementation 'skin.support:skin-support:1.2.2'
-        implementation 'skin.support:skin-support-design:1.2.1'
-        implementation 'com.squareup.retrofit2:retrofit:2.1.0'
-        implementation 'com.google.code.gson:gson:2.6.2'
-        implementation 'io.reactivex:rxjava:1.1.0'
-        implementation 'io.reactivex:rxandroid:1.1.0'
-        implementation 'com.squareup.retrofit2:converter-gson:2.1.0'
-        implementation 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
-        implementation 'com.trello:rxlifecycle:+'
-        implementation 'com.trello:rxlifecycle-components:+'
-        implementation 'com.squareup.picasso:picasso:2.5.2'
-        //图片加载框架
-        implementation 'com.android.databinding:library:1.1'
-        implementation 'com.android.databinding:baseLibrary:1.1'
-        implementation 'com.android.databinding:adapters:1.1'
-        implementation 'top.zibin:Luban:1.1.8'
-        implementation 'com.hjq:xxpermissions:5.5'
-        implementation 'com.jzj.view:ObservableScrollView:0.0.2'
-        implementation 'com.dalong:refreshlayout:1.0.1'
-        implementation 'com.nineoldandroids:library:2.4.0'
-
-        implementation 'fm.jiecao:jiecaovideoplayer:4.8.3'
-        implementation  'androidx.multidex:multidex:2.0.1'
-        //noinspection GradleCompatible
-        implementation 'com.android.support:appcompat-v7:28.0.0'
-        implementation 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar'
-        implementation 'com.nhaarman.listviewanimations:lib-manipulation:3.1.0@aar'
-        implementation 'com.nhaarman.listviewanimations:lib-core-slh:3.1.0@aar'
-        implementation 'com.truizlop.sectionedrecyclerview:library:1.0.0'
-        implementation 'tech.wangjie:qrcodetools:1.0.0'
-
-        implementation 'com.squareup.okhttp3:logging-interceptor:3.4.1'
-        implementation 'com.google.zxing:core:3.3.0'
-
-//        implementation(name: 'autil-release', ext: 'aar')
-        implementation(name: 'cutil-release', ext: 'aar')
-//        implementation(name: 'viewpicker-release', ext: 'aar')
-        implementation(name: 'selectpicker-release', ext: 'aar')
-        implementation 'com.github.rey5137:material:1.2.5'
-        implementation 'com.github.bumptech.glide:glide:4.9.0'
-        implementation 'com.github.chrisbanes:PhotoView:2.0.0'
-
-
-
-        implementation 'net.dankito.richtexteditor:richtexteditor-android:2.0.8'
-        implementation(name: 'alipaySdk-15.5.9', ext: 'aar')
-        implementation files('libs/pldroid-player-2.1.9.jar')
-        implementation project(':ninegridview')
-        implementation 'com.lxj:xpopup:1.8.10'
-        // 添加下面这句即可
-
-        implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'  //1.0.5及以前版本的老用户升级需谨慎，API改动过大
-        // 基础依赖包，必须要依赖
-        implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
-        implementation 'liji.library.dev:citypickerview:5.2.2'
-
-        implementation 'com.zhihu.android:matisse:0.5.3-beta3'
-        implementation 'com.tencent.bugly:crashreport:latest.release' //其中latest.release指代最新Bugly SDK版本号，也可以指定明确的版本号，例如2.2.0
-        implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+'
-        //引入ormlite
-        implementation 'com.j256.ormlite:ormlite-core:5.1'
-        implementation 'com.j256.ormlite:ormlite-android:5.1'
-        implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30'
-
-
-        implementation 'com.lzy.net:okgo:3.0.4'
-        implementation 'cn.jiguang.sdk:jpush:3.6.6'
-        implementation 'cn.jiguang.sdk:jcore:2.3.8'
-        implementation 'com.tbruyelle.rxpermissions2:rxpermissions:0.9.5@aar'
-        api 'io.reactivex.rxjava2:rxjava:2.1.5'
-        implementation 'me.jessyan:autosize:1.1.2'
-
-     //   implementation 'androidx.camera:camera-view:1.0.0-alpha30'
-    // implementation 'io.github.lucksiege:pictureselector:v2.7.3-rc05'//视频图片选择器
-       implementation 'io.github.lucksiege:pictureselector:v2.7.3-rc05'
-        implementation 'com.lzy.net:okrx2:2.0.2'
-        //必须使用
-        api 'io.reactivex.rxjava2:rxandroid:2.1.1'
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-}
-
-
-
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+
+android {
+    namespace "com.sl.house_property"
+
+    packagingOptions {
+        exclude 'META-INF/DEPENDENCIES'
+        exclude 'META-INF/NOTICE'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/NOTICE.txt'
+    }
+
+    signingConfigs {
+        defaultSignature {
+            keyAlias 'key0'
+            keyPassword 'haotian'
+            storeFile file('haotian.jks')
+            storePassword 'haotian'
+        }
+    }
+    lintOptions {
+        abortOnError false
+    }
+    buildFeatures {
+        dataBinding = true
+    }
+
+    compileSdkVersion 33
+    // buildToolsVersion 在 AGP 8.0+ 中不再需要，会自动使用默认版本
+    aaptOptions.cruncherEnabled = false
+    aaptOptions.useNewCruncher = false
+    defaultConfig {
+
+//        multiDexEnabled true
+        // includeCompileClasspath 在 AGP 3.0+ 中已移除，功能默认启用，无需配置
+//        multiDexEnabled true
+        applicationId "com.sl.HouseProperty"
+        minSdkVersion 21
+        targetSdkVersion 29
+//        multiDexEnabled true
+        versionCode 119
+        versionName "1.1.9"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+        ndk {
+
+            //选择要添加的对应cpu类型的.so库。
+            abiFilters  'armeabi-v7a'
+
+        }
+        manifestPlaceholders = [
+                JPUSH_PKGNAME : applicationId,
+                JPUSH_APPKEY : "4b6e03f9cc9466efbc0b2528", //JPush 上注册的包名对应的 Appkey.
+                JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可.
+        ]
+
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            //  signingConfig signingConfigs.defaultSignature
+        }
+        debug {
+            signingConfig signingConfigs.defaultSignature
+        }
+    }
+
+    repositories {
+        flatDir {
+            dirs 'libs'
+        }
+    }
+    sourceSets {
+        main {
+            assets.srcDirs = ['src/main/assets', 'src/main/assets/']
+            jniLibs.srcDirs = ['libs']
+        }
+    }
+
+    dependencies {
+        // 添加 Kotlin 标准库
+        def kotlin_version = rootProject.ext.kotlin_version
+        implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+        // Kotlin 标准库（DataBinding 编译器在 AGP 8.x 中需要）
+        compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+        annotationProcessor "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+        
+        // 统一 Kotlin 版本，排除冲突的旧版本
+        configurations.all {
+            exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk7'
+            exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
+        }
+
+        implementation fileTree(dir: 'libs', include: ['*.jar'])
+        androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+            exclude group: 'com.android.support', module: 'support-annotations'
+        })
+        implementation 'com.zhy:percent-support-extends:1.0.1'
+        implementation 'com.arialyy.aria:Aria:3.1.1'
+        implementation 'com.jcodecraeer:xrecyclerview:1.3.2'
+        implementation 'com.youth.banner:banner:1.4.10'
+//        implementation 'com.github.bumptech.glide:glide:3.7.0'
+        implementation 'skin.support:skin-support:1.2.2'
+        implementation 'skin.support:skin-support-design:1.2.1'
+        implementation 'com.squareup.retrofit2:retrofit:2.1.0'
+        implementation 'com.google.code.gson:gson:2.6.2'
+        implementation 'io.reactivex:rxjava:1.1.0'
+        implementation 'io.reactivex:rxandroid:1.1.0'
+        implementation 'com.squareup.retrofit2:converter-gson:2.1.0'
+        implementation 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
+        implementation 'com.trello:rxlifecycle:+'
+        implementation 'com.trello:rxlifecycle-components:+'
+        implementation 'com.squareup.picasso:picasso:2.5.2'
+        //图片加载框架
+        // DataBinding 在 AGP 中已内置，不再需要单独依赖
+        // implementation 'com.android.databinding:library:1.1'
+        // implementation 'com.android.databinding:baseLibrary:1.1'
+        // implementation 'com.android.databinding:adapters:1.1'
+        implementation 'top.zibin:Luban:1.1.8'
+        implementation 'com.hjq:xxpermissions:5.5'
+        implementation 'com.jzj.view:ObservableScrollView:0.0.2'
+        implementation 'com.dalong:refreshlayout:1.0.1'
+        implementation 'com.nineoldandroids:library:2.4.0'
+
+        implementation 'fm.jiecao:jiecaovideoplayer:4.8.3'
+        implementation  'androidx.multidex:multidex:2.0.1'
+        //noinspection GradleCompatible
+        implementation 'com.android.support:appcompat-v7:28.0.0'
+        implementation 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar'
+        implementation 'com.nhaarman.listviewanimations:lib-manipulation:3.1.0@aar'
+        implementation 'com.nhaarman.listviewanimations:lib-core-slh:3.1.0@aar'
+        implementation 'com.truizlop.sectionedrecyclerview:library:1.0.0'
+        implementation 'tech.wangjie:qrcodetools:1.0.0'
+
+        implementation 'com.squareup.okhttp3:logging-interceptor:3.4.1'
+        implementation 'com.google.zxing:core:3.3.0'
+
+//        implementation(name: 'autil-release', ext: 'aar')
+        implementation(name: 'cutil-release', ext: 'aar')
+//        implementation(name: 'viewpicker-release', ext: 'aar')
+        implementation(name: 'selectpicker-release', ext: 'aar')
+        implementation 'com.github.rey5137:material:1.2.5'
+        implementation 'com.github.bumptech.glide:glide:4.9.0'
+        implementation 'com.github.chrisbanes:PhotoView:2.0.0'
+
+
+
+        implementation 'net.dankito.richtexteditor:richtexteditor-android:2.0.8'
+        implementation(name: 'alipaySdk-15.5.9', ext: 'aar')
+        implementation files('libs/pldroid-player-2.1.9.jar')
+        implementation project(':ninegridview')
+        implementation 'com.lxj:xpopup:1.8.10'
+        // 添加下面这句即可
+
+        implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'  //1.0.5及以前版本的老用户升级需谨慎，API改动过大
+        // 基础依赖包，必须要依赖
+        implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
+        implementation 'liji.library.dev:citypickerview:5.2.2'
+
+        implementation 'com.zhihu.android:matisse:0.5.3-beta3'
+        implementation 'com.tencent.bugly:crashreport:latest.release' //其中latest.release指代最新Bugly SDK版本号，也可以指定明确的版本号，例如2.2.0
+        implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+'
+        //引入ormlite
+        implementation 'com.j256.ormlite:ormlite-core:5.1'
+        implementation 'com.j256.ormlite:ormlite-android:5.1'
+        implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30'
+
+
+        implementation 'com.lzy.net:okgo:3.0.4'
+        implementation 'cn.jiguang.sdk:jpush:3.6.6'
+        implementation 'cn.jiguang.sdk:jcore:2.3.8'
+        implementation 'com.tbruyelle.rxpermissions2:rxpermissions:0.9.5@aar'
+        api 'io.reactivex.rxjava2:rxjava:2.1.5'
+        implementation 'me.jessyan:autosize:1.1.2'
+
+     //   implementation 'androidx.camera:camera-view:1.0.0-alpha30'
+    // implementation 'io.github.lucksiege:pictureselector:v2.7.3-rc05'//视频图片选择器
+       implementation 'io.github.lucksiege:pictureselector:v2.7.3-rc05'
+        implementation 'com.lzy.net:okrx2:2.0.2'
+        //必须使用
+        api 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
+}
+
+
+
diff --git a/app/src/main/java/com/sl/house_property/AboutusActivity.java b/app/src/main/java/com/sl/house_property/AboutusActivity.java
index 1cbf5a0..e7d4e91 100644
--- a/app/src/main/java/com/sl/house_property/AboutusActivity.java
+++ b/app/src/main/java/com/sl/house_property/AboutusActivity.java
@@ -1,104 +1,103 @@
-package com.sl.house_property;
-
-import android.graphics.Color;
-import android.os.Bundle;
-import android.view.KeyEvent;
-import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.ProgressBar;
-
-import com.sl.house_property.databinding.ActivityAboutusBinding;
-
-public class AboutusActivity extends BaseActivity<ActivityAboutusBinding> {
-    private ProgressBar progressBar;
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_aboutus;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    //    String url="https://wy.shiningsoft.top/articlemobile/index/detail?article_id=3";
-        String url="https://wy.dou1.net/articlemobile/index/detail?article_id=3";
-       // String url="https://wy.dou1.net/articlemobile/index/detail?article_id=1";
-        String titile=getIntent().getStringExtra("titile");
-        setAbr("关于我们", new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                finish();
-            }
-        },0,null,0,null,0,null,"");
-        // progressDialog=new ProgressDialog(NewsDetailActivity.this);
-        setWebView(url);
-    }
-
-    private void setWebView(String data) {
-        WebView webview = mDataBinding.fullscreenContent1;
-        progressBar=mDataBinding.progressBar2;
-        webview.setBackgroundColor(Color.WHITE);
-        // webview.loadDataWithBaseURL(null, data, "text/html" , "utf-8", null);
-        // webview.loadData(data,"text/html" ,"utf-8");
-        webview.loadUrl(data);
-        WebSettings webSettings = webview.getSettings();
-        //如果访问的页面中要与Javascript交互，则webview必须设置支持Javascript
-        webSettings.setJavaScriptEnabled(true);
-
-        //设置自适应屏幕，两者合用
-        webSettings.setUseWideViewPort(true); //将图片调整到适合webview的大小
-        webSettings.setLoadWithOverviewMode(true); // 缩放至屏幕的大小
-        //缩放操作
-        webSettings.setSupportZoom(true); //支持缩放，默认为true。是下面那个的前提。
-        webSettings.setBuiltInZoomControls(true); //设置内置的缩放控件。若为false，则该WebView不可缩放
-        webSettings.setDisplayZoomControls(false); //隐藏原生的缩放控件
-
-//其他细节操作
-        webSettings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK); //关闭webview中缓存
-        webSettings.setAllowFileAccess(true); //设置可以访问文件
-        webSettings.setJavaScriptCanOpenWindowsAutomatically(true); //支持通过JS打开新窗口
-        webSettings.setLoadsImagesAutomatically(true); //支持自动加载图片
-        webSettings.setDefaultTextEncodingName("utf-8");//设置编码格式
-        webSettings.setAppCachePath(getPackageCodePath()+"/myapp");
-        webSettings.setAppCacheMaxSize(10000);
-        //webview.loadUrl("www.baidu.com");
-        webview.setWebViewClient(new WebViewClient(){
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                view.loadUrl(url);
-                return super.shouldOverrideUrlLoading(view, url);
-            }
-        });
-        webview.setWebChromeClient(new WebChromeClient(){
-            @Override
-
-            public void onProgressChanged(WebView view, int newProgress) {
-                if (newProgress < 100) {
-
-                    progressBar.setProgress(newProgress);
-                } else {
-                    progressBar.setVisibility(View.GONE);
-
-                }
-            }
-
-
-        });
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_BACK
-                && event.getAction() == KeyEvent.ACTION_DOWN) {
-            if( mDataBinding.fullscreenContent1.canGoBack()){
-                mDataBinding.fullscreenContent1.goBack();
-            }
-            else finish();
-            return true;
-        }
-
-        return super.onKeyDown(keyCode, event);
-    }
-}
+package com.sl.house_property;
+
+import android.graphics.Color;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.View;
+import android.webkit.WebChromeClient;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.ProgressBar;
+
+import com.sl.house_property.databinding.ActivityAboutusBinding;
+
+public class AboutusActivity extends BaseActivity<ActivityAboutusBinding> {
+    private ProgressBar progressBar;
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_aboutus;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    //    String url="https://wy.shiningsoft.top/articlemobile/index/detail?article_id=3";
+        String url="https://wy.dou1.net/articlemobile/index/detail?article_id=3";
+       // String url="https://wy.dou1.net/articlemobile/index/detail?article_id=1";
+        String titile=getIntent().getStringExtra("titile");
+        setAbr("关于我们", new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        },0,null,0,null,0,null,"");
+        // progressDialog=new ProgressDialog(NewsDetailActivity.this);
+        setWebView(url);
+    }
+
+    private void setWebView(String data) {
+        WebView webview = mDataBinding.fullscreenContent1;
+        progressBar=mDataBinding.progressBar2;
+        webview.setBackgroundColor(Color.WHITE);
+        // webview.loadDataWithBaseURL(null, data, "text/html" , "utf-8", null);
+        // webview.loadData(data,"text/html" ,"utf-8");
+        webview.loadUrl(data);
+        WebSettings webSettings = webview.getSettings();
+        //如果访问的页面中要与Javascript交互，则webview必须设置支持Javascript
+        webSettings.setJavaScriptEnabled(true);
+
+        //设置自适应屏幕，两者合用
+        webSettings.setUseWideViewPort(true); //将图片调整到适合webview的大小
+        webSettings.setLoadWithOverviewMode(true); // 缩放至屏幕的大小
+        //缩放操作
+        webSettings.setSupportZoom(true); //支持缩放，默认为true。是下面那个的前提。
+        webSettings.setBuiltInZoomControls(true); //设置内置的缩放控件。若为false，则该WebView不可缩放
+        webSettings.setDisplayZoomControls(false); //隐藏原生的缩放控件
+
+//其他细节操作
+        webSettings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK); //关闭webview中缓存
+        webSettings.setAllowFileAccess(true); //设置可以访问文件
+        webSettings.setJavaScriptCanOpenWindowsAutomatically(true); //支持通过JS打开新窗口
+        webSettings.setLoadsImagesAutomatically(true); //支持自动加载图片
+        webSettings.setDefaultTextEncodingName("utf-8");//设置编码格式
+        // setAppCachePath 和 setAppCacheMaxSize 已在 API 33 中移除，使用默认缓存设置
+        //webview.loadUrl("www.baidu.com");
+        webview.setWebViewClient(new WebViewClient(){
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                view.loadUrl(url);
+                return super.shouldOverrideUrlLoading(view, url);
+            }
+        });
+        webview.setWebChromeClient(new WebChromeClient(){
+            @Override
+
+            public void onProgressChanged(WebView view, int newProgress) {
+                if (newProgress < 100) {
+
+                    progressBar.setProgress(newProgress);
+                } else {
+                    progressBar.setVisibility(View.GONE);
+
+                }
+            }
+
+
+        });
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK
+                && event.getAction() == KeyEvent.ACTION_DOWN) {
+            if( mDataBinding.fullscreenContent1.canGoBack()){
+                mDataBinding.fullscreenContent1.goBack();
+            }
+            else finish();
+            return true;
+        }
+
+        return super.onKeyDown(keyCode, event);
+    }
+}
diff --git a/app/src/main/java/com/sl/house_property/AdeviseActivity.java b/app/src/main/java/com/sl/house_property/AdeviseActivity.java
index 768e416..82ddfb8 100644
--- a/app/src/main/java/com/sl/house_property/AdeviseActivity.java
+++ b/app/src/main/java/com/sl/house_property/AdeviseActivity.java
@@ -1,150 +1,145 @@
-package com.sl.house_property;
-
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.Gravity;
-import android.view.View;
-import android.widget.Toast;
-
-import com.gyf.immersionbar.ImmersionBar;
-import com.sl.house_property.databinding.ActivityAdeviseBinding;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import my_loader.Loader;
-import my_loader.Resultcode;
-import tools.Config;
-import http.ApiConfig;
-import rx.Subscription;
-import rx.functions.Action1;
-import utils.Md5;
-
-public class AdeviseActivity extends BaseActivity<ActivityAdeviseBinding> {
-
-    private Loader mGankLoader;
-
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_adevise;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        ImmersionBar.with(this)
-                .keyboardEnable(true)  //解决软键盘与底部输入框冲突问题
-                //  .keyboardEnable(true, WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
-                //                        | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)  //软键盘自动弹出
-                .init();
-         mDataBinding.comimit.setOnClickListener(new View.OnClickListener(){
-             @Override
-             public void onClick(View view) {
-                 if(mDataBinding.connent.getText().toString().trim().length()<3){
-                 setToast(2,getString(R.string.pleaseeditcontent));
-                 return;}
-                 Map<String,String> map=new HashMap<>();
-                 map.put("content",mDataBinding.connent.getText().toString().trim());
-
-                 map.put("userid",Config.getInstance(AdeviseActivity.this).getUser().getUserid());
-                 map.put("sign", Md5.md5("System"+"System_an_Feedback"+Md5.secret));
-                 map.put("app", "System");
-                 map.put("class", "System_an_Feedback");
-                 getGankList(ApiConfig.BASE_URL,map, "正在反馈...",view.getId());
-
-             }
-         });
-        mDataBinding.left.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
-         mDataBinding.connent.addTextChangedListener(new TextWatcher() {
-             @Override
-             public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-
-             }
-
-             @Override
-             public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-
-             }
-
-             @Override
-             public void afterTextChanged(Editable editable) {
-                  if( mDataBinding.connent.getText().toString().length()>3){
-                      mDataBinding.comimit.setEnabled(true);
-                  }else {
-                      mDataBinding.comimit.setEnabled(false);
-                  }
-             }
-         });
-    }
-
-    private void getGankList(final String myurl, Map<String, String> map, String string, final int getcode1) {
-        progressDialog.setMessage(string);
-
-        //map.put("")
-        progressDialog.setCancelable(false);
-        progressDialog.show();
-        mDataBinding.getRoot().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                progressDialog.dismiss();
-                //setToast(1, getString(R.string.timeout));
-            }
-        },13000);
-        mGankLoader = new Loader();
-     /*  Map<String,String> map=new HashMap<String,String>();
-        map.put("phone");*/
-        Subscription subscription = mGankLoader.getMovie(myurl,map).subscribe(new Action1<Resultcode>() {
-            @Override
-            public void call(Resultcode resultcode) {
-                progressDialog.dismiss();
-                //setToast(0,resultcode.status);
-                if((!(resultcode.status==0))){
-//                    setToast(1, resultcode.msg);
-                    return;
-                }
-                switch (getcode1) {
-
-                    case R.id.comimit:
-//                        setToast(0, getString(R.string.loginsucess));
-                        showToast("提交成功");
-                        mDataBinding.getRoot().postDelayed(new Runnable() {
-                            @Override
-                            public void run() {
-                                finish();
-                            }
-                        },1000);
-
-
-                        break;
-
-                }
-
-            }
-
-
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                progressDialog.dismiss();
-                showToast(getString(R.string.getdatafailure));
-                throwable.printStackTrace();
-            }
-        });
-
-        addSubscription(subscription);
-    }
-
-    private void showToast(String s) {
-        Toast toast = Toast.makeText(getApplicationContext(), s, Toast.LENGTH_SHORT);
-        toast.setGravity(Gravity.CENTER, 0, 0);
-        toast.show();
-
-
-    }
-}
+package com.sl.house_property;
+
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.Toast;
+
+import com.gyf.immersionbar.ImmersionBar;
+import com.sl.house_property.databinding.ActivityAdeviseBinding;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import my_loader.Loader;
+import my_loader.Resultcode;
+import tools.Config;
+import http.ApiConfig;
+import rx.Subscription;
+import rx.functions.Action1;
+import utils.Md5;
+
+public class AdeviseActivity extends BaseActivity<ActivityAdeviseBinding> {
+
+    private Loader mGankLoader;
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_adevise;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ImmersionBar.with(this)
+                .keyboardEnable(true)  //解决软键盘与底部输入框冲突问题
+                //  .keyboardEnable(true, WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
+                //                        | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)  //软键盘自动弹出
+                .init();
+         mDataBinding.comimit.setOnClickListener(new View.OnClickListener(){
+             @Override
+             public void onClick(View view) {
+                 if(mDataBinding.connent.getText().toString().trim().length()<3){
+                 setToast(2,getString(R.string.pleaseeditcontent));
+                 return;}
+                 Map<String,String> map=new HashMap<>();
+                 map.put("content",mDataBinding.connent.getText().toString().trim());
+
+                 map.put("userid",Config.getInstance(AdeviseActivity.this).getUser().getUserid());
+                 map.put("sign", Md5.md5("System"+"System_an_Feedback"+Md5.secret));
+                 map.put("app", "System");
+                 map.put("class", "System_an_Feedback");
+                 getGankList(ApiConfig.BASE_URL,map, "正在反馈...",view.getId());
+
+             }
+         });
+        mDataBinding.left.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+         mDataBinding.connent.addTextChangedListener(new TextWatcher() {
+             @Override
+             public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+             }
+
+             @Override
+             public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+             }
+
+             @Override
+             public void afterTextChanged(Editable editable) {
+                  if( mDataBinding.connent.getText().toString().length()>3){
+                      mDataBinding.comimit.setEnabled(true);
+                  }else {
+                      mDataBinding.comimit.setEnabled(false);
+                  }
+             }
+         });
+    }
+
+    private void getGankList(final String myurl, Map<String, String> map, String string, final int getcode1) {
+        progressDialog.setMessage(string);
+
+        //map.put("")
+        progressDialog.setCancelable(false);
+        progressDialog.show();
+        mDataBinding.getRoot().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                progressDialog.dismiss();
+                //setToast(1, getString(R.string.timeout));
+            }
+        },13000);
+        mGankLoader = new Loader();
+     /*  Map<String,String> map=new HashMap<String,String>();
+        map.put("phone");*/
+        Subscription subscription = mGankLoader.getMovie(myurl,map).subscribe(new Action1<Resultcode>() {
+            @Override
+            public void call(Resultcode resultcode) {
+                progressDialog.dismiss();
+                //setToast(0,resultcode.status);
+                if((!(resultcode.status==0))){
+//                    setToast(1, resultcode.msg);
+                    return;
+                }
+                int comimitId = R.id.comimit;
+                if (getcode1 == comimitId) {
+//                        setToast(0, getString(R.string.loginsucess));
+                    showToast("提交成功");
+                    mDataBinding.getRoot().postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            finish();
+                        }
+                    },1000);
+                }
+
+            }
+
+
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                progressDialog.dismiss();
+                showToast(getString(R.string.getdatafailure));
+                throwable.printStackTrace();
+            }
+        });
+
+        addSubscription(subscription);
+    }
+
+    private void showToast(String s) {
+        Toast toast = Toast.makeText(getApplicationContext(), s, Toast.LENGTH_SHORT);
+        toast.setGravity(Gravity.CENTER, 0, 0);
+        toast.show();
+
+
+    }
+}
diff --git a/app/src/main/java/com/sl/house_property/ForgetPwdActivity.java b/app/src/main/java/com/sl/house_property/ForgetPwdActivity.java
index 8f13743..381ce8a 100644
--- a/app/src/main/java/com/sl/house_property/ForgetPwdActivity.java
+++ b/app/src/main/java/com/sl/house_property/ForgetPwdActivity.java
@@ -1,221 +1,213 @@
-package com.sl.house_property;
-
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.view.Gravity;
-import android.view.View;
-import android.widget.Toast;
-
-import com.cutil.RegexUtils;
-import com.gyf.immersionbar.ImmersionBar;
-import com.sl.house_property.databinding.ActivityForgetPwdBinding;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import my_loader.Loader;
-import my_loader.Resultcode;
-import http.ApiConfig;
-import rx.Subscription;
-import rx.functions.Action1;
-import utils.Md5;
-
-public class ForgetPwdActivity extends BaseActivity<ActivityForgetPwdBinding> implements View.OnClickListener{
-    int recLen = 60;//获取验证，倒计时
-    private Loader mGankLoader;
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_forget_pwd;
-    }
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-//        setAbr("找回密码", new View.OnClickListener() {
-//            @Override
-//            public void onClick(View view) {
-//                finish();
-//            }
-//        }, 0, null, 0, null, 0, null, "");
-        ImmersionBar.with(this)
-                .keyboardEnable(true)
-                .init();
-        mDataBinding.getcode.setOnClickListener(this);
-
-        mDataBinding.register.setOnClickListener(this);
-        mDataBinding.left.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
-    }
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()){
-
-            case  R.id.getcode:
-                if(mDataBinding.registerphone.getText().toString().length()==0){
-                    setToast(getString(R.string.me_input_phone_tip));
-                    return;
-                }
-                if(!RegexUtils.isMobileExact(mDataBinding.registerphone.getText().toString())){
-                    setToast(getString(R.string.me_input_phone_error_tip));
-                    return;
-                }
-                getMesgCode(R.id.getcode);
-                break;
-            case  R.id.register:
-                if(mDataBinding.registerphone.getText().toString().length()==0){
-                    setToast(getString(R.string.me_input_phone_tip));
-                    return;
-                }
-                if(!RegexUtils.isMobileExact(mDataBinding.registerphone.getText().toString())){
-                    setToast(getString(R.string.me_input_phone_error_tip));
-                    return;
-                }
-
-                if(mDataBinding.logincode.getText().toString().length()<1){
-                    setToast(getString(R.string.me_input_verification_tip));
-                    return;
-                }
-
-                String password =  mDataBinding.editpaw.getText().toString();
-                if(password.length()<1){
-                    setToast(getString(R.string.me_input_password_tip));
-                    return;
-                }
-                if(!tools.RegexUtils.checkPassword(password)){
-                    setToast(getString(R.string.me_input_password_fail_tip));
-                    return;
-                }
-
-                String againPassword = mDataBinding.editpawAGAIN.getText().toString().trim();
-                if(againPassword.length()<1){
-                    setToast(getString(R.string.me_input_again_password_tip));
-                    return;
-                }
-                if(!mDataBinding.editpaw.getText().toString().trim().equals(mDataBinding.editpawAGAIN.getText().toString().trim())){
-                    setToast(getString(R.string.me_password_Inconsistent_tip));
-
-                    return;
-                }
-                register(view.getId());
-                break;
-
-        }
-    }
-    private void register(int id) {
-        Map<String,String> map=new HashMap<>();
-        map.put("phone",mDataBinding.registerphone.getText().toString().trim());
-        map.put("password",mDataBinding.editpaw.getText().toString().trim());
-        map.put("code",mDataBinding.logincode.getText().toString().trim());
-        map.put("sign", Md5.md5("Cas"+"ForgetPassword"+Md5.secret));
-        map.put("app", "Cas");
-        map.put("class", "ForgetPassword");
-        getGankList(ApiConfig.BASE_URL,map, getResources().getString(R.string.requsting),id);
-    }
-
-
-    private void getMesgCode(int id) {//获取验证码
-        // TODO Auto-generated method stub
-        recLen = 60;
-        /* getRegisterCode.setTextColor(getResources().getColor(R.color.regitergrey));*/
-//        mDataBinding.getcode.setTextColor(getResources().getColor(R.color.white));
-        mDataBinding.getcode.setClickable(false);
-        Map<String,String> map=new HashMap<>();
-        map.put("sendto",mDataBinding.registerphone.getText().toString().trim());
-        map.put("action","forgotpassword");
-        map.put("sign", Md5.md5("Cas"+"SendCode"+Md5.secret));
-        map.put("app", "Cas");
-        map.put("class", "SendCode");
-        getGankList(ApiConfig.BASE_URL,map, getResources().getString(R.string.getthecodenow),id);
-//        map = new HashMap<String, Object>();
-//        map.put("telephone", editPhoneNo.getText().toString().trim());
-//        getAsyTask(1, map, HttpUrl.registerUser(), "正在获取验证码", HttpNet.PROGRESSVISIBLE, HttpNet.POSTTYPE);//联网
-
-    }
-    private void getGankList(final String myurl, Map<String, String> map, String string, final int getcode1) {
-        progressDialog.setMessage(string);
-        progressDialog.setCancelable(false);
-        if(getcode1!=R.id.getcode)
-        progressDialog.show();
-        mDataBinding.getRoot().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                progressDialog.dismiss();
-                //setToast(1, getString(R.string.timeout));
-            }
-        },13000);
-        mGankLoader = new Loader();
-     /*  Map<String,String> map=new HashMap<String,String>();
-        map.put("phone");*/
-        Subscription subscription = mGankLoader.getMovie(myurl,map).subscribe(new Action1<Resultcode>() {
-            @Override
-            public void call(Resultcode resultcode) {
-                progressDialog.dismiss();
-                //setToast(0,resultcode.status);
-                if((!(resultcode.status==0))){
-                    setToast( resultcode.msg);
-                    mDataBinding.getcode.setClickable(true);
-                    return;
-                }
-                switch (getcode1) {
-                    case R.id.getcode:
-//                        showToast( getString(R.string.megissucess));
-                        startTimer();
-                        break;
-
-                    case R.id.register:
-                        setToast( getString(R.string.changpawdsucess));
-                        finish();
-                        break;
-                }
-            }
-
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                progressDialog.dismiss();
-                setToast(getString(R.string.getdatafailure));
-                mDataBinding.getcode.setClickable(true);
-                throwable.printStackTrace();
-            }
-        });
-
-        addSubscription(subscription);
-    }
-
-
-
-    private void startTimer(){
-        final Timer timer = new Timer();
-        final Handler handler = new Handler() {
-            @Override
-            public void handleMessage(Message msg) {
-                // TODO Auto-generated method stub
-                super.handleMessage(msg);
-                mDataBinding.getcode.setText(recLen + "");
-                if (recLen < 0) {
-                    timer.cancel();
-                    mDataBinding.getcode.setText(getResources().getString(R.string.me_again_get_verification_tip));
-                    mDataBinding.getcode.setClickable(true);
-                }
-
-            }
-        };
-        TimerTask task = new TimerTask() {
-            @Override
-            public void run() {
-                recLen--;
-                Message message = new Message();
-                message.what = 1;
-                handler.sendMessage(message);
-            }
-        };
-        timer.schedule(task, 1000, 1000);
-    }
-}
+package com.sl.house_property;
+
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.Toast;
+
+import com.cutil.RegexUtils;
+import com.gyf.immersionbar.ImmersionBar;
+import com.sl.house_property.databinding.ActivityForgetPwdBinding;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import my_loader.Loader;
+import my_loader.Resultcode;
+import http.ApiConfig;
+import rx.Subscription;
+import rx.functions.Action1;
+import utils.Md5;
+
+public class ForgetPwdActivity extends BaseActivity<ActivityForgetPwdBinding> implements View.OnClickListener{
+    int recLen = 60;//获取验证，倒计时
+    private Loader mGankLoader;
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_forget_pwd;
+    }
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+//        setAbr("找回密码", new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                finish();
+//            }
+//        }, 0, null, 0, null, 0, null, "");
+        ImmersionBar.with(this)
+                .keyboardEnable(true)
+                .init();
+        mDataBinding.getcode.setOnClickListener(this);
+
+        mDataBinding.register.setOnClickListener(this);
+        mDataBinding.left.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+    }
+    @Override
+    public void onClick(View view) {
+        int id = view.getId();
+        if (id == R.id.getcode) {
+            if(mDataBinding.registerphone.getText().toString().length()==0){
+                setToast(getString(R.string.me_input_phone_tip));
+                return;
+            }
+            if(!RegexUtils.isMobileExact(mDataBinding.registerphone.getText().toString())){
+                setToast(getString(R.string.me_input_phone_error_tip));
+                return;
+            }
+            getMesgCode(R.id.getcode);
+        } else if (id == R.id.register) {
+            if(mDataBinding.registerphone.getText().toString().length()==0){
+                setToast(getString(R.string.me_input_phone_tip));
+                return;
+            }
+            if(!RegexUtils.isMobileExact(mDataBinding.registerphone.getText().toString())){
+                setToast(getString(R.string.me_input_phone_error_tip));
+                return;
+            }
+
+            if(mDataBinding.logincode.getText().toString().length()<1){
+                setToast(getString(R.string.me_input_verification_tip));
+                return;
+            }
+
+            String password =  mDataBinding.editpaw.getText().toString();
+            if(password.length()<1){
+                setToast(getString(R.string.me_input_password_tip));
+                return;
+            }
+            if(!tools.RegexUtils.checkPassword(password)){
+                setToast(getString(R.string.me_input_password_fail_tip));
+                return;
+            }
+
+            String againPassword = mDataBinding.editpawAGAIN.getText().toString().trim();
+            if(againPassword.length()<1){
+                setToast(getString(R.string.me_input_again_password_tip));
+                return;
+            }
+            if(!mDataBinding.editpaw.getText().toString().trim().equals(mDataBinding.editpawAGAIN.getText().toString().trim())){
+                setToast(getString(R.string.me_password_Inconsistent_tip));
+
+                return;
+            }
+            register(view.getId());
+        }
+    }
+    private void register(int id) {
+        Map<String,String> map=new HashMap<>();
+        map.put("phone",mDataBinding.registerphone.getText().toString().trim());
+        map.put("password",mDataBinding.editpaw.getText().toString().trim());
+        map.put("code",mDataBinding.logincode.getText().toString().trim());
+        map.put("sign", Md5.md5("Cas"+"ForgetPassword"+Md5.secret));
+        map.put("app", "Cas");
+        map.put("class", "ForgetPassword");
+        getGankList(ApiConfig.BASE_URL,map, getResources().getString(R.string.requsting),id);
+    }
+
+
+    private void getMesgCode(int id) {//获取验证码
+        // TODO Auto-generated method stub
+        recLen = 60;
+        /* getRegisterCode.setTextColor(getResources().getColor(R.color.regitergrey));*/
+//        mDataBinding.getcode.setTextColor(getResources().getColor(R.color.white));
+        mDataBinding.getcode.setClickable(false);
+        Map<String,String> map=new HashMap<>();
+        map.put("sendto",mDataBinding.registerphone.getText().toString().trim());
+        map.put("action","forgotpassword");
+        map.put("sign", Md5.md5("Cas"+"SendCode"+Md5.secret));
+        map.put("app", "Cas");
+        map.put("class", "SendCode");
+        getGankList(ApiConfig.BASE_URL,map, getResources().getString(R.string.getthecodenow),id);
+//        map = new HashMap<String, Object>();
+//        map.put("telephone", editPhoneNo.getText().toString().trim());
+//        getAsyTask(1, map, HttpUrl.registerUser(), "正在获取验证码", HttpNet.PROGRESSVISIBLE, HttpNet.POSTTYPE);//联网
+
+    }
+    private void getGankList(final String myurl, Map<String, String> map, String string, final int getcode1) {
+        progressDialog.setMessage(string);
+        progressDialog.setCancelable(false);
+        if(getcode1!=R.id.getcode)
+        progressDialog.show();
+        mDataBinding.getRoot().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                progressDialog.dismiss();
+                //setToast(1, getString(R.string.timeout));
+            }
+        },13000);
+        mGankLoader = new Loader();
+     /*  Map<String,String> map=new HashMap<String,String>();
+        map.put("phone");*/
+        Subscription subscription = mGankLoader.getMovie(myurl,map).subscribe(new Action1<Resultcode>() {
+            @Override
+            public void call(Resultcode resultcode) {
+                progressDialog.dismiss();
+                //setToast(0,resultcode.status);
+                if((!(resultcode.status==0))){
+                    setToast( resultcode.msg);
+                    mDataBinding.getcode.setClickable(true);
+                    return;
+                }
+                if (getcode1 == R.id.getcode) {
+//                        showToast( getString(R.string.megissucess));
+                    startTimer();
+                } else if (getcode1 == R.id.register) {
+                    setToast( getString(R.string.changpawdsucess));
+                    finish();
+                }
+            }
+
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                progressDialog.dismiss();
+                setToast(getString(R.string.getdatafailure));
+                mDataBinding.getcode.setClickable(true);
+                throwable.printStackTrace();
+            }
+        });
+
+        addSubscription(subscription);
+    }
+
+
+
+    private void startTimer(){
+        final Timer timer = new Timer();
+        final Handler handler = new Handler() {
+            @Override
+            public void handleMessage(Message msg) {
+                // TODO Auto-generated method stub
+                super.handleMessage(msg);
+                mDataBinding.getcode.setText(recLen + "");
+                if (recLen < 0) {
+                    timer.cancel();
+                    mDataBinding.getcode.setText(getResources().getString(R.string.me_again_get_verification_tip));
+                    mDataBinding.getcode.setClickable(true);
+                }
+
+            }
+        };
+        TimerTask task = new TimerTask() {
+            @Override
+            public void run() {
+                recLen--;
+                Message message = new Message();
+                message.what = 1;
+                handler.sendMessage(message);
+            }
+        };
+        timer.schedule(task, 1000, 1000);
+    }
+}
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 6320d18..cfe3f71 100644
--- a/app/src/main/java/com/sl/house_property/LoginActivity.java
+++ b/app/src/main/java/com/sl/house_property/LoginActivity.java
@@ -1,349 +1,344 @@
-package com.sl.house_property;
-
-import android.app.ProgressDialog;
-import android.content.Intent;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.text.SpannableStringBuilder;
-import android.text.TextPaint;
-import android.text.method.LinkMovementMethod;
-import android.text.style.ClickableSpan;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.View;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-
-import com.cutil.RegexUtils;
-import com.google.gson.Gson;
-import com.google.gson.internal.LinkedTreeMap;
-import com.google.gson.reflect.TypeToken;
-import com.sl.house_property.databinding.ActivityLoginBinding;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import cn.jpush.android.api.JPushInterface;
-import entity.RegisterUser;
-import my_loader.Loader;
-import my_loader.Resultcode;
-import tools.Config;
-import http.ApiConfig;
-import rx.Subscription;
-import rx.functions.Action1;
-import utils.DateUtils;
-import utils.DateUtilss;
-import utils.Md5;
-import utils.SPUtils;
-
-public class LoginActivity extends BaseActivity<ActivityLoginBinding> implements View.OnClickListener {
-
-    private ProgressDialog progressDialog;
-    private Loader mGankLoader;
-
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_login;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setAbr(getString(R.string.me_login), new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                finish();
-            }
-        }, 0, null, 0, null, 0, null, "");
-
-        progressDialog = new ProgressDialog(LoginActivity.this);
-        String username = Config.getInstance(LoginActivity.this).getString("username", "15129217176");
-//        mDataBinding.phone.setText(username);
-//        mDataBinding.phone.setSelection(username.length());
-        mDataBinding.logintext.setOnClickListener(this);
-        mDataBinding.forgetpaw.setOnClickListener(this);
-        mDataBinding.gotoregister.setOnClickListener(this);
-        //获取当前日期
-        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);
-//        }
-
-        String str="我已阅读并同意《隐私政策》和《用户协议》";
-        SpannableStringBuilder ssb = new SpannableStringBuilder();
-        ssb.append(str);
-        int v1 = str.indexOf("《");
-        ssb.setSpan(new ClickableSpan() {
-            @Override
-            public void onClick(@NonNull View widget) {
-                if (mDataBinding.tvYs.isSelected()) {
-                    mDataBinding.tvYs.setSelected(false);
-
-                    Drawable drawable = getResources().getDrawable(R.mipmap.icon_publish_selected2);
-                    drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
-                    mDataBinding.tvYs.setCompoundDrawables(drawable, null, null, null);
-
-                } else {
-                    mDataBinding.tvYs.setSelected(true);
-                    Drawable drawable = getResources().getDrawable(R.mipmap.icon_publish_selected);
-                    drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
-                    mDataBinding.tvYs.setCompoundDrawables(drawable, null, null, null);
-                }
-            }
-
-            @Override
-            public void updateDrawState(@NonNull TextPaint ds) {
-                super.updateDrawState(ds);
-                ds.setColor(getResources().getColor(R.color.text2));
-                ds.setUnderlineText(false);
-            }
-        }, 0, v1, 0);
-
-        int start = str.indexOf("《");
-        ssb.setSpan(new ClickableSpan() {
-            @Override
-            public void onClick(@NonNull View widget) {
-                //隐私政策
-                WebActivitytwo.runActivity(LoginActivity.this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=19");
-            }
-
-            @Override
-            public void updateDrawState(@NonNull TextPaint ds) {
-                super.updateDrawState(ds);
-                ds.setColor(getResources().getColor(R.color.red));
-                ds.setUnderlineText(false);
-            }
-        }, start, start + 6, 0);
-        int end = str.lastIndexOf("《");
-        ssb.setSpan(new ClickableSpan() {
-            @Override
-            public void onClick(@NonNull View widget) {
-                //用户协议
-                WebActivitytwo.runActivity(LoginActivity.this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=1");
-            }
-
-            @Override
-            public void updateDrawState(@NonNull TextPaint ds) {
-                super.updateDrawState(ds);
-                ds.setColor(getResources().getColor(R.color.red));
-                ds.setUnderlineText(false);
-            }
-        }, end, end + 6, 0);
-        mDataBinding.tvYs.setMovementMethod(LinkMovementMethod.getInstance());
-        mDataBinding.tvYs.setText(ssb,TextView.BufferType.SPANNABLE);
-
-    }
-
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.gotoregister:
-                Intent intent = new Intent(LoginActivity.this, RegisterActivity.class);
-                startActivity(intent);
-                break;
-            case R.id.forgetpaw:
-                Intent intent2 = new Intent(LoginActivity.this, ForgetPwdActivity.class);
-                startActivity(intent2);
-                break;
-            case R.id.logintext:
-                if (!mDataBinding.tvYs.isSelected()) {
-                    setToast("请先阅读并勾选同意用户协议和隐私政策");
-                    return;
-                }
-
-                String phone = mDataBinding.phone.getText().toString().trim();
-                String password = mDataBinding.pwd.getText().toString().trim();
-                if (phone.length() < 1) {
-                    setToast("请输入手机号码");
-                    return;
-                }
-                if (phone.length() != 11) {
-                    setToast("请输入有效的手机号");
-                    return;
-                }
-
-                if (!RegexUtils.isMobileExact(phone)) {
-                    setToast(getString(R.string.me_account_or_password_error_tip));
-                    return;
-                }
-                if (password.equals("")) {
-                    setToast(getString(R.string.me_input_password_tip));
-                    return;
-                }
-//                if (!mDataBinding.agreewhitemeg.isChecked()) {
-//                    setToast("请先同意注册协议");
-//
-//                    return;
-//                }
-//                if (!mDataBinding.agreewhitemegy.isChecked()) {
-//                    setToast("请先同意隐私政策");
-//
-//                    return;
-//                }
-                Map<String, String> map = new HashMap<>();
-                map.put("phone", phone);
-                map.put("password", password);
-                map.put("sign", Md5.md5("Cas" + "Login" + Md5.secret));
-                map.put("app", "Cas");
-                map.put("class", "Login");
-                getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.logining), view.getId());
-                break;
-        }
-
-    }
-
-    private void getGankList(final String myurl, Map<String, String> map, String string, final int getcode1) {
-        progressDialog.setMessage(string);
-
-        //map.put("")
-        progressDialog.setCancelable(false);
-        progressDialog.show();
-        mDataBinding.getRoot().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                progressDialog.dismiss();
-                //setToast(1, getString(R.string.timeout));
-            }
-        }, 13000);
-        mGankLoader = new Loader();
-     /*  Map<String,String> map=new HashMap<String,String>();
-        map.put("phone");*/
-        Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
-            @Override
-            public void call(Resultcode resultcode) {
-                progressDialog.dismiss();
-                //setToast(0,resultcode.status);
-                if ((!(resultcode.status == 0))) {
-                    setToast(resultcode.msg);
-                    return;
-                }
-                switch (getcode1) {
-
-                    case R.id.logintext:
-                        Gson gs = new Gson();
-                        LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
-                        String s = gs.toJson(adta);
-                        RegisterUser user = gs.fromJson(s, RegisterUser.class);//把JSON字符串转为对象
-                        JPushInterface.setAlias(getApplicationContext(), 0, user.getUserid());
-                        Config.getInstance(LoginActivity.this).putUser(user);
-                        Config.getInstance(LoginActivity.this).put("username", mDataBinding.phone.getText().toString().trim());
-
-
-                        Map<String, String> map = new HashMap<>();
-                        if (user != null) {
-                            map.put("userid", user.getUserid());
-                        } else {
-                            map.put("userid", 0 + "");
-                        }
-                        map.put("app", "Cas");
-                        map.put("class", "MyHouseList");
-                        //map.put("home_id", "GetHomeByPid");
-                        map.put("sign", Md5.md5("Cas" + "MyHouseList" + Md5.secret));
-                        getpammar(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), 0);
-
-
-                        break;
-
-                }
-
-            }
-
-
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                progressDialog.dismiss();
-                setToast(getString(R.string.getdatafailure));
-                throwable.printStackTrace();
-            }
-        });
-
-        addSubscription(subscription);
-    }
-
-
-    private void getpammar(String myurl, Map<String, String> map, String msg, final int requstecode) {
-//        progressDialog.setMessage(msg);
-//        progressDialog.setCancelable(false);
-//        progressDialog.show();
-        mGankLoader = new Loader();
-        Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
-            @Override
-            public void call(Resultcode resultcode) {
-                progressDialog.dismiss();
-
-                if (!(resultcode.status == 0)) {
-                    setToast(resultcode.msg);
-                }
-                if (resultcode.status == 0) {
-                    if (requstecode == 0) {
-                        SPUtils.cleanAllSP(LoginActivity.this);
-                        Gson gs = new Gson();
-                        ArrayList<LinkedTreeMap> adta = (ArrayList<LinkedTreeMap>) resultcode.data;
-                        String s = gs.toJson(adta);
-                        //final ArrayList<MyHomequEntity> list = null;
-                        Type type = new TypeToken<ArrayList<MyHouseEntity>>() {
-                        }.getType();
-                        final ArrayList<MyHouseEntity> list = new Gson().fromJson(s, type);
-                        if (list.size() == 0) {
-                            SPUtils.setSP(LoginActivity.this, DoConfig.FANGCHAN_DATA, "0");
-                            Log.e("fuzhi", "0");
-                        } else {
-                            SPUtils.setSP(LoginActivity.this, DoConfig.FANGCHAN_DATA, "1");
-                            Log.e("fuzhi", "1");
-
-                        }
-                        if (!Config.getInstance(LoginActivity.this).getBoolean("MainTabActivity", false)) {
-                            Intent intent = new Intent(LoginActivity.this, MainTabActivity.class);
-                            startActivity(intent);
-
-                        }
-                        finish();
-                    }
-                }
-            }
-
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                progressDialog.dismiss();
-                setToast(getString(R.string.getdatafailure));
-                throwable.printStackTrace();
-            }
-        });
-
-        addSubscription(subscription);
-    }
-
-    /**
-     * 用户协议
-     *
-     * @param v v
-     */
-    public void agreementEvent(View v) {
-//        Intent intent = new Intent(this, RegisterAgreementActivity.class);
-//        startActivity(intent);
-        WebActivitytwo.runActivity(this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=1");
-    }
-
-    /**
-     * 隐私政策
-     *
-     * @param v v
-     */
-    public void yinagreementEvent(View v) {
-        WebActivitytwo.runActivity(this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=19");
-    }
-
-}
+package com.sl.house_property;
+
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.text.SpannableStringBuilder;
+import android.text.TextPaint;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+
+import com.cutil.RegexUtils;
+import com.google.gson.Gson;
+import com.google.gson.internal.LinkedTreeMap;
+import com.google.gson.reflect.TypeToken;
+import com.sl.house_property.databinding.ActivityLoginBinding;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import cn.jpush.android.api.JPushInterface;
+import entity.RegisterUser;
+import my_loader.Loader;
+import my_loader.Resultcode;
+import tools.Config;
+import http.ApiConfig;
+import rx.Subscription;
+import rx.functions.Action1;
+import utils.DateUtils;
+import utils.DateUtilss;
+import utils.Md5;
+import utils.SPUtils;
+
+public class LoginActivity extends BaseActivity<ActivityLoginBinding> implements View.OnClickListener {
+
+    private ProgressDialog progressDialog;
+    private Loader mGankLoader;
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_login;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setAbr(getString(R.string.me_login), new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        }, 0, null, 0, null, 0, null, "");
+
+        progressDialog = new ProgressDialog(LoginActivity.this);
+        String username = Config.getInstance(LoginActivity.this).getString("username", "15129217176");
+//        mDataBinding.phone.setText(username);
+//        mDataBinding.phone.setSelection(username.length());
+        mDataBinding.logintext.setOnClickListener(this);
+        mDataBinding.forgetpaw.setOnClickListener(this);
+        mDataBinding.gotoregister.setOnClickListener(this);
+        //获取当前日期
+        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);
+//        }
+
+        String str="我已阅读并同意《隐私政策》和《用户协议》";
+        SpannableStringBuilder ssb = new SpannableStringBuilder();
+        ssb.append(str);
+        int v1 = str.indexOf("《");
+        ssb.setSpan(new ClickableSpan() {
+            @Override
+            public void onClick(@NonNull View widget) {
+                if (mDataBinding.tvYs.isSelected()) {
+                    mDataBinding.tvYs.setSelected(false);
+
+                    Drawable drawable = getResources().getDrawable(R.mipmap.icon_publish_selected2);
+                    drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
+                    mDataBinding.tvYs.setCompoundDrawables(drawable, null, null, null);
+
+                } else {
+                    mDataBinding.tvYs.setSelected(true);
+                    Drawable drawable = getResources().getDrawable(R.mipmap.icon_publish_selected);
+                    drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
+                    mDataBinding.tvYs.setCompoundDrawables(drawable, null, null, null);
+                }
+            }
+
+            @Override
+            public void updateDrawState(@NonNull TextPaint ds) {
+                super.updateDrawState(ds);
+                ds.setColor(getResources().getColor(R.color.text2));
+                ds.setUnderlineText(false);
+            }
+        }, 0, v1, 0);
+
+        int start = str.indexOf("《");
+        ssb.setSpan(new ClickableSpan() {
+            @Override
+            public void onClick(@NonNull View widget) {
+                //隐私政策
+                WebActivitytwo.runActivity(LoginActivity.this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=19");
+            }
+
+            @Override
+            public void updateDrawState(@NonNull TextPaint ds) {
+                super.updateDrawState(ds);
+                ds.setColor(getResources().getColor(R.color.red));
+                ds.setUnderlineText(false);
+            }
+        }, start, start + 6, 0);
+        int end = str.lastIndexOf("《");
+        ssb.setSpan(new ClickableSpan() {
+            @Override
+            public void onClick(@NonNull View widget) {
+                //用户协议
+                WebActivitytwo.runActivity(LoginActivity.this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=1");
+            }
+
+            @Override
+            public void updateDrawState(@NonNull TextPaint ds) {
+                super.updateDrawState(ds);
+                ds.setColor(getResources().getColor(R.color.red));
+                ds.setUnderlineText(false);
+            }
+        }, end, end + 6, 0);
+        mDataBinding.tvYs.setMovementMethod(LinkMovementMethod.getInstance());
+        mDataBinding.tvYs.setText(ssb,TextView.BufferType.SPANNABLE);
+
+    }
+
+    @Override
+    public void onClick(View view) {
+        int gotoregisterId = R.id.gotoregister;
+        int forgetpawId = R.id.forgetpaw;
+        int logintextId = R.id.logintext;
+        
+        if (view.getId() == gotoregisterId) {
+            Intent intent = new Intent(LoginActivity.this, RegisterActivity.class);
+            startActivity(intent);
+        } else if (view.getId() == forgetpawId) {
+            Intent intent2 = new Intent(LoginActivity.this, ForgetPwdActivity.class);
+            startActivity(intent2);
+        } else if (view.getId() == logintextId) {
+                if (!mDataBinding.tvYs.isSelected()) {
+                    setToast("请先阅读并勾选同意用户协议和隐私政策");
+                    return;
+                }
+
+                String phone = mDataBinding.phone.getText().toString().trim();
+                String password = mDataBinding.pwd.getText().toString().trim();
+                if (phone.length() < 1) {
+                    setToast("请输入手机号码");
+                    return;
+                }
+                if (phone.length() != 11) {
+                    setToast("请输入有效的手机号");
+                    return;
+                }
+
+                if (!RegexUtils.isMobileExact(phone)) {
+                    setToast(getString(R.string.me_account_or_password_error_tip));
+                    return;
+                }
+                if (password.equals("")) {
+                    setToast(getString(R.string.me_input_password_tip));
+                    return;
+                }
+//                if (!mDataBinding.agreewhitemeg.isChecked()) {
+//                    setToast("请先同意注册协议");
+//
+//                    return;
+//                }
+//                if (!mDataBinding.agreewhitemegy.isChecked()) {
+//                    setToast("请先同意隐私政策");
+//
+//                    return;
+//                }
+                Map<String, String> map = new HashMap<>();
+                map.put("phone", phone);
+                map.put("password", password);
+                map.put("sign", Md5.md5("Cas" + "Login" + Md5.secret));
+                map.put("app", "Cas");
+                map.put("class", "Login");
+                getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.logining), view.getId());
+        }
+
+    }
+
+    private void getGankList(final String myurl, Map<String, String> map, String string, final int getcode1) {
+        progressDialog.setMessage(string);
+
+        //map.put("")
+        progressDialog.setCancelable(false);
+        progressDialog.show();
+        mDataBinding.getRoot().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                progressDialog.dismiss();
+                //setToast(1, getString(R.string.timeout));
+            }
+        }, 13000);
+        mGankLoader = new Loader();
+     /*  Map<String,String> map=new HashMap<String,String>();
+        map.put("phone");*/
+        Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
+            @Override
+            public void call(Resultcode resultcode) {
+                progressDialog.dismiss();
+                //setToast(0,resultcode.status);
+                if ((!(resultcode.status == 0))) {
+                    setToast(resultcode.msg);
+                    return;
+                }
+                int logintextId2 = R.id.logintext;
+                if (getcode1 == logintextId2) {
+                    Gson gs = new Gson();
+                    LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
+                    String s = gs.toJson(adta);
+                    RegisterUser user = gs.fromJson(s, RegisterUser.class);//把JSON字符串转为对象
+                    JPushInterface.setAlias(getApplicationContext(), 0, user.getUserid());
+                    Config.getInstance(LoginActivity.this).putUser(user);
+                    Config.getInstance(LoginActivity.this).put("username", mDataBinding.phone.getText().toString().trim());
+
+
+                    Map<String, String> map = new HashMap<>();
+                    if (user != null) {
+                        map.put("userid", user.getUserid());
+                    } else {
+                        map.put("userid", 0 + "");
+                    }
+                    map.put("app", "Cas");
+                    map.put("class", "MyHouseList");
+                    //map.put("home_id", "GetHomeByPid");
+                    map.put("sign", Md5.md5("Cas" + "MyHouseList" + Md5.secret));
+                    getpammar(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), 0);
+                }
+
+            }
+
+
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                progressDialog.dismiss();
+                setToast(getString(R.string.getdatafailure));
+                throwable.printStackTrace();
+            }
+        });
+
+        addSubscription(subscription);
+    }
+
+
+    private void getpammar(String myurl, Map<String, String> map, String msg, final int requstecode) {
+//        progressDialog.setMessage(msg);
+//        progressDialog.setCancelable(false);
+//        progressDialog.show();
+        mGankLoader = new Loader();
+        Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
+            @Override
+            public void call(Resultcode resultcode) {
+                progressDialog.dismiss();
+
+                if (!(resultcode.status == 0)) {
+                    setToast(resultcode.msg);
+                }
+                if (resultcode.status == 0) {
+                    if (requstecode == 0) {
+                        SPUtils.cleanAllSP(LoginActivity.this);
+                        Gson gs = new Gson();
+                        ArrayList<LinkedTreeMap> adta = (ArrayList<LinkedTreeMap>) resultcode.data;
+                        String s = gs.toJson(adta);
+                        //final ArrayList<MyHomequEntity> list = null;
+                        Type type = new TypeToken<ArrayList<MyHouseEntity>>() {
+                        }.getType();
+                        final ArrayList<MyHouseEntity> list = new Gson().fromJson(s, type);
+                        if (list.size() == 0) {
+                            SPUtils.setSP(LoginActivity.this, DoConfig.FANGCHAN_DATA, "0");
+                            Log.e("fuzhi", "0");
+                        } else {
+                            SPUtils.setSP(LoginActivity.this, DoConfig.FANGCHAN_DATA, "1");
+                            Log.e("fuzhi", "1");
+
+                        }
+                        if (!Config.getInstance(LoginActivity.this).getBoolean("MainTabActivity", false)) {
+                            Intent intent = new Intent(LoginActivity.this, MainTabActivity.class);
+                            startActivity(intent);
+
+                        }
+                        finish();
+                    }
+                }
+            }
+
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                progressDialog.dismiss();
+                setToast(getString(R.string.getdatafailure));
+                throwable.printStackTrace();
+            }
+        });
+
+        addSubscription(subscription);
+    }
+
+    /**
+     * 用户协议
+     *
+     * @param v v
+     */
+    public void agreementEvent(View v) {
+//        Intent intent = new Intent(this, RegisterAgreementActivity.class);
+//        startActivity(intent);
+        WebActivitytwo.runActivity(this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=1");
+    }
+
+    /**
+     * 隐私政策
+     *
+     * @param v v
+     */
+    public void yinagreementEvent(View v) {
+        WebActivitytwo.runActivity(this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=19");
+    }
+
+}
diff --git a/app/src/main/java/com/sl/house_property/Main1Fragment.java b/app/src/main/java/com/sl/house_property/Main1Fragment.java
index 7749532..7409e0a 100644
--- a/app/src/main/java/com/sl/house_property/Main1Fragment.java
+++ b/app/src/main/java/com/sl/house_property/Main1Fragment.java
@@ -1,396 +1,394 @@
-package com.sl.house_property;
-
-import android.app.ProgressDialog;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-
-import com.dalong.refreshlayout.OnRefreshListener;
-import com.google.gson.Gson;
-import com.google.gson.internal.LinkedTreeMap;
-import com.google.gson.reflect.TypeToken;
-import com.sl.house_property.user.MyMarketShopActivity;
-import com.sl.house_property.user.MyshopEditAcitivity;
-import com.sl.house_property.databinding.FragmentF1recyclerviewVorizationItemBinding;
-import com.sl.house_property.databinding.FragmentMain1Binding;
-import com.squareup.picasso.Picasso;
-import com.squareup.picasso.Target;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import adapter.BaseRecycleViewAdapter;
-import entity.Advertorial_listEntity;
-import entity.RegisterUser;
-import my_loader.Loader;
-import my_loader.Resultcode;
-import my_view.tao_bao_refresh.FullyGridLayoutManager;
-import tools.Config;
-import tools.PicassoRoundTransform;
-import http.ApiConfig;
-import rx.Subscription;
-import rx.functions.Action1;
-import utils.Md5;
-
-
-/**
- * A simple {@link Fragment} subclass.
- * Activities that contain this fragment must implement the
- * {@link Main1Fragment.OnFragmentInteractionListener} interface
- * to handle interaction events.
- * Use the {@link Main1Fragment#newInstance} factory method to
- * create an instance of this fragment.
- */
-public class Main1Fragment extends BaseFragment<FragmentMain1Binding> implements View.OnClickListener {
-    // TODO: Rename parameter arguments, choose names that match
-    // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-    private static final String ARG_PARAM1 = "param1";
-    private static final String ARG_PARAM2 = "param2";
-    BaseActivity baseActivity;
-    // TODO: Rename and change types of parameters
-    private String mParam1;
-    private String mParam2;
-
-    private OnFragmentInteractionListener mListener;
-    private ProgressDialog progressDialog;
-
-    private boolean isRefrash = false;
-
-    private int myeditcode = 1000;
-
-
-    private Loader mGankLoader;
-    private ArrayList<Advertorial_listEntity> homegridentityvArrayList;
-    public String imgme = null;
-
-    public Main1Fragment() {
-        // Required empty public constructor
-    }
-
-    /**
-     * Use this factory method to create a new instance of
-     * this fragment using the provided parameters.
-     *
-     * @param param1 Parameter 1.
-     * @param param2 Parameter 2.
-     * @return A new instance of fragment Main1Fragment.
-     */
-    // TODO: Rename and change types and number of parameters
-    public static Main1Fragment newInstance(String param1, String param2) {
-        Main1Fragment fragment = new Main1Fragment();
-        Bundle args = new Bundle();
-        args.putString(ARG_PARAM1, param1);
-        args.putString(ARG_PARAM2, param2);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getArguments() != null) {
-            mParam1 = getArguments().getString(ARG_PARAM1);
-            mParam2 = getArguments().getString(ARG_PARAM2);
-        }
-
-    }
-
-    @Override
-    protected void onCreateVew(final LayoutInflater inflater, Bundle savedInstanceState) {
-        super.onCreateVew(inflater, savedInstanceState);
-
-        baseActivity = (BaseActivity) getActivity();
-        progressDialog = new ProgressDialog(baseActivity);
-       /* mylist=new ArrayList<>();
-        getGankList(ApiConfig.GETHOMEBANNER,new HashMap<String, String>(),getString(R.string.loading),0);*/
-        baseActivity = (BaseActivity) getActivity();
-        progressDialog = new ProgressDialog(baseActivity);
-//        progressDialog.show();
-//        progressDialog.setMessage(getActivity().getString(R.string.loading));
-        mDataBinding.taobaoRefreshLayout.setOnRefreshListener(onrefalshlister);
-
-        intRecycleVerization();
-        getlist(0);
-        mDataBinding.fabu.setOnClickListener(this);
-        mDataBinding.liulan.setOnClickListener(this);
-        mDataBinding.taobaoRefreshLayout.setAutoRefresh(true);
-    }
-
-    @Override
-    protected void loadData() {
-        getlist(0);
-    }
-
-    private void getlist(int mypage) {
-        RegisterUser user =
-                Config.getInstance(getContext()).getUser();
-        Map<String, String> map = new HashMap<>();
-        if (user != null) {
-            map.put("userid", user.getUserid());
-        } else {
-            map.put("userid", 0 + "");
-        }
-        map.put("app", "Advertorial");
-        map.put("class", "Advertorial_an_AdvertorialHomeList");
-        map.put("sign", Md5.md5("Advertorial" + "Advertorial_an_AdvertorialHomeList" + Md5.secret));
-        getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), mypage);
-    }
-
-    // TODO: Rename method, update argument and hook method into UI event
-    public void onButtonPressed(Uri uri) {
-        if (mListener != null) {
-            mListener.onFragmentInteraction(uri);
-        }
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        if (context instanceof OnFragmentInteractionListener) {
-            mListener = (OnFragmentInteractionListener) context;
-        } else {
-            throw new RuntimeException(context.toString()
-                    + " must implement OnFragmentInteractionListener");
-        }
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        mListener = null;
-    }
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.fragment_main1;
-    }
-
-
-    @Override
-    public void onClick(View view) {
-        Intent intent = null;
-        switch (view.getId()) {
-            case R.id.fabu:
-                intent = null;
-                if ((Config.getInstance(Main1Fragment.this.getContext()).getUser() == null)) {
-                    intent = new Intent(Main1Fragment.this.getContext(), LoginActivity.class);
-                    startActivity(intent);
-                } else {
-                    intent = new Intent(Main1Fragment.this.getContext(), MyshopEditAcitivity.class);
-                    startActivityForResult(intent, myeditcode);
-                }
-                break;
-            case R.id.liulan:
-                intent = new Intent(getActivity(), MyMarketShopActivity.class);
-                intent.putExtra("type", 1);
-                startActivity(intent);
-                break;
-        }
-    }
-
-
-    /**
-     * This interface must be implemented by activities that contain this
-     * fragment to allow an interaction in this fragment to be communicated
-     * to the activity and potentially other fragments contained in that
-     * activity.
-     * <p>
-     * See the Android Training lesson <a href=
-     * "http://developer.android.com/training/basics/fragments/communicating.html"
-     * >Communicating with Other Fragments</a> for more in+formation.
-     */
-    public interface OnFragmentInteractionListener {
-        // TODO: Update argument type and name
-        void onFragmentInteraction(Uri uri);
-    }
-
-    private OnRefreshListener onrefalshlister = new OnRefreshListener() {
-        @Override
-        public void onRefresh() {
-            getlist(0);
-            //getGankList(ApiConfig.GETHOMEBANNER,new HashMap<String, String>(),getString(R.string.loading),0);
-            mDataBinding.taobaoRefreshLayout.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    mDataBinding.taobaoRefreshLayout.stopRefresh(true);
-                }
-            }, 10000);
-
-        }
-
-        @Override
-        public void onLoadMore() {
-            mDataBinding.taobaoRefreshLayout.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    mDataBinding.taobaoRefreshLayout.stopLoadMore(true);
-                }
-            }, 1000);
-
-        }
-    };
-
-    private void intRecycleVerization() {
-        FullyGridLayoutManager mgr = new FullyGridLayoutManager(getActivity(), 1);
-        mgr.setOrientation(FullyGridLayoutManager.VERTICAL);
-        mgr.setSmoothScrollbarEnabled(true);
-        mDataBinding.recyView.setLayoutManager(mgr);
-        BaseRecycleViewAdapter baseRecycleViewAdapter = new BaseRecycleViewAdapter(getActivity(), R.layout.fragment_f1recyclerview_vorization_item);
-        homegridentityvArrayList = new ArrayList<>();
-        baseRecycleViewAdapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() {
-            @Override
-            public void onBindViewHolder(Object b, final int position) {
-                if (!(position >= homegridentityvArrayList.size())) {
-                    FragmentF1recyclerviewVorizationItemBinding homeGridAdapterItemBinding = (FragmentF1recyclerviewVorizationItemBinding) b;
-                    homeGridAdapterItemBinding.setMyentity(homegridentityvArrayList.get(position));
-                    if (homegridentityvArrayList.get(position).getAdvertorial_picture_array().size() > 0)
-                        Picasso.with(getActivity()).load(homegridentityvArrayList.get(position).getAdvertorial_picture_array().get(0))
-                                .placeholder(R.mipmap.icon_default_rectangle)
-                                .transform(new PicassoRoundTransform())
-                                .into(homeGridAdapterItemBinding.imageView);
-                    homeGridAdapterItemBinding.fragmentRecyclerviewVorizationItem.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View view) {
-                            Intent intent = new Intent(getActivity(), NewsDetailActivity.class);
-                            intent.putExtra("url", homegridentityvArrayList.get(position).getAdvertorial_url());
-                            intent.putExtra("titile", homegridentityvArrayList.get(position).getAdvertorial_title());
-                            startActivity(intent);
-                        }
-                    });
-                }
-
-            }
-        });
-
-        mDataBinding.recyView.setAdapter(baseRecycleViewAdapter);
-        baseRecycleViewAdapter.setData(homegridentityvArrayList);
-
-        mDataBinding.recyView.setFocusableInTouchMode(false); //设置不需要焦点
-        mDataBinding.recyView.requestFocus(); //设置焦点不需要
-    }
-
-
-    private void addRecycleVerization(ArrayList<Advertorial_listEntity> lsit) {
-        mDataBinding.maincontrol.setVisibility(View.VISIBLE);
-        BaseRecycleViewAdapter baseRecycleViewAdapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
-
-        homegridentityvArrayList = lsit;
-        baseRecycleViewAdapter.setData(homegridentityvArrayList);
-
-    }
-
-
-    private void getGankList(String myurl, Map<String, String> map, String msg, final int requstecode) {
-        progressDialog.setMessage(msg);
-        progressDialog.setCancelable(false);
-//        progressDialog.show();
-
-        mGankLoader = new Loader();
-        Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
-
-
-            @Override
-            public void call(Resultcode resultcode) {
-                mDataBinding.taobaoRefreshLayout.stopRefresh(true);
-                mDataBinding.taobaoRefreshLayout.stopLoadMore(true);
-                progressDialog.dismiss();
-                if (!(resultcode.status == 0)) {
-                    baseActivity.setToast(1, resultcode.msg);
-                }
-                if (resultcode.status == 0) {
-//                    baseActivity.setToast(0, resultcode.msg);
-                    if (requstecode == 0) {
-                        Gson gs = new Gson();
-                        LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
-                        String s = gs.toJson(adta);
-
-                        ArrayList<Advertorial_listEntity> list = null;
-                        try {
-                            JSONObject jsonObject = new JSONObject(s);
-                            org.json.JSONArray array1 = jsonObject.getJSONArray("advert_info");
-                            if (array1.length() > 0) {
-                                String img = array1.getJSONObject(0).optString("advert_img");
-                                configTopImage(img);
-                                imgme = img;
-
-                            }
-                            org.json.JSONArray array = jsonObject.getJSONArray("advertorial_list");
-                            Type type = new TypeToken<ArrayList<Advertorial_listEntity>>() {
-                            }.getType();
-                            list = new Gson().fromJson(array.toString(), type);
-                            addRecycleVerization(list);
-
-
-                        } catch (JSONException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-
-            }
-
-
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                progressDialog.dismiss();
-
-                baseActivity.setToast(2, getString(R.string.getdatafailure));
-                throwable.printStackTrace();
-            }
-        });
-
-        baseActivity.addSubscription(subscription);
-    }
-
-    private Target target = new Target() {
-        @Override
-        public void onBitmapLoaded(Bitmap bitmap, Picasso.LoadedFrom from) {
-            Drawable drawable = new BitmapDrawable(bitmap);
-            mDataBinding.mylilin.setBackground(drawable);
-
-
-        }
-
-        @Override
-        public void onBitmapFailed(Drawable errorDrawable) {
-        }
-
-        @Override
-        public void onPrepareLoad(Drawable placeHolderDrawable) {
-        }
-    };
-
-    private void configTopImage(String img) {
-        Picasso
-                .with(getActivity())
-                .load(img)
-                /*.load("https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3896007654,1833866819&fm=200&gp=0.jpg")*/
-                .into(target);
-
-
-    }
-
-//    @Override
-//    public void onResume() {
-//        super.onResume();
-//        if(isRefrash){
-//            getlist(0);
-//        }else{
-//            isRefrash = true;
-//        }
-//    }
-
+package com.sl.house_property;
+
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import androidx.fragment.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import com.dalong.refreshlayout.OnRefreshListener;
+import com.google.gson.Gson;
+import com.google.gson.internal.LinkedTreeMap;
+import com.google.gson.reflect.TypeToken;
+import com.sl.house_property.user.MyMarketShopActivity;
+import com.sl.house_property.user.MyshopEditAcitivity;
+import com.sl.house_property.databinding.FragmentF1recyclerviewVorizationItemBinding;
+import com.sl.house_property.databinding.FragmentMain1Binding;
+import com.squareup.picasso.Picasso;
+import com.squareup.picasso.Target;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import adapter.BaseRecycleViewAdapter;
+import entity.Advertorial_listEntity;
+import entity.RegisterUser;
+import my_loader.Loader;
+import my_loader.Resultcode;
+import my_view.tao_bao_refresh.FullyGridLayoutManager;
+import tools.Config;
+import tools.PicassoRoundTransform;
+import http.ApiConfig;
+import rx.Subscription;
+import rx.functions.Action1;
+import utils.Md5;
+
+
+/**
+ * A simple {@link Fragment} subclass.
+ * Activities that contain this fragment must implement the
+ * {@link Main1Fragment.OnFragmentInteractionListener} interface
+ * to handle interaction events.
+ * Use the {@link Main1Fragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+public class Main1Fragment extends BaseFragment<FragmentMain1Binding> implements View.OnClickListener {
+    // TODO: Rename parameter arguments, choose names that match
+    // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+    private static final String ARG_PARAM1 = "param1";
+    private static final String ARG_PARAM2 = "param2";
+    BaseActivity baseActivity;
+    // TODO: Rename and change types of parameters
+    private String mParam1;
+    private String mParam2;
+
+    private OnFragmentInteractionListener mListener;
+    private ProgressDialog progressDialog;
+
+    private boolean isRefrash = false;
+
+    private int myeditcode = 1000;
+
+
+    private Loader mGankLoader;
+    private ArrayList<Advertorial_listEntity> homegridentityvArrayList;
+    public String imgme = null;
+
+    public Main1Fragment() {
+        // Required empty public constructor
+    }
+
+    /**
+     * Use this factory method to create a new instance of
+     * this fragment using the provided parameters.
+     *
+     * @param param1 Parameter 1.
+     * @param param2 Parameter 2.
+     * @return A new instance of fragment Main1Fragment.
+     */
+    // TODO: Rename and change types and number of parameters
+    public static Main1Fragment newInstance(String param1, String param2) {
+        Main1Fragment fragment = new Main1Fragment();
+        Bundle args = new Bundle();
+        args.putString(ARG_PARAM1, param1);
+        args.putString(ARG_PARAM2, param2);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getArguments() != null) {
+            mParam1 = getArguments().getString(ARG_PARAM1);
+            mParam2 = getArguments().getString(ARG_PARAM2);
+        }
+
+    }
+
+    @Override
+    protected void onCreateVew(final LayoutInflater inflater, Bundle savedInstanceState) {
+        super.onCreateVew(inflater, savedInstanceState);
+
+        baseActivity = (BaseActivity) getActivity();
+        progressDialog = new ProgressDialog(baseActivity);
+       /* mylist=new ArrayList<>();
+        getGankList(ApiConfig.GETHOMEBANNER,new HashMap<String, String>(),getString(R.string.loading),0);*/
+        baseActivity = (BaseActivity) getActivity();
+        progressDialog = new ProgressDialog(baseActivity);
+//        progressDialog.show();
+//        progressDialog.setMessage(getActivity().getString(R.string.loading));
+        mDataBinding.taobaoRefreshLayout.setOnRefreshListener(onrefalshlister);
+
+        intRecycleVerization();
+        getlist(0);
+        mDataBinding.fabu.setOnClickListener(this);
+        mDataBinding.liulan.setOnClickListener(this);
+        mDataBinding.taobaoRefreshLayout.setAutoRefresh(true);
+    }
+
+    @Override
+    protected void loadData() {
+        getlist(0);
+    }
+
+    private void getlist(int mypage) {
+        RegisterUser user =
+                Config.getInstance(getContext()).getUser();
+        Map<String, String> map = new HashMap<>();
+        if (user != null) {
+            map.put("userid", user.getUserid());
+        } else {
+            map.put("userid", 0 + "");
+        }
+        map.put("app", "Advertorial");
+        map.put("class", "Advertorial_an_AdvertorialHomeList");
+        map.put("sign", Md5.md5("Advertorial" + "Advertorial_an_AdvertorialHomeList" + Md5.secret));
+        getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), mypage);
+    }
+
+    // TODO: Rename method, update argument and hook method into UI event
+    public void onButtonPressed(Uri uri) {
+        if (mListener != null) {
+            mListener.onFragmentInteraction(uri);
+        }
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof OnFragmentInteractionListener) {
+            mListener = (OnFragmentInteractionListener) context;
+        } else {
+            throw new RuntimeException(context.toString()
+                    + " must implement OnFragmentInteractionListener");
+        }
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mListener = null;
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.fragment_main1;
+    }
+
+
+    @Override
+    public void onClick(View view) {
+        Intent intent = null;
+        int id = view.getId();
+        if (id == R.id.fabu) {
+            intent = null;
+            if ((Config.getInstance(Main1Fragment.this.getContext()).getUser() == null)) {
+                intent = new Intent(Main1Fragment.this.getContext(), LoginActivity.class);
+                startActivity(intent);
+            } else {
+                intent = new Intent(Main1Fragment.this.getContext(), MyshopEditAcitivity.class);
+                startActivityForResult(intent, myeditcode);
+            }
+        } else if (id == R.id.liulan) {
+            intent = new Intent(getActivity(), MyMarketShopActivity.class);
+            intent.putExtra("type", 1);
+            startActivity(intent);
+        }
+    }
+
+
+    /**
+     * This interface must be implemented by activities that contain this
+     * fragment to allow an interaction in this fragment to be communicated
+     * to the activity and potentially other fragments contained in that
+     * activity.
+     * <p>
+     * See the Android Training lesson <a href=
+     * "http://developer.android.com/training/basics/fragments/communicating.html"
+     * >Communicating with Other Fragments</a> for more in+formation.
+     */
+    public interface OnFragmentInteractionListener {
+        // TODO: Update argument type and name
+        void onFragmentInteraction(Uri uri);
+    }
+
+    private OnRefreshListener onrefalshlister = new OnRefreshListener() {
+        @Override
+        public void onRefresh() {
+            getlist(0);
+            //getGankList(ApiConfig.GETHOMEBANNER,new HashMap<String, String>(),getString(R.string.loading),0);
+            mDataBinding.taobaoRefreshLayout.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    mDataBinding.taobaoRefreshLayout.stopRefresh(true);
+                }
+            }, 10000);
+
+        }
+
+        @Override
+        public void onLoadMore() {
+            mDataBinding.taobaoRefreshLayout.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    mDataBinding.taobaoRefreshLayout.stopLoadMore(true);
+                }
+            }, 1000);
+
+        }
+    };
+
+    private void intRecycleVerization() {
+        FullyGridLayoutManager mgr = new FullyGridLayoutManager(getActivity(), 1);
+        mgr.setOrientation(FullyGridLayoutManager.VERTICAL);
+        mgr.setSmoothScrollbarEnabled(true);
+        mDataBinding.recyView.setLayoutManager(mgr);
+        BaseRecycleViewAdapter baseRecycleViewAdapter = new BaseRecycleViewAdapter(getActivity(), R.layout.fragment_f1recyclerview_vorization_item);
+        homegridentityvArrayList = new ArrayList<>();
+        baseRecycleViewAdapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() {
+            @Override
+            public void onBindViewHolder(Object b, final int position) {
+                if (!(position >= homegridentityvArrayList.size())) {
+                    FragmentF1recyclerviewVorizationItemBinding homeGridAdapterItemBinding = (FragmentF1recyclerviewVorizationItemBinding) b;
+                    homeGridAdapterItemBinding.setMyentity(homegridentityvArrayList.get(position));
+                    if (homegridentityvArrayList.get(position).getAdvertorial_picture_array().size() > 0)
+                        Picasso.with(getActivity()).load(homegridentityvArrayList.get(position).getAdvertorial_picture_array().get(0))
+                                .placeholder(R.mipmap.icon_default_rectangle)
+                                .transform(new PicassoRoundTransform())
+                                .into(homeGridAdapterItemBinding.imageView);
+                    homeGridAdapterItemBinding.fragmentRecyclerviewVorizationItem.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            Intent intent = new Intent(getActivity(), NewsDetailActivity.class);
+                            intent.putExtra("url", homegridentityvArrayList.get(position).getAdvertorial_url());
+                            intent.putExtra("titile", homegridentityvArrayList.get(position).getAdvertorial_title());
+                            startActivity(intent);
+                        }
+                    });
+                }
+
+            }
+        });
+
+        mDataBinding.recyView.setAdapter(baseRecycleViewAdapter);
+        baseRecycleViewAdapter.setData(homegridentityvArrayList);
+
+        mDataBinding.recyView.setFocusableInTouchMode(false); //设置不需要焦点
+        mDataBinding.recyView.requestFocus(); //设置焦点不需要
+    }
+
+
+    private void addRecycleVerization(ArrayList<Advertorial_listEntity> lsit) {
+        mDataBinding.maincontrol.setVisibility(View.VISIBLE);
+        BaseRecycleViewAdapter baseRecycleViewAdapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
+
+        homegridentityvArrayList = lsit;
+        baseRecycleViewAdapter.setData(homegridentityvArrayList);
+
+    }
+
+
+    private void getGankList(String myurl, Map<String, String> map, String msg, final int requstecode) {
+        progressDialog.setMessage(msg);
+        progressDialog.setCancelable(false);
+//        progressDialog.show();
+
+        mGankLoader = new Loader();
+        Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
+
+
+            @Override
+            public void call(Resultcode resultcode) {
+                mDataBinding.taobaoRefreshLayout.stopRefresh(true);
+                mDataBinding.taobaoRefreshLayout.stopLoadMore(true);
+                progressDialog.dismiss();
+                if (!(resultcode.status == 0)) {
+                    baseActivity.setToast(1, resultcode.msg);
+                }
+                if (resultcode.status == 0) {
+//                    baseActivity.setToast(0, resultcode.msg);
+                    if (requstecode == 0) {
+                        Gson gs = new Gson();
+                        LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
+                        String s = gs.toJson(adta);
+
+                        ArrayList<Advertorial_listEntity> list = null;
+                        try {
+                            JSONObject jsonObject = new JSONObject(s);
+                            org.json.JSONArray array1 = jsonObject.getJSONArray("advert_info");
+                            if (array1.length() > 0) {
+                                String img = array1.getJSONObject(0).optString("advert_img");
+                                configTopImage(img);
+                                imgme = img;
+
+                            }
+                            org.json.JSONArray array = jsonObject.getJSONArray("advertorial_list");
+                            Type type = new TypeToken<ArrayList<Advertorial_listEntity>>() {
+                            }.getType();
+                            list = new Gson().fromJson(array.toString(), type);
+                            addRecycleVerization(list);
+
+
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+
+            }
+
+
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                progressDialog.dismiss();
+
+                baseActivity.setToast(2, getString(R.string.getdatafailure));
+                throwable.printStackTrace();
+            }
+        });
+
+        baseActivity.addSubscription(subscription);
+    }
+
+    private Target target = new Target() {
+        @Override
+        public void onBitmapLoaded(Bitmap bitmap, Picasso.LoadedFrom from) {
+            Drawable drawable = new BitmapDrawable(bitmap);
+            mDataBinding.mylilin.setBackground(drawable);
+
+
+        }
+
+        @Override
+        public void onBitmapFailed(Drawable errorDrawable) {
+        }
+
+        @Override
+        public void onPrepareLoad(Drawable placeHolderDrawable) {
+        }
+    };
+
+    private void configTopImage(String img) {
+        Picasso
+                .with(getActivity())
+                .load(img)
+                /*.load("https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3896007654,1833866819&fm=200&gp=0.jpg")*/
+                .into(target);
+
+
+    }
+
+//    @Override
+//    public void onResume() {
+//        super.onResume();
+//        if(isRefrash){
+//            getlist(0);
+//        }else{
+//            isRefrash = true;
+//        }
+//    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sl/house_property/Main2Fragment.java b/app/src/main/java/com/sl/house_property/Main2Fragment.java
index 8cf6db0..7896f0d 100644
--- a/app/src/main/java/com/sl/house_property/Main2Fragment.java
+++ b/app/src/main/java/com/sl/house_property/Main2Fragment.java
@@ -1,210 +1,197 @@
-package com.sl.house_property;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-
-import com.sl.house_property.f2.FeeActivity;
-import com.sl.house_property.databinding.FragmentMain2Binding;
-
-import tools.Config;
-
-
-/**
- * A simple {@link Fragment} subclass.
- * Activities that contain this fragment must implement the
- * {@link Main1Fragment.OnFragmentInteractionListener} interface
- * to handle interaction events.
- * Use the {@link Main1Fragment#newInstance} factory method to
- * create an instance of this fragment.
- */
-public class Main2Fragment extends BaseFragment<FragmentMain2Binding> implements View.OnClickListener {
-    // TODO: Rename parameter arguments, choose names that match
-    // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
-    private static final String ARG_PARAM1 = "param1";
-    private static final String ARG_PARAM2 = "param2";
-
-    // TODO: Rename and change types of parameters
-    private String mParam1;
-    private String mParam2;
-    private Intent  intent=null;
-
-    private OnFragmentInteractionListener mListener;
-
-    public Main2Fragment() {
-        // Required empty public constructor
-    }
-
-    /**
-     * Use this factory method to create a new instance of
-     * this fragment using the provided parameters.
-     *
-     * @param param1 Parameter 1.
-     * @param param2 Parameter 2.
-     * @return A new instance of fragment Main1Fragment.
-     */
-    // TODO: Rename and change types and number of parameters
-    public static Main2Fragment newInstance(String param1, String param2) {
-        Main2Fragment fragment = new Main2Fragment();
-        Bundle args = new Bundle();
-        args.putString(ARG_PARAM1, param1);
-        args.putString(ARG_PARAM2, param2);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getArguments() != null) {
-            mParam1 = getArguments().getString(ARG_PARAM1);
-            mParam2 = getArguments().getString(ARG_PARAM2);
-        }
-    }
-
- /*  @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_main2, container, false);
-    }*/
-
-    // TODO: Rename method, update argument and hook method into UI event
-    public void onButtonPressed(Uri uri) {
-        if (mListener != null) {
-            mListener.onFragmentInteraction(uri);
-        }
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        if (context instanceof OnFragmentInteractionListener) {
-            mListener = (OnFragmentInteractionListener) context;
-        } else {
-//            throw new RuntimeException(context.toString()
-//                    + " must implement OnFragmentInteractionListener");
-        }
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        mListener = null;
-    }
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.fragment_main2;
-    }
-
-    @Override
-    protected void loadData() {
-
-    }
-    @Override
-    protected void onCreateVew(LayoutInflater inflater, Bundle savedInstanceState) {
-        super.onCreateVew(inflater, savedInstanceState);
-
-        mDataBinding.fei0.setOnClickListener(this);
-        mDataBinding.fei1.setOnClickListener(this);
-        mDataBinding.fei2.setOnClickListener(this);
-        mDataBinding.fei3.setOnClickListener(this);
-        mDataBinding.fei4.setOnClickListener(this);
-        mDataBinding.feilist.setOnClickListener(this);
-        mDataBinding.helpcenter.setOnClickListener(this);
-
-    }
-    @Override
-    public void onClick(View view) {
-        //1水费,2电费.3燃气费,4物业费,5车位管理费,6家政服务费,7报修支付费用
-    switch (view.getId()){
-        case  R.id.fei0:
-
-            if( (Config.getInstance(getContext()).getUser()==null)){
-                intent =new Intent(getContext(),LoginActivity.class);
-                startActivity(intent);
-            }else {
-                intent=new Intent(getContext(),FeeActivity.class);
-                intent.putExtra("titile","水费");
-                intent.putExtra("feeType","1");
-                startActivity(intent);
-            }
-            break;
-
-        case  R.id.fei1:
-
-            if( (Config.getInstance(getContext()).getUser()==null)){
-                intent =new Intent(getContext(),LoginActivity.class);
-                startActivity(intent);
-            }else {
-                intent=new Intent(getContext(),FeeActivity.class);
-                intent.putExtra("titile","电费");
-                intent.putExtra("feeType","2");
-                startActivity(intent);
-            }
-            break;
-
-        case  R.id.fei2:
-            if( (Config.getInstance(getContext()).getUser()==null)){
-                intent =new Intent(getContext(),LoginActivity.class);
-                startActivity(intent);
-            }else {
-                intent = new Intent(getContext(), FeeActivity.class);
-                intent.putExtra("titile", "燃气费");
-                intent.putExtra("feeType","3");
-                startActivity(intent);
-            }
-            break;
-
-        case  R.id.fei3:
-
-            if( (Config.getInstance(getContext()).getUser()==null)){
-                intent =new Intent(getContext(),LoginActivity.class);
-                startActivity(intent);
-            }else {
-                intent = new Intent(getContext(), FeeActivity.class);
-                intent.putExtra("titile", "物业费");
-                intent.putExtra("feeType","4");
-                startActivity(intent);
-            }
-            break;
-        case  R.id.fei4:
-            if( (Config.getInstance(getContext()).getUser()==null)){
-                intent =new Intent(getContext(),LoginActivity.class);
-                startActivity(intent);
-            }else {
-               intent= new Intent(getContext(), FeeActivity.class);
-                intent.putExtra("titile", "停车管理费");
-                intent.putExtra("feeType","5");
-                startActivity(intent);
-            }
-            break;
-
-        case  R.id.feilist:
-            break;
-        case  R.id.helpcenter:
-            break;
-    }
-
-    }
-
-    /**
-     * This interface must be implemented by activities that contain this
-     * fragment to allow an interaction in this fragment to be communicated
-     * to the activity and potentially other fragments contained in that
-     * activity.
-     * <p>
-     * See the Android Training lesson <a href=
-     * "http://developer.android.com/training/basics/fragments/communicating.html"
-     * >Communicating with Other Fragments</a> for more information.
-     */
-    public interface OnFragmentInteractionListener {
-        // TODO: Update argument type and name
-        void onFragmentInteraction(Uri uri);
-    }
-}
+package com.sl.house_property;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import androidx.fragment.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import com.sl.house_property.f2.FeeActivity;
+import com.sl.house_property.databinding.FragmentMain2Binding;
+
+import tools.Config;
+
+
+/**
+ * A simple {@link Fragment} subclass.
+ * Activities that contain this fragment must implement the
+ * {@link Main1Fragment.OnFragmentInteractionListener} interface
+ * to handle interaction events.
+ * Use the {@link Main1Fragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+public class Main2Fragment extends BaseFragment<FragmentMain2Binding> implements View.OnClickListener {
+    // TODO: Rename parameter arguments, choose names that match
+    // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+    private static final String ARG_PARAM1 = "param1";
+    private static final String ARG_PARAM2 = "param2";
+
+    // TODO: Rename and change types of parameters
+    private String mParam1;
+    private String mParam2;
+    private Intent  intent=null;
+
+    private OnFragmentInteractionListener mListener;
+
+    public Main2Fragment() {
+        // Required empty public constructor
+    }
+
+    /**
+     * Use this factory method to create a new instance of
+     * this fragment using the provided parameters.
+     *
+     * @param param1 Parameter 1.
+     * @param param2 Parameter 2.
+     * @return A new instance of fragment Main1Fragment.
+     */
+    // TODO: Rename and change types and number of parameters
+    public static Main2Fragment newInstance(String param1, String param2) {
+        Main2Fragment fragment = new Main2Fragment();
+        Bundle args = new Bundle();
+        args.putString(ARG_PARAM1, param1);
+        args.putString(ARG_PARAM2, param2);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getArguments() != null) {
+            mParam1 = getArguments().getString(ARG_PARAM1);
+            mParam2 = getArguments().getString(ARG_PARAM2);
+        }
+    }
+
+ /*  @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_main2, container, false);
+    }*/
+
+    // TODO: Rename method, update argument and hook method into UI event
+    public void onButtonPressed(Uri uri) {
+        if (mListener != null) {
+            mListener.onFragmentInteraction(uri);
+        }
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof OnFragmentInteractionListener) {
+            mListener = (OnFragmentInteractionListener) context;
+        } else {
+//            throw new RuntimeException(context.toString()
+//                    + " must implement OnFragmentInteractionListener");
+        }
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mListener = null;
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.fragment_main2;
+    }
+
+    @Override
+    protected void loadData() {
+
+    }
+    @Override
+    protected void onCreateVew(LayoutInflater inflater, Bundle savedInstanceState) {
+        super.onCreateVew(inflater, savedInstanceState);
+
+        mDataBinding.fei0.setOnClickListener(this);
+        mDataBinding.fei1.setOnClickListener(this);
+        mDataBinding.fei2.setOnClickListener(this);
+        mDataBinding.fei3.setOnClickListener(this);
+        mDataBinding.fei4.setOnClickListener(this);
+        mDataBinding.feilist.setOnClickListener(this);
+        mDataBinding.helpcenter.setOnClickListener(this);
+
+    }
+    @Override
+    public void onClick(View view) {
+        //1水费,2电费.3燃气费,4物业费,5车位管理费,6家政服务费,7报修支付费用
+        int id = view.getId();
+        if (id == R.id.fei0) {
+            if( (Config.getInstance(getContext()).getUser()==null)){
+                intent =new Intent(getContext(),LoginActivity.class);
+                startActivity(intent);
+            }else {
+                intent=new Intent(getContext(),FeeActivity.class);
+                intent.putExtra("titile","水费");
+                intent.putExtra("feeType","1");
+                startActivity(intent);
+            }
+        } else if (id == R.id.fei1) {
+            if( (Config.getInstance(getContext()).getUser()==null)){
+                intent =new Intent(getContext(),LoginActivity.class);
+                startActivity(intent);
+            }else {
+                intent=new Intent(getContext(),FeeActivity.class);
+                intent.putExtra("titile","电费");
+                intent.putExtra("feeType","2");
+                startActivity(intent);
+            }
+        } else if (id == R.id.fei2) {
+            if( (Config.getInstance(getContext()).getUser()==null)){
+                intent =new Intent(getContext(),LoginActivity.class);
+                startActivity(intent);
+            }else {
+                intent = new Intent(getContext(), FeeActivity.class);
+                intent.putExtra("titile", "燃气费");
+                intent.putExtra("feeType","3");
+                startActivity(intent);
+            }
+        } else if (id == R.id.fei3) {
+            if( (Config.getInstance(getContext()).getUser()==null)){
+                intent =new Intent(getContext(),LoginActivity.class);
+                startActivity(intent);
+            }else {
+                intent = new Intent(getContext(), FeeActivity.class);
+                intent.putExtra("titile", "物业费");
+                intent.putExtra("feeType","4");
+                startActivity(intent);
+            }
+        } else if (id == R.id.fei4) {
+            if( (Config.getInstance(getContext()).getUser()==null)){
+                intent =new Intent(getContext(),LoginActivity.class);
+                startActivity(intent);
+            }else {
+               intent= new Intent(getContext(), FeeActivity.class);
+                intent.putExtra("titile", "停车管理费");
+                intent.putExtra("feeType","5");
+                startActivity(intent);
+            }
+        } else if (id == R.id.feilist) {
+            // 空操作
+        } else if (id == R.id.helpcenter) {
+            // 空操作
+        }
+    }
+
+    /**
+     * This interface must be implemented by activities that contain this
+     * fragment to allow an interaction in this fragment to be communicated
+     * to the activity and potentially other fragments contained in that
+     * activity.
+     * <p>
+     * See the Android Training lesson <a href=
+     * "http://developer.android.com/training/basics/fragments/communicating.html"
+     * >Communicating with Other Fragments</a> for more information.
+     */
+    public interface OnFragmentInteractionListener {
+        // TODO: Update argument type and name
+        void onFragmentInteraction(Uri uri);
+    }
+}
diff --git a/app/src/main/java/com/sl/house_property/MainFragment.java b/app/src/main/java/com/sl/house_property/MainFragment.java
index e01d68a..ef210c9 100644
--- a/app/src/main/java/com/sl/house_property/MainFragment.java
+++ b/app/src/main/java/com/sl/house_property/MainFragment.java
@@ -1,1591 +1,1586 @@
-package com.sl.house_property;
-
-import android.app.Dialog;
-import android.app.ProgressDialog;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.graphics.Color;
-import android.graphics.Rect;
-import android.graphics.drawable.ColorDrawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.text.Html;
-import android.text.TextPaint;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewTreeObserver;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.StyleRes;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-import com.cutil.ScreenUtils;
-import com.google.gson.Gson;
-import com.google.gson.internal.LinkedTreeMap;
-import com.google.gson.reflect.TypeToken;
-import com.gyf.immersionbar.ImmersionBar;
-import com.lxj.xpopup.XPopup;
-import com.lzy.ninegrid.ImageInfo;
-import com.lzy.ninegrid.preview.NineGridViewClickAdapter;
-import com.lzy.okgo.OkGo;
-import com.lzy.okgo.cache.CacheMode;
-import com.lzy.okgo.convert.StringConvert;
-import com.lzy.okgo.model.Response;
-import com.lzy.okrx2.adapter.ObservableResponse;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
-import com.selectpicker.OptionsPopupWindow;
-import com.sl.house_property.databinding.FragmentMainBinding;
-import com.sl.house_property.databinding.ItemCommentBinding;
-import com.sl.house_property.databinding.ItemDiscoveryBinding;
-import com.sl.house_property.db.CommentBeanData;
-import com.sl.house_property.db.dao.CommentDao;
-import com.sl.house_property.discovery.DeleteCommentDialog;
-import com.sl.house_property.discovery.GoodsInfoDialog;
-import com.sl.house_property.discovery.HistoryRecordActivity;
-import com.sl.house_property.discovery.HistoryRecordActivitytwo;
-import com.sl.house_property.discovery.SelectDialog;
-import com.sl.house_property.order.SettleActivity;
-import com.sl.house_property.user.MyMarketShopActivity;
-import com.sl.house_property.user.MyPropertyActivity;
-import com.squareup.picasso.Picasso;
-import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram;
-import com.tencent.mm.opensdk.openapi.IWXAPI;
-import com.tencent.mm.opensdk.openapi.WXAPIFactory;
-import com.youth.banner.Banner;
-import com.youth.banner.BannerConfig;
-import com.youth.banner.Transformer;
-import com.youth.banner.listener.OnBannerClickListener;
-import com.youth.banner.loader.ImageLoader;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.lang.reflect.Type;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import adapter.BaseRecycleViewAdapter;
-import entity.Advert_carouseleEntity;
-import entity.DiscoveryListEntity;
-import entity.GetVesionResponseBean;
-import entity.GoodsDetailEntity;
-import entity.HomelistitemEntity;
-import entity.MainF1Entity;
-import entity.RegisterUser;
-import http.ApiConfig;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
-import my_loader.Loader;
-import my_loader.Resultcode;
-import my_view.CommentDialog;
-import my_view.tao_bao_refresh.FullyGridLayoutManager;
-import rx.Subscription;
-import rx.functions.Action1;
-import tools.Config;
-import utils.CommonUtils;
-import utils.DateUtilss;
-import utils.KeyboardUtil;
-import utils.Md5;
-import utils.SPUtils;
-import utils.TimeUtils;
-import utils.UpdateManager;
-import utils.UtilHelpers;
-import utils.VersionUtils;
-
-
-/**
- * A simple {@link Fragment} subclass.
- * Activities that contain this fragment must implement the
- * {@link Main1Fragment.OnFragmentInteractionListener} interface
- * to handle interaction events.
- * Use the {@link Main1Fragment#newInstance} factory method to
- * create an instance of this fragment.
- */
-public class MainFragment extends BaseFragment<FragmentMainBinding> implements View.OnClickListener, MainTabActivity.MyOnTouchListener {
-    private static final String ARG_PARAM1 = "param1";
-    private static final String ARG_PARAM2 = "param2";
-    BaseActivity baseActivity;
-    private String mParam1;
-    private String mParam2;
-    private ArrayList<DiscoveryListEntity> discoveryListEntities = new ArrayList<>();
-    private OnFragmentInteractionListener mListener;
-    private ProgressDialog progressDialog;
-    private Loader mGankLoader;
-
-    private ArrayList<String> mBannerImages;
-
-    private List<String> bannerTitile;
-    private RegisterUser user;
-    private String miyuetime;
-    private String wy_id="";
-    private String dangqianversion;
-    private UpdateManager mUpdateManager;//版本更新
-
-
-    public MainFragment() {
-        // Required empty public constructor
-    }
-
-    /**
-     * Use this factory method to create a new instance of
-     * this fragment using the provided parameters.
-     *
-     * @param param1 Parameter 1.
-     * @param param2 Parameter 2.
-     * @return A new instance of fragment Main1Fragment.
-     */
-    // TODO: Rename and change types and number of parameters
-    public static MainFragment newInstance(String param1, String param2) {
-        MainFragment fragment = new MainFragment();
-        Bundle args = new Bundle();
-        args.putString(ARG_PARAM1, param1);
-        args.putString(ARG_PARAM2, param2);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        RegisterUser user1;
-        if (user == null) {
-            user1 = Config.getInstance(getActivity()).getUser();
-            if (user1 != null) {
-                Map<String, String> map = new HashMap<>();
-                if (user1 != null) {
-                    map.put("userid", user1.getUserid());
-                } else {
-                    map.put("userid", 0 + "");
-                }
-                map.put("app", "Advert");
-                map.put("class", "Advertr_an_AdvertHomeList");
-                map.put("sign", Md5.md5("Advert" + "Advertr_an_AdvertHomeList" + Md5.secret));
-                getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), 0, false);
-                user = user1;
-                page=1;
-                getlist(page);
-            }
-        }
-
-        if (wy_id.equals("")) {
-            Map<String, String> map = new HashMap<>();
-            RegisterUser registerUser = Config.getInstance(getContext()).getUser();
-            if (registerUser != null) {
-                map.put("userid", registerUser.getUserid());
-            } else {
-                map.put("userid", 0 + "");
-            }
-
-            map.put("sign", Md5.md5("Cas" + "GetMyAddress" + Md5.secret));
-            map.put("app", "Cas");
-            map.put("class", "GetMyAddress");
-            getGankList(ApiConfig.BASE_URL, map, "", 1);
-            return;
-        }
-
-    }
-
-    private ArrayList<HomelistitemEntity> list;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getArguments() != null) {
-            mParam1 = getArguments().getString(ARG_PARAM1);
-            mParam2 = getArguments().getString(ARG_PARAM2);
-        }
-        //String time = (String) SPUtils.getSp(getContext(), DoConfig.MY_HOUST_TIME, "智慧小区");
-        CommentDao commentDao = new CommentDao(getActivity());
-        ArrayList<CommentBeanData> commentBeanData = commentDao.queryAll();
-        if(commentBeanData.size()>0){
-            miyuetime = commentBeanData.get(0).getMiyuetime();
-            try {
-                boolean b = DateUtilss.IsToday(miyuetime);
-                Log.e("时间",b+"");
-                if(!DateUtilss.IsToday(miyuetime))
-                    commentDao.delete(commentBeanData);
-            } catch (ParseException e) {
-                e.printStackTrace();
-            }
-        }
-
-        //版本更新
-        upDataVersion();
-    }
-
-    private void upDataVersion() {
-        //获取当前应用版本号
-        try {
-            dangqianversion = getVersion()+"";
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        requestVersion();
-    }
-
-
-    /**
-     * 获取当前应用版本号
-     */
-    public int getVersion() {
-        int versionCode=0;
-        try {
-            PackageInfo packageInfo = getContext().getPackageManager().getPackageInfo(getContext().getPackageName(), 0);
-            String versionName = packageInfo.versionName;
-            versionCode = packageInfo.versionCode;
-            Log.d("当前版本号==", "Version Name: " + versionName);
-            Log.d("当前版本号==", "Version Code: " + versionCode);
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
-        }
-        return versionCode;
-    }
-    /**
-     * 请求最新版本号
-     */
-    public void requestVersion() {
-        OkGo.<String>post(ApiConfig.BASE_URL)
-                .params("app", "Cas")
-                .params("class", "GetVersion")
-                .params("sign", Md5.md5("Cas" + "GetVersion" + Md5.secret))
-                .converter(new StringConvert())//
-                .cacheMode(CacheMode.NO_CACHE)  //无缓存模式 CacheMode.NO_CACHE
-                .adapt(new ObservableResponse<String>())//
-                .subscribeOn(Schedulers.io())//
-                .observeOn(AndroidSchedulers.mainThread())//
-                .subscribe(new io.reactivex.Observer<Response<String>>() {
-
-                    @Override
-                    public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
-                        //   addDisposable(d);
-                    }
-
-                    @Override
-                    public void onNext(@io.reactivex.annotations.NonNull Response<String> response) {
-                        String body = (String) response.body();
-                        Log.e("版本更新",body);
-                        Log.e("当前版本",dangqianversion);
-                        try {
-                            JSONObject jsonObject = new JSONObject(body);
-                            int status = jsonObject.getInt("status");
-                            if (status == 0) {
-                                JSONObject data = jsonObject.getJSONObject("data");
-                                String newVersion = data.getString("version");
-                                String newVersion_url = data.getString("version_url");
-                                int versionUpdate = VersionUtils.compareVersion(dangqianversion, newVersion);
-                                if (versionUpdate == -1) {//两个版本相同
-                                    GetVesionResponseBean mGetVesionResponseBean = new GetVesionResponseBean();
-                                    GetVesionResponseBean.ResultBean resultBean = new GetVesionResponseBean.ResultBean();
-                                    resultBean.setContent("修复若干bug");
-                                    resultBean.setVersion(newVersion);
-                                    mGetVesionResponseBean.setResult(resultBean);
-                                    ADialog mShareWechatDialog = new ADialog(getContext(), 0, mGetVesionResponseBean,newVersion_url);
-                                    mShareWechatDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);//代码中取消标题栏
-                                    mShareWechatDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-                                    Window win = mShareWechatDialog.getWindow();
-                                    win.getDecorView().setPadding(0, 0, 0, 0);
-                                    WindowManager.LayoutParams lp = win.getAttributes();
-                                    lp.width = WindowManager.LayoutParams.FILL_PARENT;
-                                    lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
-                                    win.setAttributes(lp);
-                                    mShareWechatDialog.setCancelable(false);
-                                    mShareWechatDialog.show();
-                                } else {//没有最新版本
-                                    Log.e("当前版本",dangqianversion);
-                                }
-                            }
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                    }
-
-                    @Override
-                    public void onError(@io.reactivex.annotations.NonNull Throwable e) {
-                        e.printStackTrace();
-
-                    }
-
-                    @Override
-                    public void onComplete() {
-
-                    }
-                });
-
-
-    }
-
-
-
-    class ADialog extends Dialog implements View.OnClickListener {
-        private Context context;
-        GetVesionResponseBean mGetVesionResponseBean;
-        private String url="";
-
-        public ADialog(@NonNull Context context, @StyleRes int themeResId, GetVesionResponseBean mGetVesionResponseBean,String str) {
-            super(context, themeResId);
-            this.context = context;
-            this.mGetVesionResponseBean = mGetVesionResponseBean;
-            this.url=str;
-        }
-
-        @Override
-        protected void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-            this.setContentView(R.layout.version_dailog);
-            launchAppDetail(url);
-        }
-
-        public void launchAppDetail(String url) {
-
-            String content = mGetVesionResponseBean.getResult().getContent();
-            content = content.replace("</br>", "<br>");
-            TextView mContentTv = (TextView) findViewById(R.id.tv_content);
-            mContentTv.setText(Html.fromHtml(content));
-            TextView mVersionTv = (TextView) findViewById(R.id.tv_version);
-            mVersionTv.setText("V" + mGetVesionResponseBean.getResult().getVersion());
-            Button mUpdateBtn = (Button) findViewById(R.id.btn_update);
-            Button btn_update_one = (Button) findViewById(R.id.btn_update_one);
-
-            mUpdateBtn.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    dismiss();
-                    // 这里来检测版本是否需要更新
-                    mUpdateManager = new UpdateManager(getContext(), url);
-                    mUpdateManager.checkUpdateDownload();
-                }
-            });
-
-            btn_update_one.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    dismiss();
-                }
-            });
-        }
-
-
-        @Override
-        public void onClick(View v) {
-
-
-        }
-    }
-
-
-    private void getGankList(final String myurl, Map<String, String> map, String string, final int getcode1) {
-        progressDialog.setMessage(string);
-        progressDialog.setCancelable(false);
-        progressDialog.show();
-        mDataBinding.getRoot().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                progressDialog.dismiss();
-                //setToast(1, getString(R.string.timeout));
-            }
-        }, 13000);
-        mGankLoader = new Loader();
-        mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
-            @Override
-            public void call(Resultcode resultcode) {
-                progressDialog.dismiss();
-                //setToast(0,resultcode.status);
-                if ((!(resultcode.status == 0))) {
-                    Toast.makeText(getContext(), resultcode.msg, Toast.LENGTH_SHORT).show();
-                    return;
-                }
-                switch (getcode1) {
-
-                    case 0:
-                        Log.e("测试1","");
-                        Gson gs = new Gson();
-                        LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
-                        String s = gs.toJson(adta);
-                        try {
-                            JSONObject jsonObject = new JSONObject(s);
-                            JSONArray jsonArray = jsonObject.getJSONArray("home");
-                            Type type = new TypeToken<ArrayList<HomelistitemEntity>>() {
-                            }.getType();
-                            list = new Gson().fromJson(jsonArray.toString(), type);
-                            if (list == null || list.isEmpty()) {
-                                return;
-                            }
-                            final ArrayList<String> strings = new ArrayList<>();
-                            for (int i = 0; i < list.size(); i++) {
-                                strings.add(list.get(i).getAddress());
-                            }
-                            OptionsPopupWindow alarmOptionPop = new OptionsPopupWindow(getContext());
-                            alarmOptionPop.setPicker(strings);
-
-                            alarmOptionPop.setOnoptionsSelectListener(new OptionsPopupWindow.OnOptionsSelectListener() {
-                                @Override
-                                public void onOptionsSelect(int position, int option2, int options3) {
-                                    if (list.size() > 0) {
-                                        Log.e("设置的数据1",list.get(position).getAddress());
-                                     SPUtils.setSP(getActivity(), DoConfig.MY_HOUST_ADDRESS, list.get(position).getAddress()+","+list.get(position).getWy_id());
-                                        mDataBinding.tv1Address.setText(list.get(position).getAddress());
-                                      //  SPUtils.setSP(getActivity(), DoConfig.MY_HOUST_WYID, list.get(position).getWy_id());
-                                        wy_id=list.get(position).getWy_id();
-                                    }
-
-                                }
-                            });
-
-                            alarmOptionPop.showAtLocation(mDataBinding.getRoot(), Gravity.BOTTOM, 0, 0);
-                        } catch (JSONException e) {
-                            e.printStackTrace();
-                        }
-
-
-                        break;
-                    case 1:
-                        Log.e("测试2","");
-                        Gson gss = new Gson();
-                        LinkedTreeMap adtaa = (LinkedTreeMap) resultcode.data;
-                        String ss = gss.toJson(adtaa);
-                        try {
-                            JSONObject jsonObject = new JSONObject(ss);
-                            JSONArray jsonArray = jsonObject.getJSONArray("home");
-                            Type type = new TypeToken<ArrayList<HomelistitemEntity>>() {
-                            }.getType();
-                            list = new Gson().fromJson(jsonArray.toString(), type);
-                            if (list == null || list.isEmpty()) {
-                                return;
-                            }
-                            final ArrayList<String> strings = new ArrayList<>();
-                            for (int i = 0; i < list.size(); i++) {
-                                strings.add(list.get(i).getAddress());
-                            }
-                            if (list.size() > 0) {
-                                Log.e("设置的数据3",list.get(0).getAddress());
-                                SPUtils.setSP(getActivity(), DoConfig.MY_HOUST_ADDRESS, list.get(0).getAddress()+","+list.get(0).getWy_id());
-                                mDataBinding.tv1Address.setText(list.get(0).getAddress());
-                             //  SPUtils.setSP(getActivity(), DoConfig.MY_HOUST_WYID, list.get(0).getWy_id());
-                                wy_id=list.get(0).getWy_id();
-                            }
-
-                        } catch (JSONException e) {
-                            e.printStackTrace();
-                        }
-                        break;
-                }
-
-            }
-
-
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                progressDialog.dismiss();
-                //
-                Toast.makeText(getContext(), getString(R.string.getdatafailure), Toast.LENGTH_SHORT).show();
-
-                throwable.printStackTrace();
-            }
-        });
-
-
-    }
-
-    @Override
-    protected void onCreateVew(LayoutInflater inflater, Bundle savedInstanceState) {
-        super.onCreateVew(inflater, savedInstanceState);
-        baseActivity = (BaseActivity) getActivity();
-        progressDialog = new ProgressDialog(getContext());
-        intRecycleView();
-        mDataBinding.taobaoRefreshLayout.setOnRefreshLoadMoreListener(onrefalshlister);
-        mDataBinding.scan.setOnClickListener(this);
-        mDataBinding.entrancegurd.setOnClickListener(this);
-        mDataBinding.cargara.setOnClickListener(this);
-        mDataBinding.moew1.setOnClickListener(this);
-        //mDataBinding.moew2.setOnClickListener(this);
-        View banner = mDataBinding.l3;
-        LinearLayout.LayoutParams bannerLP = (LinearLayout.LayoutParams) banner.getLayoutParams();
-        bannerLP.width = ScreenUtils.getScreenWidth();
-        banner.setLayoutParams(bannerLP);
-        mDataBinding.taobaoRefreshLayout.autoRefresh();
-        String areaa = (String) SPUtils.getSp(getContext(), DoConfig.MY_HOUST_ADDRESS, "智慧小区");
-        if (!TextUtils.isEmpty(areaa)&&!areaa.equals("智慧小区")) {
-            try {
-                String[] split = areaa.split(",");
-                String area=split[0];
-                Log.e("地址1",area);
-                mDataBinding.tv1Address.setText(area);
-                wy_id=split[1];
-            } catch (Exception e) {
-
-            }
-        }
-
-
-        mDataBinding.tv1Address.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (list == null || list.isEmpty()) {
-                    Map<String, String> map = new HashMap<>();
-                    RegisterUser registerUser = Config.getInstance(getContext()).getUser();
-                    if (registerUser != null) {
-                        map.put("userid", registerUser.getUserid());
-                    } else {
-                        map.put("userid", 0 + "");
-                    }
-
-                    map.put("sign", Md5.md5("Cas" + "GetMyAddress" + Md5.secret));
-                    map.put("app", "Cas");
-                    map.put("class", "GetMyAddress");
-                    getGankList(ApiConfig.BASE_URL, map, "", 0);
-                    return;
-                }
-                final ArrayList<String> strings = new ArrayList<>();
-                for (int i = 0; i < list.size(); i++) {
-                    strings.add(list.get(i).getAddress());
-                }
-                OptionsPopupWindow alarmOptionPop = new OptionsPopupWindow(getContext());
-                alarmOptionPop.setPicker(strings);
-
-                alarmOptionPop.setOnoptionsSelectListener(new OptionsPopupWindow.OnOptionsSelectListener() {
-                    @Override
-                    public void onOptionsSelect(int position, int option2, int options3) {
-                        if (list.size() > 0) {
-                            Log.e("设置的数据2",list.get(position).getAddress());
-                            SPUtils.setSP(getActivity(), DoConfig.MY_HOUST_ADDRESS, list.get(position).getAddress()+","+list.get(position).getWy_id());
-                          //  SPUtils.setSP(getActivity(), DoConfig.MY_HOUST_WYID, list.get(position).getWy_id());
-                            wy_id=list.get(position).getWy_id();
-                            mDataBinding.tv1Address.setText(list.get(position).getAddress());
-                        }
-
-                    }
-                });
-
-                alarmOptionPop.showAtLocation(mDataBinding.getRoot(), Gravity.BOTTOM, 0, 0);
-
-            }
-        });
-
-        MainTabActivity activity = (MainTabActivity) getActivity();
-        activity.registerMyOnTouchListener(this);
-        final RegisterUser user =
-                Config.getInstance(getActivity()).getUser();
-        Map<String, String> map = new HashMap<>();
-        if (user != null) {
-            map.put("userid", user.getUserid());
-        } else {
-            map.put("userid", 0 + "");
-        }
-        map.put("app", "Advert");
-        map.put("class", "Advertr_an_AdvertHomeList");
-        map.put("sign", Md5.md5("Advert" + "Advertr_an_AdvertHomeList" + Md5.secret));
-        getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), 0, false);
-
-        mDataBinding.service.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if( (Config.getInstance(getContext()).getUser()==null)){
-                    Intent intent =new Intent(getContext(),LoginActivity.class);
-                    startActivity(intent);
-                    return;
-                }
-
-
-                String fangchan = (String) SPUtils.getSp(getActivity(), DoConfig.FANGCHAN_DATA, "0");
-                Log.e("fangchan",fangchan);
-                if(fangchan.equals("0")){
-                    Intent intent = new Intent(getActivity(), MyPropertyActivity.class);
-                    intent.putExtra("usertitile", "我的房产");
-                    startActivityForResult(intent, 0);
-                    return;
-                }
-
-                Intent intent = new Intent(getContext(), HistoryRecordActivitytwo.class);
-                final RegisterUser user =
-                        Config.getInstance(getActivity()).getUser();
-                intent.putExtra("userId", user.getUserid());
-                intent.putExtra("wyuserId", wy_id);
-                intent.putExtra("userName", user.getNickname());
-                intent.putExtra("title", "物业服务");
-                intent.putExtra("dataType",1);
-                startActivity(intent);
-            }
-        });
-    }
-
-    // TODO: Rename method, update argument and hook method into UI event
-    public void onButtonPressed(Uri uri) {
-        if (mListener != null) {
-            mListener.onFragmentInteraction(uri);
-        }
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        if (context instanceof OnFragmentInteractionListener) {
-            mListener = (OnFragmentInteractionListener) context;
-        } else {
-//            throw new RuntimeException(context.toString()
-//                    + " must implement OnFragmentInteractionListener");
-        }
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        mListener = null;
-    }
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.fragment_main;
-    }
-
-    @Override
-    protected void loadData() {
-
-    }
-
-    @Override
-    public void onClick(View view) {
-        Intent intent = null;
-        switch (view.getId()) {
-            case R.id.scan:
-                if ((Config.getInstance(MainFragment.this.getContext()).getUser() == null)) {
-                    intent = new Intent(MainFragment.this.getContext(), LoginActivity.class);
-                } else {
-                    intent = new Intent(getActivity(), QRcodeActivity.class);
-                }
-                startActivity(intent);
-                break;
-            case R.id.entrancegurd://门禁
-
-                if( (Config.getInstance(getContext()).getUser()==null)){
-                    intent =new Intent(getContext(),LoginActivity.class);
-                    startActivity(intent);
-                    return;
-                }
-
-                String fangchan = (String) SPUtils.getSp(getActivity(), DoConfig.FANGCHAN_DATA, "0");
-                Log.e("fangchan",fangchan);
-                if(fangchan.equals("0")){
-                    intent = new Intent(getActivity(), MyPropertyActivity.class);
-                    intent.putExtra("usertitile", "我的房产");
-                    startActivityForResult(intent, 0);
-                    return;
-                }
-
-                if ((Config.getInstance(MainFragment.this.getContext()).getUser() == null)) {
-                    intent = new Intent(MainFragment.this.getContext(), LoginActivity.class);
-                } else {
-                    intent = new Intent(getActivity(), CodeActivity.class);
-                }
-                startActivity(intent);
-                break;
-            case R.id.cargara://社区内购
-                String appId = "wx7e09fff168f6e58d"; // 填移动应用(App)的 AppId，非小程序的 AppID
-                IWXAPI api = WXAPIFactory.createWXAPI(getActivity(), appId);
-                WXLaunchMiniProgram.Req req = new WXLaunchMiniProgram.Req();
-                req.userName = "gh_f750eee96b89"; // 填小程序原始id
-                req.path = "/pages/index/index";  //拉起小程序页面的可带参路径，不填默认拉起小程序首页，对于小游戏，可以只传入 query 部分，来实现传参效果，如：传入 "?foo=bar"。
-                req.miniprogramType = WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE;// 可选打开 开发版，体验版和正式版
-                api.sendReq(req);
-                break;
-            case R.id.moew1:
-                intent = new Intent(getActivity(), MyMarketShopActivity.class);
-                startActivity(intent);
-                break;
-        }
-    }
-
-    /**
-     * This interface must be implemented by activities that contain this
-     * fragment to allow an interaction in this fragment to be communicated
-     * to the activity and potentially other fragments contained in that
-     * activity.
-     * <p>
-     * See the Android Training lesson <a href=
-     * "http://developer.android.com/training/basics/fragments/communicating.html"
-     * >Communicating with Other Fragments</a> for more information.
-     */
-    public interface OnFragmentInteractionListener {
-        // TODO: Update argument type and name
-        void onFragmentInteraction(Uri uri);
-    }
-
-    private void configFragments(ArrayList<Advert_carouseleEntity> user) {//banner事件
-        // mDataBinding.banner.removeAllViews();
-        mDataBinding.banner.releaseBanner();
-        bannerTitile = new ArrayList<>();
-        mBannerImages = new ArrayList<>();
-        for (int i = 0; i < user.size(); i++) {
-            Advert_carouseleEntity advertCarouseleEntity = user.get(i);
-            if (advertCarouseleEntity == null) {
-                bannerTitile.add("");
-            } else {
-                bannerTitile.add(advertCarouseleEntity.getAdvert_source());
-            }
-            mBannerImages.add(advertCarouseleEntity.getAdvert_img());
-        }
-        Banner banner = mDataBinding.banner;
-        banner.setBannerTitles(bannerTitile);
-        banner.setImageLoader(new ImageLoader() {
-            @Override
-            public void displayImage(Context context, Object path, ImageView imageView) {
-                Picasso.with(context).load((String) path)
-                        .into(imageView);
-            }
-        });
-        banner.setImages(mBannerImages);
-        banner.setBannerAnimation(Transformer.Default);
-        banner.setDelayTime(5000);
-        banner.isAutoPlay(true);
-        banner.setBannerStyle(BannerConfig.CIRCLE_INDICATOR);
-        banner.setIndicatorGravity(BannerConfig.CENTER);
-        banner.start();
-
-        mDataBinding.banner.setOnBannerClickListener(new OnBannerClickListener() {
-            @Override
-            public void OnBannerClick(int i) {
-                Advert_carouseleEntity advert_carouseleEntity = user.get(i-1);
-                String advert_source = advert_carouseleEntity.getAdvert_source();
-                if(advert_source.length()>0){
-                    String appId = "wx7e09fff168f6e58d"; // 填移动应用(App)的 AppId，非小程序的 AppID
-                    IWXAPI api = WXAPIFactory.createWXAPI(getActivity(), appId);
-                    WXLaunchMiniProgram.Req req = new WXLaunchMiniProgram.Req();
-                    req.userName = "gh_f750eee96b89"; // 填小程序原始id
-                    req.path = advert_source;                  ////拉起小程序页面的可带参路径，不填默认拉起小程序首页，对于小游戏，可以只传入 query 部分，来实现传参效果，如：传入 "?foo=bar"。
-                    req.miniprogramType = WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE;// 可选打开 开发版，体验版和正式版
-                    api.sendReq(req);
-                }
-            }
-        });
-        TextPaint tp = mDataBinding.usershoptextid.getPaint();
-
-        tp.setFakeBoldText(true);
-    }
-
-    private int currentKeyboardH;
-    private int editTextBodyHeight;
-
-    public void updateEditTextBodyVisible(int visibility) {
-        mDataBinding.llComment.setVisibility(visibility);
-        if (View.VISIBLE == visibility) {
-            mDataBinding.llComment.requestFocus();
-            //弹出键盘
-            CommonUtils.showSoftInput(mDataBinding.etComment.getContext(), mDataBinding.etComment);
-
-        } else if (View.GONE == visibility) {
-            //隐藏键盘
-            MainTabActivity activity = (MainTabActivity) getActivity();
-            activity.visibilyBottom(View.VISIBLE);
-            CommonUtils.hideSoftInput(mDataBinding.etComment.getContext(), mDataBinding.etComment);
-        }
-    }
-
-    private void setViewTreeObserver() {
-        final ViewTreeObserver swipeRefreshLayoutVTO = mDataBinding.myl1.getViewTreeObserver();
-        swipeRefreshLayoutVTO.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-            @Override
-            public void onGlobalLayout() {
-                Rect r = new Rect();
-                mDataBinding.myl1.getWindowVisibleDisplayFrame(r);
-                int statusBarH = ImmersionBar.getStatusBarHeight(getActivity());//状态栏高度
-                int screenH = mDataBinding.myl1.getRootView().getHeight();
-                if (r.top != statusBarH) {
-                    //r.top代表的是状态栏高度，在沉浸式状态栏时r.top＝0，通过getStatusBarHeight获取状态栏高度
-                    r.top = statusBarH;
-                }
-                int keyboardH = screenH - (r.bottom - r.top);
-
-                if (keyboardH == currentKeyboardH) {//有变化时才处理，否则会陷入死循环
-                    return;
-                }
-                currentKeyboardH = keyboardH;
-                editTextBodyHeight = mDataBinding.llComment.getHeight();
-                if (keyboardH < 150) {//说明是隐藏键盘的情况
-                    updateEditTextBodyVisible(View.GONE);
-                    return;
-                }
-            }
-        });
-    }
-
-    private void getlist(int mypage) {
-        RegisterUser user =
-                Config.getInstance(getContext()).getUser();
-        Map<String, String> map = new HashMap<>();
-        if (user != null) {
-            map.put("userid", user.getUserid());
-        } else {
-            map.put("userid", 0 + "");
-        }
-        map.put("app", "Goods");
-        map.put("type", "1");
-        map.put("class", "IndexGoodsLists");
-        map.put("page", mypage + "");
-        map.put("sign", Md5.md5("Goods" + "IndexGoodsLists" + Md5.secret));
-        getGankList2(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), mypage);
-    }
-
-    /**
-     * 获取控件左上顶点Y坐标
-     *
-     * @param view
-     * @return
-     */
-    private int getCoordinateY(View view) {
-        int[] coordinate = new int[2];
-        view.getLocationOnScreen(coordinate);
-        return coordinate[1];
-    }
-
-    private void intRecycleView() {
-        mDataBinding.tvSendComment.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                setViewTreeObserver();
-            }
-        });
-        mDataBinding.scrollViewExtend.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                if (mDataBinding.llComment.getVisibility() == View.VISIBLE) {
-                    updateEditTextBodyVisible(View.GONE);
-                    return true;
-                }
-                return false;
-            }
-        });
-        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseActivity);
-        mDataBinding.recyView.setNestedScrollingEnabled(false);//禁止rcyc嵌套滑动
-        mDataBinding.recyView.setLayoutManager(linearLayoutManager);
-        BaseRecycleViewAdapter<DiscoveryListEntity, ItemDiscoveryBinding> baseRecycleViewAdapter = new BaseRecycleViewAdapter(getActivity(), R.layout.item_discovery);
-        baseRecycleViewAdapter.setHasStableIds(true);
-
-        discoveryListEntities = new ArrayList<>();
-        baseRecycleViewAdapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() {
-            @Override
-            public void onBindViewHolder(Object b, final int position) {
-                if (!(position >= discoveryListEntities.size())) {
-                    final ItemDiscoveryBinding homeGridAdapterItemBinding = (ItemDiscoveryBinding) b;
-                    final DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
-                    homeGridAdapterItemBinding.tvNikeName.setText(discoveryListEntity.getNickname());
-                    homeGridAdapterItemBinding.tvContent.setText(discoveryListEntity.getGoods_detail());
-                    homeGridAdapterItemBinding.ivComment.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(final View v) {
-                            final CommentDialog commentDialog = new CommentDialog(baseActivity);
-
-                            commentDialog.setShowBug(discoveryListEntity.getType().equals("2"));
-                            commentDialog.setPraise(discoveryListEntity.getIs_like() == 1);
-                            final int mBottomY = getCoordinateY(homeGridAdapterItemBinding.ivComment) + homeGridAdapterItemBinding.ivComment.getHeight();
-                            commentDialog.setOnCommentOperateListener(new CommentDialog.OnCommentOperateListener() {
-                                @Override
-                                public void click(int type) {
-
-                                    if (type == 1 || type == 2) {
-                                        //点赞/取消
-                                        commentDialog.dismiss();
-                                        like(discoveryListEntity.getGoods_id(), position);
-                                    } else if (type == 3) {
-                                        itemIndex = -1;
-                                        mDataBinding.llComment.setVisibility(View.VISIBLE);
-                                        mDataBinding.etComment.requestFocus();
-                                        mDataBinding.etComment.setHint("评论");
-                                        if (getActivity() instanceof MainTabActivity) {
-                                            MainTabActivity activity = (MainTabActivity) getActivity();
-                                            activity.visibilyBottom(View.GONE);
-                                        }
-                                        KeyboardUtil.showSoftInput(getContext());
-                                        commentPosition = position;
-                                        commentDialog.dismiss();
-                                        mDataBinding.etComment.setText("");
-                                        homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() {
-                                            @Override
-                                            public void run() {
-                                                int y = getCoordinateY(mDataBinding.llComment) - 20;
-                                                //评论时滑动到对应item底部和输入框顶部对齐
-                                                mDataBinding.scrollViewExtend.smoothScrollBy(0, mBottomY - y);
-                                            }
-                                        }, 300);
-
-                                    } else if (type == 4) {
-                                        //   addCart(discoveryListEntity.getGoods_id(),discoveryListEntity.)
-                                        getGoodsDetail(discoveryListEntity.getGoods_id(), discoveryListEntity, type);
-                                        commentDialog.dismiss();
-
-                                    } else if (type == 5) {
-                                        getGoodsDetail(discoveryListEntity.getGoods_id(), discoveryListEntity, type);
-                                        commentDialog.dismiss();
-                                    }
-                                }
-                            });
-
-                            new XPopup.Builder(baseActivity).hasShadowBg(false).atView(homeGridAdapterItemBinding.ivComment).asCustom(commentDialog)
-                                    .show();
-
-                        }
-                    });
-                    homeGridAdapterItemBinding.tvTime.setText(TimeUtils.getRecentTimeSpanByNow(TimeUtils.dataOne(discoveryListEntity.getCtime())));
-
-                    if (discoveryListEntity.getLike().isEmpty()) {
-                        homeGridAdapterItemBinding.tvLike.setVisibility(View.GONE);
-                    } else {
-                        homeGridAdapterItemBinding.tvLike.setVisibility(View.VISIBLE);
-                        StringBuilder likeString = new StringBuilder();
-                        for (int i = 0; i < discoveryListEntity.getLike().size(); i++) {
-                           // if (i != 0 && i != discoveryListEntity.getLike().size() - 1) {
-                            if (i != 0 ) {
-                                likeString.append(",");
-                            }
-                            likeString.append(discoveryListEntity.getLike().get(i).getNickname());
-
-                        }
-                        homeGridAdapterItemBinding.tvLike.setText(likeString.toString());
-
-
-
-                    }
-                    if (discoveryListEntity.getDis_content().isEmpty()) {
-                        homeGridAdapterItemBinding.rvComment.setVisibility(View.GONE);
-                    } else {
-                        homeGridAdapterItemBinding.rvComment.setVisibility(View.VISIBLE);
-                        FullyGridLayoutManager mgr = new FullyGridLayoutManager(getActivity(), 1);
-                        mgr.setOrientation(FullyGridLayoutManager.VERTICAL);
-                        mgr.setSmoothScrollbarEnabled(true);
-                        homeGridAdapterItemBinding.rvComment.setLayoutManager(mgr);
-                        BaseRecycleViewAdapter<DiscoveryListEntity.Dis_content, ItemCommentBinding> baseRecycleViewAdapter = new BaseRecycleViewAdapter(getActivity(), R.layout.item_comment);
-                        homeGridAdapterItemBinding.rvComment.setAdapter(baseRecycleViewAdapter);
-                        final ArrayList<DiscoveryListEntity.Dis_content> dis_content = discoveryListEntity.getDis_content();
-                        baseRecycleViewAdapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() {
-                            @Override
-                            public void onBindViewHolder(Object b, final int itemPosition) {
-                                ItemCommentBinding itemCommentBinding = (ItemCommentBinding) b;
-                                if (TextUtils.isEmpty(dis_content.get(itemPosition).getReply())) {
-                                    itemCommentBinding.llHf.setVisibility(View.GONE);
-                                    itemCommentBinding.ll.setVisibility(View.VISIBLE);
-                                    itemCommentBinding.tvName.setText(dis_content.get(itemPosition).getNickname() + ":  ");
-                                    itemCommentBinding.tvInfo.setText(dis_content.get(itemPosition).getContents());
-                                } else {
-
-                                    itemCommentBinding.ll.setVisibility(View.GONE);
-                                    itemCommentBinding.llHf.setVisibility(View.VISIBLE);
-                                    itemCommentBinding.tvName2.setText(dis_content.get(itemPosition).getNickname());
-                                    itemCommentBinding.tvInfo2.setText("回复");
-                                    itemCommentBinding.tvName3.setText(dis_content.get(itemPosition).getReply() + ":");
-                                    itemCommentBinding.tvInfo3.setText(dis_content.get(itemPosition).getContents());
-
-                                }
-                                itemCommentBinding.llItem.setOnClickListener(new View.OnClickListener() {
-                                    @Override
-                                    public void onClick(View v) {
-
-                                        final RegisterUser registerUser = Config.getInstance(getContext()).getUser();
-                                        if (registerUser == null) {
-                                            return;
-                                        }
-
-                                        final int mBottomY = getCoordinateY(homeGridAdapterItemBinding.ivComment) + homeGridAdapterItemBinding.ivComment.getHeight();
-                                        if (dis_content.get(itemPosition).getFrom_id()==null
-                                                ||registerUser.getUserid().equals(dis_content.get(itemPosition).getFrom_id())){
-                                            mDataBinding.llComment.setVisibility(View.GONE);
-                                            DeleteCommentDialog deleteCommentDialog = new DeleteCommentDialog(getContext());
-                                            deleteCommentDialog.setOnSelectListener(new SelectDialog.OnSelectListener() {
-                                                @Override
-                                                public void select(int type) {
-                                                    deleteComment(dis_content.get(itemPosition).getDis_id(),registerUser.getUserid(),position,itemPosition);
-                                                }
-                                            });
-                                            new XPopup.Builder(getContext()).asCustom(deleteCommentDialog).show();
-                                        }else {
-                                            itemIndex =itemPosition;
-
-                                            mDataBinding.llComment.setVisibility(View.VISIBLE);
-                                            mDataBinding.etComment.requestFocus();
-                                            mDataBinding.etComment.setHint("回复 " + dis_content.get(itemPosition).getNickname());
-                                            if (getActivity() instanceof MainTabActivity) {
-                                                MainTabActivity activity = (MainTabActivity) getActivity();
-                                                activity.visibilyBottom(View.GONE);
-                                            }
-                                            KeyboardUtil.showSoftInput(getContext());
-                                            commentPosition = position;
-                                            // commentDialog.dismiss();
-                                            mDataBinding.etComment.setText("");
-                                            homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() {
-                                                @Override
-                                                public void run() {
-                                                    int y = getCoordinateY(mDataBinding.llComment) - 20;
-                                                    //评论时滑动到对应item底部和输入框顶部对齐
-                                                    mDataBinding.scrollViewExtend.smoothScrollBy(0, mBottomY - y);
-                                                }
-                                            }, 300);
-                                        }
-
-
-
-                                    }
-                                });
-                            }
-                        });
-                        baseRecycleViewAdapter.setData(dis_content);
-
-                    }
-
-
-                    RequestOptions requestOptions = new RequestOptions();
-                    requestOptions.placeholder(R.mipmap.icon_default_rectangle);
-                    requestOptions.error(R.mipmap.icon_default_rectangle);
-
-                    Glide.with(getContext()).load(discoveryListEntity.getAvatar())
-                            .apply(requestOptions)
-                            .into(homeGridAdapterItemBinding.imageHead);
-                    homeGridAdapterItemBinding.imageHead.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            Intent intent = new Intent(getContext(), HistoryRecordActivity.class);
-                            intent.putExtra("userId", discoveryListEntity.getUserid());
-                            intent.putExtra("userName", discoveryListEntity.getNickname());
-                            intent.putExtra("title", discoveryListEntity.getNickname());
-
-                            startActivity(intent);
-                        }
-                    });
-                    ArrayList<ImageInfo> imageInfos = new ArrayList<>();
-
-                    if (discoveryListEntity.getPic().size() > 0) {
-
-                        //  Log.e("pic", discoveryListEntity.getPic().get(0));
-                        for (int i = 0; i < discoveryListEntity.getPic().size(); i++) {
-                            if (discoveryListEntity.getPic().get(i).endsWith(".mp4") || discoveryListEntity.getPic().get(i).endsWith(".avi")) {
-                                ImageInfo imageInfo = new ImageInfo();
-                                imageInfo.setType(2);
-                                imageInfo.setBigImageUrl(discoveryListEntity.getPic().get(i));
-                                imageInfo.setThumbnailUrl(discoveryListEntity.getPic().get(i));
-                                imageInfos.add(imageInfo);
-                            } else {
-                                ImageInfo imageInfo = new ImageInfo();
-                                imageInfo.setType(1);
-                                imageInfo.setBigImageUrl(discoveryListEntity.getPic().get(i));
-                                imageInfo.setThumbnailUrl(discoveryListEntity.getPic().get(i));
-                                imageInfos.add(imageInfo);
-                            }
-
-                        }
-
-                    } else if (!TextUtils.isEmpty(discoveryListEntity.getThumb())){
-                        ImageInfo imageInfo = new ImageInfo();
-                        imageInfo.setType(1);
-                        imageInfo.setBigImageUrl(discoveryListEntity.getThumb());
-                        imageInfo.setThumbnailUrl(discoveryListEntity.getThumb());
-                        imageInfos.add(imageInfo);
-                    }
-                    homeGridAdapterItemBinding.nineGrid.setAdapter(new NineGridViewClickAdapter(getContext(), imageInfos));
-                }
-            }
-        });
-        mDataBinding.recyView.setAdapter(baseRecycleViewAdapter);
-
-        baseRecycleViewAdapter.setData(discoveryListEntities);
-        mDataBinding.tvSendComment.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-
-                if (commentPosition != -1) {
-                    MainTabActivity activity = (MainTabActivity) getActivity();
-                    CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment);
-                    mDataBinding.llComment.setVisibility(View.GONE);
-                    activity.visibilyBottom(View.VISIBLE);
-                    Log.e("xxx", discoveryListEntities.get(commentPosition).getGoods_id());
-                    comment(discoveryListEntities.get(commentPosition).getGoods_id(), commentPosition, itemIndex, mDataBinding.etComment.getText().toString());
-                }
-            }
-        });
-    }
-    private int commentPosition = -1;
-    private int itemIndex = -1;
-    @Override
-    public boolean onTouch(MotionEvent ev) {
-        switch (ev.getAction()) {
-
-            case MotionEvent.ACTION_DOWN:
-                //点击空白处隐藏键盘，隐藏输入框相关
-                if (getActivity().getCurrentFocus() != null && getActivity().getCurrentFocus().getId() == R.id.tv_send_comment) {
-                    return false;
-                }
-                boolean b = UtilHelpers.hideKeyboard(ev, getActivity().getCurrentFocus(), getActivity());
-                if (b) {
-                    CommonUtils.hideSoftInput(mDataBinding.etComment.getContext(), mDataBinding.etComment);
-                    MainTabActivity activity = (MainTabActivity) getActivity();
-                    activity.visibilyBottom(View.VISIBLE);
-                    mDataBinding.llComment.setVisibility(View.GONE);
-                }
-                break;
-        }
-        return false;
-    }
-
-    private void getGoodsDetail(final String goodsId, final DiscoveryListEntity entity, final int goodtype) {
-        final RegisterUser user =
-                Config.getInstance(getContext()).getUser();
-        Map<String, String> map = new HashMap<>();
-        if (user != null) {
-            map.put("userid", user.getUserid());
-        } else {
-            map.put("userid", 0 + "");
-        }
-        map.put("app", "Goods");
-        map.put("class", "GoodsInfo");
-        map.put("goods_id", goodsId);
-        map.put("sign", Md5.md5("Goods" + "GoodsInfo" + Md5.secret));
-        progressDialog.setMessage("获取信息中");
-        progressDialog.setCancelable(false);
-        mGankLoader = new Loader();
-        Subscription subscription = mGankLoader.getMovie(ApiConfig.BASE_URL, map)
-                .subscribe(new Action1<Resultcode>() {
-                    @Override
-                    public void call(Resultcode resultcode) {
-                        progressDialog.dismiss();
-                        if (resultcode.status == 0) {
-                            Gson gs = new Gson();
-                            LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
-                            String s = gs.toJson(adta);
-
-                            try {
-
-                                JSONObject jsonObject = new JSONObject(s);
-                                org.json.JSONArray array = jsonObject.getJSONArray("info");
-                                final Type type = new TypeToken<ArrayList<GoodsDetailEntity>>() {
-                                }.getType();
-                                ArrayList<GoodsDetailEntity> o = gs.fromJson(array.toString(), type);
-
-                                GoodsInfoDialog goodsInfoDialog = new GoodsInfoDialog(baseActivity, entity, o);
-                                goodsInfoDialog.setOnConfirmListener(new GoodsInfoDialog.OnGoodsSelectPropertyListener() {
-                                    @Override
-                                    public void onSelect(String code, int num) {
-                                        if (goodtype == 4) {
-                                            Intent intent = new Intent(baseActivity, SettleActivity.class);
-                                            intent.putExtra("goodsType", 1);
-                                            intent.putExtra("goods_id", goodsId);
-                                            intent.putExtra("product_code", code);
-                                            intent.putExtra("sale_num", num + "");
-                                            startActivity(intent);
-                                        } else if (goodtype == 5) {
-                                            addCart(goodsId, code, num + "");
-                                        }
-
-                                    }
-                                });
-                                new XPopup.Builder(baseActivity).asCustom(goodsInfoDialog).show();
-
-                            } catch (JSONException e) {
-                                e.printStackTrace();
-                            }
-
-                        } else {
-                            baseActivity.setToast(resultcode.msg);
-                        }
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        progressDialog.dismiss();
-                        baseActivity.setToast(2, "获取信息失败");
-                        throwable.printStackTrace();
-                    }
-                });
-        baseActivity.addSubscription(subscription);
-    }
-
-    private void comment(String goodsId, final int position, final int  itemIndex, final String content) {
-        final RegisterUser user =
-                Config.getInstance(getContext()).getUser();
-        Map<String, String> map = new HashMap<>();
-        if (user != null) {
-            map.put("userid", user.getUserid());
-        } else {
-            map.put("userid", 0 + "");
-        }
-        map.put("app", "Goods");
-        map.put("class", "DisGoods");
-        map.put("goods_id", goodsId);
-        if (itemIndex!=-1){
-            DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
-            ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
-            String from_id = dis_content1.get(itemIndex).getFrom_id();
-            if (!TextUtils.isEmpty(from_id)) {
-                map.put("reply_id", from_id);
-            }
-        }
-
-        map.put("contents", content);
-        map.put("sign", Md5.md5("Goods" + "DisGoods" + Md5.secret));
-        progressDialog.setMessage("提交中");
-        progressDialog.setCancelable(false);
-//        progressDialog.show();
-
-        mGankLoader = new Loader();
-        Subscription subscription = mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {
-
-
-            @Override
-            public void call(Resultcode resultcode) {
-
-                progressDialog.dismiss();
-                if (!(resultcode.status == 0)) {
-                    baseActivity.setToast(1, resultcode.msg);
-                }
-                if (resultcode.status == 0) {
-
-                    String nickname = user.getNickname();
-                    BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
-                    DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content();
-                    dis_content.setContents(content);
-                    dis_content.setNickname(nickname);
-
-                    DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
-                    ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
-                    if (itemIndex!=-1){
-                        dis_content.setReply(dis_content1.get(itemIndex).getNickname());
-                    }
-                    dis_content1.add(dis_content);
-                    discoveryListEntity.setDis_content(dis_content1);
-                    adapter.upDateOne(position, discoveryListEntity);
-                }
-            }
-
-
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                progressDialog.dismiss();
-                baseActivity.setToast(2, "提交失败");
-                throwable.printStackTrace();
-            }
-        });
-
-        baseActivity.addSubscription(subscription);
-
-    }
-
-    //如果你需要考虑更好的体验，可以这么操作
-    @Override
-    public void onStart() {
-        super.onStart();
-        //开始轮播
-        mDataBinding.banner.startAutoPlay();
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        //结束轮播
-        mDataBinding.banner.stopAutoPlay();
-    }
-
-    private int page = 1;
-
-    private OnRefreshLoadMoreListener onrefalshlister = new OnRefreshLoadMoreListener() {
-        @Override
-        public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
-            getlist(page);
-        }
-
-        @Override
-        public void onRefresh(@NonNull RefreshLayout refreshLayout) {
-            page=1;
-            getlist(page);
-
-            final RegisterUser user =
-                    Config.getInstance(getActivity()).getUser();
-            Map<String, String> map = new HashMap<>();
-            if (user != null) {
-                map.put("userid", user.getUserid());
-            } else {
-                map.put("userid", 0 + "");
-            }
-            map.put("app", "Advert");
-            map.put("class", "Advertr_an_AdvertHomeList");
-            map.put("sign", Md5.md5("Advert" + "Advertr_an_AdvertHomeList" + Md5.secret));
-            getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), 0, false);
-        }
-
-
-    };
-
-    private void getGankList2(String myurl, Map<String, String> map, String msg, final int requstecode) {
-        progressDialog.setMessage(msg);
-        progressDialog.setCancelable(false);
-//        if (page>1){
-//            progressDialog.show();
-//        }
-
-
-        mGankLoader = new Loader();
-        Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
-
-
-            @Override
-            public void call(Resultcode resultcode) {
-
-                mDataBinding.taobaoRefreshLayout.finishRefresh();
-                mDataBinding.taobaoRefreshLayout.finishLoadMore();
-                progressDialog.dismiss();
-                if (!(resultcode.status == 0)) {
-                    baseActivity.setToast(1, resultcode.msg);
-                }
-                if (resultcode.status == 0) {
-                    // intRecycleView();
-                    Gson gs = new Gson();
-                    LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
-                    String s = gs.toJson(adta);
-                    try {
-                        JSONObject jsonObject = new JSONObject(s);
-                        org.json.JSONArray array = jsonObject.getJSONArray("info");
-                        Type type = new TypeToken<ArrayList<DiscoveryListEntity>>() {
-                        }.getType();
-                        ArrayList<DiscoveryListEntity> o = new Gson().fromJson(array.toString(), type);
-                        if (page == 1) {
-
-                            discoveryListEntities.clear();
-                            discoveryListEntities.addAll(o);
-                            BaseRecycleViewAdapter baseRecycleViewAdapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
-                            baseRecycleViewAdapter.setData(discoveryListEntities);
-                            page++;
-                        } else {
-                            discoveryListEntities.addAll(o);
-
-                            BaseRecycleViewAdapter baseRecycleViewAdapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
-                            baseRecycleViewAdapter.setData(discoveryListEntities);
-                            //    Log.e("sizi", discoveryListEntities.size() + "");
-                            //   int count = jsonObject.getInt("count");
-                            if (o.isEmpty()) {
-                                mDataBinding.taobaoRefreshLayout.finishLoadMoreWithNoMoreData();
-                            } else {
-
-                                page++;
-
-                            }
-                        }
-
-
-                    } catch (Exception e) {
-                        e.fillInStackTrace();
-                    }
-                }
-
-            }
-
-
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                progressDialog.dismiss();
-                mDataBinding.taobaoRefreshLayout.finishRefresh();
-                mDataBinding.taobaoRefreshLayout.finishLoadMore();
-                baseActivity.setToast(2, getString(R.string.getdatafailure));
-                throwable.printStackTrace();
-            }
-        });
-
-        baseActivity.addSubscription(subscription);
-    }
-
-    private void getGankList(String myurl, Map<String, String> map, String msg, final int requstecode, final boolean isshowdilaog) {
-        mGankLoader = new Loader();
-        Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
-            @Override
-            public void call(Resultcode resultcode) {
-                //  mDataBinding.taobaoRefreshLayout.finishRefresh();
-                if (!(resultcode.status == 0)) {
-                    baseActivity.setToast(1, resultcode.msg);
-                }
-                if (resultcode.status == 0) {
-//                    baseActivity.setToast(0,resultcode.msg);
-                    if (requstecode == 0) {
-                        Gson gs = new Gson();
-                        LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
-                        String s = gs.toJson(adta);
-                        MainF1Entity user = gs.fromJson(s, MainF1Entity.class);//把JSON字符串转为对象
-                        configFragments(user.getAdvert_carousel());
-                        //intRecycleHorization(user.getAdvertorial_list());
-                        //   intRecycleVerization(user.getMessage_list());
-                    }
-
-                }
-
-            }
-
-
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                //  mDataBinding.taobaoRefreshLayout.finishRefresh();
-                baseActivity.setToast(2, getString(R.string.getdatafailure));
-                throwable.printStackTrace();
-            }
-        });
-
-        baseActivity.addSubscription(subscription);
-    }
-
-    private void like(String goodsId, final int position) {
-        final RegisterUser user =
-                Config.getInstance(getContext()).getUser();
-        Map<String, String> map = new HashMap<>();
-        if (user != null) {
-            map.put("userid", user.getUserid());
-        } else {
-            map.put("userid", 0 + "");
-        }
-        map.put("app", "Goods");
-        map.put("class", "AddUp");
-        map.put("goods_id", goodsId);
-        map.put("sign", Md5.md5("Goods" + "AddUp" + Md5.secret));
-        progressDialog.setMessage("提交中");
-        progressDialog.setCancelable(false);
-//        progressDialog.show();
-
-        mGankLoader = new Loader();
-        Subscription subscription = mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {
-
-
-            @Override
-            public void call(Resultcode resultcode) {
-
-                progressDialog.dismiss();
-                if (!(resultcode.status == 0)) {
-                    baseActivity.setToast(1, resultcode.msg);
-                }
-                if (resultcode.status == 0) {
-                    BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
-                    if (discoveryListEntities.get(position).getIs_like() == 1) {
-                        discoveryListEntities.get(position).setIs_like(0);
-                        ArrayList<DiscoveryListEntity.Like> like = discoveryListEntities.get(position).getLike();
-                        for (int i = 0; i < like.size(); i++) {
-                            if (user.getUserid().equals(like.get(i).getUserid())) {
-                                like.remove(i);
-                                break;
-                            }
-                        }
-                        discoveryListEntities.get(position).setLike(like);
-                    } else {
-                        discoveryListEntities.get(position).setIs_like(1);
-                        DiscoveryListEntity.Like like = new DiscoveryListEntity.Like();
-                        like.setNickname(user.getNickname());
-                        like.setUserid(user.getUserid());
-                        discoveryListEntities.get(position).getLike().add(like);
-                    }
-
-                    adapter.upDateOne(position, discoveryListEntities.get(position));
-                }
-
-            }
-
-
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                progressDialog.dismiss();
-                baseActivity.setToast(2, "提交失败");
-                throwable.printStackTrace();
-            }
-        });
-
-        baseActivity.addSubscription(subscription);
-
-    }
-
-    private void addCart(String goods_id, String product_code, String goodsNum) {
-        RegisterUser user =
-                Config.getInstance(getContext()).getUser();
-        Map<String, String> map = new HashMap<>();
-        if (user != null) {
-            map.put("userid", user.getUserid());
-        } else {
-            map.put("userid", 0 + "");
-        }
-        map.put("app", "Goods");
-        map.put("class", "AddCart");
-        map.put("goods_id", goods_id);
-        map.put("product_code", product_code);
-        map.put("num", goodsNum);
-        map.put("sign", Md5.md5("Goods" + "AddCart" + Md5.secret));
-        progressDialog.setMessage("提交中");
-        progressDialog.setCancelable(false);
-        mGankLoader = new Loader();
-        Subscription subscribe = mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {
-            @Override
-            public void call(Resultcode resultcode) {
-                progressDialog.dismiss();
-                if (resultcode.status == 0) {
-                    baseActivity.setToast(0, "成功加入购物车");
-                } else {
-                    baseActivity.setToast(3, resultcode.msg);
-                }
-            }
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                progressDialog.dismiss();
-                baseActivity.setToast(2, "提交失败");
-                throwable.printStackTrace();
-            }
-        });
-        baseActivity.addSubscription(subscribe);
-    }
-
-
-    private void deleteComment(String dis_id, String userid, final int superPosition, final int itemPosition) {
-        Map<String, String> map = new HashMap<>();
-
-        progressDialog.show();
-        map.put("app", "Goods");
-
-        map.put("class", "DelDis");
-        map.put("sign", Md5.md5("Goods" + "DelDis" + Md5.secret));
-        map.put("dis_id", dis_id);
-        map.put("userid", userid);
-        mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {
-            @Override
-            public void call(Resultcode resultcode) {
-                progressDialog.dismiss();
-                if (!(resultcode.status == 0)) {
-                    Toast.makeText(getContext(), resultcode.msg, Toast.LENGTH_SHORT).show();
-                } else {
-                    BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
-                    DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(superPosition);
-                    ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
-                    dis_content1.remove(itemPosition);
-                    discoveryListEntity.setDis_content(dis_content1);
-                    adapter.upDateOne(superPosition, discoveryListEntity);
-                }
-            }
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                Toast.makeText(getContext(), getString(R.string.getdatafailure), Toast.LENGTH_SHORT).show();
-            }
-        });
-    }
+package com.sl.house_property;
+
+import android.app.Dialog;
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.graphics.Color;
+import android.graphics.Rect;
+import android.graphics.drawable.ColorDrawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.Html;
+import android.text.TextPaint;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.StyleRes;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
+import com.cutil.ScreenUtils;
+import com.google.gson.Gson;
+import com.google.gson.internal.LinkedTreeMap;
+import com.google.gson.reflect.TypeToken;
+import com.gyf.immersionbar.ImmersionBar;
+import com.lxj.xpopup.XPopup;
+import com.lzy.ninegrid.ImageInfo;
+import com.lzy.ninegrid.preview.NineGridViewClickAdapter;
+import com.lzy.okgo.OkGo;
+import com.lzy.okgo.cache.CacheMode;
+import com.lzy.okgo.convert.StringConvert;
+import com.lzy.okgo.model.Response;
+import com.lzy.okrx2.adapter.ObservableResponse;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
+import com.selectpicker.OptionsPopupWindow;
+import com.sl.house_property.databinding.FragmentMainBinding;
+import com.sl.house_property.databinding.ItemCommentBinding;
+import com.sl.house_property.databinding.ItemDiscoveryBinding;
+import com.sl.house_property.db.CommentBeanData;
+import com.sl.house_property.db.dao.CommentDao;
+import com.sl.house_property.discovery.DeleteCommentDialog;
+import com.sl.house_property.discovery.GoodsInfoDialog;
+import com.sl.house_property.discovery.HistoryRecordActivity;
+import com.sl.house_property.discovery.HistoryRecordActivitytwo;
+import com.sl.house_property.discovery.SelectDialog;
+import com.sl.house_property.order.SettleActivity;
+import com.sl.house_property.user.MyMarketShopActivity;
+import com.sl.house_property.user.MyPropertyActivity;
+import com.squareup.picasso.Picasso;
+import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
+import com.tencent.mm.opensdk.openapi.WXAPIFactory;
+import com.youth.banner.Banner;
+import com.youth.banner.BannerConfig;
+import com.youth.banner.Transformer;
+import com.youth.banner.listener.OnBannerClickListener;
+import com.youth.banner.loader.ImageLoader;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.lang.reflect.Type;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import adapter.BaseRecycleViewAdapter;
+import entity.Advert_carouseleEntity;
+import entity.DiscoveryListEntity;
+import entity.GetVesionResponseBean;
+import entity.GoodsDetailEntity;
+import entity.HomelistitemEntity;
+import entity.MainF1Entity;
+import entity.RegisterUser;
+import http.ApiConfig;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.schedulers.Schedulers;
+import my_loader.Loader;
+import my_loader.Resultcode;
+import my_view.CommentDialog;
+import my_view.tao_bao_refresh.FullyGridLayoutManager;
+import rx.Subscription;
+import rx.functions.Action1;
+import tools.Config;
+import utils.CommonUtils;
+import utils.DateUtilss;
+import utils.KeyboardUtil;
+import utils.Md5;
+import utils.SPUtils;
+import utils.TimeUtils;
+import utils.UpdateManager;
+import utils.UtilHelpers;
+import utils.VersionUtils;
+
+
+/**
+ * A simple {@link Fragment} subclass.
+ * Activities that contain this fragment must implement the
+ * {@link Main1Fragment.OnFragmentInteractionListener} interface
+ * to handle interaction events.
+ * Use the {@link Main1Fragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+public class MainFragment extends BaseFragment<FragmentMainBinding> implements View.OnClickListener, MainTabActivity.MyOnTouchListener {
+    private static final String ARG_PARAM1 = "param1";
+    private static final String ARG_PARAM2 = "param2";
+    BaseActivity baseActivity;
+    private String mParam1;
+    private String mParam2;
+    private ArrayList<DiscoveryListEntity> discoveryListEntities = new ArrayList<>();
+    private OnFragmentInteractionListener mListener;
+    private ProgressDialog progressDialog;
+    private Loader mGankLoader;
+
+    private ArrayList<String> mBannerImages;
+
+    private List<String> bannerTitile;
+    private RegisterUser user;
+    private String miyuetime;
+    private String wy_id="";
+    private String dangqianversion;
+    private UpdateManager mUpdateManager;//版本更新
+
+
+    public MainFragment() {
+        // Required empty public constructor
+    }
+
+    /**
+     * Use this factory method to create a new instance of
+     * this fragment using the provided parameters.
+     *
+     * @param param1 Parameter 1.
+     * @param param2 Parameter 2.
+     * @return A new instance of fragment Main1Fragment.
+     */
+    // TODO: Rename and change types and number of parameters
+    public static MainFragment newInstance(String param1, String param2) {
+        MainFragment fragment = new MainFragment();
+        Bundle args = new Bundle();
+        args.putString(ARG_PARAM1, param1);
+        args.putString(ARG_PARAM2, param2);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        RegisterUser user1;
+        if (user == null) {
+            user1 = Config.getInstance(getActivity()).getUser();
+            if (user1 != null) {
+                Map<String, String> map = new HashMap<>();
+                if (user1 != null) {
+                    map.put("userid", user1.getUserid());
+                } else {
+                    map.put("userid", 0 + "");
+                }
+                map.put("app", "Advert");
+                map.put("class", "Advertr_an_AdvertHomeList");
+                map.put("sign", Md5.md5("Advert" + "Advertr_an_AdvertHomeList" + Md5.secret));
+                getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), 0, false);
+                user = user1;
+                page=1;
+                getlist(page);
+            }
+        }
+
+        if (wy_id.equals("")) {
+            Map<String, String> map = new HashMap<>();
+            RegisterUser registerUser = Config.getInstance(getContext()).getUser();
+            if (registerUser != null) {
+                map.put("userid", registerUser.getUserid());
+            } else {
+                map.put("userid", 0 + "");
+            }
+
+            map.put("sign", Md5.md5("Cas" + "GetMyAddress" + Md5.secret));
+            map.put("app", "Cas");
+            map.put("class", "GetMyAddress");
+            getGankList(ApiConfig.BASE_URL, map, "", 1);
+            return;
+        }
+
+    }
+
+    private ArrayList<HomelistitemEntity> list;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getArguments() != null) {
+            mParam1 = getArguments().getString(ARG_PARAM1);
+            mParam2 = getArguments().getString(ARG_PARAM2);
+        }
+        //String time = (String) SPUtils.getSp(getContext(), DoConfig.MY_HOUST_TIME, "智慧小区");
+        CommentDao commentDao = new CommentDao(getActivity());
+        ArrayList<CommentBeanData> commentBeanData = commentDao.queryAll();
+        if(commentBeanData.size()>0){
+            miyuetime = commentBeanData.get(0).getMiyuetime();
+            try {
+                boolean b = DateUtilss.IsToday(miyuetime);
+                Log.e("时间",b+"");
+                if(!DateUtilss.IsToday(miyuetime))
+                    commentDao.delete(commentBeanData);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+        }
+
+        //版本更新
+        upDataVersion();
+    }
+
+    private void upDataVersion() {
+        //获取当前应用版本号
+        try {
+            dangqianversion = getVersion()+"";
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        requestVersion();
+    }
+
+
+    /**
+     * 获取当前应用版本号
+     */
+    public int getVersion() {
+        int versionCode=0;
+        try {
+            PackageInfo packageInfo = getContext().getPackageManager().getPackageInfo(getContext().getPackageName(), 0);
+            String versionName = packageInfo.versionName;
+            versionCode = packageInfo.versionCode;
+            Log.d("当前版本号==", "Version Name: " + versionName);
+            Log.d("当前版本号==", "Version Code: " + versionCode);
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        return versionCode;
+    }
+    /**
+     * 请求最新版本号
+     */
+    public void requestVersion() {
+        OkGo.<String>post(ApiConfig.BASE_URL)
+                .params("app", "Cas")
+                .params("class", "GetVersion")
+                .params("sign", Md5.md5("Cas" + "GetVersion" + Md5.secret))
+                .converter(new StringConvert())//
+                .cacheMode(CacheMode.NO_CACHE)  //无缓存模式 CacheMode.NO_CACHE
+                .adapt(new ObservableResponse<String>())//
+                .subscribeOn(Schedulers.io())//
+                .observeOn(AndroidSchedulers.mainThread())//
+                .subscribe(new io.reactivex.Observer<Response<String>>() {
+
+                    @Override
+                    public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
+                        //   addDisposable(d);
+                    }
+
+                    @Override
+                    public void onNext(@io.reactivex.annotations.NonNull Response<String> response) {
+                        String body = (String) response.body();
+                        Log.e("版本更新",body);
+                        Log.e("当前版本",dangqianversion);
+                        try {
+                            JSONObject jsonObject = new JSONObject(body);
+                            int status = jsonObject.getInt("status");
+                            if (status == 0) {
+                                JSONObject data = jsonObject.getJSONObject("data");
+                                String newVersion = data.getString("version");
+                                String newVersion_url = data.getString("version_url");
+                                int versionUpdate = VersionUtils.compareVersion(dangqianversion, newVersion);
+                                if (versionUpdate == -1) {//两个版本相同
+                                    GetVesionResponseBean mGetVesionResponseBean = new GetVesionResponseBean();
+                                    GetVesionResponseBean.ResultBean resultBean = new GetVesionResponseBean.ResultBean();
+                                    resultBean.setContent("修复若干bug");
+                                    resultBean.setVersion(newVersion);
+                                    mGetVesionResponseBean.setResult(resultBean);
+                                    ADialog mShareWechatDialog = new ADialog(getContext(), 0, mGetVesionResponseBean,newVersion_url);
+                                    mShareWechatDialog.requestWindowFeature(Window.FEATURE_NO_TITLE);//代码中取消标题栏
+                                    mShareWechatDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+                                    Window win = mShareWechatDialog.getWindow();
+                                    win.getDecorView().setPadding(0, 0, 0, 0);
+                                    WindowManager.LayoutParams lp = win.getAttributes();
+                                    lp.width = WindowManager.LayoutParams.FILL_PARENT;
+                                    lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
+                                    win.setAttributes(lp);
+                                    mShareWechatDialog.setCancelable(false);
+                                    mShareWechatDialog.show();
+                                } else {//没有最新版本
+                                    Log.e("当前版本",dangqianversion);
+                                }
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+
+                    @Override
+                    public void onError(@io.reactivex.annotations.NonNull Throwable e) {
+                        e.printStackTrace();
+
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
+
+
+    }
+
+
+
+    class ADialog extends Dialog implements View.OnClickListener {
+        private Context context;
+        GetVesionResponseBean mGetVesionResponseBean;
+        private String url="";
+
+        public ADialog(@NonNull Context context, @StyleRes int themeResId, GetVesionResponseBean mGetVesionResponseBean,String str) {
+            super(context, themeResId);
+            this.context = context;
+            this.mGetVesionResponseBean = mGetVesionResponseBean;
+            this.url=str;
+        }
+
+        @Override
+        protected void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            this.setContentView(R.layout.version_dailog);
+            launchAppDetail(url);
+        }
+
+        public void launchAppDetail(String url) {
+
+            String content = mGetVesionResponseBean.getResult().getContent();
+            content = content.replace("</br>", "<br>");
+            TextView mContentTv = (TextView) findViewById(R.id.tv_content);
+            mContentTv.setText(Html.fromHtml(content));
+            TextView mVersionTv = (TextView) findViewById(R.id.tv_version);
+            mVersionTv.setText("V" + mGetVesionResponseBean.getResult().getVersion());
+            Button mUpdateBtn = (Button) findViewById(R.id.btn_update);
+            Button btn_update_one = (Button) findViewById(R.id.btn_update_one);
+
+            mUpdateBtn.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    dismiss();
+                    // 这里来检测版本是否需要更新
+                    mUpdateManager = new UpdateManager(getContext(), url);
+                    mUpdateManager.checkUpdateDownload();
+                }
+            });
+
+            btn_update_one.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    dismiss();
+                }
+            });
+        }
+
+
+        @Override
+        public void onClick(View v) {
+
+
+        }
+    }
+
+
+    private void getGankList(final String myurl, Map<String, String> map, String string, final int getcode1) {
+        progressDialog.setMessage(string);
+        progressDialog.setCancelable(false);
+        progressDialog.show();
+        mDataBinding.getRoot().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                progressDialog.dismiss();
+                //setToast(1, getString(R.string.timeout));
+            }
+        }, 13000);
+        mGankLoader = new Loader();
+        mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
+            @Override
+            public void call(Resultcode resultcode) {
+                progressDialog.dismiss();
+                //setToast(0,resultcode.status);
+                if ((!(resultcode.status == 0))) {
+                    Toast.makeText(getContext(), resultcode.msg, Toast.LENGTH_SHORT).show();
+                    return;
+                }
+                switch (getcode1) {
+
+                    case 0:
+                        Log.e("测试1","");
+                        Gson gs = new Gson();
+                        LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
+                        String s = gs.toJson(adta);
+                        try {
+                            JSONObject jsonObject = new JSONObject(s);
+                            JSONArray jsonArray = jsonObject.getJSONArray("home");
+                            Type type = new TypeToken<ArrayList<HomelistitemEntity>>() {
+                            }.getType();
+                            list = new Gson().fromJson(jsonArray.toString(), type);
+                            if (list == null || list.isEmpty()) {
+                                return;
+                            }
+                            final ArrayList<String> strings = new ArrayList<>();
+                            for (int i = 0; i < list.size(); i++) {
+                                strings.add(list.get(i).getAddress());
+                            }
+                            OptionsPopupWindow alarmOptionPop = new OptionsPopupWindow(getContext());
+                            alarmOptionPop.setPicker(strings);
+
+                            alarmOptionPop.setOnoptionsSelectListener(new OptionsPopupWindow.OnOptionsSelectListener() {
+                                @Override
+                                public void onOptionsSelect(int position, int option2, int options3) {
+                                    if (list.size() > 0) {
+                                        Log.e("设置的数据1",list.get(position).getAddress());
+                                     SPUtils.setSP(getActivity(), DoConfig.MY_HOUST_ADDRESS, list.get(position).getAddress()+","+list.get(position).getWy_id());
+                                        mDataBinding.tv1Address.setText(list.get(position).getAddress());
+                                      //  SPUtils.setSP(getActivity(), DoConfig.MY_HOUST_WYID, list.get(position).getWy_id());
+                                        wy_id=list.get(position).getWy_id();
+                                    }
+
+                                }
+                            });
+
+                            alarmOptionPop.showAtLocation(mDataBinding.getRoot(), Gravity.BOTTOM, 0, 0);
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+
+
+                        break;
+                    case 1:
+                        Log.e("测试2","");
+                        Gson gss = new Gson();
+                        LinkedTreeMap adtaa = (LinkedTreeMap) resultcode.data;
+                        String ss = gss.toJson(adtaa);
+                        try {
+                            JSONObject jsonObject = new JSONObject(ss);
+                            JSONArray jsonArray = jsonObject.getJSONArray("home");
+                            Type type = new TypeToken<ArrayList<HomelistitemEntity>>() {
+                            }.getType();
+                            list = new Gson().fromJson(jsonArray.toString(), type);
+                            if (list == null || list.isEmpty()) {
+                                return;
+                            }
+                            final ArrayList<String> strings = new ArrayList<>();
+                            for (int i = 0; i < list.size(); i++) {
+                                strings.add(list.get(i).getAddress());
+                            }
+                            if (list.size() > 0) {
+                                Log.e("设置的数据3",list.get(0).getAddress());
+                                SPUtils.setSP(getActivity(), DoConfig.MY_HOUST_ADDRESS, list.get(0).getAddress()+","+list.get(0).getWy_id());
+                                mDataBinding.tv1Address.setText(list.get(0).getAddress());
+                             //  SPUtils.setSP(getActivity(), DoConfig.MY_HOUST_WYID, list.get(0).getWy_id());
+                                wy_id=list.get(0).getWy_id();
+                            }
+
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                        break;
+                }
+
+            }
+
+
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                progressDialog.dismiss();
+                //
+                Toast.makeText(getContext(), getString(R.string.getdatafailure), Toast.LENGTH_SHORT).show();
+
+                throwable.printStackTrace();
+            }
+        });
+
+
+    }
+
+    @Override
+    protected void onCreateVew(LayoutInflater inflater, Bundle savedInstanceState) {
+        super.onCreateVew(inflater, savedInstanceState);
+        baseActivity = (BaseActivity) getActivity();
+        progressDialog = new ProgressDialog(getContext());
+        intRecycleView();
+        mDataBinding.taobaoRefreshLayout.setOnRefreshLoadMoreListener(onrefalshlister);
+        mDataBinding.scan.setOnClickListener(this);
+        mDataBinding.entrancegurd.setOnClickListener(this);
+        mDataBinding.cargara.setOnClickListener(this);
+        mDataBinding.moew1.setOnClickListener(this);
+        //mDataBinding.moew2.setOnClickListener(this);
+        View banner = mDataBinding.l3;
+        LinearLayout.LayoutParams bannerLP = (LinearLayout.LayoutParams) banner.getLayoutParams();
+        bannerLP.width = ScreenUtils.getScreenWidth();
+        banner.setLayoutParams(bannerLP);
+        mDataBinding.taobaoRefreshLayout.autoRefresh();
+        String areaa = (String) SPUtils.getSp(getContext(), DoConfig.MY_HOUST_ADDRESS, "智慧小区");
+        if (!TextUtils.isEmpty(areaa)&&!areaa.equals("智慧小区")) {
+            try {
+                String[] split = areaa.split(",");
+                String area=split[0];
+                Log.e("地址1",area);
+                mDataBinding.tv1Address.setText(area);
+                wy_id=split[1];
+            } catch (Exception e) {
+
+            }
+        }
+
+
+        mDataBinding.tv1Address.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (list == null || list.isEmpty()) {
+                    Map<String, String> map = new HashMap<>();
+                    RegisterUser registerUser = Config.getInstance(getContext()).getUser();
+                    if (registerUser != null) {
+                        map.put("userid", registerUser.getUserid());
+                    } else {
+                        map.put("userid", 0 + "");
+                    }
+
+                    map.put("sign", Md5.md5("Cas" + "GetMyAddress" + Md5.secret));
+                    map.put("app", "Cas");
+                    map.put("class", "GetMyAddress");
+                    getGankList(ApiConfig.BASE_URL, map, "", 0);
+                    return;
+                }
+                final ArrayList<String> strings = new ArrayList<>();
+                for (int i = 0; i < list.size(); i++) {
+                    strings.add(list.get(i).getAddress());
+                }
+                OptionsPopupWindow alarmOptionPop = new OptionsPopupWindow(getContext());
+                alarmOptionPop.setPicker(strings);
+
+                alarmOptionPop.setOnoptionsSelectListener(new OptionsPopupWindow.OnOptionsSelectListener() {
+                    @Override
+                    public void onOptionsSelect(int position, int option2, int options3) {
+                        if (list.size() > 0) {
+                            Log.e("设置的数据2",list.get(position).getAddress());
+                            SPUtils.setSP(getActivity(), DoConfig.MY_HOUST_ADDRESS, list.get(position).getAddress()+","+list.get(position).getWy_id());
+                          //  SPUtils.setSP(getActivity(), DoConfig.MY_HOUST_WYID, list.get(position).getWy_id());
+                            wy_id=list.get(position).getWy_id();
+                            mDataBinding.tv1Address.setText(list.get(position).getAddress());
+                        }
+
+                    }
+                });
+
+                alarmOptionPop.showAtLocation(mDataBinding.getRoot(), Gravity.BOTTOM, 0, 0);
+
+            }
+        });
+
+        MainTabActivity activity = (MainTabActivity) getActivity();
+        activity.registerMyOnTouchListener(this);
+        final RegisterUser user =
+                Config.getInstance(getActivity()).getUser();
+        Map<String, String> map = new HashMap<>();
+        if (user != null) {
+            map.put("userid", user.getUserid());
+        } else {
+            map.put("userid", 0 + "");
+        }
+        map.put("app", "Advert");
+        map.put("class", "Advertr_an_AdvertHomeList");
+        map.put("sign", Md5.md5("Advert" + "Advertr_an_AdvertHomeList" + Md5.secret));
+        getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), 0, false);
+
+        mDataBinding.service.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if( (Config.getInstance(getContext()).getUser()==null)){
+                    Intent intent =new Intent(getContext(),LoginActivity.class);
+                    startActivity(intent);
+                    return;
+                }
+
+
+                String fangchan = (String) SPUtils.getSp(getActivity(), DoConfig.FANGCHAN_DATA, "0");
+                Log.e("fangchan",fangchan);
+                if(fangchan.equals("0")){
+                    Intent intent = new Intent(getActivity(), MyPropertyActivity.class);
+                    intent.putExtra("usertitile", "我的房产");
+                    startActivityForResult(intent, 0);
+                    return;
+                }
+
+                Intent intent = new Intent(getContext(), HistoryRecordActivitytwo.class);
+                final RegisterUser user =
+                        Config.getInstance(getActivity()).getUser();
+                intent.putExtra("userId", user.getUserid());
+                intent.putExtra("wyuserId", wy_id);
+                intent.putExtra("userName", user.getNickname());
+                intent.putExtra("title", "物业服务");
+                intent.putExtra("dataType",1);
+                startActivity(intent);
+            }
+        });
+    }
+
+    // TODO: Rename method, update argument and hook method into UI event
+    public void onButtonPressed(Uri uri) {
+        if (mListener != null) {
+            mListener.onFragmentInteraction(uri);
+        }
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof OnFragmentInteractionListener) {
+            mListener = (OnFragmentInteractionListener) context;
+        } else {
+//            throw new RuntimeException(context.toString()
+//                    + " must implement OnFragmentInteractionListener");
+        }
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mListener = null;
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.fragment_main;
+    }
+
+    @Override
+    protected void loadData() {
+
+    }
+
+    @Override
+    public void onClick(View view) {
+        Intent intent = null;
+        int id = view.getId();
+        if (id == R.id.scan) {
+            if ((Config.getInstance(MainFragment.this.getContext()).getUser() == null)) {
+                intent = new Intent(MainFragment.this.getContext(), LoginActivity.class);
+            } else {
+                intent = new Intent(getActivity(), QRcodeActivity.class);
+            }
+            startActivity(intent);
+        } else if (id == R.id.entrancegurd) {//门禁
+            if( (Config.getInstance(getContext()).getUser()==null)){
+                intent =new Intent(getContext(),LoginActivity.class);
+                startActivity(intent);
+                return;
+            }
+
+            String fangchan = (String) SPUtils.getSp(getActivity(), DoConfig.FANGCHAN_DATA, "0");
+            Log.e("fangchan",fangchan);
+            if(fangchan.equals("0")){
+                intent = new Intent(getActivity(), MyPropertyActivity.class);
+                intent.putExtra("usertitile", "我的房产");
+                startActivityForResult(intent, 0);
+                return;
+            }
+
+            if ((Config.getInstance(MainFragment.this.getContext()).getUser() == null)) {
+                intent = new Intent(MainFragment.this.getContext(), LoginActivity.class);
+            } else {
+                intent = new Intent(getActivity(), CodeActivity.class);
+            }
+            startActivity(intent);
+        } else if (id == R.id.cargara) {//社区内购
+            String appId = "wx7e09fff168f6e58d"; // 填移动应用(App)的 AppId，非小程序的 AppID
+            IWXAPI api = WXAPIFactory.createWXAPI(getActivity(), appId);
+            WXLaunchMiniProgram.Req req = new WXLaunchMiniProgram.Req();
+            req.userName = "gh_f750eee96b89"; // 填小程序原始id
+            req.path = "/pages/index/index";  //拉起小程序页面的可带参路径，不填默认拉起小程序首页，对于小游戏，可以只传入 query 部分，来实现传参效果，如：传入 "?foo=bar"。
+            req.miniprogramType = WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE;// 可选打开 开发版，体验版和正式版
+            api.sendReq(req);
+        } else if (id == R.id.moew1) {
+            intent = new Intent(getActivity(), MyMarketShopActivity.class);
+            startActivity(intent);
+        }
+    }
+
+    /**
+     * This interface must be implemented by activities that contain this
+     * fragment to allow an interaction in this fragment to be communicated
+     * to the activity and potentially other fragments contained in that
+     * activity.
+     * <p>
+     * See the Android Training lesson <a href=
+     * "http://developer.android.com/training/basics/fragments/communicating.html"
+     * >Communicating with Other Fragments</a> for more information.
+     */
+    public interface OnFragmentInteractionListener {
+        // TODO: Update argument type and name
+        void onFragmentInteraction(Uri uri);
+    }
+
+    private void configFragments(ArrayList<Advert_carouseleEntity> user) {//banner事件
+        // mDataBinding.banner.removeAllViews();
+        mDataBinding.banner.releaseBanner();
+        bannerTitile = new ArrayList<>();
+        mBannerImages = new ArrayList<>();
+        for (int i = 0; i < user.size(); i++) {
+            Advert_carouseleEntity advertCarouseleEntity = user.get(i);
+            if (advertCarouseleEntity == null) {
+                bannerTitile.add("");
+            } else {
+                bannerTitile.add(advertCarouseleEntity.getAdvert_source());
+            }
+            mBannerImages.add(advertCarouseleEntity.getAdvert_img());
+        }
+        Banner banner = mDataBinding.banner;
+        banner.setBannerTitles(bannerTitile);
+        banner.setImageLoader(new ImageLoader() {
+            @Override
+            public void displayImage(Context context, Object path, ImageView imageView) {
+                Picasso.with(context).load((String) path)
+                        .into(imageView);
+            }
+        });
+        banner.setImages(mBannerImages);
+        banner.setBannerAnimation(Transformer.Default);
+        banner.setDelayTime(5000);
+        banner.isAutoPlay(true);
+        banner.setBannerStyle(BannerConfig.CIRCLE_INDICATOR);
+        banner.setIndicatorGravity(BannerConfig.CENTER);
+        banner.start();
+
+        mDataBinding.banner.setOnBannerClickListener(new OnBannerClickListener() {
+            @Override
+            public void OnBannerClick(int i) {
+                Advert_carouseleEntity advert_carouseleEntity = user.get(i-1);
+                String advert_source = advert_carouseleEntity.getAdvert_source();
+                if(advert_source.length()>0){
+                    String appId = "wx7e09fff168f6e58d"; // 填移动应用(App)的 AppId，非小程序的 AppID
+                    IWXAPI api = WXAPIFactory.createWXAPI(getActivity(), appId);
+                    WXLaunchMiniProgram.Req req = new WXLaunchMiniProgram.Req();
+                    req.userName = "gh_f750eee96b89"; // 填小程序原始id
+                    req.path = advert_source;                  ////拉起小程序页面的可带参路径，不填默认拉起小程序首页，对于小游戏，可以只传入 query 部分，来实现传参效果，如：传入 "?foo=bar"。
+                    req.miniprogramType = WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE;// 可选打开 开发版，体验版和正式版
+                    api.sendReq(req);
+                }
+            }
+        });
+        TextPaint tp = mDataBinding.usershoptextid.getPaint();
+
+        tp.setFakeBoldText(true);
+    }
+
+    private int currentKeyboardH;
+    private int editTextBodyHeight;
+
+    public void updateEditTextBodyVisible(int visibility) {
+        mDataBinding.llComment.setVisibility(visibility);
+        if (View.VISIBLE == visibility) {
+            mDataBinding.llComment.requestFocus();
+            //弹出键盘
+            CommonUtils.showSoftInput(mDataBinding.etComment.getContext(), mDataBinding.etComment);
+
+        } else if (View.GONE == visibility) {
+            //隐藏键盘
+            MainTabActivity activity = (MainTabActivity) getActivity();
+            activity.visibilyBottom(View.VISIBLE);
+            CommonUtils.hideSoftInput(mDataBinding.etComment.getContext(), mDataBinding.etComment);
+        }
+    }
+
+    private void setViewTreeObserver() {
+        final ViewTreeObserver swipeRefreshLayoutVTO = mDataBinding.myl1.getViewTreeObserver();
+        swipeRefreshLayoutVTO.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                Rect r = new Rect();
+                mDataBinding.myl1.getWindowVisibleDisplayFrame(r);
+                int statusBarH = ImmersionBar.getStatusBarHeight(getActivity());//状态栏高度
+                int screenH = mDataBinding.myl1.getRootView().getHeight();
+                if (r.top != statusBarH) {
+                    //r.top代表的是状态栏高度，在沉浸式状态栏时r.top＝0，通过getStatusBarHeight获取状态栏高度
+                    r.top = statusBarH;
+                }
+                int keyboardH = screenH - (r.bottom - r.top);
+
+                if (keyboardH == currentKeyboardH) {//有变化时才处理，否则会陷入死循环
+                    return;
+                }
+                currentKeyboardH = keyboardH;
+                editTextBodyHeight = mDataBinding.llComment.getHeight();
+                if (keyboardH < 150) {//说明是隐藏键盘的情况
+                    updateEditTextBodyVisible(View.GONE);
+                    return;
+                }
+            }
+        });
+    }
+
+    private void getlist(int mypage) {
+        RegisterUser user =
+                Config.getInstance(getContext()).getUser();
+        Map<String, String> map = new HashMap<>();
+        if (user != null) {
+            map.put("userid", user.getUserid());
+        } else {
+            map.put("userid", 0 + "");
+        }
+        map.put("app", "Goods");
+        map.put("type", "1");
+        map.put("class", "IndexGoodsLists");
+        map.put("page", mypage + "");
+        map.put("sign", Md5.md5("Goods" + "IndexGoodsLists" + Md5.secret));
+        getGankList2(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), mypage);
+    }
+
+    /**
+     * 获取控件左上顶点Y坐标
+     *
+     * @param view
+     * @return
+     */
+    private int getCoordinateY(View view) {
+        int[] coordinate = new int[2];
+        view.getLocationOnScreen(coordinate);
+        return coordinate[1];
+    }
+
+    private void intRecycleView() {
+        mDataBinding.tvSendComment.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                setViewTreeObserver();
+            }
+        });
+        mDataBinding.scrollViewExtend.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                if (mDataBinding.llComment.getVisibility() == View.VISIBLE) {
+                    updateEditTextBodyVisible(View.GONE);
+                    return true;
+                }
+                return false;
+            }
+        });
+        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseActivity);
+        mDataBinding.recyView.setNestedScrollingEnabled(false);//禁止rcyc嵌套滑动
+        mDataBinding.recyView.setLayoutManager(linearLayoutManager);
+        BaseRecycleViewAdapter<DiscoveryListEntity, ItemDiscoveryBinding> baseRecycleViewAdapter = new BaseRecycleViewAdapter(getActivity(), R.layout.item_discovery);
+        baseRecycleViewAdapter.setHasStableIds(true);
+
+        discoveryListEntities = new ArrayList<>();
+        baseRecycleViewAdapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() {
+            @Override
+            public void onBindViewHolder(Object b, final int position) {
+                if (!(position >= discoveryListEntities.size())) {
+                    final ItemDiscoveryBinding homeGridAdapterItemBinding = (ItemDiscoveryBinding) b;
+                    final DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
+                    homeGridAdapterItemBinding.tvNikeName.setText(discoveryListEntity.getNickname());
+                    homeGridAdapterItemBinding.tvContent.setText(discoveryListEntity.getGoods_detail());
+                    homeGridAdapterItemBinding.ivComment.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(final View v) {
+                            final CommentDialog commentDialog = new CommentDialog(baseActivity);
+
+                            commentDialog.setShowBug(discoveryListEntity.getType().equals("2"));
+                            commentDialog.setPraise(discoveryListEntity.getIs_like() == 1);
+                            final int mBottomY = getCoordinateY(homeGridAdapterItemBinding.ivComment) + homeGridAdapterItemBinding.ivComment.getHeight();
+                            commentDialog.setOnCommentOperateListener(new CommentDialog.OnCommentOperateListener() {
+                                @Override
+                                public void click(int type) {
+
+                                    if (type == 1 || type == 2) {
+                                        //点赞/取消
+                                        commentDialog.dismiss();
+                                        like(discoveryListEntity.getGoods_id(), position);
+                                    } else if (type == 3) {
+                                        itemIndex = -1;
+                                        mDataBinding.llComment.setVisibility(View.VISIBLE);
+                                        mDataBinding.etComment.requestFocus();
+                                        mDataBinding.etComment.setHint("评论");
+                                        if (getActivity() instanceof MainTabActivity) {
+                                            MainTabActivity activity = (MainTabActivity) getActivity();
+                                            activity.visibilyBottom(View.GONE);
+                                        }
+                                        KeyboardUtil.showSoftInput(getContext());
+                                        commentPosition = position;
+                                        commentDialog.dismiss();
+                                        mDataBinding.etComment.setText("");
+                                        homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() {
+                                            @Override
+                                            public void run() {
+                                                int y = getCoordinateY(mDataBinding.llComment) - 20;
+                                                //评论时滑动到对应item底部和输入框顶部对齐
+                                                mDataBinding.scrollViewExtend.smoothScrollBy(0, mBottomY - y);
+                                            }
+                                        }, 300);
+
+                                    } else if (type == 4) {
+                                        //   addCart(discoveryListEntity.getGoods_id(),discoveryListEntity.)
+                                        getGoodsDetail(discoveryListEntity.getGoods_id(), discoveryListEntity, type);
+                                        commentDialog.dismiss();
+
+                                    } else if (type == 5) {
+                                        getGoodsDetail(discoveryListEntity.getGoods_id(), discoveryListEntity, type);
+                                        commentDialog.dismiss();
+                                    }
+                                }
+                            });
+
+                            new XPopup.Builder(baseActivity).hasShadowBg(false).atView(homeGridAdapterItemBinding.ivComment).asCustom(commentDialog)
+                                    .show();
+
+                        }
+                    });
+                    homeGridAdapterItemBinding.tvTime.setText(TimeUtils.getRecentTimeSpanByNow(TimeUtils.dataOne(discoveryListEntity.getCtime())));
+
+                    if (discoveryListEntity.getLike().isEmpty()) {
+                        homeGridAdapterItemBinding.tvLike.setVisibility(View.GONE);
+                    } else {
+                        homeGridAdapterItemBinding.tvLike.setVisibility(View.VISIBLE);
+                        StringBuilder likeString = new StringBuilder();
+                        for (int i = 0; i < discoveryListEntity.getLike().size(); i++) {
+                           // if (i != 0 && i != discoveryListEntity.getLike().size() - 1) {
+                            if (i != 0 ) {
+                                likeString.append(",");
+                            }
+                            likeString.append(discoveryListEntity.getLike().get(i).getNickname());
+
+                        }
+                        homeGridAdapterItemBinding.tvLike.setText(likeString.toString());
+
+
+
+                    }
+                    if (discoveryListEntity.getDis_content().isEmpty()) {
+                        homeGridAdapterItemBinding.rvComment.setVisibility(View.GONE);
+                    } else {
+                        homeGridAdapterItemBinding.rvComment.setVisibility(View.VISIBLE);
+                        FullyGridLayoutManager mgr = new FullyGridLayoutManager(getActivity(), 1);
+                        mgr.setOrientation(FullyGridLayoutManager.VERTICAL);
+                        mgr.setSmoothScrollbarEnabled(true);
+                        homeGridAdapterItemBinding.rvComment.setLayoutManager(mgr);
+                        BaseRecycleViewAdapter<DiscoveryListEntity.Dis_content, ItemCommentBinding> baseRecycleViewAdapter = new BaseRecycleViewAdapter(getActivity(), R.layout.item_comment);
+                        homeGridAdapterItemBinding.rvComment.setAdapter(baseRecycleViewAdapter);
+                        final ArrayList<DiscoveryListEntity.Dis_content> dis_content = discoveryListEntity.getDis_content();
+                        baseRecycleViewAdapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() {
+                            @Override
+                            public void onBindViewHolder(Object b, final int itemPosition) {
+                                ItemCommentBinding itemCommentBinding = (ItemCommentBinding) b;
+                                if (TextUtils.isEmpty(dis_content.get(itemPosition).getReply())) {
+                                    itemCommentBinding.llHf.setVisibility(View.GONE);
+                                    itemCommentBinding.ll.setVisibility(View.VISIBLE);
+                                    itemCommentBinding.tvName.setText(dis_content.get(itemPosition).getNickname() + ":  ");
+                                    itemCommentBinding.tvInfo.setText(dis_content.get(itemPosition).getContents());
+                                } else {
+
+                                    itemCommentBinding.ll.setVisibility(View.GONE);
+                                    itemCommentBinding.llHf.setVisibility(View.VISIBLE);
+                                    itemCommentBinding.tvName2.setText(dis_content.get(itemPosition).getNickname());
+                                    itemCommentBinding.tvInfo2.setText("回复");
+                                    itemCommentBinding.tvName3.setText(dis_content.get(itemPosition).getReply() + ":");
+                                    itemCommentBinding.tvInfo3.setText(dis_content.get(itemPosition).getContents());
+
+                                }
+                                itemCommentBinding.llItem.setOnClickListener(new View.OnClickListener() {
+                                    @Override
+                                    public void onClick(View v) {
+
+                                        final RegisterUser registerUser = Config.getInstance(getContext()).getUser();
+                                        if (registerUser == null) {
+                                            return;
+                                        }
+
+                                        final int mBottomY = getCoordinateY(homeGridAdapterItemBinding.ivComment) + homeGridAdapterItemBinding.ivComment.getHeight();
+                                        if (dis_content.get(itemPosition).getFrom_id()==null
+                                                ||registerUser.getUserid().equals(dis_content.get(itemPosition).getFrom_id())){
+                                            mDataBinding.llComment.setVisibility(View.GONE);
+                                            DeleteCommentDialog deleteCommentDialog = new DeleteCommentDialog(getContext());
+                                            deleteCommentDialog.setOnSelectListener(new SelectDialog.OnSelectListener() {
+                                                @Override
+                                                public void select(int type) {
+                                                    deleteComment(dis_content.get(itemPosition).getDis_id(),registerUser.getUserid(),position,itemPosition);
+                                                }
+                                            });
+                                            new XPopup.Builder(getContext()).asCustom(deleteCommentDialog).show();
+                                        }else {
+                                            itemIndex =itemPosition;
+
+                                            mDataBinding.llComment.setVisibility(View.VISIBLE);
+                                            mDataBinding.etComment.requestFocus();
+                                            mDataBinding.etComment.setHint("回复 " + dis_content.get(itemPosition).getNickname());
+                                            if (getActivity() instanceof MainTabActivity) {
+                                                MainTabActivity activity = (MainTabActivity) getActivity();
+                                                activity.visibilyBottom(View.GONE);
+                                            }
+                                            KeyboardUtil.showSoftInput(getContext());
+                                            commentPosition = position;
+                                            // commentDialog.dismiss();
+                                            mDataBinding.etComment.setText("");
+                                            homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() {
+                                                @Override
+                                                public void run() {
+                                                    int y = getCoordinateY(mDataBinding.llComment) - 20;
+                                                    //评论时滑动到对应item底部和输入框顶部对齐
+                                                    mDataBinding.scrollViewExtend.smoothScrollBy(0, mBottomY - y);
+                                                }
+                                            }, 300);
+                                        }
+
+
+
+                                    }
+                                });
+                            }
+                        });
+                        baseRecycleViewAdapter.setData(dis_content);
+
+                    }
+
+
+                    RequestOptions requestOptions = new RequestOptions();
+                    requestOptions.placeholder(R.mipmap.icon_default_rectangle);
+                    requestOptions.error(R.mipmap.icon_default_rectangle);
+
+                    Glide.with(getContext()).load(discoveryListEntity.getAvatar())
+                            .apply(requestOptions)
+                            .into(homeGridAdapterItemBinding.imageHead);
+                    homeGridAdapterItemBinding.imageHead.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            Intent intent = new Intent(getContext(), HistoryRecordActivity.class);
+                            intent.putExtra("userId", discoveryListEntity.getUserid());
+                            intent.putExtra("userName", discoveryListEntity.getNickname());
+                            intent.putExtra("title", discoveryListEntity.getNickname());
+
+                            startActivity(intent);
+                        }
+                    });
+                    ArrayList<ImageInfo> imageInfos = new ArrayList<>();
+
+                    if (discoveryListEntity.getPic().size() > 0) {
+
+                        //  Log.e("pic", discoveryListEntity.getPic().get(0));
+                        for (int i = 0; i < discoveryListEntity.getPic().size(); i++) {
+                            if (discoveryListEntity.getPic().get(i).endsWith(".mp4") || discoveryListEntity.getPic().get(i).endsWith(".avi")) {
+                                ImageInfo imageInfo = new ImageInfo();
+                                imageInfo.setType(2);
+                                imageInfo.setBigImageUrl(discoveryListEntity.getPic().get(i));
+                                imageInfo.setThumbnailUrl(discoveryListEntity.getPic().get(i));
+                                imageInfos.add(imageInfo);
+                            } else {
+                                ImageInfo imageInfo = new ImageInfo();
+                                imageInfo.setType(1);
+                                imageInfo.setBigImageUrl(discoveryListEntity.getPic().get(i));
+                                imageInfo.setThumbnailUrl(discoveryListEntity.getPic().get(i));
+                                imageInfos.add(imageInfo);
+                            }
+
+                        }
+
+                    } else if (!TextUtils.isEmpty(discoveryListEntity.getThumb())){
+                        ImageInfo imageInfo = new ImageInfo();
+                        imageInfo.setType(1);
+                        imageInfo.setBigImageUrl(discoveryListEntity.getThumb());
+                        imageInfo.setThumbnailUrl(discoveryListEntity.getThumb());
+                        imageInfos.add(imageInfo);
+                    }
+                    homeGridAdapterItemBinding.nineGrid.setAdapter(new NineGridViewClickAdapter(getContext(), imageInfos));
+                }
+            }
+        });
+        mDataBinding.recyView.setAdapter(baseRecycleViewAdapter);
+
+        baseRecycleViewAdapter.setData(discoveryListEntities);
+        mDataBinding.tvSendComment.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                if (commentPosition != -1) {
+                    MainTabActivity activity = (MainTabActivity) getActivity();
+                    CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment);
+                    mDataBinding.llComment.setVisibility(View.GONE);
+                    activity.visibilyBottom(View.VISIBLE);
+                    Log.e("xxx", discoveryListEntities.get(commentPosition).getGoods_id());
+                    comment(discoveryListEntities.get(commentPosition).getGoods_id(), commentPosition, itemIndex, mDataBinding.etComment.getText().toString());
+                }
+            }
+        });
+    }
+    private int commentPosition = -1;
+    private int itemIndex = -1;
+    @Override
+    public boolean onTouch(MotionEvent ev) {
+        switch (ev.getAction()) {
+
+            case MotionEvent.ACTION_DOWN:
+                //点击空白处隐藏键盘，隐藏输入框相关
+                if (getActivity().getCurrentFocus() != null && getActivity().getCurrentFocus().getId() == R.id.tv_send_comment) {
+                    return false;
+                }
+                boolean b = UtilHelpers.hideKeyboard(ev, getActivity().getCurrentFocus(), getActivity());
+                if (b) {
+                    CommonUtils.hideSoftInput(mDataBinding.etComment.getContext(), mDataBinding.etComment);
+                    MainTabActivity activity = (MainTabActivity) getActivity();
+                    activity.visibilyBottom(View.VISIBLE);
+                    mDataBinding.llComment.setVisibility(View.GONE);
+                }
+                break;
+        }
+        return false;
+    }
+
+    private void getGoodsDetail(final String goodsId, final DiscoveryListEntity entity, final int goodtype) {
+        final RegisterUser user =
+                Config.getInstance(getContext()).getUser();
+        Map<String, String> map = new HashMap<>();
+        if (user != null) {
+            map.put("userid", user.getUserid());
+        } else {
+            map.put("userid", 0 + "");
+        }
+        map.put("app", "Goods");
+        map.put("class", "GoodsInfo");
+        map.put("goods_id", goodsId);
+        map.put("sign", Md5.md5("Goods" + "GoodsInfo" + Md5.secret));
+        progressDialog.setMessage("获取信息中");
+        progressDialog.setCancelable(false);
+        mGankLoader = new Loader();
+        Subscription subscription = mGankLoader.getMovie(ApiConfig.BASE_URL, map)
+                .subscribe(new Action1<Resultcode>() {
+                    @Override
+                    public void call(Resultcode resultcode) {
+                        progressDialog.dismiss();
+                        if (resultcode.status == 0) {
+                            Gson gs = new Gson();
+                            LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
+                            String s = gs.toJson(adta);
+
+                            try {
+
+                                JSONObject jsonObject = new JSONObject(s);
+                                org.json.JSONArray array = jsonObject.getJSONArray("info");
+                                final Type type = new TypeToken<ArrayList<GoodsDetailEntity>>() {
+                                }.getType();
+                                ArrayList<GoodsDetailEntity> o = gs.fromJson(array.toString(), type);
+
+                                GoodsInfoDialog goodsInfoDialog = new GoodsInfoDialog(baseActivity, entity, o);
+                                goodsInfoDialog.setOnConfirmListener(new GoodsInfoDialog.OnGoodsSelectPropertyListener() {
+                                    @Override
+                                    public void onSelect(String code, int num) {
+                                        if (goodtype == 4) {
+                                            Intent intent = new Intent(baseActivity, SettleActivity.class);
+                                            intent.putExtra("goodsType", 1);
+                                            intent.putExtra("goods_id", goodsId);
+                                            intent.putExtra("product_code", code);
+                                            intent.putExtra("sale_num", num + "");
+                                            startActivity(intent);
+                                        } else if (goodtype == 5) {
+                                            addCart(goodsId, code, num + "");
+                                        }
+
+                                    }
+                                });
+                                new XPopup.Builder(baseActivity).asCustom(goodsInfoDialog).show();
+
+                            } catch (JSONException e) {
+                                e.printStackTrace();
+                            }
+
+                        } else {
+                            baseActivity.setToast(resultcode.msg);
+                        }
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        progressDialog.dismiss();
+                        baseActivity.setToast(2, "获取信息失败");
+                        throwable.printStackTrace();
+                    }
+                });
+        baseActivity.addSubscription(subscription);
+    }
+
+    private void comment(String goodsId, final int position, final int  itemIndex, final String content) {
+        final RegisterUser user =
+                Config.getInstance(getContext()).getUser();
+        Map<String, String> map = new HashMap<>();
+        if (user != null) {
+            map.put("userid", user.getUserid());
+        } else {
+            map.put("userid", 0 + "");
+        }
+        map.put("app", "Goods");
+        map.put("class", "DisGoods");
+        map.put("goods_id", goodsId);
+        if (itemIndex!=-1){
+            DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
+            ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
+            String from_id = dis_content1.get(itemIndex).getFrom_id();
+            if (!TextUtils.isEmpty(from_id)) {
+                map.put("reply_id", from_id);
+            }
+        }
+
+        map.put("contents", content);
+        map.put("sign", Md5.md5("Goods" + "DisGoods" + Md5.secret));
+        progressDialog.setMessage("提交中");
+        progressDialog.setCancelable(false);
+//        progressDialog.show();
+
+        mGankLoader = new Loader();
+        Subscription subscription = mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {
+
+
+            @Override
+            public void call(Resultcode resultcode) {
+
+                progressDialog.dismiss();
+                if (!(resultcode.status == 0)) {
+                    baseActivity.setToast(1, resultcode.msg);
+                }
+                if (resultcode.status == 0) {
+
+                    String nickname = user.getNickname();
+                    BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
+                    DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content();
+                    dis_content.setContents(content);
+                    dis_content.setNickname(nickname);
+
+                    DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
+                    ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
+                    if (itemIndex!=-1){
+                        dis_content.setReply(dis_content1.get(itemIndex).getNickname());
+                    }
+                    dis_content1.add(dis_content);
+                    discoveryListEntity.setDis_content(dis_content1);
+                    adapter.upDateOne(position, discoveryListEntity);
+                }
+            }
+
+
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                progressDialog.dismiss();
+                baseActivity.setToast(2, "提交失败");
+                throwable.printStackTrace();
+            }
+        });
+
+        baseActivity.addSubscription(subscription);
+
+    }
+
+    //如果你需要考虑更好的体验，可以这么操作
+    @Override
+    public void onStart() {
+        super.onStart();
+        //开始轮播
+        mDataBinding.banner.startAutoPlay();
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        //结束轮播
+        mDataBinding.banner.stopAutoPlay();
+    }
+
+    private int page = 1;
+
+    private OnRefreshLoadMoreListener onrefalshlister = new OnRefreshLoadMoreListener() {
+        @Override
+        public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
+            getlist(page);
+        }
+
+        @Override
+        public void onRefresh(@NonNull RefreshLayout refreshLayout) {
+            page=1;
+            getlist(page);
+
+            final RegisterUser user =
+                    Config.getInstance(getActivity()).getUser();
+            Map<String, String> map = new HashMap<>();
+            if (user != null) {
+                map.put("userid", user.getUserid());
+            } else {
+                map.put("userid", 0 + "");
+            }
+            map.put("app", "Advert");
+            map.put("class", "Advertr_an_AdvertHomeList");
+            map.put("sign", Md5.md5("Advert" + "Advertr_an_AdvertHomeList" + Md5.secret));
+            getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), 0, false);
+        }
+
+
+    };
+
+    private void getGankList2(String myurl, Map<String, String> map, String msg, final int requstecode) {
+        progressDialog.setMessage(msg);
+        progressDialog.setCancelable(false);
+//        if (page>1){
+//            progressDialog.show();
+//        }
+
+
+        mGankLoader = new Loader();
+        Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
+
+
+            @Override
+            public void call(Resultcode resultcode) {
+
+                mDataBinding.taobaoRefreshLayout.finishRefresh();
+                mDataBinding.taobaoRefreshLayout.finishLoadMore();
+                progressDialog.dismiss();
+                if (!(resultcode.status == 0)) {
+                    baseActivity.setToast(1, resultcode.msg);
+                }
+                if (resultcode.status == 0) {
+                    // intRecycleView();
+                    Gson gs = new Gson();
+                    LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
+                    String s = gs.toJson(adta);
+                    try {
+                        JSONObject jsonObject = new JSONObject(s);
+                        org.json.JSONArray array = jsonObject.getJSONArray("info");
+                        Type type = new TypeToken<ArrayList<DiscoveryListEntity>>() {
+                        }.getType();
+                        ArrayList<DiscoveryListEntity> o = new Gson().fromJson(array.toString(), type);
+                        if (page == 1) {
+
+                            discoveryListEntities.clear();
+                            discoveryListEntities.addAll(o);
+                            BaseRecycleViewAdapter baseRecycleViewAdapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
+                            baseRecycleViewAdapter.setData(discoveryListEntities);
+                            page++;
+                        } else {
+                            discoveryListEntities.addAll(o);
+
+                            BaseRecycleViewAdapter baseRecycleViewAdapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
+                            baseRecycleViewAdapter.setData(discoveryListEntities);
+                            //    Log.e("sizi", discoveryListEntities.size() + "");
+                            //   int count = jsonObject.getInt("count");
+                            if (o.isEmpty()) {
+                                mDataBinding.taobaoRefreshLayout.finishLoadMoreWithNoMoreData();
+                            } else {
+
+                                page++;
+
+                            }
+                        }
+
+
+                    } catch (Exception e) {
+                        e.fillInStackTrace();
+                    }
+                }
+
+            }
+
+
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                progressDialog.dismiss();
+                mDataBinding.taobaoRefreshLayout.finishRefresh();
+                mDataBinding.taobaoRefreshLayout.finishLoadMore();
+                baseActivity.setToast(2, getString(R.string.getdatafailure));
+                throwable.printStackTrace();
+            }
+        });
+
+        baseActivity.addSubscription(subscription);
+    }
+
+    private void getGankList(String myurl, Map<String, String> map, String msg, final int requstecode, final boolean isshowdilaog) {
+        mGankLoader = new Loader();
+        Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
+            @Override
+            public void call(Resultcode resultcode) {
+                //  mDataBinding.taobaoRefreshLayout.finishRefresh();
+                if (!(resultcode.status == 0)) {
+                    baseActivity.setToast(1, resultcode.msg);
+                }
+                if (resultcode.status == 0) {
+//                    baseActivity.setToast(0,resultcode.msg);
+                    if (requstecode == 0) {
+                        Gson gs = new Gson();
+                        LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
+                        String s = gs.toJson(adta);
+                        MainF1Entity user = gs.fromJson(s, MainF1Entity.class);//把JSON字符串转为对象
+                        configFragments(user.getAdvert_carousel());
+                        //intRecycleHorization(user.getAdvertorial_list());
+                        //   intRecycleVerization(user.getMessage_list());
+                    }
+
+                }
+
+            }
+
+
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                //  mDataBinding.taobaoRefreshLayout.finishRefresh();
+                baseActivity.setToast(2, getString(R.string.getdatafailure));
+                throwable.printStackTrace();
+            }
+        });
+
+        baseActivity.addSubscription(subscription);
+    }
+
+    private void like(String goodsId, final int position) {
+        final RegisterUser user =
+                Config.getInstance(getContext()).getUser();
+        Map<String, String> map = new HashMap<>();
+        if (user != null) {
+            map.put("userid", user.getUserid());
+        } else {
+            map.put("userid", 0 + "");
+        }
+        map.put("app", "Goods");
+        map.put("class", "AddUp");
+        map.put("goods_id", goodsId);
+        map.put("sign", Md5.md5("Goods" + "AddUp" + Md5.secret));
+        progressDialog.setMessage("提交中");
+        progressDialog.setCancelable(false);
+//        progressDialog.show();
+
+        mGankLoader = new Loader();
+        Subscription subscription = mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {
+
+
+            @Override
+            public void call(Resultcode resultcode) {
+
+                progressDialog.dismiss();
+                if (!(resultcode.status == 0)) {
+                    baseActivity.setToast(1, resultcode.msg);
+                }
+                if (resultcode.status == 0) {
+                    BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
+                    if (discoveryListEntities.get(position).getIs_like() == 1) {
+                        discoveryListEntities.get(position).setIs_like(0);
+                        ArrayList<DiscoveryListEntity.Like> like = discoveryListEntities.get(position).getLike();
+                        for (int i = 0; i < like.size(); i++) {
+                            if (user.getUserid().equals(like.get(i).getUserid())) {
+                                like.remove(i);
+                                break;
+                            }
+                        }
+                        discoveryListEntities.get(position).setLike(like);
+                    } else {
+                        discoveryListEntities.get(position).setIs_like(1);
+                        DiscoveryListEntity.Like like = new DiscoveryListEntity.Like();
+                        like.setNickname(user.getNickname());
+                        like.setUserid(user.getUserid());
+                        discoveryListEntities.get(position).getLike().add(like);
+                    }
+
+                    adapter.upDateOne(position, discoveryListEntities.get(position));
+                }
+
+            }
+
+
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                progressDialog.dismiss();
+                baseActivity.setToast(2, "提交失败");
+                throwable.printStackTrace();
+            }
+        });
+
+        baseActivity.addSubscription(subscription);
+
+    }
+
+    private void addCart(String goods_id, String product_code, String goodsNum) {
+        RegisterUser user =
+                Config.getInstance(getContext()).getUser();
+        Map<String, String> map = new HashMap<>();
+        if (user != null) {
+            map.put("userid", user.getUserid());
+        } else {
+            map.put("userid", 0 + "");
+        }
+        map.put("app", "Goods");
+        map.put("class", "AddCart");
+        map.put("goods_id", goods_id);
+        map.put("product_code", product_code);
+        map.put("num", goodsNum);
+        map.put("sign", Md5.md5("Goods" + "AddCart" + Md5.secret));
+        progressDialog.setMessage("提交中");
+        progressDialog.setCancelable(false);
+        mGankLoader = new Loader();
+        Subscription subscribe = mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {
+            @Override
+            public void call(Resultcode resultcode) {
+                progressDialog.dismiss();
+                if (resultcode.status == 0) {
+                    baseActivity.setToast(0, "成功加入购物车");
+                } else {
+                    baseActivity.setToast(3, resultcode.msg);
+                }
+            }
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                progressDialog.dismiss();
+                baseActivity.setToast(2, "提交失败");
+                throwable.printStackTrace();
+            }
+        });
+        baseActivity.addSubscription(subscribe);
+    }
+
+
+    private void deleteComment(String dis_id, String userid, final int superPosition, final int itemPosition) {
+        Map<String, String> map = new HashMap<>();
+
+        progressDialog.show();
+        map.put("app", "Goods");
+
+        map.put("class", "DelDis");
+        map.put("sign", Md5.md5("Goods" + "DelDis" + Md5.secret));
+        map.put("dis_id", dis_id);
+        map.put("userid", userid);
+        mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {
+            @Override
+            public void call(Resultcode resultcode) {
+                progressDialog.dismiss();
+                if (!(resultcode.status == 0)) {
+                    Toast.makeText(getContext(), resultcode.msg, Toast.LENGTH_SHORT).show();
+                } else {
+                    BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
+                    DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(superPosition);
+                    ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
+                    dis_content1.remove(itemPosition);
+                    discoveryListEntity.setDis_content(dis_content1);
+                    adapter.upDateOne(superPosition, discoveryListEntity);
+                }
+            }
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                Toast.makeText(getContext(), getString(R.string.getdatafailure), Toast.LENGTH_SHORT).show();
+            }
+        });
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sl/house_property/MainTabActivity.java b/app/src/main/java/com/sl/house_property/MainTabActivity.java
index d1c157b..213cf86 100644
--- a/app/src/main/java/com/sl/house_property/MainTabActivity.java
+++ b/app/src/main/java/com/sl/house_property/MainTabActivity.java
@@ -1,371 +1,371 @@
-package com.sl.house_property;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.core.app.ActivityCompat;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentTransaction;
-import android.util.Log;
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.RadioGroup;
-
-import com.google.gson.Gson;
-import com.google.gson.internal.LinkedTreeMap;
-import com.gyf.immersionbar.ImmersionBar;
-import com.sl.house_property.cart.CartFragment;
-import com.sl.house_property.databinding.ActivityMainTabBinding;
-import com.sl.house_property.discovery.DiscoveryFragment;
-import com.sl.house_property.message.MessageEntity;
-import com.sl.house_property.message.MessageFragment;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import entity.RegisterUser;
-import http.ApiConfig;
-import my_loader.Loader;
-import my_loader.Resultcode;
-import rx.functions.Action1;
-import tools.Config;
-import utils.Md5;
-
-public class MainTabActivity extends BaseActivity<ActivityMainTabBinding>
-        implements View.OnClickListener,
-        Main1Fragment.OnFragmentInteractionListener,
-        Main2Fragment.OnFragmentInteractionListener,
-        Main3Fragment.OnFragmentInteractionListener,
-        Main4Fragment.OnFragmentInteractionListener {
-
-    /*定义的全局返回码，例如在主界面的某个Fragment点击某一项后进入下一个界面后
-      如果在下一个界面有数据更改，需要Fragment刷新时，通过setResult方法通知主界面，主界面的
-      onActivityResult方法会接收到通知，再刷新相应的Fragment
-     */
-    //请求状态码，这里的状态码可以随便写什么数字都可以
-    private static final int REQUEST_PERMISSION_CODE = 1;
-    private final static String[] PERMISSIONS_STORAGE = {
-            android.Manifest.permission.READ_EXTERNAL_STORAGE,
-            android.Manifest.permission.WRITE_EXTERNAL_STORAGE,};
-    public static final int RESUlT_CODE_0 = 201;//首页
-    public static final int RESUlT_CODE_1 = 202;//发现
-    public static final int RESUlT_CODE_2 = 203;//购物车
-    // public static final int RESUlT_CODE_3 = 204;//
-    public static final int RESUlT_CODE_4 = 205;//我的
-    private RadioGroup radioGroup;
-    private MainFragment fragment0;
-    private DiscoveryFragment fragment1;
-    private Main3Fragment fragment2;
-    private CartFragment fragment3;
-    private Main4Fragment fragment4;
-    private MessageFragment messageFragment;
-   // private LikeFragment likeFragment;
-    private Fragment currentFragment;
-
-    private int myeditcode = 1000;
-
-    private Loader mGankLoader;
-
-    public void visibilyBottom(int isVisibily) {
-        findViewById(R.id.rl_bottom).setVisibility(isVisibily);
-    }
-    public void setMessageCount(int num){
-       // TextView viewById = findViewById(R.id.redview);
-
-        if (num>0){
-            mDataBinding.redview.setText(num+"");
-            mDataBinding.redview.setVisibility(View.VISIBLE);
-        }else {
-            mDataBinding.redview.setVisibility(View.GONE);
-        }
-    }
-    //2. 保存MyOnTouchListener接口的列表
-    private ArrayList<MyOnTouchListener> onTouchListeners = new ArrayList<MyOnTouchListener>();
-
-    //1.触摸事件接口
-    public interface MyOnTouchListener {
-        public boolean onTouch(MotionEvent ev);
-    }
-
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent ev) {
-        for (MyOnTouchListener listener : onTouchListeners) {
-            //listener.onTouch(ev);
-        }
-        return super.dispatchTouchEvent(ev);
-    }
-
-    //4.提供给Fragment通过getActivity()方法来注册自己的触摸事件的方法
-    public void registerMyOnTouchListener(MyOnTouchListener myOnTouchListener) {
-        onTouchListeners.add(myOnTouchListener);
-    }
-
-    //5.提供给Fragment通过getActivity()方法来注销自己的触摸事件的方法
-    public void unregisterMyOnTouchListener(MyOnTouchListener myOnTouchListener) {
-        onTouchListeners.remove(myOnTouchListener);
-    }
-
-    @Override
-    protected int getLayoutResId() {
-
-
-        return R.layout.activity_main_tab;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Config.getInstance(MainTabActivity.this).put("MainTabActivity", true);
-        //setPhotoSysyrmbar();
-        //setSytemBar(R.color.colorPrimary);//设置主题样式
-        //setFramentMarginTop();
-        ImmersionBar.with(this)
-                .keyboardEnable(true)  //解决软键盘与底部输入框冲突问题
-                //  .keyboardEnable(true, WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
-                //                        | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)  //软键盘自动弹出
-                .init();
-        initView();
-        getData();
-        verifyStoragePermissions(this);
-
-    }
-    public void verifyStoragePermissions(Activity activity) {
-
-        try {
-            //判断当前系统是否是Android6.0(对应API 23)以及以上，如果是则判断是否含有了权限
-            if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
-                //检测是否有写的权限
-                int permission = ActivityCompat.checkSelfPermission(activity,
-                        "android.permission.WRITE_EXTERNAL_STORAGE");
-                /***
-                 * checkSelfPermission返回两个值
-                 * 有权限: PackageManager.PERMISSION_GRANTED
-                 * 无权限: PackageManager.PERMISSION_DENIED
-                 */
-                if (permission != PackageManager.PERMISSION_GRANTED) {
-                    // 没有写的权限，去申请写的权限，会弹出对话框
-                    ActivityCompat.requestPermissions(this, PERMISSIONS_STORAGE, REQUEST_PERMISSION_CODE);
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    //回调函数，申请权限后回调onRequestPermissionResult函数，第一个参数为请求码，第二个参数是刚刚请求的权限集，第三个参数是请求结果，0表示授权成功，-1表示授权失败
-//requestCode：这个对应请求状态码，permissions：这个是前面你要申请的权限集合，grantResults：这个是申请权限的结果
-    @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        if (requestCode == REQUEST_PERMISSION_CODE) {
-            for (int i = 0; i < permissions.length; i++) {
-                //grantResults[i]：返回0，表示授权成功，返回-1，表示授权失败
-                Log.i("111333", "申请的权限为：" + permissions[i] + ",申请结果：" + grantResults[i]);
-            }
-        }
-    }
-
-    @SuppressLint("MissingSuperCall")
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-    }
-
-    private void initView() {
-        findViewById(R.id.rl2).setOnClickListener(this);
-        findViewById(R.id.button).setOnClickListener(this);
-        findViewById(R.id.button1).setOnClickListener(this);
-        findViewById(R.id.button4).setOnClickListener(this);
-        mDataBinding.button.setChecked(true);
-        mDataBinding.getRoot().setBackground(getResources().getDrawable(R.drawable.background_slowly));
-        changeFragment(mDataBinding.button.getId());
-
-    }
-
-    private void changeFragment(int i) {
-        FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
-        if (currentFragment != null)
-            fragmentTransaction.hide(currentFragment);
-
-        switch (i) {
-            case R.id.button:
-                mDataBinding.button.setChecked(true);
-                mDataBinding.button1.setChecked(false);
-                mDataBinding.button2.setChecked(false);
-                mDataBinding.button4.setChecked(false);
-//          mDataBinding.getRoot().setBackground(getResources().getDrawable(R.drawable.background_slowly));
-                if (fragment0 == null) {
-                    fragment0 = MainFragment.newInstance("", "");
-                    fragmentTransaction.add(R.id.mycontent, fragment0, "fragment0");
-                } else {
-                    fragmentTransaction.show(fragment0);
-                }
-                currentFragment = fragment0;
-
-                //setSytemBar(R.color.transparent);
-                break;
-            case R.id.button1:
-                mDataBinding.button.setChecked(false);
-                mDataBinding.button1.setChecked(true);
-                mDataBinding.button2.setChecked(false);
-                mDataBinding.button4.setChecked(false);
-//               mDataBinding.getRoot().setBackground(getResources().getDrawable(R.drawable.background_slowly));
-                if (fragment1 == null) {
-
-                    fragment1 = DiscoveryFragment.newInstance("", "");
-                    fragmentTransaction.add(R.id.mycontent, fragment1, "fragment1");
-                } else {
-
-                    fragmentTransaction.show(fragment1);
-                }
-
-                currentFragment = fragment1;
-
-                break;
-            case R.id.rl2:
-                mDataBinding.button.setChecked(false);
-                mDataBinding.button1.setChecked(false);
-                mDataBinding.button2.setChecked(true);
-                mDataBinding.button4.setChecked(false);
-                if (messageFragment == null) {
-                    messageFragment = MessageFragment.newInstance();
-                    fragmentTransaction.add(R.id.mycontent, messageFragment, "fragment2");
-                } else {
-                    fragmentTransaction.show(messageFragment);
-                }
-
-                currentFragment = messageFragment;
-                break;
-            case R.id.button3:
-//               mDataBinding.getRoot().setBackground(getResources().getDrawable(R.drawable.background_slowly));
-                if (fragment3 == null) {
-                    fragment3 = CartFragment.newInstance();
-                    fragmentTransaction.add(R.id.mycontent, fragment3, "fragment3");
-                } else {
-                    fragmentTransaction.show(fragment3);
-                }
-
-                currentFragment = fragment3;
-                break;
-            case R.id.button4:
-                mDataBinding.button.setChecked(false);
-                mDataBinding.button1.setChecked(false);
-                mDataBinding.button2.setChecked(false);
-                mDataBinding.button4.setChecked(true);
-//               mDataBinding.getRoot().setBackground(getResources().getDrawable(R.mipmap.beijing));
-                if (fragment4 == null) {
-                    fragment4 = Main4Fragment.newInstance("", "");
-                    fragmentTransaction.add(R.id.mycontent, fragment4, "fragment4");
-                } else {
-                    fragmentTransaction.show(fragment4);
-                }
-                currentFragment = fragment4;
-                break;
-        }
-        try {
-            fragmentTransaction.commit();
-        } catch (Exception e) {
-            e.fillInStackTrace();
-            fragmentTransaction.commitAllowingStateLoss();
-        }
-
-    }
-
-    @Override
-    public void onClick(View view) {
-
-        if (view.getId() == R.id.button4) {
-            if ((Config.getInstance(MainTabActivity.this).getUser() == null)) {
-                Intent intent = new Intent(MainTabActivity.this, LoginActivity.class);
-                startActivity(intent);
-                mDataBinding.button.setChecked(false);
-                mDataBinding.button1.setChecked(false);
-                mDataBinding.button2.setChecked(false);
-                mDataBinding.button4.setChecked(false);
-                return;
-
-            }
-        }
-        changeFragment(view.getId());
-    }
-
-    public void onFragmentInteraction(Uri uri) {
-
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
-        Log.e("测试","测试");
-        if (resultCode == RESUlT_CODE_4) {
-            if (currentFragment == fragment4) {
-                fragment4.refreshData();
-            }
-            try {
-            } catch (Exception e) {
-                e.fillInStackTrace();
-                fragmentTransaction.commitAllowingStateLoss();
-            }
-        } else if (resultCode == myeditcode) {
-            if (currentFragment == fragment1) {
-                fragment1.loadData();
-            }
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        Config.getInstance(MainTabActivity.this).put("MainTabActivity", false);
-    }
-
-    private void getData() {
-        RegisterUser user =
-                Config.getInstance(MainTabActivity.this).getUser();
-        Map<String, String> map = new HashMap<>();
-        if (user != null) {
-            map.put("userid", user.getUserid());
-        } else {
-            map.put("userid", 0 + "");
-        }
-        map.put("app", "Store");
-        map.put("class", "GetMsgList");
-        map.put("sign", Md5.md5("Store" + "GetMsgList" + Md5.secret));
-        Loader mGankLoader = new Loader();
-        mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {
-            @Override
-            public void call(Resultcode resultcode) {
-                if (!(resultcode.status == 0)) {
-//                    getActivity().setToast(1, resultcode.msg);
-                    return;
-                }
-
-                Gson gs = new Gson();
-                LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
-                String s = gs.toJson(adta);
-                MessageEntity messageEntity = gs.fromJson(s, MessageEntity.class);
-                int i = Integer.parseInt(messageEntity.getMsg_count());
-                if (i > 0) {
-                            setMessageCount(i);
-                }
-            }
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                throwable.fillInStackTrace();
-
-            }
-        });
-    }
-
-}
-
+package com.sl.house_property;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.RadioGroup;
+
+import com.google.gson.Gson;
+import com.google.gson.internal.LinkedTreeMap;
+import com.gyf.immersionbar.ImmersionBar;
+import com.sl.house_property.cart.CartFragment;
+import com.sl.house_property.databinding.ActivityMainTabBinding;
+import com.sl.house_property.discovery.DiscoveryFragment;
+import com.sl.house_property.message.MessageEntity;
+import com.sl.house_property.message.MessageFragment;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import entity.RegisterUser;
+import http.ApiConfig;
+import my_loader.Loader;
+import my_loader.Resultcode;
+import rx.functions.Action1;
+import tools.Config;
+import utils.Md5;
+
+public class MainTabActivity extends BaseActivity<ActivityMainTabBinding>
+        implements View.OnClickListener,
+        Main1Fragment.OnFragmentInteractionListener,
+        Main2Fragment.OnFragmentInteractionListener,
+        Main3Fragment.OnFragmentInteractionListener,
+        Main4Fragment.OnFragmentInteractionListener {
+
+    /*定义的全局返回码，例如在主界面的某个Fragment点击某一项后进入下一个界面后
+      如果在下一个界面有数据更改，需要Fragment刷新时，通过setResult方法通知主界面，主界面的
+      onActivityResult方法会接收到通知，再刷新相应的Fragment
+     */
+    //请求状态码，这里的状态码可以随便写什么数字都可以
+    private static final int REQUEST_PERMISSION_CODE = 1;
+    private final static String[] PERMISSIONS_STORAGE = {
+            android.Manifest.permission.READ_EXTERNAL_STORAGE,
+            android.Manifest.permission.WRITE_EXTERNAL_STORAGE,};
+    public static final int RESUlT_CODE_0 = 201;//首页
+    public static final int RESUlT_CODE_1 = 202;//发现
+    public static final int RESUlT_CODE_2 = 203;//购物车
+    // public static final int RESUlT_CODE_3 = 204;//
+    public static final int RESUlT_CODE_4 = 205;//我的
+    private RadioGroup radioGroup;
+    private MainFragment fragment0;
+    private DiscoveryFragment fragment1;
+    private Main3Fragment fragment2;
+    private CartFragment fragment3;
+    private Main4Fragment fragment4;
+    private MessageFragment messageFragment;
+   // private LikeFragment likeFragment;
+    private Fragment currentFragment;
+
+    private int myeditcode = 1000;
+
+    private Loader mGankLoader;
+
+    public void visibilyBottom(int isVisibily) {
+        findViewById(R.id.rl_bottom).setVisibility(isVisibily);
+    }
+    public void setMessageCount(int num){
+       // TextView viewById = findViewById(R.id.redview);
+
+        if (num>0){
+            mDataBinding.redview.setText(num+"");
+            mDataBinding.redview.setVisibility(View.VISIBLE);
+        }else {
+            mDataBinding.redview.setVisibility(View.GONE);
+        }
+    }
+    //2. 保存MyOnTouchListener接口的列表
+    private ArrayList<MyOnTouchListener> onTouchListeners = new ArrayList<MyOnTouchListener>();
+
+    //1.触摸事件接口
+    public interface MyOnTouchListener {
+        public boolean onTouch(MotionEvent ev);
+    }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        for (MyOnTouchListener listener : onTouchListeners) {
+            //listener.onTouch(ev);
+        }
+        return super.dispatchTouchEvent(ev);
+    }
+
+    //4.提供给Fragment通过getActivity()方法来注册自己的触摸事件的方法
+    public void registerMyOnTouchListener(MyOnTouchListener myOnTouchListener) {
+        onTouchListeners.add(myOnTouchListener);
+    }
+
+    //5.提供给Fragment通过getActivity()方法来注销自己的触摸事件的方法
+    public void unregisterMyOnTouchListener(MyOnTouchListener myOnTouchListener) {
+        onTouchListeners.remove(myOnTouchListener);
+    }
+
+    @Override
+    protected int getLayoutResId() {
+
+
+        return R.layout.activity_main_tab;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Config.getInstance(MainTabActivity.this).put("MainTabActivity", true);
+        //setPhotoSysyrmbar();
+        //setSytemBar(R.color.colorPrimary);//设置主题样式
+        //setFramentMarginTop();
+        ImmersionBar.with(this)
+                .keyboardEnable(true)  //解决软键盘与底部输入框冲突问题
+                //  .keyboardEnable(true, WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
+                //                        | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)  //软键盘自动弹出
+                .init();
+        initView();
+        getData();
+        verifyStoragePermissions(this);
+
+    }
+    public void verifyStoragePermissions(Activity activity) {
+
+        try {
+            //判断当前系统是否是Android6.0(对应API 23)以及以上，如果是则判断是否含有了权限
+            if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
+                //检测是否有写的权限
+                int permission = ActivityCompat.checkSelfPermission(activity,
+                        "android.permission.WRITE_EXTERNAL_STORAGE");
+                /***
+                 * checkSelfPermission返回两个值
+                 * 有权限: PackageManager.PERMISSION_GRANTED
+                 * 无权限: PackageManager.PERMISSION_DENIED
+                 */
+                if (permission != PackageManager.PERMISSION_GRANTED) {
+                    // 没有写的权限，去申请写的权限，会弹出对话框
+                    ActivityCompat.requestPermissions(this, PERMISSIONS_STORAGE, REQUEST_PERMISSION_CODE);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    //回调函数，申请权限后回调onRequestPermissionResult函数，第一个参数为请求码，第二个参数是刚刚请求的权限集，第三个参数是请求结果，0表示授权成功，-1表示授权失败
+//requestCode：这个对应请求状态码，permissions：这个是前面你要申请的权限集合，grantResults：这个是申请权限的结果
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == REQUEST_PERMISSION_CODE) {
+            for (int i = 0; i < permissions.length; i++) {
+                //grantResults[i]：返回0，表示授权成功，返回-1，表示授权失败
+                Log.i("111333", "申请的权限为：" + permissions[i] + ",申请结果：" + grantResults[i]);
+            }
+        }
+    }
+
+    @SuppressLint("MissingSuperCall")
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+    }
+
+    private void initView() {
+        findViewById(R.id.rl2).setOnClickListener(this);
+        findViewById(R.id.button).setOnClickListener(this);
+        findViewById(R.id.button1).setOnClickListener(this);
+        findViewById(R.id.button4).setOnClickListener(this);
+        mDataBinding.button.setChecked(true);
+        mDataBinding.getRoot().setBackground(getResources().getDrawable(R.drawable.background_slowly));
+        changeFragment(mDataBinding.button.getId());
+
+    }
+
+    private void changeFragment(int i) {
+        FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
+        if (currentFragment != null)
+            fragmentTransaction.hide(currentFragment);
+
+        int buttonId = R.id.button;
+        int button1Id = R.id.button1;
+        int rl2Id = R.id.rl2;
+        int button3Id = R.id.button3;
+        int button4Id = R.id.button4;
+        
+        if (i == buttonId) {
+            mDataBinding.button.setChecked(true);
+            mDataBinding.button1.setChecked(false);
+            mDataBinding.button2.setChecked(false);
+            mDataBinding.button4.setChecked(false);
+//          mDataBinding.getRoot().setBackground(getResources().getDrawable(R.drawable.background_slowly));
+            if (fragment0 == null) {
+                fragment0 = MainFragment.newInstance("", "");
+                fragmentTransaction.add(R.id.mycontent, fragment0, "fragment0");
+            } else {
+                fragmentTransaction.show(fragment0);
+            }
+            currentFragment = fragment0;
+
+            //setSytemBar(R.color.transparent);
+        } else if (i == button1Id) {
+            mDataBinding.button.setChecked(false);
+            mDataBinding.button1.setChecked(true);
+            mDataBinding.button2.setChecked(false);
+            mDataBinding.button4.setChecked(false);
+//               mDataBinding.getRoot().setBackground(getResources().getDrawable(R.drawable.background_slowly));
+            if (fragment1 == null) {
+
+                fragment1 = DiscoveryFragment.newInstance("", "");
+                fragmentTransaction.add(R.id.mycontent, fragment1, "fragment1");
+            } else {
+
+                fragmentTransaction.show(fragment1);
+            }
+
+            currentFragment = fragment1;
+
+        } else if (i == rl2Id) {
+            mDataBinding.button.setChecked(false);
+            mDataBinding.button1.setChecked(false);
+            mDataBinding.button2.setChecked(true);
+            mDataBinding.button4.setChecked(false);
+            if (messageFragment == null) {
+                messageFragment = MessageFragment.newInstance();
+                fragmentTransaction.add(R.id.mycontent, messageFragment, "fragment2");
+            } else {
+                fragmentTransaction.show(messageFragment);
+            }
+
+            currentFragment = messageFragment;
+        } else if (i == button3Id) {
+//               mDataBinding.getRoot().setBackground(getResources().getDrawable(R.drawable.background_slowly));
+            if (fragment3 == null) {
+                fragment3 = CartFragment.newInstance();
+                fragmentTransaction.add(R.id.mycontent, fragment3, "fragment3");
+            } else {
+                fragmentTransaction.show(fragment3);
+            }
+
+            currentFragment = fragment3;
+        } else if (i == button4Id) {
+            mDataBinding.button.setChecked(false);
+            mDataBinding.button1.setChecked(false);
+            mDataBinding.button2.setChecked(false);
+            mDataBinding.button4.setChecked(true);
+//               mDataBinding.getRoot().setBackground(getResources().getDrawable(R.mipmap.beijing));
+            if (fragment4 == null) {
+                fragment4 = Main4Fragment.newInstance("", "");
+                fragmentTransaction.add(R.id.mycontent, fragment4, "fragment4");
+            } else {
+                fragmentTransaction.show(fragment4);
+            }
+            currentFragment = fragment4;
+        }
+        try {
+            fragmentTransaction.commit();
+        } catch (Exception e) {
+            e.fillInStackTrace();
+            fragmentTransaction.commitAllowingStateLoss();
+        }
+
+    }
+
+    @Override
+    public void onClick(View view) {
+
+        if (view.getId() == R.id.button4) {
+            if ((Config.getInstance(MainTabActivity.this).getUser() == null)) {
+                Intent intent = new Intent(MainTabActivity.this, LoginActivity.class);
+                startActivity(intent);
+                mDataBinding.button.setChecked(false);
+                mDataBinding.button1.setChecked(false);
+                mDataBinding.button2.setChecked(false);
+                mDataBinding.button4.setChecked(false);
+                return;
+
+            }
+        }
+        changeFragment(view.getId());
+    }
+
+    public void onFragmentInteraction(Uri uri) {
+
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
+        Log.e("测试","测试");
+        if (resultCode == RESUlT_CODE_4) {
+            if (currentFragment == fragment4) {
+                fragment4.refreshData();
+            }
+            try {
+            } catch (Exception e) {
+                e.fillInStackTrace();
+                fragmentTransaction.commitAllowingStateLoss();
+            }
+        } else if (resultCode == myeditcode) {
+            if (currentFragment == fragment1) {
+                fragment1.loadData();
+            }
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        Config.getInstance(MainTabActivity.this).put("MainTabActivity", false);
+    }
+
+    private void getData() {
+        RegisterUser user =
+                Config.getInstance(MainTabActivity.this).getUser();
+        Map<String, String> map = new HashMap<>();
+        if (user != null) {
+            map.put("userid", user.getUserid());
+        } else {
+            map.put("userid", 0 + "");
+        }
+        map.put("app", "Store");
+        map.put("class", "GetMsgList");
+        map.put("sign", Md5.md5("Store" + "GetMsgList" + Md5.secret));
+        Loader mGankLoader = new Loader();
+        mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {
+            @Override
+            public void call(Resultcode resultcode) {
+                if (!(resultcode.status == 0)) {
+//                    getActivity().setToast(1, resultcode.msg);
+                    return;
+                }
+
+                Gson gs = new Gson();
+                LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
+                String s = gs.toJson(adta);
+                MessageEntity messageEntity = gs.fromJson(s, MessageEntity.class);
+                int i = Integer.parseInt(messageEntity.getMsg_count());
+                if (i > 0) {
+                            setMessageCount(i);
+                }
+            }
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                throwable.fillInStackTrace();
+
+            }
+        });
+    }
+
+}
+
diff --git a/app/src/main/java/com/sl/house_property/MakeErrorActivity.java b/app/src/main/java/com/sl/house_property/MakeErrorActivity.java
index 2c6f274..3a7e928 100644
--- a/app/src/main/java/com/sl/house_property/MakeErrorActivity.java
+++ b/app/src/main/java/com/sl/house_property/MakeErrorActivity.java
@@ -1,85 +1,83 @@
-package com.sl.house_property;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.Window;
-import android.widget.TextView;
-
-import com.sl.house_property.databinding.ActivityMakeErrorBinding;
-
-
-public class MakeErrorActivity extends BaseActivity<ActivityMakeErrorBinding> implements View.OnClickListener {
-
-    private TextView backToMain;
-    private TextView exitApp;
-
-    private TextView details;
-    private String error = "";
-
-
-    @Override
-    protected void onPause() {
-
-
-        super.onPause();
-
-        //有可能在执行完onPause或onStop后,系统资源紧张将Activity杀死,所以有必要在此保存持久数据
-    }
-
-    protected void onResume() {
-
-        super.onResume();
-    }
-
-    @Override
-    protected int getLayoutResId() {
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        return R.layout.activity_make_error;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        MyApplication.getApp().addActivitys(MakeErrorActivity.this);
-        //String a = "&#037";
-        backToMain = mDataBinding.textView21;
-        exitApp = mDataBinding.textView22;
-
-        details = mDataBinding.textMode;
-
-        error = getIntent().getStringExtra("eroor");
-        details.setText(error);
-        backToMain.setOnClickListener(this);
-        exitApp.setOnClickListener(this);
-    }
-
-    @Override
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.textView21:
-                            Intent intent = new Intent(MakeErrorActivity.this, LogoActivity.class);
-                            startActivity(intent);
-                                finish();
-                // getAsyTask(int index,Map<String,Object> map,String url,String  titile,int visible,Boolean  isPost)
-                //(final int index,Map<String, Object> params,String url,final Activity act,String  msg,int  type,Handler mHandler,boolean isPost){
-               // httpNet.getAsyBackResult(1, map, HttpUrl.giveABUg(), MakeErrorActivity.this, "正在上传服务器，请稍等", HttpNet.PROGRESSVISIBLE, handler, HttpNet.POSTTYPE);
-                break;
-            case R.id.textView22:
-                MyApplication.getApp().exit();
-                finish();
-                break;
-        }
-    }
-
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_BACK) {
-
-            Intent intent = new Intent(MakeErrorActivity.this, LogoActivity.class);
-            startActivity(intent);
-            finish();
-        }
-        return true;
-    }
-}
+package com.sl.house_property;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.Window;
+import android.widget.TextView;
+
+import com.sl.house_property.databinding.ActivityMakeErrorBinding;
+
+
+public class MakeErrorActivity extends BaseActivity<ActivityMakeErrorBinding> implements View.OnClickListener {
+
+    private TextView backToMain;
+    private TextView exitApp;
+
+    private TextView details;
+    private String error = "";
+
+
+    @Override
+    protected void onPause() {
+
+
+        super.onPause();
+
+        //有可能在执行完onPause或onStop后,系统资源紧张将Activity杀死,所以有必要在此保存持久数据
+    }
+
+    protected void onResume() {
+
+        super.onResume();
+    }
+
+    @Override
+    protected int getLayoutResId() {
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+        return R.layout.activity_make_error;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        MyApplication.getApp().addActivitys(MakeErrorActivity.this);
+        //String a = "&#037";
+        backToMain = mDataBinding.textView21;
+        exitApp = mDataBinding.textView22;
+
+        details = mDataBinding.textMode;
+
+        error = getIntent().getStringExtra("eroor");
+        details.setText(error);
+        backToMain.setOnClickListener(this);
+        exitApp.setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View v) {
+        int id = v.getId();
+        if (id == R.id.textView21) {
+            Intent intent = new Intent(MakeErrorActivity.this, LogoActivity.class);
+            startActivity(intent);
+            finish();
+            // getAsyTask(int index,Map<String,Object> map,String url,String  titile,int visible,Boolean  isPost)
+            //(final int index,Map<String, Object> params,String url,final Activity act,String  msg,int  type,Handler mHandler,boolean isPost){
+            // httpNet.getAsyBackResult(1, map, HttpUrl.giveABUg(), MakeErrorActivity.this, "正在上传服务器，请稍等", HttpNet.PROGRESSVISIBLE, handler, HttpNet.POSTTYPE);
+        } else if (id == R.id.textView22) {
+            MyApplication.getApp().exit();
+            finish();
+        }
+    }
+
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+
+            Intent intent = new Intent(MakeErrorActivity.this, LogoActivity.class);
+            startActivity(intent);
+            finish();
+        }
+        return true;
+    }
+}
diff --git a/app/src/main/java/com/sl/house_property/MarkingFinishAwardDialong.java b/app/src/main/java/com/sl/house_property/MarkingFinishAwardDialong.java
index 852708b..d3db635 100644
--- a/app/src/main/java/com/sl/house_property/MarkingFinishAwardDialong.java
+++ b/app/src/main/java/com/sl/house_property/MarkingFinishAwardDialong.java
@@ -1,66 +1,61 @@
-package com.sl.house_property;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.os.Bundle;
-import androidx.annotation.NonNull;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-
-/**
- * Created by 蔡雅楠 on 2018/4/24.
- */
-
-public class MarkingFinishAwardDialong extends Dialog implements View.OnClickListener{
-    private ImageView mIvClose;
-    private TextView mTvMoney;
-    private String awardMoney;
-    private Button btn_oreder_back;
-
-    public MarkingFinishAwardDialong(@NonNull Context context, int themeResId, String moneyStr) {
-        super(context, themeResId);
-        this.awardMoney = moneyStr;
-    }
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        this.setContentView(R.layout.marking_award_activity);
-        mIvClose = (ImageView) findViewById(R.id.close);
-        btn_oreder_back = (Button) findViewById(R.id.btn_oreder_back);
-       // mTvMoney = findViewById(R.id.tv_award_money);
-        mIvClose.setOnClickListener(this);
-        btn_oreder_back.setOnClickListener(this);
-     //   mTvMoney.setText(awardMoney);
-    }
-
-    @Override
-    public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.close:
-                MarkingFinishAwardDialong.this.dismiss();
-                break;
-            case R.id.btn_oreder_back:
-               // takeMyPhoto(1000);
-
-                break;
-            default:
-                break;
-        }
-    }
-//    private void takeMyPhoto(int userImgeREQUST) {
-//        //拍照
-//        Intent intent = new Intent(getActivity(),
-//                SelectPicDanimicActivity.class);
-//        intent.putExtra("photoid", userImgeREQUST);
-//        intent.putExtra("crop", true);
-//        intent.putExtra("cropx", 100);
-//        intent.putExtra("cropy", 100);
-//        intent.putExtra("entertype", 100);
-//        startActivityForResult(intent, userImgeREQUST);
-//        getActivity().overridePendingTransition(R.anim.slide_from_bottom,
-//                R.anim.slide_out_bottom);
-//    }
-}
+package com.sl.house_property;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+
+/**
+ * Created by 蔡雅楠 on 2018/4/24.
+ */
+
+public class MarkingFinishAwardDialong extends Dialog implements View.OnClickListener{
+    private ImageView mIvClose;
+    private TextView mTvMoney;
+    private String awardMoney;
+    private Button btn_oreder_back;
+
+    public MarkingFinishAwardDialong(@NonNull Context context, int themeResId, String moneyStr) {
+        super(context, themeResId);
+        this.awardMoney = moneyStr;
+    }
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        this.setContentView(R.layout.marking_award_activity);
+        mIvClose = (ImageView) findViewById(R.id.close);
+        btn_oreder_back = (Button) findViewById(R.id.btn_oreder_back);
+       // mTvMoney = findViewById(R.id.tv_award_money);
+        mIvClose.setOnClickListener(this);
+        btn_oreder_back.setOnClickListener(this);
+     //   mTvMoney.setText(awardMoney);
+    }
+
+    @Override
+    public void onClick(View v) {
+        int id = v.getId();
+        if (id == R.id.close) {
+            MarkingFinishAwardDialong.this.dismiss();
+        } else if (id == R.id.btn_oreder_back) {
+            // takeMyPhoto(1000);
+        }
+    }
+//    private void takeMyPhoto(int userImgeREQUST) {
+//        //拍照
+//        Intent intent = new Intent(getActivity(),
+//                SelectPicDanimicActivity.class);
+//        intent.putExtra("photoid", userImgeREQUST);
+//        intent.putExtra("crop", true);
+//        intent.putExtra("cropx", 100);
+//        intent.putExtra("cropy", 100);
+//        intent.putExtra("entertype", 100);
+//        startActivityForResult(intent, userImgeREQUST);
+//        getActivity().overridePendingTransition(R.anim.slide_from_bottom,
+//                R.anim.slide_out_bottom);
+//    }
+}
diff --git a/app/src/main/java/com/sl/house_property/ModifyPswdActivity.java b/app/src/main/java/com/sl/house_property/ModifyPswdActivity.java
index 6ce99c5..026d571 100644
--- a/app/src/main/java/com/sl/house_property/ModifyPswdActivity.java
+++ b/app/src/main/java/com/sl/house_property/ModifyPswdActivity.java
@@ -1,175 +1,163 @@
-package com.sl.house_property;
-
-import android.os.Bundle;
-import android.view.Gravity;
-import android.view.View;
-import android.widget.Toast;
-
-import com.gyf.immersionbar.ImmersionBar;
-import com.sl.house_property.databinding.ActivityModifyPswdBinding;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import entity.RegisterUser;
-import my_loader.Loader;
-import my_loader.Resultcode;
-import tools.Config;
-import http.ApiConfig;
-import rx.Subscription;
-import rx.functions.Action1;
-import utils.Md5;
-
-public class ModifyPswdActivity extends BaseActivity<ActivityModifyPswdBinding> implements View.OnClickListener{
-    int recLen = 60;//获取验证，倒计时
-
-    private Loader mGankLoader;
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_modify_pswd;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        ImmersionBar.with(this)
-                .keyboardEnable(true)  //解决软键盘与底部输入框冲突问题
-                //  .keyboardEnable(true, WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
-                //                        | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)  //软键盘自动弹出
-                .init();
-//        setAbr(getString(R.string.modifypwsd), new View.OnClickListener() {
-//            @Override
-//            public void onClick(View view) {
-//                finish();
-//            }
-//        }, 0, null, 0, null, 0, null, "");
-//
-
-        mDataBinding.register.setOnClickListener(this);
-        mDataBinding.left.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
-    }
-
-
-
-
-
-
-
-
-
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()){
-
-
-
-            case  R.id.register:
-
-                if(mDataBinding.logincode.getText().toString().length()<6){
-                    setToast(getString(R.string.me_input_old_password_tip));
-                    return;
-                }
-                String newPassword =  mDataBinding.editpaw.getText().toString();
-                if(newPassword.length()<1){
-                    setToast(getString(R.string.me_input_new_password_tip));
-                    return;
-                }
-                if(!tools.RegexUtils.checkPassword(newPassword)){
-                    setToast(getString(R.string.me_input_password_fail_tip));
-                    return;
-                }
-                if(!mDataBinding.editpaw.getText().toString().trim().equals(mDataBinding.editpawAGAIN.getText().toString().trim())){
-                    setToast("两次新密码输入不一致");
-                    return;
-                }
-
-                register(view.getId());
-                break;
-
-        }
-    }
-
-    private boolean checkIsPassword(String password){
-        String check = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z_]{6,20}$";
-        Pattern regex = Pattern.compile(check);
-        Matcher matcher = regex.matcher(password);
-        return matcher.matches();
-    }
-
-    private void register(int id) {
-        RegisterUser user= Config.getInstance(ModifyPswdActivity.this).getUser();
-        Map<String,String> map=new HashMap<>();
-
-        map.put("password",mDataBinding.logincode.getText().toString().trim());
-        map.put("newpassword ",mDataBinding.editpaw.getText().toString().trim());
-        map.put("class", "ChangePwd");
-        map.put("sign", Md5.md5("Cas"+"ChangePwd"+Md5.secret));
-        map.put("app", "Cas");
-        map.put("userid", user.getUserid());
-        getGankList(ApiConfig.BASE_URL,map, getResources().getString(R.string.requsting),id);
-    }
-
-
-    private void getGankList(final String myurl, Map<String, String> map, String string, final int getcode1) {
-        progressDialog.setMessage(string);
-
-        //map.put("")
-        progressDialog.setCancelable(false);
-        progressDialog.show();
-        mDataBinding.getRoot().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                progressDialog.dismiss();
-                //setToast(1, getString(R.string.timeout));
-            }
-        },13000);
-        mGankLoader = new Loader();
-     /*  Map<String,String> map=new HashMap<String,String>();
-        map.put("phone");*/
-        Subscription subscription = mGankLoader.getMovie(myurl,map).subscribe(new Action1<Resultcode>() {
-            @Override
-            public void call(Resultcode resultcode) {
-                progressDialog.dismiss();
-                //setToast(0,resultcode.status);
-                if((!(resultcode.status==0))){
-                    setToast(resultcode.msg);
-                    return;
-                }
-                switch (getcode1) {
-
-
-                    case R.id.register:
-                        setToast("修改密码成功");
-                        mDataBinding.getRoot().postDelayed(new Runnable() {
-                            @Override
-                            public void run() {
-                                finish();
-                            }
-                        },1500);
-
-                        break;
-
-                }
-
-            }
-
-
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                progressDialog.dismiss();
-                setToast(getString(R.string.getdatafailure));
-                throwable.printStackTrace();
-            }
-        });
-
-        addSubscription(subscription);
-    }
-}
+package com.sl.house_property;
+
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.Toast;
+
+import com.gyf.immersionbar.ImmersionBar;
+import com.sl.house_property.databinding.ActivityModifyPswdBinding;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import entity.RegisterUser;
+import my_loader.Loader;
+import my_loader.Resultcode;
+import tools.Config;
+import http.ApiConfig;
+import rx.Subscription;
+import rx.functions.Action1;
+import utils.Md5;
+
+public class ModifyPswdActivity extends BaseActivity<ActivityModifyPswdBinding> implements View.OnClickListener{
+    int recLen = 60;//获取验证，倒计时
+
+    private Loader mGankLoader;
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_modify_pswd;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ImmersionBar.with(this)
+                .keyboardEnable(true)  //解决软键盘与底部输入框冲突问题
+                //  .keyboardEnable(true, WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
+                //                        | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)  //软键盘自动弹出
+                .init();
+//        setAbr(getString(R.string.modifypwsd), new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                finish();
+//            }
+//        }, 0, null, 0, null, 0, null, "");
+//
+
+        mDataBinding.register.setOnClickListener(this);
+        mDataBinding.left.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+    }
+
+
+
+
+
+
+
+
+
+    @Override
+    public void onClick(View view) {
+        int id = view.getId();
+        if (id == R.id.register) {
+            if(mDataBinding.logincode.getText().toString().length()<6){
+                setToast(getString(R.string.me_input_old_password_tip));
+                return;
+            }
+            String newPassword =  mDataBinding.editpaw.getText().toString();
+            if(newPassword.length()<1){
+                setToast(getString(R.string.me_input_new_password_tip));
+                return;
+            }
+            if(!tools.RegexUtils.checkPassword(newPassword)){
+                setToast(getString(R.string.me_input_password_fail_tip));
+                return;
+            }
+            if(!mDataBinding.editpaw.getText().toString().trim().equals(mDataBinding.editpawAGAIN.getText().toString().trim())){
+                setToast("两次新密码输入不一致");
+                return;
+            }
+
+            register(view.getId());
+        }
+    }
+
+    private boolean checkIsPassword(String password){
+        String check = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z_]{6,20}$";
+        Pattern regex = Pattern.compile(check);
+        Matcher matcher = regex.matcher(password);
+        return matcher.matches();
+    }
+
+    private void register(int id) {
+        RegisterUser user= Config.getInstance(ModifyPswdActivity.this).getUser();
+        Map<String,String> map=new HashMap<>();
+
+        map.put("password",mDataBinding.logincode.getText().toString().trim());
+        map.put("newpassword ",mDataBinding.editpaw.getText().toString().trim());
+        map.put("class", "ChangePwd");
+        map.put("sign", Md5.md5("Cas"+"ChangePwd"+Md5.secret));
+        map.put("app", "Cas");
+        map.put("userid", user.getUserid());
+        getGankList(ApiConfig.BASE_URL,map, getResources().getString(R.string.requsting),id);
+    }
+
+
+    private void getGankList(final String myurl, Map<String, String> map, String string, final int getcode1) {
+        progressDialog.setMessage(string);
+
+        //map.put("")
+        progressDialog.setCancelable(false);
+        progressDialog.show();
+        mDataBinding.getRoot().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                progressDialog.dismiss();
+                //setToast(1, getString(R.string.timeout));
+            }
+        },13000);
+        mGankLoader = new Loader();
+     /*  Map<String,String> map=new HashMap<String,String>();
+        map.put("phone");*/
+        Subscription subscription = mGankLoader.getMovie(myurl,map).subscribe(new Action1<Resultcode>() {
+            @Override
+            public void call(Resultcode resultcode) {
+                progressDialog.dismiss();
+                //setToast(0,resultcode.status);
+                if((!(resultcode.status==0))){
+                    setToast(resultcode.msg);
+                    return;
+                }
+                if (getcode1 == R.id.register) {
+                    setToast("修改密码成功");
+                    mDataBinding.getRoot().postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            finish();
+                        }
+                    },1500);
+                }
+
+            }
+
+
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                progressDialog.dismiss();
+                setToast(getString(R.string.getdatafailure));
+                throwable.printStackTrace();
+            }
+        });
+
+        addSubscription(subscription);
+    }
+}
diff --git a/app/src/main/java/com/sl/house_property/NewsDetailActivity.java b/app/src/main/java/com/sl/house_property/NewsDetailActivity.java
index afa92a5..0796db7 100644
--- a/app/src/main/java/com/sl/house_property/NewsDetailActivity.java
+++ b/app/src/main/java/com/sl/house_property/NewsDetailActivity.java
@@ -1,119 +1,118 @@
-package com.sl.house_property;
-
-
-import android.graphics.Color;
-import android.os.Bundle;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.ProgressBar;
-
-import com.sl.house_property.databinding.ActivityNewsDetailBinding;
-
-public class NewsDetailActivity extends BaseActivity<ActivityNewsDetailBinding> {
-
-
-    private ProgressBar progressBar;
-
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_news_detail;
-    }
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        String url=getIntent().getStringExtra("url");
-       String titile=getIntent().getStringExtra("titile");
-        setAbr(titile, new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                finish();
-            }
-        },0,null,0,null,0,null,"");
-       // progressDialog=new ProgressDialog(NewsDetailActivity.this);
-        setWebView(url);
-    }
-
-    private void setWebView(String data) {
-        final WebView webview = mDataBinding.fullscreenContent1;
-        progressBar=mDataBinding.progressBar2;
-        webview.setBackgroundColor(Color.WHITE);
-       // webview.loadDataWithBaseURL(null, data, "text/html" , "utf-8", null);
-        // webview.loadData(data,"text/html" ,"utf-8");
-        webview.loadUrl(data);
-        WebSettings webSettings = webview.getSettings();
-       //如果访问的页面中要与Javascript交互，则webview必须设置支持Javascript
-        webSettings.setJavaScriptEnabled(true);
-
-     //设置自适应屏幕，两者合用
-        webSettings.setUseWideViewPort(true); //将图片调整到适合webview的大小
-        webSettings.setLoadWithOverviewMode(true); // 缩放至屏幕的大小
-      //缩放操作
-        webSettings.setSupportZoom(true); //支持缩放，默认为true。是下面那个的前提。
-        webSettings.setBuiltInZoomControls(true); //设置内置的缩放控件。若为false，则该WebView不可缩放
-        webSettings.setDisplayZoomControls(false); //隐藏原生的缩放控件
-
-//其他细节操作
-        webSettings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK); //关闭webview中缓存
-        webSettings.setAllowFileAccess(true); //设置可以访问文件
-        webSettings.setJavaScriptCanOpenWindowsAutomatically(true); //支持通过JS打开新窗口
-        webSettings.setLoadsImagesAutomatically(true); //支持自动加载图片
-        webSettings.setDefaultTextEncodingName("utf-8");//设置编码格式
-        webSettings.setAppCachePath(getPackageCodePath()+"/myapp");
-        webSettings.setAppCacheMaxSize(10000);
-        //webview.loadUrl("www.baidu.com");
-        webview.setWebViewClient(new WebViewClient(){
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                view.loadUrl(url);
-                return super.shouldOverrideUrlLoading(view, url);
-            }
-        });
-
-        webview.setScrollContainer(true);
-        webview.setVerticalScrollBarEnabled(true);
-        webview.setHorizontalScrollBarEnabled(true);
-
-        webview.setWebChromeClient(new WebChromeClient(){
-            @Override
-
-            public void onProgressChanged(WebView view, int newProgress) {
-                if (newProgress < 100) {
-
-                    progressBar.setProgress(newProgress);
-                } else {
-                    progressBar.setVisibility(View.GONE);
-
-                }
-            }
-
-
-        });
-
-        webview.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                webview.requestDisallowInterceptTouchEvent(true);
-                return false;
-            }
-        });
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_BACK
-                && event.getAction() == KeyEvent.ACTION_DOWN) {
-            if( mDataBinding.fullscreenContent1.canGoBack()){
-                mDataBinding.fullscreenContent1.goBack();
-            }
-            else finish();
-            return true;
-        }
-
-        return super.onKeyDown(keyCode, event);
-    }
-}
+package com.sl.house_property;
+
+
+import android.graphics.Color;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.webkit.WebChromeClient;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.ProgressBar;
+
+import com.sl.house_property.databinding.ActivityNewsDetailBinding;
+
+public class NewsDetailActivity extends BaseActivity<ActivityNewsDetailBinding> {
+
+
+    private ProgressBar progressBar;
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_news_detail;
+    }
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        String url=getIntent().getStringExtra("url");
+       String titile=getIntent().getStringExtra("titile");
+        setAbr(titile, new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        },0,null,0,null,0,null,"");
+       // progressDialog=new ProgressDialog(NewsDetailActivity.this);
+        setWebView(url);
+    }
+
+    private void setWebView(String data) {
+        final WebView webview = mDataBinding.fullscreenContent1;
+        progressBar=mDataBinding.progressBar2;
+        webview.setBackgroundColor(Color.WHITE);
+       // webview.loadDataWithBaseURL(null, data, "text/html" , "utf-8", null);
+        // webview.loadData(data,"text/html" ,"utf-8");
+        webview.loadUrl(data);
+        WebSettings webSettings = webview.getSettings();
+       //如果访问的页面中要与Javascript交互，则webview必须设置支持Javascript
+        webSettings.setJavaScriptEnabled(true);
+
+     //设置自适应屏幕，两者合用
+        webSettings.setUseWideViewPort(true); //将图片调整到适合webview的大小
+        webSettings.setLoadWithOverviewMode(true); // 缩放至屏幕的大小
+      //缩放操作
+        webSettings.setSupportZoom(true); //支持缩放，默认为true。是下面那个的前提。
+        webSettings.setBuiltInZoomControls(true); //设置内置的缩放控件。若为false，则该WebView不可缩放
+        webSettings.setDisplayZoomControls(false); //隐藏原生的缩放控件
+
+//其他细节操作
+        webSettings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK); //关闭webview中缓存
+        webSettings.setAllowFileAccess(true); //设置可以访问文件
+        webSettings.setJavaScriptCanOpenWindowsAutomatically(true); //支持通过JS打开新窗口
+        webSettings.setLoadsImagesAutomatically(true); //支持自动加载图片
+        webSettings.setDefaultTextEncodingName("utf-8");//设置编码格式
+        // setAppCachePath 和 setAppCacheMaxSize 已在 API 33 中移除，使用默认缓存设置
+        //webview.loadUrl("www.baidu.com");
+        webview.setWebViewClient(new WebViewClient(){
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                view.loadUrl(url);
+                return super.shouldOverrideUrlLoading(view, url);
+            }
+        });
+
+        webview.setScrollContainer(true);
+        webview.setVerticalScrollBarEnabled(true);
+        webview.setHorizontalScrollBarEnabled(true);
+
+        webview.setWebChromeClient(new WebChromeClient(){
+            @Override
+
+            public void onProgressChanged(WebView view, int newProgress) {
+                if (newProgress < 100) {
+
+                    progressBar.setProgress(newProgress);
+                } else {
+                    progressBar.setVisibility(View.GONE);
+
+                }
+            }
+
+
+        });
+
+        webview.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                webview.requestDisallowInterceptTouchEvent(true);
+                return false;
+            }
+        });
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK
+                && event.getAction() == KeyEvent.ACTION_DOWN) {
+            if( mDataBinding.fullscreenContent1.canGoBack()){
+                mDataBinding.fullscreenContent1.goBack();
+            }
+            else finish();
+            return true;
+        }
+
+        return super.onKeyDown(keyCode, event);
+    }
+}
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 e7a7466..bb57fc1 100644
--- a/app/src/main/java/com/sl/house_property/RegisterActivity.java
+++ b/app/src/main/java/com/sl/house_property/RegisterActivity.java
@@ -1,303 +1,292 @@
-package com.sl.house_property;
-
-import android.app.ProgressDialog;
-
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.view.View;
-import com.cutil.RegexUtils;
-import com.google.gson.Gson;
-import com.google.gson.internal.LinkedTreeMap;
-import com.gyf.immersionbar.ImmersionBar;
-import com.lxj.xpopup.XPopup;
-import com.sl.house_property.databinding.ActivityRegisterBinding;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
-import entity.RegisterUser;
-import http.ApiConfig;
-import my_loader.Loader;
-import my_loader.Resultcode;
-import rx.Subscription;
-import rx.functions.Action1;
-import utils.Md5;
-
-public class RegisterActivity extends BaseActivity<ActivityRegisterBinding> implements View.OnClickListener {
-    int recLen = 60;//获取验证，倒计时
-    private ProgressDialog progressDialog;
-    private Loader mGankLoader;
-
-
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_register;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        progressDialog = new ProgressDialog(RegisterActivity.this);
-
-//        setAbr(getString(R.string.register), new View.OnClickListener() {
-//            @Override
-//            public void onClick(View view) {
-//                finish();
-//            }
-//        }, 0, null, 0, null, 0, null, "");
-        ImmersionBar.with(this)
-                .keyboardEnable(true)
-                .init();
-        mDataBinding.getcode.setOnClickListener(this);
-
-        mDataBinding.register.setOnClickListener(this);
-        mDataBinding.left.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
-//        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
-    public void onClick(View view) {
-        switch (view.getId()) {
-
-
-            case R.id.getcode:
-                if (mDataBinding.registerphone.getText().toString().length() < 1) {
-                    setToast(getString(R.string.me_input_phone_tip));
-                    return;
-                }
-                if (!RegexUtils.isMobileExact(mDataBinding.registerphone.getText().toString())) {
-                    setToast(getString(R.string.me_input_phone_error_tip));
-                    return;
-                }
-                getMesgCode(R.id.getcode);
-                break;
-            case R.id.register:
-                if (mDataBinding.registerphone.getText().toString().length() == 0) {
-                    setToast(getString(R.string.me_input_phone_tip));
-                    return;
-                }
-                if (!RegexUtils.isMobileExact(mDataBinding.registerphone.getText().toString())) {
-                    setToast(getString(R.string.me_input_phone_error_tip));
-                    return;
-                }
-
-                if (mDataBinding.logincode.getText().toString().length() < 1) {
-                    setToast(getString(R.string.me_input_verification_tip));
-                    return;
-                }
-
-                String password = mDataBinding.editpaw.getText().toString();
-                if (password.length() < 1) {
-                    setToast(getString(R.string.me_input_password_tip));
-                    return;
-                }
-//                if(password.length()<6){
-//                    showToast(getString(R.string.me_input_password_short_tip));
-//
-//                    return;
-//                }
-                if (!tools.RegexUtils.checkPassword(password)) {
-                    setToast(getString(R.string.me_input_password_fail_tip));
-                    return;
-                }
-
-                String againPassword = mDataBinding.editagainpaw.getText().toString().trim();
-                if (againPassword.length() < 1) {
-                    setToast(getString(R.string.me_input_again_password_tip));
-                    return;
-                }
-
-                if (!mDataBinding.editpaw.getText().toString().trim().equals(mDataBinding.editagainpaw.getText().toString().trim())) {
-                    setToast(getString(R.string.me_password_Inconsistent_tip));
-
-                    return;
-                }
-
-                if (!mDataBinding.agreewhitemeg.isChecked()) {
-                    setToast("请先同意注册协议");
-
-                    return;
-                }
-                if (!mDataBinding.agreewhitemegy.isChecked()) {
-                    setToast("请先同意隐私政策");
-
-                    return;
-                }
-
-                register(view.getId());
-                break;
-
-        }
-    }
-
-    private void register(int id) {
-        Map<String, String> map = new HashMap<>();
-        map.put("phone", mDataBinding.registerphone.getText().toString().trim());
-        map.put("password", mDataBinding.editpaw.getText().toString().trim());
-        map.put("code", mDataBinding.logincode.getText().toString().trim());
-        map.put("sign", Md5.md5("Cas" + "UserReg" + Md5.secret));
-        map.put("app", "Cas");
-        map.put("class", "UserReg");
-        getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.registering), id);
-    }
-
-
-    private void getMesgCode(int id) {//获取验证码
-        // TODO Auto-generated method stub
-        recLen = 60;
-        /* getRegisterCode.setTextColor(getResources().getColor(R.color.regitergrey));*/
-
-        mDataBinding.getcode.setClickable(false);
-        Map<String, String> map = new HashMap<>();
-        map.put("sendto", mDataBinding.registerphone.getText().toString().trim());
-        map.put("action", "register");
-        map.put("sign", Md5.md5("Cas" + "SendCode" + Md5.secret));
-        map.put("app", "Cas");
-        map.put("class", "SendCode");
-        getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.getthecodenow), id);
-//        map = new HashMap<String, Object>();
-//        map.put("telephone", editPhoneNo.getText().toString().trim());
-//        getAsyTask(1, map, HttpUrl.registerUser(), "正在获取验证码", HttpNet.PROGRESSVISIBLE, HttpNet.POSTTYPE);//联网
-
-    }
-
-    private void getGankList(final String myurl, Map<String, String> map, String string, final int getcode1) {
-        progressDialog.setMessage(string);
-
-        //map.put("")
-        progressDialog.setCancelable(false);
-        progressDialog.show();
-        mDataBinding.getRoot().postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                progressDialog.dismiss();
-                //setToast(1, getString(R.string.timeout));
-            }
-        }, 13000);
-        mGankLoader = new Loader();
-     /*  Map<String,String> map=new HashMap<String,String>();
-        map.put("phone");*/
-        Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
-            @Override
-            public void call(Resultcode resultcode) {
-                progressDialog.dismiss();
-                //setToast(0,resultcode.status);
-                if ((!(resultcode.status == 0))) {
-                    setToast(resultcode.msg);
-                    mDataBinding.getcode.setClickable(true);
-                    return;
-                }
-                switch (getcode1) {
-                    case R.id.getcode:
-                        setToast(getString(R.string.megissucess));
-                        startTimer();
-                        break;
-
-                    case R.id.register:
-                        setToast(getString(R.string.registersucess));
-                        Gson gs = new Gson();
-                        LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
-                        String s = gs.toJson(adta);
-                        RegisterUser user = gs.fromJson(s, RegisterUser.class);//把JSON字符串转为对象
-                        BindHouseDialog bindHouseDialog = new BindHouseDialog(RegisterActivity.this);
-                        bindHouseDialog.setUserId(user.getUserid());
-                        bindHouseDialog.setOnBindHouseListener(new BindHouseDialog.OnBindHouseListener() {
-                            @Override
-                            public void onSubmit() {
-
-                                setToast("提交成功");
-                                finish();
-                            }
-                        });
-                        new XPopup.Builder(RegisterActivity.this).asCustom(bindHouseDialog).show();
-
-                        break;
-
-                }
-
-            }
-
-
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                progressDialog.dismiss();
-                mDataBinding.getcode.setClickable(true);
-                setToast(getString(R.string.getdatafailure));
-                throwable.printStackTrace();
-            }
-        });
-
-        addSubscription(subscription);
-    }
-
-    private void startTimer() {
-        final Timer timer = new Timer();
-        final Handler handler = new Handler() {
-            @Override
-            public void handleMessage(Message msg) {
-                // TODO Auto-generated method stub
-                super.handleMessage(msg);
-                mDataBinding.getcode.setText(recLen + "");
-                if (recLen < 0) {
-                    timer.cancel();
-                    mDataBinding.getcode.setText("重新获取");
-                    mDataBinding.getcode.setClickable(true);
-
-                }
-
-            }
-        };
-        TimerTask task = new TimerTask() {
-
-
-            @Override
-            public void run() {
-                recLen--;
-                Message message = new Message();
-                message.what = 1;
-                handler.sendMessage(message);
-            }
-
-
-        };
-        timer.schedule(task, 1000, 1000);
-    }
-
-
-    /**
-     * 用户协议
-     *
-     * @param v v
-     */
-    public void agreementEvent(View v) {
-//        Intent intent = new Intent(this, RegisterAgreementActivity.class);
-//        startActivity(intent);
-        WebActivitytwo.runActivity(this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=1");
-    }
-    /**
-     * 隐私政策
-     *
-     * @param v v
-     */
-    public void yinagreementEvent(View v) {
-        WebActivitytwo.runActivity(this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=19");
-    }
-}
+package com.sl.house_property;
+
+import android.app.ProgressDialog;
+
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.view.View;
+import com.cutil.RegexUtils;
+import com.google.gson.Gson;
+import com.google.gson.internal.LinkedTreeMap;
+import com.gyf.immersionbar.ImmersionBar;
+import com.lxj.xpopup.XPopup;
+import com.sl.house_property.databinding.ActivityRegisterBinding;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
+import entity.RegisterUser;
+import http.ApiConfig;
+import my_loader.Loader;
+import my_loader.Resultcode;
+import rx.Subscription;
+import rx.functions.Action1;
+import utils.Md5;
+
+public class RegisterActivity extends BaseActivity<ActivityRegisterBinding> implements View.OnClickListener {
+    int recLen = 60;//获取验证，倒计时
+    private ProgressDialog progressDialog;
+    private Loader mGankLoader;
+
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_register;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        progressDialog = new ProgressDialog(RegisterActivity.this);
+
+//        setAbr(getString(R.string.register), new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                finish();
+//            }
+//        }, 0, null, 0, null, 0, null, "");
+        ImmersionBar.with(this)
+                .keyboardEnable(true)
+                .init();
+        mDataBinding.getcode.setOnClickListener(this);
+
+        mDataBinding.register.setOnClickListener(this);
+        mDataBinding.left.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+//        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
+    public void onClick(View view) {
+        int id = view.getId();
+        if (id == R.id.getcode) {
+            if (mDataBinding.registerphone.getText().toString().length() < 1) {
+                setToast(getString(R.string.me_input_phone_tip));
+                return;
+            }
+            if (!RegexUtils.isMobileExact(mDataBinding.registerphone.getText().toString())) {
+                setToast(getString(R.string.me_input_phone_error_tip));
+                return;
+            }
+            getMesgCode(R.id.getcode);
+        } else if (id == R.id.register) {
+            if (mDataBinding.registerphone.getText().toString().length() == 0) {
+                setToast(getString(R.string.me_input_phone_tip));
+                return;
+            }
+            if (!RegexUtils.isMobileExact(mDataBinding.registerphone.getText().toString())) {
+                setToast(getString(R.string.me_input_phone_error_tip));
+                return;
+            }
+
+            if (mDataBinding.logincode.getText().toString().length() < 1) {
+                setToast(getString(R.string.me_input_verification_tip));
+                return;
+            }
+
+            String password = mDataBinding.editpaw.getText().toString();
+            if (password.length() < 1) {
+                setToast(getString(R.string.me_input_password_tip));
+                return;
+            }
+//                if(password.length()<6){
+//                    showToast(getString(R.string.me_input_password_short_tip));
+//
+//                    return;
+//                }
+            if (!tools.RegexUtils.checkPassword(password)) {
+                setToast(getString(R.string.me_input_password_fail_tip));
+                return;
+            }
+
+            String againPassword = mDataBinding.editagainpaw.getText().toString().trim();
+            if (againPassword.length() < 1) {
+                setToast(getString(R.string.me_input_again_password_tip));
+                return;
+            }
+
+            if (!mDataBinding.editpaw.getText().toString().trim().equals(mDataBinding.editagainpaw.getText().toString().trim())) {
+                setToast(getString(R.string.me_password_Inconsistent_tip));
+
+                return;
+            }
+
+            if (!mDataBinding.agreewhitemeg.isChecked()) {
+                setToast("请先同意注册协议");
+
+                return;
+            }
+            if (!mDataBinding.agreewhitemegy.isChecked()) {
+                setToast("请先同意隐私政策");
+
+                return;
+            }
+
+            register(view.getId());
+        }
+    }
+
+    private void register(int id) {
+        Map<String, String> map = new HashMap<>();
+        map.put("phone", mDataBinding.registerphone.getText().toString().trim());
+        map.put("password", mDataBinding.editpaw.getText().toString().trim());
+        map.put("code", mDataBinding.logincode.getText().toString().trim());
+        map.put("sign", Md5.md5("Cas" + "UserReg" + Md5.secret));
+        map.put("app", "Cas");
+        map.put("class", "UserReg");
+        getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.registering), id);
+    }
+
+
+    private void getMesgCode(int id) {//获取验证码
+        // TODO Auto-generated method stub
+        recLen = 60;
+        /* getRegisterCode.setTextColor(getResources().getColor(R.color.regitergrey));*/
+
+        mDataBinding.getcode.setClickable(false);
+        Map<String, String> map = new HashMap<>();
+        map.put("sendto", mDataBinding.registerphone.getText().toString().trim());
+        map.put("action", "register");
+        map.put("sign", Md5.md5("Cas" + "SendCode" + Md5.secret));
+        map.put("app", "Cas");
+        map.put("class", "SendCode");
+        getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.getthecodenow), id);
+//        map = new HashMap<String, Object>();
+//        map.put("telephone", editPhoneNo.getText().toString().trim());
+//        getAsyTask(1, map, HttpUrl.registerUser(), "正在获取验证码", HttpNet.PROGRESSVISIBLE, HttpNet.POSTTYPE);//联网
+
+    }
+
+    private void getGankList(final String myurl, Map<String, String> map, String string, final int getcode1) {
+        progressDialog.setMessage(string);
+
+        //map.put("")
+        progressDialog.setCancelable(false);
+        progressDialog.show();
+        mDataBinding.getRoot().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                progressDialog.dismiss();
+                //setToast(1, getString(R.string.timeout));
+            }
+        }, 13000);
+        mGankLoader = new Loader();
+     /*  Map<String,String> map=new HashMap<String,String>();
+        map.put("phone");*/
+        Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
+            @Override
+            public void call(Resultcode resultcode) {
+                progressDialog.dismiss();
+                //setToast(0,resultcode.status);
+                if ((!(resultcode.status == 0))) {
+                    setToast(resultcode.msg);
+                    mDataBinding.getcode.setClickable(true);
+                    return;
+                }
+                if (getcode1 == R.id.getcode) {
+                    setToast(getString(R.string.megissucess));
+                    startTimer();
+                } else if (getcode1 == R.id.register) {
+                    setToast(getString(R.string.registersucess));
+                    Gson gs = new Gson();
+                    LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
+                    String s = gs.toJson(adta);
+                    RegisterUser user = gs.fromJson(s, RegisterUser.class);//把JSON字符串转为对象
+                    BindHouseDialog bindHouseDialog = new BindHouseDialog(RegisterActivity.this);
+                    bindHouseDialog.setUserId(user.getUserid());
+                    bindHouseDialog.setOnBindHouseListener(new BindHouseDialog.OnBindHouseListener() {
+                        @Override
+                        public void onSubmit() {
+
+                            setToast("提交成功");
+                            finish();
+                        }
+                    });
+                    new XPopup.Builder(RegisterActivity.this).asCustom(bindHouseDialog).show();
+                }
+
+            }
+
+
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                progressDialog.dismiss();
+                mDataBinding.getcode.setClickable(true);
+                setToast(getString(R.string.getdatafailure));
+                throwable.printStackTrace();
+            }
+        });
+
+        addSubscription(subscription);
+    }
+
+    private void startTimer() {
+        final Timer timer = new Timer();
+        final Handler handler = new Handler() {
+            @Override
+            public void handleMessage(Message msg) {
+                // TODO Auto-generated method stub
+                super.handleMessage(msg);
+                mDataBinding.getcode.setText(recLen + "");
+                if (recLen < 0) {
+                    timer.cancel();
+                    mDataBinding.getcode.setText("重新获取");
+                    mDataBinding.getcode.setClickable(true);
+
+                }
+
+            }
+        };
+        TimerTask task = new TimerTask() {
+
+
+            @Override
+            public void run() {
+                recLen--;
+                Message message = new Message();
+                message.what = 1;
+                handler.sendMessage(message);
+            }
+
+
+        };
+        timer.schedule(task, 1000, 1000);
+    }
+
+
+    /**
+     * 用户协议
+     *
+     * @param v v
+     */
+    public void agreementEvent(View v) {
+//        Intent intent = new Intent(this, RegisterAgreementActivity.class);
+//        startActivity(intent);
+        WebActivitytwo.runActivity(this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=1");
+    }
+    /**
+     * 隐私政策
+     *
+     * @param v v
+     */
+    public void yinagreementEvent(View v) {
+        WebActivitytwo.runActivity(this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=19");
+    }
+}
diff --git a/app/src/main/java/com/sl/house_property/RegisterAgreementActivity.java b/app/src/main/java/com/sl/house_property/RegisterAgreementActivity.java
index 0ababb8..1594555 100644
--- a/app/src/main/java/com/sl/house_property/RegisterAgreementActivity.java
+++ b/app/src/main/java/com/sl/house_property/RegisterAgreementActivity.java
@@ -1,106 +1,105 @@
-package com.sl.house_property;
-
-
-import android.graphics.Color;
-import android.os.Bundle;
-import android.view.KeyEvent;
-import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.ProgressBar;
-
-import com.sl.house_property.databinding.ActivityRegisterAgreementBinding;
-
-public class RegisterAgreementActivity extends BaseActivity<ActivityRegisterAgreementBinding> {
-
-
-    private ProgressBar progressBar;
-
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_register_agreement;
-    }
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-       // String url="https://wy.shiningsoft.top/articlemobile/index/detail?article_id=1";
-        String url="https://wy.dou1.net/articlemobile/index/detail?article_id=1";
-       String titile=getIntent().getStringExtra("titile");
-        setAbr("注册协议", new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                finish();
-            }
-        },0,null,0,null,0,null,"");
-       // progressDialog=new ProgressDialog(NewsDetailActivity.this);
-        setWebView(url);
-    }
-
-    private void setWebView(String data) {
-        WebView webview = mDataBinding.fullscreenContent1;
-        progressBar=mDataBinding.progressBar2;
-        webview.setBackgroundColor(Color.WHITE);
-       // webview.loadDataWithBaseURL(null, data, "text/html" , "utf-8", null);
-        // webview.loadData(data,"text/html" ,"utf-8");
-        webview.loadUrl(data);
-        WebSettings webSettings = webview.getSettings();
-       //如果访问的页面中要与Javascript交互，则webview必须设置支持Javascript
-        webSettings.setJavaScriptEnabled(true);
-
-     //设置自适应屏幕，两者合用
-        webSettings.setUseWideViewPort(true); //将图片调整到适合webview的大小
-        webSettings.setLoadWithOverviewMode(true); // 缩放至屏幕的大小
-      //缩放操作
-        webSettings.setSupportZoom(true); //支持缩放，默认为true。是下面那个的前提。
-        webSettings.setBuiltInZoomControls(true); //设置内置的缩放控件。若为false，则该WebView不可缩放
-        webSettings.setDisplayZoomControls(false); //隐藏原生的缩放控件
-
-//其他细节操作
-        webSettings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK); //关闭webview中缓存
-        webSettings.setAllowFileAccess(true); //设置可以访问文件
-        webSettings.setJavaScriptCanOpenWindowsAutomatically(true); //支持通过JS打开新窗口
-        webSettings.setLoadsImagesAutomatically(true); //支持自动加载图片
-        webSettings.setDefaultTextEncodingName("utf-8");//设置编码格式
-        webSettings.setAppCachePath(getPackageCodePath()+"/myapp");
-        webSettings.setAppCacheMaxSize(10000);
-        //webview.loadUrl("www.baidu.com");
-        webview.setWebViewClient(new WebViewClient(){
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                view.loadUrl(url);
-                return super.shouldOverrideUrlLoading(view, url);
-            }
-        });
-        webview.setWebChromeClient(new WebChromeClient(){
-            @Override
-
-            public void onProgressChanged(WebView view, int newProgress) {
-                if (newProgress < 100) {
-
-                    progressBar.setProgress(newProgress);
-                } else {
-                    progressBar.setVisibility(View.GONE);
-
-                }
-            }
-
-
-        });
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_BACK
-                && event.getAction() == KeyEvent.ACTION_DOWN) {
-            if( mDataBinding.fullscreenContent1.canGoBack()){
-                mDataBinding.fullscreenContent1.goBack();
-            }
-            else finish();
-            return true;
-        }
-
-        return super.onKeyDown(keyCode, event);
-    }
-}
+package com.sl.house_property;
+
+
+import android.graphics.Color;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.View;
+import android.webkit.WebChromeClient;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.ProgressBar;
+
+import com.sl.house_property.databinding.ActivityRegisterAgreementBinding;
+
+public class RegisterAgreementActivity extends BaseActivity<ActivityRegisterAgreementBinding> {
+
+
+    private ProgressBar progressBar;
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_register_agreement;
+    }
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+       // String url="https://wy.shiningsoft.top/articlemobile/index/detail?article_id=1";
+        String url="https://wy.dou1.net/articlemobile/index/detail?article_id=1";
+       String titile=getIntent().getStringExtra("titile");
+        setAbr("注册协议", new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        },0,null,0,null,0,null,"");
+       // progressDialog=new ProgressDialog(NewsDetailActivity.this);
+        setWebView(url);
+    }
+
+    private void setWebView(String data) {
+        WebView webview = mDataBinding.fullscreenContent1;
+        progressBar=mDataBinding.progressBar2;
+        webview.setBackgroundColor(Color.WHITE);
+       // webview.loadDataWithBaseURL(null, data, "text/html" , "utf-8", null);
+        // webview.loadData(data,"text/html" ,"utf-8");
+        webview.loadUrl(data);
+        WebSettings webSettings = webview.getSettings();
+       //如果访问的页面中要与Javascript交互，则webview必须设置支持Javascript
+        webSettings.setJavaScriptEnabled(true);
+
+     //设置自适应屏幕，两者合用
+        webSettings.setUseWideViewPort(true); //将图片调整到适合webview的大小
+        webSettings.setLoadWithOverviewMode(true); // 缩放至屏幕的大小
+      //缩放操作
+        webSettings.setSupportZoom(true); //支持缩放，默认为true。是下面那个的前提。
+        webSettings.setBuiltInZoomControls(true); //设置内置的缩放控件。若为false，则该WebView不可缩放
+        webSettings.setDisplayZoomControls(false); //隐藏原生的缩放控件
+
+//其他细节操作
+        webSettings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK); //关闭webview中缓存
+        webSettings.setAllowFileAccess(true); //设置可以访问文件
+        webSettings.setJavaScriptCanOpenWindowsAutomatically(true); //支持通过JS打开新窗口
+        webSettings.setLoadsImagesAutomatically(true); //支持自动加载图片
+        webSettings.setDefaultTextEncodingName("utf-8");//设置编码格式
+        // setAppCachePath 和 setAppCacheMaxSize 已在 API 33 中移除，使用默认缓存设置
+        //webview.loadUrl("www.baidu.com");
+        webview.setWebViewClient(new WebViewClient(){
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                view.loadUrl(url);
+                return super.shouldOverrideUrlLoading(view, url);
+            }
+        });
+        webview.setWebChromeClient(new WebChromeClient(){
+            @Override
+
+            public void onProgressChanged(WebView view, int newProgress) {
+                if (newProgress < 100) {
+
+                    progressBar.setProgress(newProgress);
+                } else {
+                    progressBar.setVisibility(View.GONE);
+
+                }
+            }
+
+
+        });
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK
+                && event.getAction() == KeyEvent.ACTION_DOWN) {
+            if( mDataBinding.fullscreenContent1.canGoBack()){
+                mDataBinding.fullscreenContent1.goBack();
+            }
+            else finish();
+            return true;
+        }
+
+        return super.onKeyDown(keyCode, event);
+    }
+}
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 1bb15c1..400f830 100644
--- a/app/src/main/java/com/sl/house_property/SettingActivity.java
+++ b/app/src/main/java/com/sl/house_property/SettingActivity.java
@@ -1,146 +1,139 @@
-package com.sl.house_property;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.view.View;
-import android.widget.Toast;
-
-import com.gyf.immersionbar.ImmersionBar;
-import com.sl.house_property.databinding.ActivitySettingBinding;
-
-import cn.jpush.android.api.JPushInterface;
-import tools.APKVersionCodeUtils;
-import tools.Config;
-import utils.CacheDataManager;
-
-public class SettingActivity extends BaseActivity<ActivitySettingBinding> implements View.OnClickListener {
-
-    private Handler handler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            super.handleMessage(msg);
-            switch (msg.what) {
-                case 0:
-                    progressDialog.dismiss();
-                    setToast( getString(R.string.clearup));
-                    try {
-                        mDataBinding.cachsiez.setText(CacheDataManager.getTotalCacheSize(SettingActivity.this));
-
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                  break;
-
-                case 1:
-                    handler.post(new clearCache());
-                    break;
-
-            }
-        }
-    };
-
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_setting;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        ImmersionBar.with(this)
-                .keyboardEnable(false)  //解决软键盘与底部输入框冲突问题
-                //  .keyboardEnable(true, WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
-                //                        | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)  //软键盘自动弹出
-                .init();
-        mDataBinding.id1.setOnClickListener(this);
-        mDataBinding.id2.setOnClickListener(this);
-        mDataBinding.id3.setOnClickListener(this);
-        mDataBinding.loginout.setOnClickListener(this);
-        mDataBinding.id0.setOnClickListener(this);
-        mDataBinding.left.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
-        mDataBinding.myverion.setText("V" + APKVersionCodeUtils.getVerName(SettingActivity.this));
-        try {
-            mDataBinding.cachsiez.setText(CacheDataManager.getTotalCacheSize(SettingActivity.this));
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        mDataBinding.ll5.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                WebActivitytwo.runActivity(SettingActivity.this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=19");
-            }
-        });
-        mDataBinding.ll6.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                WebActivitytwo.runActivity(SettingActivity.this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=1");
-            }
-        });
-    }
-
-    @Override
-    public void onClick(View view) {
-        Intent intent = null;
-        switch (view.getId()) {
-
-            case R.id.id0:
-                intent = new Intent(SettingActivity.this, ModifyPswdActivity.class);
-                startActivity(intent);
-                break;
-            case R.id.id3:
-//                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);
-                startActivity(intent);
-                break;
-            case R.id.id1:
-                progressDialog.setMessage("正在清理...");
-
-                progressDialog.setCancelable(false);
-                progressDialog.show();
-                handler.sendEmptyMessage(1);
-
-                break;
-            case R.id.loginout:
-                JPushInterface.deleteAlias(getApplicationContext(),0);
-                Config.getInstance(SettingActivity.this).DeleteUser();
-                MyApplication.getApp().existActivitys();
-                intent = new Intent(SettingActivity.this, LoginActivity.class);
-                startActivity(intent);
-                break;
-        }
-    }
-
-    class clearCache implements Runnable {
-
-        @Override
-
-        public void run() {
-
-            try {
-
-                CacheDataManager.clearAllCache(SettingActivity.this);
-                Thread.sleep(4000);
-                if (CacheDataManager.getTotalCacheSize(SettingActivity.this).startsWith("0")) {
-                    handler.sendEmptyMessage(0);
-                }
-            } catch (Exception e) {
-
-                return;
-
-            }
-
-        }
-
-    }
-}
+package com.sl.house_property;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.view.View;
+import android.widget.Toast;
+
+import com.gyf.immersionbar.ImmersionBar;
+import com.sl.house_property.databinding.ActivitySettingBinding;
+
+import cn.jpush.android.api.JPushInterface;
+import tools.APKVersionCodeUtils;
+import tools.Config;
+import utils.CacheDataManager;
+
+public class SettingActivity extends BaseActivity<ActivitySettingBinding> implements View.OnClickListener {
+
+    private Handler handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            switch (msg.what) {
+                case 0:
+                    progressDialog.dismiss();
+                    setToast( getString(R.string.clearup));
+                    try {
+                        mDataBinding.cachsiez.setText(CacheDataManager.getTotalCacheSize(SettingActivity.this));
+
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                  break;
+
+                case 1:
+                    handler.post(new clearCache());
+                    break;
+
+            }
+        }
+    };
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_setting;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ImmersionBar.with(this)
+                .keyboardEnable(false)  //解决软键盘与底部输入框冲突问题
+                //  .keyboardEnable(true, WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
+                //                        | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)  //软键盘自动弹出
+                .init();
+        mDataBinding.id1.setOnClickListener(this);
+        mDataBinding.id2.setOnClickListener(this);
+        mDataBinding.id3.setOnClickListener(this);
+        mDataBinding.loginout.setOnClickListener(this);
+        mDataBinding.id0.setOnClickListener(this);
+        mDataBinding.left.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        mDataBinding.myverion.setText("V" + APKVersionCodeUtils.getVerName(SettingActivity.this));
+        try {
+            mDataBinding.cachsiez.setText(CacheDataManager.getTotalCacheSize(SettingActivity.this));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        mDataBinding.ll5.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                WebActivitytwo.runActivity(SettingActivity.this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=19");
+            }
+        });
+        mDataBinding.ll6.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                WebActivitytwo.runActivity(SettingActivity.this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=1");
+            }
+        });
+    }
+
+    @Override
+    public void onClick(View view) {
+        Intent intent = null;
+        int id = view.getId();
+        if (id == R.id.id0) {
+            intent = new Intent(SettingActivity.this, ModifyPswdActivity.class);
+            startActivity(intent);
+        } else if (id == R.id.id3) {
+//                intent = new Intent(SettingActivity.this, AboutusActivity.class);
+//                startActivity(intent);
+            WebActivitytwo.runActivity(SettingActivity.this, "关于我们", "https://wy.dou1.net/articlemobile/index/detail?article_id=3");
+        } else if (id == R.id.id2) {
+            intent = new Intent(SettingActivity.this, AdeviseActivity.class);
+            startActivity(intent);
+        } else if (id == R.id.id1) {
+            progressDialog.setMessage("正在清理...");
+
+            progressDialog.setCancelable(false);
+            progressDialog.show();
+            handler.sendEmptyMessage(1);
+        } else if (id == R.id.loginout) {
+            JPushInterface.deleteAlias(getApplicationContext(),0);
+            Config.getInstance(SettingActivity.this).DeleteUser();
+            MyApplication.getApp().existActivitys();
+            intent = new Intent(SettingActivity.this, LoginActivity.class);
+            startActivity(intent);
+        }
+    }
+
+    class clearCache implements Runnable {
+
+        @Override
+
+        public void run() {
+
+            try {
+
+                CacheDataManager.clearAllCache(SettingActivity.this);
+                Thread.sleep(4000);
+                if (CacheDataManager.getTotalCacheSize(SettingActivity.this).startsWith("0")) {
+                    handler.sendEmptyMessage(0);
+                }
+            } catch (Exception e) {
+
+                return;
+
+            }
+
+        }
+
+    }
+}
diff --git a/app/src/main/java/com/sl/house_property/WebActivitytwo.java b/app/src/main/java/com/sl/house_property/WebActivitytwo.java
index f1a7c3a..67f5554 100644
--- a/app/src/main/java/com/sl/house_property/WebActivitytwo.java
+++ b/app/src/main/java/com/sl/house_property/WebActivitytwo.java
@@ -1,111 +1,106 @@
-package com.sl.house_property;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.ImageView;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import com.gyf.immersionbar.ImmersionBar;
-
-public class WebActivitytwo extends AppCompatActivity implements View.OnClickListener {
-    public final static String URL = "url";
-    public final static String TITLE = "title";
-    private WebView webView;
-    private ProgressBar pb;
-    private ImageView mLayTopLeftTv;
-    private TextView mLayTopTitle;
-    private TextView mRight;
-    private ImageView mIvCode;
-    private ProgressBar mPb;
-    private WebView mWebView;
-
-    public static void runActivity(Context context, String title, String url) {
-        Intent intent = new Intent(context, WebActivitytwo.class);
-        intent.putExtra(URL, url);
-        intent.putExtra(TITLE, title);
-        context.startActivity(intent);
-    }
-
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_webtwo);
-        String url = getIntent().getStringExtra(URL);
-        String title = getIntent().getStringExtra(TITLE);
-        ImmersionBar.with(this)
-                .keyboardEnable(false)  //解决软键盘与底部输入框冲突问题
-                //  .keyboardEnable(true, WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
-                //                        | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)  //软键盘自动弹出
-                .barColor(R.color.colorPrimary).init();
-
-        initView();
-        pb.setMax(100);
-
-        WebSettings webSettings = webView.getSettings();
-        webSettings.setDomStorageEnabled(true);//主要是这句
-        webSettings.setJavaScriptEnabled(true);//启用js
-        webSettings.setBlockNetworkImage(false);//解决图片不显示
-        webSettings.setJavaScriptCanOpenWindowsAutomatically(true);
-        webSettings.setLoadsImagesAutomatically(true);
-        webSettings.setAppCacheEnabled(true);
-        webSettings.setCacheMode(WebSettings.LOAD_DEFAULT);
-//        webView.getSettings().setJavaScriptEnabled(true);
-        webSettings.setSupportZoom(true);
-        webSettings.setBuiltInZoomControls(true);
-        webView.setWebChromeClient(new WebChromeClient() {
-            @Override
-            public void onProgressChanged(WebView view, int newProgress) {
-                pb.setProgress(newProgress);
-                if (newProgress >= 100) {
-                    pb.setVisibility(View.GONE);
-                }
-            }
-        });
-
-        webView.setWebViewClient(new WebViewClient() {
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                view.loadUrl(url);
-                return true;
-            }
-        });
-        webView.loadUrl(url);
-
-    }
-
-    private void initView() {
-        webView = (WebView) findViewById(R.id.webView);
-        webView.setOnClickListener(this);
-        pb = (ProgressBar) findViewById(R.id.pb);
-        mLayTopLeftTv = (ImageView) findViewById(R.id.layTop_left_tv);
-        mLayTopLeftTv.setOnClickListener(this);
-        mLayTopTitle = (TextView) findViewById(R.id.layTop_title);
-     //   mRight = (TextView) findViewById(R.id.right);
-     //   mIvCode = (ImageView) findViewById(R.id.iv_code);
-        mPb = (ProgressBar) findViewById(R.id.pb);
-        mWebView = (WebView) findViewById(R.id.webView);
-        mLayTopTitle.setText("智慧豆豆");
-    }
-
-    @Override
-    public void onClick(View v) {
-        switch (v.getId()) {
-            default:
-                break;
-            case R.id.webView:
-                break;
-            case R.id.layTop_left_tv:
-                finish();
-                break;
-        }
-    }
-}
+package com.sl.house_property;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
+import android.view.View;
+import android.webkit.WebChromeClient;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import com.gyf.immersionbar.ImmersionBar;
+
+public class WebActivitytwo extends AppCompatActivity implements View.OnClickListener {
+    public final static String URL = "url";
+    public final static String TITLE = "title";
+    private WebView webView;
+    private ProgressBar pb;
+    private ImageView mLayTopLeftTv;
+    private TextView mLayTopTitle;
+    private TextView mRight;
+    private ImageView mIvCode;
+    private ProgressBar mPb;
+    private WebView mWebView;
+
+    public static void runActivity(Context context, String title, String url) {
+        Intent intent = new Intent(context, WebActivitytwo.class);
+        intent.putExtra(URL, url);
+        intent.putExtra(TITLE, title);
+        context.startActivity(intent);
+    }
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_webtwo);
+        String url = getIntent().getStringExtra(URL);
+        String title = getIntent().getStringExtra(TITLE);
+        ImmersionBar.with(this)
+                .keyboardEnable(false)  //解决软键盘与底部输入框冲突问题
+                //  .keyboardEnable(true, WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
+                //                        | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)  //软键盘自动弹出
+                .barColor(R.color.colorPrimary).init();
+
+        initView();
+        pb.setMax(100);
+
+        WebSettings webSettings = webView.getSettings();
+        webSettings.setDomStorageEnabled(true);//主要是这句
+        webSettings.setJavaScriptEnabled(true);//启用js
+        webSettings.setBlockNetworkImage(false);//解决图片不显示
+        webSettings.setJavaScriptCanOpenWindowsAutomatically(true);
+        webSettings.setLoadsImagesAutomatically(true);
+        // setAppCacheEnabled 已在 API 33 中移除，使用默认缓存设置
+        webSettings.setCacheMode(WebSettings.LOAD_DEFAULT);
+//        webView.getSettings().setJavaScriptEnabled(true);
+        webSettings.setSupportZoom(true);
+        webSettings.setBuiltInZoomControls(true);
+        webView.setWebChromeClient(new WebChromeClient() {
+            @Override
+            public void onProgressChanged(WebView view, int newProgress) {
+                pb.setProgress(newProgress);
+                if (newProgress >= 100) {
+                    pb.setVisibility(View.GONE);
+                }
+            }
+        });
+
+        webView.setWebViewClient(new WebViewClient() {
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                view.loadUrl(url);
+                return true;
+            }
+        });
+        webView.loadUrl(url);
+
+    }
+
+    private void initView() {
+        webView = (WebView) findViewById(R.id.webView);
+        webView.setOnClickListener(this);
+        pb = (ProgressBar) findViewById(R.id.pb);
+        mLayTopLeftTv = (ImageView) findViewById(R.id.layTop_left_tv);
+        mLayTopLeftTv.setOnClickListener(this);
+        mLayTopTitle = (TextView) findViewById(R.id.layTop_title);
+     //   mRight = (TextView) findViewById(R.id.right);
+     //   mIvCode = (ImageView) findViewById(R.id.iv_code);
+        mPb = (ProgressBar) findViewById(R.id.pb);
+        mWebView = (WebView) findViewById(R.id.webView);
+        mLayTopTitle.setText("智慧豆豆");
+    }
+
+    @Override
+    public void onClick(View v) {
+        int id = v.getId();
+        if (id == R.id.layTop_left_tv) {
+            finish();
+        }
+    }
+}
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 aa5655b..d15f796 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
@@ -1,566 +1,566 @@
-package com.sl.house_property.discovery;
-
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.BitmapDrawable;
-import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.GridLayoutManager;
-
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.View;
-
-import com.gyf.immersionbar.ImmersionBar;
-import com.hjq.permissions.OnPermission;
-import com.hjq.permissions.Permission;
-import com.hjq.permissions.XXPermissions;
-import com.luck.picture.lib.PictureSelector;
-import com.luck.picture.lib.config.PictureMimeType;
-import com.luck.picture.lib.entity.LocalMedia;
-import com.luck.picture.lib.listener.OnResultCallbackListener;
-import com.lxj.xpopup.XPopup;
-import com.lxj.xpopup.interfaces.OnConfirmListener;
-import com.sl.house_property.BaseActivity;
-import com.sl.house_property.R;
-import com.sl.house_property.databinding.ActivityAddDiscoveryBinding;
-import com.sl.house_property.databinding.ItemAddGoodsBinding;
-import com.zhihu.matisse.Matisse;
-import com.zhihu.matisse.MimeType;
-import com.zhihu.matisse.engine.impl.PicassoEngine;
-import com.zhihu.matisse.internal.entity.CaptureStrategy;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import adapter.BaseRecycleViewAdapter;
-import entity.RegisterUser;
-import http.ApiConfig;
-import http.FileUpLoad.retrofit.HttpStaticApi;
-import http.FileUpLoad.retrofit.RetrofitCallBack;
-import http.FileUpLoad.retrofit.RetrofitHttpUpLoad;
-import my_loader.Resultcode;
-import okhttp3.MediaType;
-import okhttp3.RequestBody;
-import retrofit2.Response;
-import tools.Config;
-import tools.GlideEngine;
-import top.zibin.luban.Luban;
-import utils.Md5;
-
-public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBinding> {
-
-    private static final int REQUEST_CODE_SELECT_PICTURE = 300;
-    private int type;
-    private AdditionImageWrapper additionImageWrapper;
-    private ArrayList<GoodsInfoEntity> strings;
-    private String goodsInfo = "";
-
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_add_discovery;
-    }
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        ImmersionBar.with(this)
-                .keyboardEnable(true)  //解决软键盘与底部输入框冲突问题
-                //  .keyboardEnable(true, WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
-                //                        | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)  //软键盘自动弹出
-                .init();
-        mDataBinding.rec2.setNestedScrollingEnabled(false);
-        mDataBinding.rvDynamicImage.setNestedScrollingEnabled(false);
-        mDataBinding.left.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                finish();
-            }
-        });
-        type = getIntent().getIntExtra("type", 0);
-        if (type == 0) {
-            mDataBinding.tvCover.setVisibility(View.GONE);
-            mDataBinding.vi.setVisibility(View.GONE);
-            mDataBinding.rec2.setVisibility(View.GONE);
-            mDataBinding.tvGoods.setVisibility(View.GONE);
-        } else if (type == 1) {
-
-            mDataBinding.tvCover.setVisibility(View.VISIBLE);
-            mDataBinding.vi.setVisibility(View.VISIBLE);
-            mDataBinding.rec2.setVisibility(View.VISIBLE);
-            mDataBinding.tvGoods.setVisibility(View.VISIBLE);
-            final BaseRecycleViewAdapter<GoodsInfoEntity, ItemAddGoodsBinding> adapter = new BaseRecycleViewAdapter<>(AddDiscoveryActivity.this, R.layout.item_add_goods);
-            strings = new ArrayList<>();
-            strings.add(new GoodsInfoEntity("+", "+"));
-            adapter.setData(strings);
-            adapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView<ItemAddGoodsBinding>() {
-                @Override
-                public void onBindViewHolder(ItemAddGoodsBinding b, int position) {
-                    b.tv.setText(strings.get(position).getValue());
-                }
-            });
-            adapter.setOnItemClickListener(new BaseRecycleViewAdapter.OnItemClickListener() {
-                @Override
-                public void onItemClick(View itemView, final int position) {
-                    if (strings.get(position).getValue().equals("+")) {
-                        //添加
-                        AddGoodsDialog addGoodsDialog = new AddGoodsDialog(AddDiscoveryActivity.this, null);
-                        addGoodsDialog.setOnAddGoodsInputListener(new AddGoodsDialog.OnAddGoodsInputListener() {
-                            @Override
-                            public void onConfirm(String info, String s) {
-//                                if (goodsInfo.equals("")) {
-//                                    goodsInfo = info;
-//                                } else {
-//                                    goodsInfo = goodsInfo + "|" + info;
-//                                }
-                                Log.e("xxxx", info);
-                                Log.e("xxxx1", s);
-                                strings.remove(strings.size() - 1);
-                                strings.add(new GoodsInfoEntity(info, s));
-                                for (int i = 0; i < strings.size(); i++) {
-                                    if (goodsInfo.equals("")) {
-                                        goodsInfo = goodsInfo + strings.get(i).getInfo();
-                                    } else {
-                                        goodsInfo = goodsInfo + "|" + strings.get(i).getInfo();
-                                    }
-                                }
-                                strings.add(new GoodsInfoEntity("+", "+"));
-                                adapter.setData(strings);
-
-
-                            }
-                        });
-                        new XPopup.Builder(AddDiscoveryActivity.this).asCustom(addGoodsDialog).show();
-
-                    } else {
-                        SelectDialog selectDialog = new SelectDialog(AddDiscoveryActivity.this);
-                        selectDialog.setOnSelectListener(new SelectDialog.OnSelectListener() {
-                            @Override
-                            public void select(int type) {
-                                if (type == 1) {
-                                    //编辑
-                                    AddGoodsDialog addGoodsDialog = new AddGoodsDialog(AddDiscoveryActivity.this, strings.get(position).getInfo());
-                                    addGoodsDialog.setOnAddGoodsInputListener(new AddGoodsDialog.OnAddGoodsInputListener() {
-                                        @Override
-                                        public void onConfirm(String info, String s) {
-                                            Log.e("xxxx", info);
-                                            Log.e("xxxx1", s);
-                                            strings.set(position, new GoodsInfoEntity(info, s));
-                                            strings.remove(strings.size() - 1);
-                                            for (int i = 0; i < strings.size(); i++) {
-                                                if (goodsInfo.equals("")) {
-                                                    goodsInfo = goodsInfo + strings.get(i).getInfo();
-                                                } else {
-                                                    goodsInfo = goodsInfo + "|" + strings.get(i).getInfo();
-                                                }
-                                            }
-                                            strings.add(new GoodsInfoEntity("+", "+"));
-                                            adapter.setData(strings);
-                                        }
-                                    });
-                                    new XPopup.Builder(AddDiscoveryActivity.this).asCustom(addGoodsDialog).show();
-                                } else if (type == 2) {
-                                    //删除
-                                    strings.remove(position);
-                                    strings.remove(strings.size() - 1);
-                                    for (int i = 0; i < strings.size(); i++) {
-                                        if (goodsInfo.equals("")) {
-                                            goodsInfo = goodsInfo + strings.get(i).getInfo();
-                                        } else {
-                                            goodsInfo = goodsInfo + "|" + strings.get(i).getInfo();
-                                        }
-                                    }
-                                    strings.add(new GoodsInfoEntity("+", "+"));
-                                    adapter.setData(strings);
-                                }
-                            }
-                        });
-                        new XPopup.Builder(AddDiscoveryActivity.this).asCustom(selectDialog).show();
-                    }
-                }
-            });
-            mDataBinding.rec2.setAdapter(adapter);
-            mDataBinding.rec2.setLayoutManager(new GridLayoutManager(AddDiscoveryActivity.this, 4));
-            mDataBinding.tvCover.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    checkAlbumPermission(411, 1);
-                }
-            });
-        }
-        additionImageWrapper = new AdditionImageWrapper(this, mDataBinding.rvDynamicImage);
-        additionImageWrapper.wrap(new AdditionImageWrapper.OnAdditionLayoutItemClick() {
-            @Override
-            public void onAdditionItemClick() {
-                //
-                Log.e("xxxxx","onAdditionItemClick");
-                checkAlbumPermission(REQUEST_CODE_SELECT_PICTURE, additionImageWrapper.getRemainCount());
-            }
-
-            @Override
-            public void onImageItemClick(int position) {
-                //普通图片被点击
-
-                List<File> imageList = additionImageWrapper.getImageList();
-                ArrayList<String> arrayListOf = new ArrayList<>();
-                for (int i = 0; i < imageList.size(); i++) {
-                    arrayListOf.add(imageList.get(i).getAbsolutePath());
-
-                }
-                Intent intent = new Intent(AddDiscoveryActivity.this, ImageViewerAndDeleteActivity.class);
-
-                if (arrayListOf.size() > 0 & arrayListOf.get(0).endsWith("mp4")) {
-                    String s = arrayListOf.get(0);
-                    arrayListOf.clear();
-                    arrayListOf.add(s);
-
-                    intent.putExtra("type", 1);
-                }
-                intent.putStringArrayListExtra("images", arrayListOf);
-                intent.putExtra("index", position);
-                intent.putStringArrayListExtra("images", arrayListOf);
-                startActivityForResult(intent, 111);
-            }
-        });
-        mDataBinding.tvSend.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                submit();
-            }
-        });
-    }
-
-    File file = null;
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == 111 && resultCode == 111) {
-            ArrayList<String> images = data.getStringArrayListExtra("images");
-            ArrayList<File> files = new ArrayList<>();
-            for (int i = 0; i < images.size(); i++) {
-                files.add(new File(images.get(i)));
-            }
-            additionImageWrapper.setData(files);
-
-        } else if (requestCode == 411 && resultCode == RESULT_OK && data != null) {
-            List<String> strings = Matisse.obtainPathResult(data);
-
-            if (!strings.isEmpty()) {
-                try {
-                    List<File> list = Luban.with(AddDiscoveryActivity.this).load(strings).ignoreBy(100).setTargetDir(getCacheDir().getAbsolutePath()).get();
-                    if (null != list && list.size() > 0) {
-                        file = list.get(0);
-                        Bitmap bitmap = BitmapFactory.decodeFile(file.toString());
-                        mDataBinding.tvCover.setBackground(new BitmapDrawable(getResources(), bitmap));
-                        mDataBinding.tvCover.setText("");
-                    }
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-
-            }
-        }
-    }
-    ArrayList<File> files = new ArrayList<>();
-
-    private void goToSelect() {
-        int postType = PictureMimeType.ofAll();
-        if (additionImageWrapper.getImageList().size() > 0) {
-            postType = PictureMimeType.ofImage();
-        } else {
-            postType = PictureMimeType.ofAll();
-        }
-        PictureSelector create = PictureSelector.create(this);
-        if (postType == 1||postType==0) {
-            create.openGallery(postType)
-                    .isCamera(true)
-                    .isWeChatStyle(true)
-                    .maxSelectNum(additionImageWrapper.getRemainCount())
-                    .isPreviewImage(true)
-                    .isPreviewVideo(true)
-                    .isCompress(true)
-                    .videoMaxSecond(20)
-                    .videoMinSecond(3)
-                    .recordVideoSecond(15)
-                    .imageEngine(GlideEngine.createGlideEngine())
-                    .isWithVideoImage(false)
-                    .forResult(new OnResultCallbackListener<LocalMedia>() {
-                        @Override
-                        public void onResult(List<LocalMedia> result) {
-                            if (result != null && result.size() > 0) {
-                                for (int i = 0; i < result.size(); i++) {
-                                    LocalMedia item = result.get(i);
-                                    if (item.getMimeType().startsWith("image")) {
-                                        files.add(new File(item.getCompressPath()));
-                                    } else if (item.getMimeType().startsWith("video")) {
-                                        additionImageWrapper.setLimit(1);
-                                        files.add(new File(item.getRealPath()));
-                                    }
-                                }
-
-                                additionImageWrapper.setData(files);
-                            }
-                        }
-
-                        @Override
-                        public void onCancel() {
-
-                        }
-                    });
-        }
-    }
-//    private var postType: Int = 0
-//    fun goToSelect() {
-//        if (additionImageWrapper.imageList.size > 0) {
-//            if (postType == 0) {
-//                postType = 1
-//            }
-//        }
-//        val create = PictureSelector.create(this)
-//        if (postType == 0) {
-//            create.openGallery(PictureMimeType.ofAll())
-
-    //
-//                    .forResult(object : OnResultCallbackListener<LocalMedia> {
-//                override fun onResult(result: MutableList<LocalMedia>?) {
-//                    if (!result.isNullOrEmpty()) {
-//                        val mutableListOf = mutableListOf<VideoImagePathEntity>()
-//                        mutableListOf.addAll(additionImageWrapper.imageList)
-//                        for (item in result) {
-//                            if (item.mimeType.startsWith("image")) {
-//                                postType = 1
-//                                mutableListOf.add(VideoImagePathEntity(1, item.compressPath))
-//
-//                            } else if (item.mimeType.startsWith("video")) {
-//                                postType = 2
-//                                WKLog.e(item.realPath)
-//                                mutableListOf.add(VideoImagePathEntity(2, item.realPath))
-//                                additionImageWrapper.setLimit(1)
-//                                WKLog.e(item.path)
-//                                WKLog.e(item.realPath)
-//                            }
-//                        }
-//
-//
-//
-//
-//                        additionImageWrapper.setData(mutableListOf)
-//                    }
-//
-//                }
-//
-//                override fun onCancel() {
-//                }
-//
-//            })
-//        } else if (postType == 1) {
-//            create.openGallery(PictureMimeType.ofImage())
-//                    .isCamera(true)
-//                    .isWeChatStyle(true)
-//                    .maxSelectNum(additionImageWrapper.remainCount)
-//
-//                    .isPreviewImage(true)
-//                    .isPreviewVideo(true)
-//                    .isCompress(true)
-//                    .imageEngine(GlideEngine.createGlideEngine())
-//                    .isWithVideoImage(false)
-//                    .forResult(object : OnResultCallbackListener<LocalMedia> {
-//                override fun onResult(result: MutableList<LocalMedia>?) {
-//                    val mutableListOf = mutableListOf<VideoImagePathEntity>()
-//                    mutableListOf.addAll(additionImageWrapper.imageList)
-//                    if (!result.isNullOrEmpty()) {
-//                        for (item in result) {
-//                            mutableListOf.add(VideoImagePathEntity(1, item.compressPath))
-//                        }
-//                    }
-//                    additionImageWrapper.setData(mutableListOf)
-//                }
-//
-//                override fun onCancel() {
-//                }
-//
-//            })
-//        }
-//
-//
-//    }
-    private void selectImage(int requestCode, int max) {
-        Matisse
-                .from(this)
-                //选择视频和图片
-                .choose(MimeType.ofAll())
-
-                //这两行要连用 是否在选择图片中展示照相 和适配安卓7.0 FileProvider
-                .capture(true)
-                .captureStrategy(new CaptureStrategy(true, "PhotoPicker"))
-                //有序选择图片 123456...
-                .countable(true)
-                //最大选择数量为9
-                .maxSelectable(max)
-                //选择方向
-                .restrictOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
-                //界面中缩略图的质量
-                .thumbnailScale(0.8f)
-                //蓝色主题
-                .theme(R.style.Matisse_Zhihu)
-                //Picasso加载方式
-                .imageEngine(new PicassoEngine())
-                //请求码
-                .forResult(requestCode);
-    }
-
-
-    /*
-     * 检查访问相册权限
-     * */
-    private void checkAlbumPermission(final int requestCode, final int max) {
-        XXPermissions.with(this).permission(Permission.WRITE_EXTERNAL_STORAGE, Permission.CAMERA).request(new OnPermission() {
-            @Override
-            public void hasPermission(List<String> granted, boolean isAll) {
-                if (isAll) {
-                    goToSelect();
-                    //   selectImage(requestCode, max);
-                }
-            }
-
-            @Override
-            public void noPermission(List<String> denied, boolean quick) {
-                if (quick)
-                    new XPopup.Builder(AddDiscoveryActivity.this).asConfirm(
-                            "提示", "需要相册和相机权限才可以正常使用"
-                            , new OnConfirmListener() {
-                                @Override
-                                public void onConfirm() {
-                                    XXPermissions.gotoPermissionSettings(AddDiscoveryActivity.this);
-                                }
-                            }).show();
-            }
-        });
-//        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-//            selectImage(requestCode, max);
-//            return;
-//        }
-//        if ((ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)&&(ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED)) {
-//            //权限还没有授予，需要在这里写申请权限的代码
-//            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-//                requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA}, 2);
-//            }
-//
-//        } else {
-//            selectImage(requestCode, max);
-//        }
-    }
-
-
-    private void submit() {
-        RetrofitHttpUpLoad retrofitHttpUpLoad = RetrofitHttpUpLoad.getInstance();
-        retrofitHttpUpLoad.clear();
-//        Map<String, Object> map = new HashMap<>();
-        RegisterUser user =
-                Config.getInstance(this).getUser();
-        Map<String, RequestBody> map = new HashMap<>();
-        if (user != null) {
-            map.put("userid", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), user.getUserid()));
-        } else {
-            map.put("userid", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), 0 + ""));
-
-        }
-        Log.e("userId", user.getUserid());
-        map.put("app", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), "Goods"));
-
-        map.put("class", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), "AddGoodsInfo"));
-        map.put("sign", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), Md5.md5("Goods" + "AddGoodsInfo" + Md5.secret)));
-        Log.e("sign", Md5.md5("Goods" + "AddGoodsInfo" + Md5.secret));
-        map.put("type", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), type + 1 + ""));
-
-        if (type == 1) {
-            if (additionImageWrapper.getImageList().size() < 1) {
-                setToast("请添加图片或视频");
-                return;
-            }
-        }
-
-
-        String goodsDetail = mDataBinding.etInfo.getText().toString().trim();
-        if (TextUtils.isEmpty(goodsDetail)) {
-            setToast("请输入文字信息");
-            return;
-        }
-        map.put("goods_detail", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), goodsDetail));
-        Log.e("goods_detail", goodsDetail);
-
-        if (type == 1) {
-            if (goodsInfo.isEmpty()) {
-                setToast("请添加商品规格");
-                return;
-            }
-
-            map.put("property", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), goodsInfo));
-            Log.e("property", goodsInfo);
-
-            if (file == null || !file.isFile()) {
-                setToast("请上传商品封面图");
-                return;
-            }
-        }
-
-
-        for (int i = 0; i < additionImageWrapper.getImageList().size(); i++) {
-            if (additionImageWrapper.getImageList().get(i).getAbsolutePath().endsWith("mp4")){
-                map.put("video" + i + "\"; filename=\"" + additionImageWrapper.getImageList().get(i).getName() + "", RequestBody.create(MediaType.get("multipart/form-data"), additionImageWrapper.getImageList().get(i)));
-
-            }else {
-                map.put("pic" + i + "\"; filename=\"" + additionImageWrapper.getImageList().get(i).getName() + "", RequestBody.create(MediaType.get("multipart/form-data"), additionImageWrapper.getImageList().get(i)));
-
-            }
-            Log.e("xxxx", additionImageWrapper.getImageList().get(i).getAbsolutePath());
-        }
-        if (file != null) {
-            map.put("pic" + additionImageWrapper.getImageList().size() + "\"; filename=\"" + file.getName() + "", RequestBody.create(MediaType.get("multipart/form-data"), file));
-
-            map.put("file_count", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), additionImageWrapper.getImageList().size() + 1 + ""));
-
-        } else {
-            map.put("file_count", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), additionImageWrapper.getImageList().size() + ""));
-
-        }
-        //   params.put(key + "\"; filename=\"" + ((File) o).getName() + "", requestBody);
-        progressDialog.setMessage("提交中");
-        progressDialog.show();
-
-
-//        Map<String, RequestBody> params = retrofitHttpUpLoad.addParameter(map).bulider();
-        retrofitHttpUpLoad.addToEnqueue(retrofitHttpUpLoad.mHttpService.upLoadAgree(ApiConfig.BASE_URL, map),
-                new RetrofitCallBack() {
-                    @Override
-                    public void onResponse(Response response, int method) {
-                        progressDialog.dismiss();
-                        if (method == HttpStaticApi.HTTP_UPLOADIMAGE) {
-                            Resultcode resultcode = (Resultcode) response.body();
-                            if (0 == (resultcode.status)) {
-                                setToast(getString(R.string.addSuccess));
-                                setResult(200);
-                                finish();
-                            } else {
-                                setToast(resultcode.msg);
-                            }
-                        }
-
-                    }
-
-                    @Override
-                    public void onFailure(Response response, int method) {
-                        progressDialog.dismiss();
-                        setToast("提交失败");
-                    }
-                }, HttpStaticApi.HTTP_UPLOADIMAGE);
-    }
-}
+package com.sl.house_property.discovery;
+
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.GridLayoutManager;
+
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+
+import com.gyf.immersionbar.ImmersionBar;
+import com.hjq.permissions.OnPermission;
+import com.hjq.permissions.Permission;
+import com.hjq.permissions.XXPermissions;
+import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.config.PictureMimeType;
+import com.luck.picture.lib.entity.LocalMedia;
+import com.luck.picture.lib.listener.OnResultCallbackListener;
+import com.lxj.xpopup.XPopup;
+import com.lxj.xpopup.interfaces.OnConfirmListener;
+import com.sl.house_property.BaseActivity;
+import com.sl.house_property.R;
+import com.sl.house_property.databinding.ActivityAddDiscoveryBinding;
+import com.sl.house_property.databinding.ItemAddGoodsBinding;
+import com.zhihu.matisse.Matisse;
+import com.zhihu.matisse.MimeType;
+import com.zhihu.matisse.engine.impl.PicassoEngine;
+import com.zhihu.matisse.internal.entity.CaptureStrategy;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import adapter.BaseRecycleViewAdapter;
+import entity.RegisterUser;
+import http.ApiConfig;
+import http.FileUpLoad.retrofit.HttpStaticApi;
+import http.FileUpLoad.retrofit.RetrofitCallBack;
+import http.FileUpLoad.retrofit.RetrofitHttpUpLoad;
+import my_loader.Resultcode;
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+import retrofit2.Response;
+import tools.Config;
+import tools.GlideEngine;
+import top.zibin.luban.Luban;
+import utils.Md5;
+
+public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBinding> {
+
+    private static final int REQUEST_CODE_SELECT_PICTURE = 300;
+    private int type;
+    private AdditionImageWrapper additionImageWrapper;
+    private ArrayList<GoodsInfoEntity> strings;
+    private String goodsInfo = "";
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_add_discovery;
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ImmersionBar.with(this)
+                .keyboardEnable(true)  //解决软键盘与底部输入框冲突问题
+                //  .keyboardEnable(true, WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
+                //                        | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)  //软键盘自动弹出
+                .init();
+        mDataBinding.rec2.setNestedScrollingEnabled(false);
+        mDataBinding.rvDynamicImage.setNestedScrollingEnabled(false);
+        mDataBinding.left.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        type = getIntent().getIntExtra("type", 0);
+        if (type == 0) {
+            mDataBinding.tvCover.setVisibility(View.GONE);
+            mDataBinding.vi.setVisibility(View.GONE);
+            mDataBinding.rec2.setVisibility(View.GONE);
+            mDataBinding.tvGoods.setVisibility(View.GONE);
+        } else if (type == 1) {
+
+            mDataBinding.tvCover.setVisibility(View.VISIBLE);
+            mDataBinding.vi.setVisibility(View.VISIBLE);
+            mDataBinding.rec2.setVisibility(View.VISIBLE);
+            mDataBinding.tvGoods.setVisibility(View.VISIBLE);
+            final BaseRecycleViewAdapter<GoodsInfoEntity, ItemAddGoodsBinding> adapter = new BaseRecycleViewAdapter<>(AddDiscoveryActivity.this, R.layout.item_add_goods);
+            strings = new ArrayList<>();
+            strings.add(new GoodsInfoEntity("+", "+"));
+            adapter.setData(strings);
+            adapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView<ItemAddGoodsBinding>() {
+                @Override
+                public void onBindViewHolder(ItemAddGoodsBinding b, int position) {
+                    b.tv.setText(strings.get(position).getValue());
+                }
+            });
+            adapter.setOnItemClickListener(new BaseRecycleViewAdapter.OnItemClickListener() {
+                @Override
+                public void onItemClick(View itemView, final int position) {
+                    if (strings.get(position).getValue().equals("+")) {
+                        //添加
+                        AddGoodsDialog addGoodsDialog = new AddGoodsDialog(AddDiscoveryActivity.this, null);
+                        addGoodsDialog.setOnAddGoodsInputListener(new AddGoodsDialog.OnAddGoodsInputListener() {
+                            @Override
+                            public void onConfirm(String info, String s) {
+//                                if (goodsInfo.equals("")) {
+//                                    goodsInfo = info;
+//                                } else {
+//                                    goodsInfo = goodsInfo + "|" + info;
+//                                }
+                                Log.e("xxxx", info);
+                                Log.e("xxxx1", s);
+                                strings.remove(strings.size() - 1);
+                                strings.add(new GoodsInfoEntity(info, s));
+                                for (int i = 0; i < strings.size(); i++) {
+                                    if (goodsInfo.equals("")) {
+                                        goodsInfo = goodsInfo + strings.get(i).getInfo();
+                                    } else {
+                                        goodsInfo = goodsInfo + "|" + strings.get(i).getInfo();
+                                    }
+                                }
+                                strings.add(new GoodsInfoEntity("+", "+"));
+                                adapter.setData(strings);
+
+
+                            }
+                        });
+                        new XPopup.Builder(AddDiscoveryActivity.this).asCustom(addGoodsDialog).show();
+
+                    } else {
+                        SelectDialog selectDialog = new SelectDialog(AddDiscoveryActivity.this);
+                        selectDialog.setOnSelectListener(new SelectDialog.OnSelectListener() {
+                            @Override
+                            public void select(int type) {
+                                if (type == 1) {
+                                    //编辑
+                                    AddGoodsDialog addGoodsDialog = new AddGoodsDialog(AddDiscoveryActivity.this, strings.get(position).getInfo());
+                                    addGoodsDialog.setOnAddGoodsInputListener(new AddGoodsDialog.OnAddGoodsInputListener() {
+                                        @Override
+                                        public void onConfirm(String info, String s) {
+                                            Log.e("xxxx", info);
+                                            Log.e("xxxx1", s);
+                                            strings.set(position, new GoodsInfoEntity(info, s));
+                                            strings.remove(strings.size() - 1);
+                                            for (int i = 0; i < strings.size(); i++) {
+                                                if (goodsInfo.equals("")) {
+                                                    goodsInfo = goodsInfo + strings.get(i).getInfo();
+                                                } else {
+                                                    goodsInfo = goodsInfo + "|" + strings.get(i).getInfo();
+                                                }
+                                            }
+                                            strings.add(new GoodsInfoEntity("+", "+"));
+                                            adapter.setData(strings);
+                                        }
+                                    });
+                                    new XPopup.Builder(AddDiscoveryActivity.this).asCustom(addGoodsDialog).show();
+                                } else if (type == 2) {
+                                    //删除
+                                    strings.remove(position);
+                                    strings.remove(strings.size() - 1);
+                                    for (int i = 0; i < strings.size(); i++) {
+                                        if (goodsInfo.equals("")) {
+                                            goodsInfo = goodsInfo + strings.get(i).getInfo();
+                                        } else {
+                                            goodsInfo = goodsInfo + "|" + strings.get(i).getInfo();
+                                        }
+                                    }
+                                    strings.add(new GoodsInfoEntity("+", "+"));
+                                    adapter.setData(strings);
+                                }
+                            }
+                        });
+                        new XPopup.Builder(AddDiscoveryActivity.this).asCustom(selectDialog).show();
+                    }
+                }
+            });
+            mDataBinding.rec2.setAdapter(adapter);
+            mDataBinding.rec2.setLayoutManager(new GridLayoutManager(AddDiscoveryActivity.this, 4));
+            mDataBinding.tvCover.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    checkAlbumPermission(411, 1);
+                }
+            });
+        }
+        additionImageWrapper = new AdditionImageWrapper(this, mDataBinding.rvDynamicImage);
+        additionImageWrapper.wrap(new AdditionImageWrapper.OnAdditionLayoutItemClick() {
+            @Override
+            public void onAdditionItemClick() {
+                //
+                Log.e("xxxxx","onAdditionItemClick");
+                checkAlbumPermission(REQUEST_CODE_SELECT_PICTURE, additionImageWrapper.getRemainCount());
+            }
+
+            @Override
+            public void onImageItemClick(int position) {
+                //普通图片被点击
+
+                List<File> imageList = additionImageWrapper.getImageList();
+                ArrayList<String> arrayListOf = new ArrayList<>();
+                for (int i = 0; i < imageList.size(); i++) {
+                    arrayListOf.add(imageList.get(i).getAbsolutePath());
+
+                }
+                Intent intent = new Intent(AddDiscoveryActivity.this, ImageViewerAndDeleteActivity.class);
+
+                if (arrayListOf.size() > 0 & arrayListOf.get(0).endsWith("mp4")) {
+                    String s = arrayListOf.get(0);
+                    arrayListOf.clear();
+                    arrayListOf.add(s);
+
+                    intent.putExtra("type", 1);
+                }
+                intent.putStringArrayListExtra("images", arrayListOf);
+                intent.putExtra("index", position);
+                intent.putStringArrayListExtra("images", arrayListOf);
+                startActivityForResult(intent, 111);
+            }
+        });
+        mDataBinding.tvSend.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                submit();
+            }
+        });
+    }
+
+    File file = null;
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 111 && resultCode == 111) {
+            ArrayList<String> images = data.getStringArrayListExtra("images");
+            ArrayList<File> files = new ArrayList<>();
+            for (int i = 0; i < images.size(); i++) {
+                files.add(new File(images.get(i)));
+            }
+            additionImageWrapper.setData(files);
+
+        } else if (requestCode == 411 && resultCode == RESULT_OK && data != null) {
+            List<String> strings = Matisse.obtainPathResult(data);
+
+            if (!strings.isEmpty()) {
+                try {
+                    List<File> list = Luban.with(AddDiscoveryActivity.this).load(strings).ignoreBy(100).setTargetDir(getCacheDir().getAbsolutePath()).get();
+                    if (null != list && list.size() > 0) {
+                        file = list.get(0);
+                        Bitmap bitmap = BitmapFactory.decodeFile(file.toString());
+                        mDataBinding.tvCover.setBackground(new BitmapDrawable(getResources(), bitmap));
+                        mDataBinding.tvCover.setText("");
+                    }
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+
+            }
+        }
+    }
+    ArrayList<File> files = new ArrayList<>();
+
+    private void goToSelect() {
+        int postType = PictureMimeType.ofAll();
+        if (additionImageWrapper.getImageList().size() > 0) {
+            postType = PictureMimeType.ofImage();
+        } else {
+            postType = PictureMimeType.ofAll();
+        }
+        PictureSelector create = PictureSelector.create(this);
+        if (postType == 1||postType==0) {
+            create.openGallery(postType)
+                    .isCamera(true)
+                    .isWeChatStyle(true)
+                    .maxSelectNum(additionImageWrapper.getRemainCount())
+                    .isPreviewImage(true)
+                    .isPreviewVideo(true)
+                    .isCompress(true)
+                    .videoMaxSecond(20)
+                    .videoMinSecond(3)
+                    .recordVideoSecond(15)
+                    .imageEngine(GlideEngine.createGlideEngine())
+                    .isWithVideoImage(false)
+                    .forResult(new OnResultCallbackListener<LocalMedia>() {
+                        @Override
+                        public void onResult(List<LocalMedia> result) {
+                            if (result != null && result.size() > 0) {
+                                for (int i = 0; i < result.size(); i++) {
+                                    LocalMedia item = result.get(i);
+                                    if (item.getMimeType().startsWith("image")) {
+                                        files.add(new File(item.getCompressPath()));
+                                    } else if (item.getMimeType().startsWith("video")) {
+                                        additionImageWrapper.setLimit(1);
+                                        files.add(new File(item.getRealPath()));
+                                    }
+                                }
+
+                                additionImageWrapper.setData(files);
+                            }
+                        }
+
+                        @Override
+                        public void onCancel() {
+
+                        }
+                    });
+        }
+    }
+//    private var postType: Int = 0
+//    fun goToSelect() {
+//        if (additionImageWrapper.imageList.size > 0) {
+//            if (postType == 0) {
+//                postType = 1
+//            }
+//        }
+//        val create = PictureSelector.create(this)
+//        if (postType == 0) {
+//            create.openGallery(PictureMimeType.ofAll())
+
+    //
+//                    .forResult(object : OnResultCallbackListener<LocalMedia> {
+//                override fun onResult(result: MutableList<LocalMedia>?) {
+//                    if (!result.isNullOrEmpty()) {
+//                        val mutableListOf = mutableListOf<VideoImagePathEntity>()
+//                        mutableListOf.addAll(additionImageWrapper.imageList)
+//                        for (item in result) {
+//                            if (item.mimeType.startsWith("image")) {
+//                                postType = 1
+//                                mutableListOf.add(VideoImagePathEntity(1, item.compressPath))
+//
+//                            } else if (item.mimeType.startsWith("video")) {
+//                                postType = 2
+//                                WKLog.e(item.realPath)
+//                                mutableListOf.add(VideoImagePathEntity(2, item.realPath))
+//                                additionImageWrapper.setLimit(1)
+//                                WKLog.e(item.path)
+//                                WKLog.e(item.realPath)
+//                            }
+//                        }
+//
+//
+//
+//
+//                        additionImageWrapper.setData(mutableListOf)
+//                    }
+//
+//                }
+//
+//                override fun onCancel() {
+//                }
+//
+//            })
+//        } else if (postType == 1) {
+//            create.openGallery(PictureMimeType.ofImage())
+//                    .isCamera(true)
+//                    .isWeChatStyle(true)
+//                    .maxSelectNum(additionImageWrapper.remainCount)
+//
+//                    .isPreviewImage(true)
+//                    .isPreviewVideo(true)
+//                    .isCompress(true)
+//                    .imageEngine(GlideEngine.createGlideEngine())
+//                    .isWithVideoImage(false)
+//                    .forResult(object : OnResultCallbackListener<LocalMedia> {
+//                override fun onResult(result: MutableList<LocalMedia>?) {
+//                    val mutableListOf = mutableListOf<VideoImagePathEntity>()
+//                    mutableListOf.addAll(additionImageWrapper.imageList)
+//                    if (!result.isNullOrEmpty()) {
+//                        for (item in result) {
+//                            mutableListOf.add(VideoImagePathEntity(1, item.compressPath))
+//                        }
+//                    }
+//                    additionImageWrapper.setData(mutableListOf)
+//                }
+//
+//                override fun onCancel() {
+//                }
+//
+//            })
+//        }
+//
+//
+//    }
+    private void selectImage(int requestCode, int max) {
+        Matisse
+                .from(this)
+                //选择视频和图片
+                .choose(MimeType.ofAll())
+
+                //这两行要连用 是否在选择图片中展示照相 和适配安卓7.0 FileProvider
+                .capture(true)
+                .captureStrategy(new CaptureStrategy(true, "PhotoPicker"))
+                //有序选择图片 123456...
+                .countable(true)
+                //最大选择数量为9
+                .maxSelectable(max)
+                //选择方向
+                .restrictOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
+                //界面中缩略图的质量
+                .thumbnailScale(0.8f)
+                //蓝色主题
+                .theme(R.style.Matisse_Zhihu_Custom)
+                //Picasso加载方式
+                .imageEngine(new PicassoEngine())
+                //请求码
+                .forResult(requestCode);
+    }
+
+
+    /*
+     * 检查访问相册权限
+     * */
+    private void checkAlbumPermission(final int requestCode, final int max) {
+        XXPermissions.with(this).permission(Permission.WRITE_EXTERNAL_STORAGE, Permission.CAMERA).request(new OnPermission() {
+            @Override
+            public void hasPermission(List<String> granted, boolean isAll) {
+                if (isAll) {
+                    goToSelect();
+                    //   selectImage(requestCode, max);
+                }
+            }
+
+            @Override
+            public void noPermission(List<String> denied, boolean quick) {
+                if (quick)
+                    new XPopup.Builder(AddDiscoveryActivity.this).asConfirm(
+                            "提示", "需要相册和相机权限才可以正常使用"
+                            , new OnConfirmListener() {
+                                @Override
+                                public void onConfirm() {
+                                    XXPermissions.gotoPermissionSettings(AddDiscoveryActivity.this);
+                                }
+                            }).show();
+            }
+        });
+//        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+//            selectImage(requestCode, max);
+//            return;
+//        }
+//        if ((ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)&&(ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED)) {
+//            //权限还没有授予，需要在这里写申请权限的代码
+//            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+//                requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA}, 2);
+//            }
+//
+//        } else {
+//            selectImage(requestCode, max);
+//        }
+    }
+
+
+    private void submit() {
+        RetrofitHttpUpLoad retrofitHttpUpLoad = RetrofitHttpUpLoad.getInstance();
+        retrofitHttpUpLoad.clear();
+//        Map<String, Object> map = new HashMap<>();
+        RegisterUser user =
+                Config.getInstance(this).getUser();
+        Map<String, RequestBody> map = new HashMap<>();
+        if (user != null) {
+            map.put("userid", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), user.getUserid()));
+        } else {
+            map.put("userid", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), 0 + ""));
+
+        }
+        Log.e("userId", user.getUserid());
+        map.put("app", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), "Goods"));
+
+        map.put("class", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), "AddGoodsInfo"));
+        map.put("sign", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), Md5.md5("Goods" + "AddGoodsInfo" + Md5.secret)));
+        Log.e("sign", Md5.md5("Goods" + "AddGoodsInfo" + Md5.secret));
+        map.put("type", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), type + 1 + ""));
+
+        if (type == 1) {
+            if (additionImageWrapper.getImageList().size() < 1) {
+                setToast("请添加图片或视频");
+                return;
+            }
+        }
+
+
+        String goodsDetail = mDataBinding.etInfo.getText().toString().trim();
+        if (TextUtils.isEmpty(goodsDetail)) {
+            setToast("请输入文字信息");
+            return;
+        }
+        map.put("goods_detail", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), goodsDetail));
+        Log.e("goods_detail", goodsDetail);
+
+        if (type == 1) {
+            if (goodsInfo.isEmpty()) {
+                setToast("请添加商品规格");
+                return;
+            }
+
+            map.put("property", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), goodsInfo));
+            Log.e("property", goodsInfo);
+
+            if (file == null || !file.isFile()) {
+                setToast("请上传商品封面图");
+                return;
+            }
+        }
+
+
+        for (int i = 0; i < additionImageWrapper.getImageList().size(); i++) {
+            if (additionImageWrapper.getImageList().get(i).getAbsolutePath().endsWith("mp4")){
+                map.put("video" + i + "\"; filename=\"" + additionImageWrapper.getImageList().get(i).getName() + "", RequestBody.create(MediaType.get("multipart/form-data"), additionImageWrapper.getImageList().get(i)));
+
+            }else {
+                map.put("pic" + i + "\"; filename=\"" + additionImageWrapper.getImageList().get(i).getName() + "", RequestBody.create(MediaType.get("multipart/form-data"), additionImageWrapper.getImageList().get(i)));
+
+            }
+            Log.e("xxxx", additionImageWrapper.getImageList().get(i).getAbsolutePath());
+        }
+        if (file != null) {
+            map.put("pic" + additionImageWrapper.getImageList().size() + "\"; filename=\"" + file.getName() + "", RequestBody.create(MediaType.get("multipart/form-data"), file));
+
+            map.put("file_count", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), additionImageWrapper.getImageList().size() + 1 + ""));
+
+        } else {
+            map.put("file_count", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), additionImageWrapper.getImageList().size() + ""));
+
+        }
+        //   params.put(key + "\"; filename=\"" + ((File) o).getName() + "", requestBody);
+        progressDialog.setMessage("提交中");
+        progressDialog.show();
+
+
+//        Map<String, RequestBody> params = retrofitHttpUpLoad.addParameter(map).bulider();
+        retrofitHttpUpLoad.addToEnqueue(retrofitHttpUpLoad.mHttpService.upLoadAgree(ApiConfig.BASE_URL, map),
+                new RetrofitCallBack() {
+                    @Override
+                    public void onResponse(Response response, int method) {
+                        progressDialog.dismiss();
+                        if (method == HttpStaticApi.HTTP_UPLOADIMAGE) {
+                            Resultcode resultcode = (Resultcode) response.body();
+                            if (0 == (resultcode.status)) {
+                                setToast(getString(R.string.addSuccess));
+                                setResult(200);
+                                finish();
+                            } else {
+                                setToast(resultcode.msg);
+                            }
+                        }
+
+                    }
+
+                    @Override
+                    public void onFailure(Response response, int method) {
+                        progressDialog.dismiss();
+                        setToast("提交失败");
+                    }
+                }, HttpStaticApi.HTTP_UPLOADIMAGE);
+    }
+}
diff --git a/app/src/main/java/com/sl/house_property/discovery/DiscoveryFragment.java b/app/src/main/java/com/sl/house_property/discovery/DiscoveryFragment.java
index 7957fc7..e6c61c2 100644
--- a/app/src/main/java/com/sl/house_property/discovery/DiscoveryFragment.java
+++ b/app/src/main/java/com/sl/house_property/discovery/DiscoveryFragment.java
@@ -1,1118 +1,1118 @@
-package com.sl.house_property.discovery;
-
-import android.app.ProgressDialog;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.graphics.Bitmap;
-import android.graphics.Rect;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewTreeObserver;
-import android.widget.Toast;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-import com.google.gson.Gson;
-import com.google.gson.internal.LinkedTreeMap;
-import com.google.gson.reflect.TypeToken;
-import com.gyf.immersionbar.ImmersionBar;
-import com.hjq.permissions.OnPermission;
-import com.hjq.permissions.Permission;
-import com.hjq.permissions.XXPermissions;
-import com.lxj.xpopup.XPopup;
-import com.lxj.xpopup.interfaces.OnConfirmListener;
-import com.lxj.xpopup.interfaces.OnSelectListener;
-import com.lzy.ninegrid.ImageInfo;
-import com.lzy.ninegrid.preview.NineGridViewClickAdapter;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
-import com.sl.house_property.BaseActivity;
-import com.sl.house_property.BaseFragment;
-import com.sl.house_property.MainTabActivity;
-import com.sl.house_property.R;
-import com.sl.house_property.databinding.FragmentDiscoveryBinding;
-import com.sl.house_property.databinding.ItemCommentBinding;
-import com.sl.house_property.databinding.ItemDiscoveryBinding;
-import com.sl.house_property.order.SettleActivity;
-import com.squareup.picasso.Picasso;
-import com.squareup.picasso.Target;
-import com.zhihu.matisse.Matisse;
-import com.zhihu.matisse.MimeType;
-import com.zhihu.matisse.engine.impl.PicassoEngine;
-import com.zhihu.matisse.internal.entity.CaptureStrategy;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.File;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import adapter.BaseRecycleViewAdapter;
-import entity.DiscoveryListEntity;
-import entity.GoodsDetailEntity;
-import entity.RegisterUser;
-import http.ApiConfig;
-import my_loader.Loader;
-import my_loader.Resultcode;
-import my_view.CommentDialog;
-import my_view.tao_bao_refresh.FullyGridLayoutManager;
-import rx.Subscription;
-import rx.functions.Action1;
-import tools.Config;
-import tools.PicassoRoundTransform;
-import top.zibin.luban.Luban;
-import utils.CommonUtils;
-import utils.KeyboardUtil;
-import utils.Md5;
-import utils.TimeUtils;
-import utils.UtilHelpers;
-
-public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> implements MainTabActivity.MyOnTouchListener {
-    private static final String ARG_PARAM1 = "param1";
-    private static final String ARG_PARAM2 = "param2";
-    private String mParam1;
-    private String mParam2;
-    BaseActivity baseActivity;
-    private ProgressDialog progressDialog;
-    private ArrayList<DiscoveryListEntity> discoveryListEntities = new ArrayList<>();
-
-    @Override
-    protected int getLayoutId() {
-        return R.layout.fragment_discovery;
-    }
-
-    @Override
-    public void loadData() {
-
-    }
-
-    private int page = 1;
-
-    @Override
-    protected void onCreateVew(LayoutInflater inflater, Bundle savedInstanceState) {
-        super.onCreateVew(inflater, savedInstanceState);
-        baseActivity = (BaseActivity) getActivity();
-        progressDialog = new ProgressDialog(baseActivity);
-        intRecycleView();
-        mDataBinding.dw.setOnRefreshLoadMoreListener(new OnRefreshLoadMoreListener() {
-            @Override
-            public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
-                getlist(page);
-            }
-
-            @Override
-            public void onRefresh(@NonNull RefreshLayout refreshLayout) {
-                page = 1;
-                getlist(page);
-            }
-        });
-        mDataBinding.dw.autoRefresh();
-
-        final MainTabActivity activity = (MainTabActivity) getActivity();
-        activity.registerMyOnTouchListener(this);
-        final String[] data = {"发布说说", "发布商品"};
-        mDataBinding.ivAdd.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-//                new XPopup.Builder(activity).atView(mDataBinding.ivAdd).asAttachList(data, null, new OnSelectListener() {
-//                    @Override
-//                    public void onSelect(int position, String text) {
-//                        Intent intent = new Intent(getContext(), AddDiscoveryActivity.class);
-//                        intent.putExtra("type", position);
-//                        startActivityForResult(intent, 14);
-//                    }
-//                }).show();
-                CreateTypeSelectDialog createTypeSelectDialog = new CreateTypeSelectDialog(activity);
-                createTypeSelectDialog.setOnSelectListener(new OnSelectListener() {
-                    @Override
-                    public void onSelect(int position, String text) {
-                        Intent intent = new Intent(getContext(), AddDiscoveryActivity.class);
-                        intent.putExtra("type", position);
-                        startActivityForResult(intent, 14);
-                    }
-                });
-                new XPopup.Builder(activity).asCustom(createTypeSelectDialog).show();
-
-            }
-        });
-        mDataBinding.v.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                checkAlbumPermission(191, 1);
-            }
-        });
-    }
-
-    private void selectImage(int requestCode, int max) {
-        Matisse
-                .from(this)
-                //选择视频和图片
-                .choose(MimeType.ofImage())
-
-                //这两行要连用 是否在选择图片中展示照相 和适配安卓7.0 FileProvider
-                .capture(true)
-                .captureStrategy(new CaptureStrategy(true, "PhotoPicker"))
-                //有序选择图片 123456...
-                .countable(true)
-                //最大选择数量为9
-                .maxSelectable(max)
-                //选择方向
-                .restrictOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
-                //界面中缩略图的质量
-                .thumbnailScale(0.8f)
-                //蓝色主题
-                .theme(R.style.Matisse_Zhihu)
-                //Picasso加载方式
-                .imageEngine(new PicassoEngine())
-                //请求码
-                .forResult(requestCode);
-    }
-
-
-    /*
-     * 检查访问相册权限
-     * */
-    private void checkAlbumPermission(final int requestCode, final int max) {
-        XXPermissions.with(baseActivity).permission(Permission.WRITE_EXTERNAL_STORAGE, Permission.CAMERA).request(new OnPermission() {
-            @Override
-            public void hasPermission(List<String> granted, boolean isAll) {
-                if (isAll) {
-                    selectImage(requestCode, max);
-                }
-            }
-
-            @Override
-            public void noPermission(List<String> denied, boolean quick) {
-                if (quick)
-                    new XPopup.Builder(baseActivity).asConfirm(
-                            "提示", "需要相册和相机权限才可以正常使用"
-                            , new OnConfirmListener() {
-                                @Override
-                                public void onConfirm() {
-                                    XXPermissions.gotoPermissionSettings(baseActivity);
-                                }
-                            }).show();
-            }
-        });
-//        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-//            selectImage(requestCode, max);
-//            return;
-//        }
-//        if ((ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)&&(ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED)) {
-//            //权限还没有授予，需要在这里写申请权限的代码
-//            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-//                requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA}, 2);
-//            }
-//
-//        } else {
-//            selectImage(requestCode, max);
-//        }
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        MainTabActivity activity = (MainTabActivity) getActivity();
-        activity.unregisterMyOnTouchListener(this);
-    }
-
-    public void updateEditTextBodyVisible(int visibility) {
-        mDataBinding.llComment.setVisibility(visibility);
-        if (View.VISIBLE == visibility) {
-            mDataBinding.llComment.requestFocus();
-            //弹出键盘
-            CommonUtils.showSoftInput(mDataBinding.etComment.getContext(), mDataBinding.etComment);
-
-        } else if (View.GONE == visibility) {
-            //隐藏键盘
-            MainTabActivity activity = (MainTabActivity) getActivity();
-            activity.visibilyBottom(View.VISIBLE);
-            CommonUtils.hideSoftInput(mDataBinding.etComment.getContext(), mDataBinding.etComment);
-        }
-    }
-
-    private int currentKeyboardH;
-    private int editTextBodyHeight;
-
-    private void setViewTreeObserver() {
-        final ViewTreeObserver swipeRefreshLayoutVTO = mDataBinding.rl.getViewTreeObserver();
-        swipeRefreshLayoutVTO.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-            @Override
-            public void onGlobalLayout() {
-                Rect r = new Rect();
-                mDataBinding.rl.getWindowVisibleDisplayFrame(r);
-                int statusBarH = ImmersionBar.getStatusBarHeight(DiscoveryFragment.this);//状态栏高度
-                int screenH = mDataBinding.rl.getRootView().getHeight();
-                if (r.top != statusBarH) {
-                    //r.top代表的是状态栏高度，在沉浸式状态栏时r.top＝0，通过getStatusBarHeight获取状态栏高度
-                    r.top = statusBarH;
-                }
-                int keyboardH = screenH - (r.bottom - r.top);
-
-                if (keyboardH == currentKeyboardH) {//有变化时才处理，否则会陷入死循环
-                    return;
-                }
-                currentKeyboardH = keyboardH;
-                editTextBodyHeight = mDataBinding.llComment.getHeight();
-                if (keyboardH < 150) {//说明是隐藏键盘的情况
-                    updateEditTextBodyVisible(View.GONE);
-                    return;
-                }
-            }
-        });
-    }
-
-    private Loader mGankLoader;
-
-    private void getlist(int mypage) {
-        RegisterUser user =
-                Config.getInstance(getContext()).getUser();
-        Map<String, String> map = new HashMap<>();
-        if (user != null) {
-            map.put("userid", user.getUserid());
-            mDataBinding.head.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    Intent intent = new Intent(getContext(), HistoryRecordActivity.class);
-                    intent.putExtra("userId", user.getUserid());
-                    intent.putExtra("userName", user.getNickname());
-                    intent.putExtra("title", user.getNickname());
-                    startActivity(intent);
-                }
-            });
-        } else {
-            map.put("userid", 0 + "");
-        }
-        map.put("app", "Goods");
-        map.put("class", "GoodsLists");
-        map.put("page", mypage + "");
-        map.put("sign", Md5.md5("Goods" + "GoodsLists" + Md5.secret));
-        getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), mypage);
-
-    }
-
-    private void addCart(String goods_id, String product_code, String goodsNum) {
-        RegisterUser user =
-                Config.getInstance(getContext()).getUser();
-        Map<String, String> map = new HashMap<>();
-        if (user != null) {
-            map.put("userid", user.getUserid());
-        } else {
-            map.put("userid", 0 + "");
-        }
-        map.put("app", "Goods");
-        map.put("class", "AddCart");
-        map.put("goods_id", goods_id);
-        map.put("product_code", product_code);
-        map.put("num", goodsNum);
-        map.put("sign", Md5.md5("Goods" + "AddCart" + Md5.secret));
-        progressDialog.setMessage("提交中");
-        progressDialog.setCancelable(false);
-        mGankLoader = new Loader();
-        Subscription subscribe = mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {
-            @Override
-            public void call(Resultcode resultcode) {
-                progressDialog.dismiss();
-                if (resultcode.status == 0) {
-                    baseActivity.setToast(0, "成功加入购物车");
-                } else {
-                    baseActivity.setToast(3, resultcode.msg);
-                }
-            }
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                progressDialog.dismiss();
-                baseActivity.setToast(2, "提交失败");
-                throwable.printStackTrace();
-            }
-        });
-        baseActivity.addSubscription(subscribe);
-    }
-
-    private void like(String goodsId, final int position) {
-        final RegisterUser user =
-                Config.getInstance(getContext()).getUser();
-        Map<String, String> map = new HashMap<>();
-        if (user != null) {
-            map.put("userid", user.getUserid());
-        } else {
-            map.put("userid", 0 + "");
-        }
-        map.put("app", "Goods");
-        map.put("class", "AddUp");
-        map.put("goods_id", goodsId);
-        map.put("sign", Md5.md5("Goods" + "AddUp" + Md5.secret));
-        progressDialog.setMessage("提交中");
-        progressDialog.setCancelable(false);
-//        progressDialog.show();
-
-        mGankLoader = new Loader();
-        Subscription subscription = mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {
-
-
-            @Override
-            public void call(Resultcode resultcode) {
-
-                progressDialog.dismiss();
-                if (!(resultcode.status == 0)) {
-                    baseActivity.setToast(1, resultcode.msg);
-                }
-                if (resultcode.status == 0) {
-                    BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
-                    if (discoveryListEntities.get(position).getIs_like() == 1) {
-                        discoveryListEntities.get(position).setIs_like(0);
-                        ArrayList<DiscoveryListEntity.Like> like = discoveryListEntities.get(position).getLike();
-                        for (int i = 0; i < like.size(); i++) {
-                            if (user.getUserid().equals(like.get(i).getUserid())) {
-                                like.remove(i);
-                                break;
-                            }
-                        }
-                        discoveryListEntities.get(position).setLike(like);
-                    } else {
-                        discoveryListEntities.get(position).setIs_like(1);
-                        DiscoveryListEntity.Like like = new DiscoveryListEntity.Like();
-                        like.setNickname(user.getNickname());
-                        like.setUserid(user.getUserid());
-                        discoveryListEntities.get(position).getLike().add(like);
-                    }
-
-                    adapter.upDateOne(position, discoveryListEntities.get(position));
-                }
-
-            }
-
-
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                progressDialog.dismiss();
-                baseActivity.setToast(2, "提交失败");
-                throwable.printStackTrace();
-            }
-        });
-
-        baseActivity.addSubscription(subscription);
-
-    }
-
-    /**
-     * 获取控件左上顶点Y坐标
-     *
-     * @param view
-     * @return
-     */
-    private int getCoordinateY(View view) {
-        int[] coordinate = new int[2];
-        view.getLocationOnScreen(coordinate);
-        return coordinate[1];
-    }
-
-    private int commentPosition = -1;
-
-    private void intRecycleView() {
-        mDataBinding.tvSendComment.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                setViewTreeObserver();
-            }
-        });
-        mDataBinding.sv.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                if (mDataBinding.llComment.getVisibility() == View.VISIBLE) {
-                    updateEditTextBodyVisible(View.GONE);
-                    return true;
-                }
-                return false;
-            }
-        });
-
-        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseActivity);
-        mDataBinding.recyView.setNestedScrollingEnabled(false);//禁止rcyc嵌套滑动
-        mDataBinding.recyView.setLayoutManager(linearLayoutManager);
-        BaseRecycleViewAdapter<DiscoveryListEntity, ItemDiscoveryBinding> baseRecycleViewAdapter = new BaseRecycleViewAdapter(getActivity(), R.layout.item_discovery);
-        baseRecycleViewAdapter.setHasStableIds(true);
-
-        discoveryListEntities = new ArrayList<>();
-        baseRecycleViewAdapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() {
-            @Override
-            public void onBindViewHolder(Object b, final int position) {
-                if (!(position >= discoveryListEntities.size())) {
-                    final ItemDiscoveryBinding homeGridAdapterItemBinding = (ItemDiscoveryBinding) b;
-                    //       homeGridAdapterItemBinding.setMyentity(discoveryListEntities.get(position));
-                    final DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
-                    homeGridAdapterItemBinding.tvNikeName.setText(discoveryListEntity.getNickname());
-                    homeGridAdapterItemBinding.tvContent.setText(discoveryListEntity.getGoods_detail());
-
-//                    Picasso.with(getActivity()).load(discoveryListEntity.getAvatar())
-//                            .placeholder(R.mipmap.icon_default_rectangle)
-//                            .transform(new PicassoRoundTransform())
-//                            .into(homeGridAdapterItemBinding.imageHead);
-
-                    homeGridAdapterItemBinding.ivComment.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(final View v) {
-                            final CommentDialog commentDialog = new CommentDialog(baseActivity);
-                            commentDialog.setShowBug(discoveryListEntity.getType().equals("2"));
-                            commentDialog.setPraise(discoveryListEntity.getIs_like() == 1);
-                            final int mBottomY = getCoordinateY(homeGridAdapterItemBinding.ivComment) + homeGridAdapterItemBinding.ivComment.getHeight();
-                            commentDialog.setOnCommentOperateListener(new CommentDialog.OnCommentOperateListener() {
-                                @Override
-                                public void click(int type) {
-
-                                    if (type == 1 || type == 2) {
-                                        //点赞/取消
-                                        commentDialog.dismiss();
-                                        like(discoveryListEntity.getGoods_id(), position);
-                                    } else if (type == 3) {
-                                        itemIndex = -1;
-                                        mDataBinding.llComment.setVisibility(View.VISIBLE);
-                                        mDataBinding.etComment.requestFocus();
-                                        mDataBinding.etComment.setHint("评论");
-                                        if (getActivity() instanceof MainTabActivity) {
-                                            MainTabActivity activity = (MainTabActivity) getActivity();
-                                            activity.visibilyBottom(View.GONE);
-                                        }
-                                        KeyboardUtil.showSoftInput(getContext());
-                                        commentPosition = position;
-                                        commentDialog.dismiss();
-                                        mDataBinding.etComment.setText("");
-                                        homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() {
-                                            @Override
-                                            public void run() {
-                                                int y = getCoordinateY(mDataBinding.llComment) - 20;
-                                                //评论时滑动到对应item底部和输入框顶部对齐
-                                                mDataBinding.sv.smoothScrollBy(0, mBottomY - y);
-                                            }
-                                        }, 300);
-
-//                                        mDataBinding.llComment.setVisibility(View.VISIBLE);
-//                                        mDataBinding.etComment.requestFocus();
-//                                        mDataBinding.etComment.setHint("评论");
-//                                        MainTabActivity activity = (MainTabActivity) getActivity();
-//                                        KeyboardUtil.showSoftInput(getContext());
-//                                        activity.visibilyBottom(View.GONE);
-//
-//                                        commentDialog.dismiss();
-//                                        mDataBinding.etComment.setText("");
-//                                        commentPosition = position;
-//                                        homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() {
-//                                            @Override
-//                                            public void run() {
-//                                                int y = getCoordinateY(mDataBinding.llComment) - 20;
-//                                                //评论时滑动到对应item底部和输入框顶部对齐
-//                                                mDataBinding.sv.smoothScrollBy(0, mBottomY - y);
-//
-//                                            }
-//                                        }, 300);
-
-
-                                    } else if (type == 4) {
-                                        //   addCart(discoveryListEntity.getGoods_id(),discoveryListEntity.)
-                                        getGoodsDetail(discoveryListEntity.getGoods_id(), discoveryListEntity, type);
-                                        commentDialog.dismiss();
-
-                                    } else if (type == 5) {
-                                        getGoodsDetail(discoveryListEntity.getGoods_id(), discoveryListEntity, type);
-                                        commentDialog.dismiss();
-                                    }
-                                }
-                            });
-                            new XPopup.Builder(baseActivity).hasShadowBg(false).atView(homeGridAdapterItemBinding.ivComment)
-                                    .asCustom(commentDialog)
-                                    .show();
-
-                        }
-                    });
-                    homeGridAdapterItemBinding.tvTime.setText(TimeUtils.getRecentTimeSpanByNow(TimeUtils.dataOne(discoveryListEntity.getCtime())));
-
-                    if (discoveryListEntity.getLike().isEmpty()) {
-                        homeGridAdapterItemBinding.tvLike.setVisibility(View.GONE);
-                    } else {
-                        homeGridAdapterItemBinding.tvLike.setVisibility(View.VISIBLE);
-                        StringBuilder likeString = new StringBuilder();
-                        for (int i = 0; i < discoveryListEntity.getLike().size(); i++) {
-                            //  if (i != 0 && i != discoveryListEntity.getLike().size() - 1) {
-                            //     likeString.append(",");
-                            //  }
-
-                            if (i != 0) {
-                                likeString.append(",");
-                            }
-                            likeString.append(discoveryListEntity.getLike().get(i).getNickname());
-
-                        }
-                        homeGridAdapterItemBinding.tvLike.setText(likeString.toString());
-                        //    TimeUtils.getRecentTimeSpanByNow(TimeUtils.dataOne(discoveryListEntity.getCtime()))
-
-
-                    }
-                    if (discoveryListEntity.getDis_content().isEmpty()) {
-                        homeGridAdapterItemBinding.rvComment.setVisibility(View.GONE);
-                    } else {
-                        homeGridAdapterItemBinding.rvComment.setVisibility(View.VISIBLE);
-                        FullyGridLayoutManager mgr = new FullyGridLayoutManager(getActivity(), 1);
-                        mgr.setOrientation(FullyGridLayoutManager.VERTICAL);
-                        mgr.setSmoothScrollbarEnabled(true);
-                        homeGridAdapterItemBinding.rvComment.setLayoutManager(mgr);
-                        BaseRecycleViewAdapter<DiscoveryListEntity.Dis_content, ItemCommentBinding> baseRecycleViewAdapter = new BaseRecycleViewAdapter(getActivity(), R.layout.item_comment);
-                        homeGridAdapterItemBinding.rvComment.setAdapter(baseRecycleViewAdapter);
-                        final ArrayList<DiscoveryListEntity.Dis_content> dis_content = discoveryListEntity.getDis_content();
-                        baseRecycleViewAdapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() {
-                            @Override
-                            public void onBindViewHolder(Object b, final int itemPosition) {
-                                ItemCommentBinding itemCommentBinding = (ItemCommentBinding) b;
-//                                itemCommentBinding.tvName.setText(dis_content.get(position).getNickname() + ":  ");
-//                                itemCommentBinding.tvInfo.setText(dis_content.get(position).getContents());
-//                                if (dis_content.get(position).getReply().isEmpty()) {
-//                                    itemCommentBinding.llHf.setVisibility(View.GONE);
-//
-//                                } else {
-//                                    itemCommentBinding.llHf.setVisibility(View.VISIBLE);
-//                                    itemCommentBinding.tvName2.setText(discoveryListEntity.getNickname());
-//                                    itemCommentBinding.tvInfo2.setText("回复");
-//                                    itemCommentBinding.tvName3.setText(dis_content.get(position).getNickname() + ":");
-//                                    itemCommentBinding.tvInfo3.setText(dis_content.get(position).getReply());
-//
-//                                }
-                                if (TextUtils.isEmpty(dis_content.get(itemPosition).getReply())) {
-                                    itemCommentBinding.llHf.setVisibility(View.GONE);
-                                    itemCommentBinding.ll.setVisibility(View.VISIBLE);
-                                    itemCommentBinding.tvName.setText(dis_content.get(itemPosition).getNickname() + ":  ");
-                                    itemCommentBinding.tvInfo.setText(dis_content.get(itemPosition).getContents());
-                                } else {
-                                    itemCommentBinding.ll.setVisibility(View.GONE);
-                                    itemCommentBinding.llHf.setVisibility(View.VISIBLE);
-                                    itemCommentBinding.tvName2.setText(dis_content.get(itemPosition).getNickname());
-                                    itemCommentBinding.tvInfo2.setText("回复");
-                                    itemCommentBinding.tvName3.setText(dis_content.get(itemPosition).getReply() + ":");
-                                    itemCommentBinding.tvInfo3.setText(dis_content.get(itemPosition).getContents());
-
-                                }
-                                itemCommentBinding.llItem.setOnClickListener(new View.OnClickListener() {
-                                    @Override
-                                    public void onClick(View v) {
-                                        final RegisterUser registerUser = Config.getInstance(getContext()).getUser();
-                                        if (registerUser == null) {
-                                            return;
-                                        }
-
-                                        final int mBottomY = getCoordinateY(homeGridAdapterItemBinding.ivComment) + homeGridAdapterItemBinding.ivComment.getHeight();
-
-                                        if (dis_content.get(itemPosition).getFrom_id() == null
-                                                || registerUser.getUserid().equals(dis_content.get(itemPosition).getFrom_id())) {
-                                            mDataBinding.llComment.setVisibility(View.GONE);
-                                            DeleteCommentDialog deleteCommentDialog = new DeleteCommentDialog(getContext());
-                                            deleteCommentDialog.setOnSelectListener(new SelectDialog.OnSelectListener() {
-                                                @Override
-                                                public void select(int type) {
-                                                    deleteComment(dis_content.get(itemPosition).getDis_id(), registerUser.getUserid(), position, itemPosition);
-                                                }
-                                            });
-                                            new XPopup.Builder(getContext()).asCustom(deleteCommentDialog).show();
-                                        } else {
-                                            itemIndex = itemPosition;
-
-                                            mDataBinding.llComment.setVisibility(View.VISIBLE);
-                                            mDataBinding.etComment.requestFocus();
-                                            mDataBinding.etComment.setHint("回复 " + dis_content.get(itemPosition).getNickname());
-                                            if (getActivity() instanceof MainTabActivity) {
-                                                MainTabActivity activity = (MainTabActivity) getActivity();
-                                                activity.visibilyBottom(View.GONE);
-                                            }
-                                            KeyboardUtil.showSoftInput(getContext());
-                                            commentPosition = position;
-                                            // commentDialog.dismiss();
-                                            mDataBinding.etComment.setText("");
-                                            homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() {
-                                                @Override
-                                                public void run() {
-                                                    int y = getCoordinateY(mDataBinding.llComment) - 20;
-                                                    //评论时滑动到对应item底部和输入框顶部对齐
-                                                    mDataBinding.sv.smoothScrollBy(0, mBottomY - y);
-                                                }
-                                            }, 300);
-
-                                        }
-
-
-                                    }
-                                });
-                            }
-                        });
-                        baseRecycleViewAdapter.setData(dis_content);
-
-                    }
-
-
-                    RequestOptions requestOptions = new RequestOptions();
-                    requestOptions.placeholder(R.mipmap.icon_default_rectangle);
-                    requestOptions.error(R.mipmap.icon_default_rectangle);
-
-                    Glide.with(getContext()).load(discoveryListEntity.getAvatar())
-                            .apply(requestOptions)
-                            .into(homeGridAdapterItemBinding.imageHead);
-                    homeGridAdapterItemBinding.imageHead.setOnClickListener(new View.OnClickListener() {
-                        @Override
-                        public void onClick(View v) {
-                            Intent intent = new Intent(getContext(), HistoryRecordActivity.class);
-                            intent.putExtra("userId", discoveryListEntity.getUserid());
-                            intent.putExtra("userName", discoveryListEntity.getNickname());
-                            intent.putExtra("title", discoveryListEntity.getNickname());
-                            startActivity(intent);
-                        }
-                    });
-                    ArrayList<ImageInfo> imageInfos = new ArrayList<>();
-
-                    if (discoveryListEntity.getPic().size() > 0) {
-
-                        //  Log.e("pic", discoveryListEntity.getPic().get(0));
-                        for (int i = 0; i < discoveryListEntity.getPic().size(); i++) {
-                            if (discoveryListEntity.getPic().get(i).endsWith(".mp4") || discoveryListEntity.getPic().get(i).endsWith(".avi")) {
-                                ImageInfo imageInfo = new ImageInfo();
-                                imageInfo.setType(2);
-                                imageInfo.setBigImageUrl(discoveryListEntity.getPic().get(i));
-                                imageInfo.setThumbnailUrl(discoveryListEntity.getPic().get(i));
-                                imageInfos.add(imageInfo);
-                            } else {
-                                ImageInfo imageInfo = new ImageInfo();
-                                imageInfo.setType(1);
-                                imageInfo.setBigImageUrl(discoveryListEntity.getPic().get(i));
-                                imageInfo.setThumbnailUrl(discoveryListEntity.getPic().get(i));
-                                imageInfos.add(imageInfo);
-                            }
-
-                        }
-
-                    } else if (!TextUtils.isEmpty(discoveryListEntity.getThumb())) {
-                        ImageInfo imageInfo = new ImageInfo();
-                        imageInfo.setType(1);
-                        imageInfo.setBigImageUrl(discoveryListEntity.getThumb());
-                        imageInfo.setThumbnailUrl(discoveryListEntity.getThumb());
-                        imageInfos.add(imageInfo);
-                    }
-                    homeGridAdapterItemBinding.nineGrid.setAdapter(new NineGridViewClickAdapter(getContext(), imageInfos));
-                }
-            }
-        });
-        mDataBinding.recyView.setAdapter(baseRecycleViewAdapter);
-
-        baseRecycleViewAdapter.setData(discoveryListEntities);
-        mDataBinding.tvSendComment.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                // discoveryListEntity.
-                if (commentPosition != -1) {
-                    MainTabActivity activity = (MainTabActivity) getActivity();
-                    CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment);
-                    mDataBinding.llComment.setVisibility(View.GONE);
-                    activity.visibilyBottom(View.VISIBLE);
-                    Log.e("xxx", discoveryListEntities.get(commentPosition).getGoods_id());
-                    comment(discoveryListEntities.get(commentPosition).getGoods_id(), commentPosition, itemIndex, mDataBinding.etComment.getText().toString());
-                }
-
-            }
-        });
-    }
-
-    private void getGankList(String myurl, Map<String, String> map, String msg, final int requstecode) {
-        progressDialog.setMessage(msg);
-        progressDialog.setCancelable(false);
-//        if (page>1){
-//            progressDialog.show();
-//        }
-
-
-        mGankLoader = new Loader();
-        Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
-
-
-            @Override
-            public void call(Resultcode resultcode) {
-
-                mDataBinding.dw.finishRefresh();
-                mDataBinding.dw.finishLoadMore();
-                progressDialog.dismiss();
-                if (!(resultcode.status == 0)) {
-                    baseActivity.setToast(1, resultcode.msg);
-                }
-                if (resultcode.status == 0) {
-                    // intRecycleView();
-                    Gson gs = new Gson();
-                    LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
-                    String s = gs.toJson(adta);
-
-                    //    String s = new GetJsonDataUtil().getJson(getActivity(), "controlStatus.json");//获取assets目录下的json文件数据
-                    try {
-                        DiscoverEntity discoverEntity = gs.fromJson(s, DiscoverEntity.class);
-                        //        JSONObject jsonObject = new JSONObject(s);
-                        //        org.json.JSONArray array = jsonObject.getJSONArray("info");
-                        //        Type type = new TypeToken<ArrayList<DiscoveryListEntity>>() {
-                        //       }.getType();
-                        if (page == 1) {
-                            String fengmian = discoverEntity.getFengmian();
-                            String avatar = discoverEntity.getAvatar();
-                            if (!TextUtils.isEmpty(fengmian)) {
-                                Picasso.with(getActivity()).load(fengmian)
-                                        .placeholder(R.mipmap.icon_default_rectangle)
-                                        .into(target);
-                            }
-                            if (!TextUtils.isEmpty(avatar)) {
-                                Picasso.with(getActivity()).load(avatar)
-                                        .placeholder(R.mipmap.icon_default_rectangle)
-                                        .transform(new PicassoRoundTransform())
-                                        .into(mDataBinding.head);
-                            }
-
-                            List<DiscoveryListEntity> info = discoverEntity.getInfo();
-                            discoveryListEntities.clear();
-                            discoveryListEntities.addAll(info);
-                            BaseRecycleViewAdapter baseRecycleViewAdapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
-                            baseRecycleViewAdapter.setData(discoveryListEntities);
-                            page++;
-
-                        } else {
-                            //  ArrayList<DiscoveryListEntity> o = new Gson().fromJson(array.toString(), type);
-                            List<DiscoveryListEntity> info = discoverEntity.getInfo();
-                            discoveryListEntities.addAll(info);
-
-                            BaseRecycleViewAdapter baseRecycleViewAdapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
-                            baseRecycleViewAdapter.setData(discoveryListEntities);
-                            //    Log.e("sizi", discoveryListEntities.size() + "");
-                            //   int count = jsonObject.getInt("count");
-                            if (info.isEmpty()) {
-                                mDataBinding.dw.finishLoadMoreWithNoMoreData();
-                            } else {
-
-                                page++;
-
-                            }
-                        }
-
-
-                    } catch (Exception e) {
-                        e.fillInStackTrace();
-                    }
-                }
-
-            }
-
-
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                progressDialog.dismiss();
-                mDataBinding.dw.finishRefresh();
-                mDataBinding.dw.finishLoadMore();
-                baseActivity.setToast(2, getString(R.string.getdatafailure));
-                throwable.printStackTrace();
-            }
-        });
-
-        baseActivity.addSubscription(subscription);
-    }
-
-    private Target target = new Target() {
-        @Override
-        public void onBitmapLoaded(Bitmap bitmap, Picasso.LoadedFrom from) {
-            Drawable drawable = new BitmapDrawable(bitmap);
-            mDataBinding.v.setBackground(drawable);
-
-
-        }
-
-        @Override
-        public void onBitmapFailed(Drawable errorDrawable) {
-        }
-
-        @Override
-        public void onPrepareLoad(Drawable placeHolderDrawable) {
-        }
-    };
-
-    public static DiscoveryFragment newInstance(String param1, String param2) {
-        DiscoveryFragment fragment = new DiscoveryFragment();
-        Bundle args = new Bundle();
-        args.putString(ARG_PARAM1, param1);
-        args.putString(ARG_PARAM2, param2);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getArguments() != null) {
-            mParam1 = getArguments().getString(ARG_PARAM1);
-            mParam2 = getArguments().getString(ARG_PARAM2);
-        }
-
-    }
-
-    @Override
-    public boolean onTouch(MotionEvent ev) {
-        switch (ev.getAction()) {
-
-            case MotionEvent.ACTION_DOWN:
-                //点击空白处隐藏键盘，隐藏输入框相关
-                if (getActivity().getCurrentFocus() != null && getActivity().getCurrentFocus().getId() == R.id.tv_send_comment) {
-                    return false;
-                }
-                boolean b = UtilHelpers.hideKeyboard(ev, getActivity().getCurrentFocus(), getActivity());
-                if (b) {
-                    CommonUtils.hideSoftInput(mDataBinding.etComment.getContext(), mDataBinding.etComment);
-                    MainTabActivity activity = (MainTabActivity) getActivity();
-                    activity.visibilyBottom(View.VISIBLE);
-                    mDataBinding.llComment.setVisibility(View.GONE);
-                }
-                break;
-        }
-        return false;
-    }
-
-    private void getGoodsDetail(final String goodsId, final DiscoveryListEntity entity, final int goodtype) {
-        final RegisterUser user =
-                Config.getInstance(getContext()).getUser();
-        Map<String, String> map = new HashMap<>();
-        if (user != null) {
-            map.put("userid", user.getUserid());
-        } else {
-            map.put("userid", 0 + "");
-        }
-        map.put("app", "Goods");
-        map.put("class", "GoodsInfo");
-        map.put("goods_id", goodsId);
-        map.put("sign", Md5.md5("Goods" + "GoodsInfo" + Md5.secret));
-        progressDialog.setMessage("获取信息中");
-        progressDialog.setCancelable(false);
-        mGankLoader = new Loader();
-        Subscription subscription = mGankLoader.getMovie(ApiConfig.BASE_URL, map)
-                .subscribe(new Action1<Resultcode>() {
-                    @Override
-                    public void call(Resultcode resultcode) {
-                        progressDialog.dismiss();
-                        if (resultcode.status == 0) {
-                            Gson gs = new Gson();
-                            LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
-                            String s = gs.toJson(adta);
-
-                            try {
-
-                                JSONObject jsonObject = new JSONObject(s);
-                                org.json.JSONArray array = jsonObject.getJSONArray("info");
-                                final Type type = new TypeToken<ArrayList<GoodsDetailEntity>>() {
-                                }.getType();
-                                ArrayList<GoodsDetailEntity> o = gs.fromJson(array.toString(), type);
-
-                                GoodsInfoDialog goodsInfoDialog = new GoodsInfoDialog(baseActivity, entity, o);
-                                goodsInfoDialog.setOnConfirmListener(new GoodsInfoDialog.OnGoodsSelectPropertyListener() {
-                                    @Override
-                                    public void onSelect(String code, int num) {
-                                        if (goodtype == 4) {
-                                            Intent intent = new Intent(baseActivity, SettleActivity.class);
-                                            intent.putExtra("goodsType", 1);
-                                            intent.putExtra("goods_id", goodsId);
-                                            intent.putExtra("product_code", code);
-                                            intent.putExtra("sale_num", num + "");
-                                            startActivity(intent);
-                                        } else if (goodtype == 5) {
-                                            addCart(goodsId, code, num + "");
-                                        }
-
-                                    }
-                                });
-                                new XPopup.Builder(baseActivity).asCustom(goodsInfoDialog).show();
-
-                            } catch (JSONException e) {
-                                e.printStackTrace();
-                            }
-
-                        } else {
-                            baseActivity.setToast(resultcode.msg);
-                        }
-                    }
-                }, new Action1<Throwable>() {
-                    @Override
-                    public void call(Throwable throwable) {
-                        progressDialog.dismiss();
-                        baseActivity.setToast(2, "获取信息失败");
-                        throwable.printStackTrace();
-                    }
-                });
-        baseActivity.addSubscription(subscription);
-    }
-
-    private int itemIndex = -1;
-
-    private void comment(String goodsId, final int position, final int itemIndex, final String content) {
-        final RegisterUser user =
-                Config.getInstance(getContext()).getUser();
-        Map<String, String> map = new HashMap<>();
-        if (user != null) {
-            map.put("userid", user.getUserid());
-
-        } else {
-            map.put("userid", 0 + "");
-        }
-        map.put("app", "Goods");
-        map.put("class", "DisGoods");
-        map.put("goods_id", goodsId);
-        if (itemIndex != -1) {
-            DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
-            ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
-            String from_id = dis_content1.get(itemIndex).getFrom_id();
-            if (!TextUtils.isEmpty(from_id)) {
-                map.put("reply_id", from_id);
-            }
-        }
-
-        map.put("contents", content);
-        map.put("sign", Md5.md5("Goods" + "DisGoods" + Md5.secret));
-        progressDialog.setMessage("提交中");
-        progressDialog.setCancelable(false);
-//        progressDialog.show();
-
-        mGankLoader = new Loader();
-        Subscription subscription = mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {
-
-
-            @Override
-            public void call(Resultcode resultcode) {
-
-                progressDialog.dismiss();
-                if (!(resultcode.status == 0)) {
-                    baseActivity.setToast(1, resultcode.msg);
-                }
-                if (resultcode.status == 0) {
-                    String nickname = user.getNickname();
-                    BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
-                    DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content();
-                    dis_content.setContents(content);
-                    dis_content.setNickname(nickname);
-
-                    DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
-                    ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
-                    if (itemIndex != -1) {
-                        dis_content.setReply(dis_content1.get(itemIndex).getNickname());
-                    }
-                    dis_content1.add(dis_content);
-                    discoveryListEntity.setDis_content(dis_content1);
-                    adapter.upDateOne(position, discoveryListEntity);
-//                    String nickname = user.getNickname();
-//                    BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
-//                    DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content();
-//                    dis_content.setContents(content);
-//                    dis_content.setNickname(nickname);
-//                    dis_content.setReply("");
-//                    DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
-//                    ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
-//                    dis_content1.add(dis_content);
-//
-//                    discoveryListEntity.setDis_content(dis_content1);
-//                    adapter.upDateOne(position, discoveryListEntity);
-//                    BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
-//                    if (discoveryListEntities.get(position).getDis_content().isEmpty()) {
-//                        DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content();
-//                        dis_content.setContents(content);
-//
-//                    }
-//
-//                    adapter.upDateOne(position, discoveryListEntities.get(position));
-                }
-
-            }
-
-
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                progressDialog.dismiss();
-                baseActivity.setToast(2, "提交失败");
-                throwable.printStackTrace();
-            }
-        });
-
-        baseActivity.addSubscription(subscription);
-
-    }
-
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == 14 && resultCode == 200) {
-            page = 1;
-            getlist(1);
-        } else if (requestCode == 191) {
-            //选取图片回调
-            if (data==null){
-                return;
-            }
-            List<String> strings = Matisse.obtainPathResult(data);
-            if (!strings.isEmpty()){
-                try {
-
-                    List<File> list = Luban.with(baseActivity).load(strings).ignoreBy(100).setTargetDir(baseActivity.getCacheDir().getAbsolutePath()).get();
-                    if (null != list && list.size() > 0) {
-                    File    file = list.get(0);
-                       // Bitmap bitmap = BitmapFactory.decodeFile(file.toString());
-                        Picasso.with(getActivity()).load(file)
-                                .placeholder(R.mipmap.icon_default_rectangle)
-                                .into(target);
-                    }
-                }catch (Exception e){
-
-                }
-
-            }
-        }
-
-    }
-
-    private void deleteComment(String dis_id, String userid, final int superPosition, final int itemPosition) {
-        Map<String, String> map = new HashMap<>();
-
-        progressDialog.show();
-        map.put("app", "Goods");
-
-        map.put("class", "DelDis");
-        map.put("sign", Md5.md5("Goods" + "DelDis" + Md5.secret));
-        map.put("dis_id", dis_id);
-        map.put("userid", userid);
-        mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {
-            @Override
-            public void call(Resultcode resultcode) {
-                progressDialog.dismiss();
-                if (!(resultcode.status == 0)) {
-                    Toast.makeText(getContext(), resultcode.msg, Toast.LENGTH_SHORT).show();
-                } else {
-                    BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
-                    DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(superPosition);
-                    ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
-                    dis_content1.remove(itemPosition);
-                    discoveryListEntity.setDis_content(dis_content1);
-                    adapter.upDateOne(superPosition, discoveryListEntity);
-                }
-            }
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                Toast.makeText(getContext(), getString(R.string.getdatafailure), Toast.LENGTH_SHORT).show();
-            }
-        });
-    }
-}
+package com.sl.house_property.discovery;
+
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.graphics.Bitmap;
+import android.graphics.Rect;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.widget.Toast;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
+import com.google.gson.Gson;
+import com.google.gson.internal.LinkedTreeMap;
+import com.google.gson.reflect.TypeToken;
+import com.gyf.immersionbar.ImmersionBar;
+import com.hjq.permissions.OnPermission;
+import com.hjq.permissions.Permission;
+import com.hjq.permissions.XXPermissions;
+import com.lxj.xpopup.XPopup;
+import com.lxj.xpopup.interfaces.OnConfirmListener;
+import com.lxj.xpopup.interfaces.OnSelectListener;
+import com.lzy.ninegrid.ImageInfo;
+import com.lzy.ninegrid.preview.NineGridViewClickAdapter;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
+import com.sl.house_property.BaseActivity;
+import com.sl.house_property.BaseFragment;
+import com.sl.house_property.MainTabActivity;
+import com.sl.house_property.R;
+import com.sl.house_property.databinding.FragmentDiscoveryBinding;
+import com.sl.house_property.databinding.ItemCommentBinding;
+import com.sl.house_property.databinding.ItemDiscoveryBinding;
+import com.sl.house_property.order.SettleActivity;
+import com.squareup.picasso.Picasso;
+import com.squareup.picasso.Target;
+import com.zhihu.matisse.Matisse;
+import com.zhihu.matisse.MimeType;
+import com.zhihu.matisse.engine.impl.PicassoEngine;
+import com.zhihu.matisse.internal.entity.CaptureStrategy;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.File;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import adapter.BaseRecycleViewAdapter;
+import entity.DiscoveryListEntity;
+import entity.GoodsDetailEntity;
+import entity.RegisterUser;
+import http.ApiConfig;
+import my_loader.Loader;
+import my_loader.Resultcode;
+import my_view.CommentDialog;
+import my_view.tao_bao_refresh.FullyGridLayoutManager;
+import rx.Subscription;
+import rx.functions.Action1;
+import tools.Config;
+import tools.PicassoRoundTransform;
+import top.zibin.luban.Luban;
+import utils.CommonUtils;
+import utils.KeyboardUtil;
+import utils.Md5;
+import utils.TimeUtils;
+import utils.UtilHelpers;
+
+public class DiscoveryFragment extends BaseFragment<FragmentDiscoveryBinding> implements MainTabActivity.MyOnTouchListener {
+    private static final String ARG_PARAM1 = "param1";
+    private static final String ARG_PARAM2 = "param2";
+    private String mParam1;
+    private String mParam2;
+    BaseActivity baseActivity;
+    private ProgressDialog progressDialog;
+    private ArrayList<DiscoveryListEntity> discoveryListEntities = new ArrayList<>();
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.fragment_discovery;
+    }
+
+    @Override
+    public void loadData() {
+
+    }
+
+    private int page = 1;
+
+    @Override
+    protected void onCreateVew(LayoutInflater inflater, Bundle savedInstanceState) {
+        super.onCreateVew(inflater, savedInstanceState);
+        baseActivity = (BaseActivity) getActivity();
+        progressDialog = new ProgressDialog(baseActivity);
+        intRecycleView();
+        mDataBinding.dw.setOnRefreshLoadMoreListener(new OnRefreshLoadMoreListener() {
+            @Override
+            public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
+                getlist(page);
+            }
+
+            @Override
+            public void onRefresh(@NonNull RefreshLayout refreshLayout) {
+                page = 1;
+                getlist(page);
+            }
+        });
+        mDataBinding.dw.autoRefresh();
+
+        final MainTabActivity activity = (MainTabActivity) getActivity();
+        activity.registerMyOnTouchListener(this);
+        final String[] data = {"发布说说", "发布商品"};
+        mDataBinding.ivAdd.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+//                new XPopup.Builder(activity).atView(mDataBinding.ivAdd).asAttachList(data, null, new OnSelectListener() {
+//                    @Override
+//                    public void onSelect(int position, String text) {
+//                        Intent intent = new Intent(getContext(), AddDiscoveryActivity.class);
+//                        intent.putExtra("type", position);
+//                        startActivityForResult(intent, 14);
+//                    }
+//                }).show();
+                CreateTypeSelectDialog createTypeSelectDialog = new CreateTypeSelectDialog(activity);
+                createTypeSelectDialog.setOnSelectListener(new OnSelectListener() {
+                    @Override
+                    public void onSelect(int position, String text) {
+                        Intent intent = new Intent(getContext(), AddDiscoveryActivity.class);
+                        intent.putExtra("type", position);
+                        startActivityForResult(intent, 14);
+                    }
+                });
+                new XPopup.Builder(activity).asCustom(createTypeSelectDialog).show();
+
+            }
+        });
+        mDataBinding.v.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                checkAlbumPermission(191, 1);
+            }
+        });
+    }
+
+    private void selectImage(int requestCode, int max) {
+        Matisse
+                .from(this)
+                //选择视频和图片
+                .choose(MimeType.ofImage())
+
+                //这两行要连用 是否在选择图片中展示照相 和适配安卓7.0 FileProvider
+                .capture(true)
+                .captureStrategy(new CaptureStrategy(true, "PhotoPicker"))
+                //有序选择图片 123456...
+                .countable(true)
+                //最大选择数量为9
+                .maxSelectable(max)
+                //选择方向
+                .restrictOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
+                //界面中缩略图的质量
+                .thumbnailScale(0.8f)
+                //蓝色主题
+                .theme(R.style.Matisse_Zhihu_Custom)
+                //Picasso加载方式
+                .imageEngine(new PicassoEngine())
+                //请求码
+                .forResult(requestCode);
+    }
+
+
+    /*
+     * 检查访问相册权限
+     * */
+    private void checkAlbumPermission(final int requestCode, final int max) {
+        XXPermissions.with(baseActivity).permission(Permission.WRITE_EXTERNAL_STORAGE, Permission.CAMERA).request(new OnPermission() {
+            @Override
+            public void hasPermission(List<String> granted, boolean isAll) {
+                if (isAll) {
+                    selectImage(requestCode, max);
+                }
+            }
+
+            @Override
+            public void noPermission(List<String> denied, boolean quick) {
+                if (quick)
+                    new XPopup.Builder(baseActivity).asConfirm(
+                            "提示", "需要相册和相机权限才可以正常使用"
+                            , new OnConfirmListener() {
+                                @Override
+                                public void onConfirm() {
+                                    XXPermissions.gotoPermissionSettings(baseActivity);
+                                }
+                            }).show();
+            }
+        });
+//        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+//            selectImage(requestCode, max);
+//            return;
+//        }
+//        if ((ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)&&(ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED)) {
+//            //权限还没有授予，需要在这里写申请权限的代码
+//            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+//                requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.CAMERA}, 2);
+//            }
+//
+//        } else {
+//            selectImage(requestCode, max);
+//        }
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        MainTabActivity activity = (MainTabActivity) getActivity();
+        activity.unregisterMyOnTouchListener(this);
+    }
+
+    public void updateEditTextBodyVisible(int visibility) {
+        mDataBinding.llComment.setVisibility(visibility);
+        if (View.VISIBLE == visibility) {
+            mDataBinding.llComment.requestFocus();
+            //弹出键盘
+            CommonUtils.showSoftInput(mDataBinding.etComment.getContext(), mDataBinding.etComment);
+
+        } else if (View.GONE == visibility) {
+            //隐藏键盘
+            MainTabActivity activity = (MainTabActivity) getActivity();
+            activity.visibilyBottom(View.VISIBLE);
+            CommonUtils.hideSoftInput(mDataBinding.etComment.getContext(), mDataBinding.etComment);
+        }
+    }
+
+    private int currentKeyboardH;
+    private int editTextBodyHeight;
+
+    private void setViewTreeObserver() {
+        final ViewTreeObserver swipeRefreshLayoutVTO = mDataBinding.rl.getViewTreeObserver();
+        swipeRefreshLayoutVTO.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                Rect r = new Rect();
+                mDataBinding.rl.getWindowVisibleDisplayFrame(r);
+                int statusBarH = ImmersionBar.getStatusBarHeight(DiscoveryFragment.this);//状态栏高度
+                int screenH = mDataBinding.rl.getRootView().getHeight();
+                if (r.top != statusBarH) {
+                    //r.top代表的是状态栏高度，在沉浸式状态栏时r.top＝0，通过getStatusBarHeight获取状态栏高度
+                    r.top = statusBarH;
+                }
+                int keyboardH = screenH - (r.bottom - r.top);
+
+                if (keyboardH == currentKeyboardH) {//有变化时才处理，否则会陷入死循环
+                    return;
+                }
+                currentKeyboardH = keyboardH;
+                editTextBodyHeight = mDataBinding.llComment.getHeight();
+                if (keyboardH < 150) {//说明是隐藏键盘的情况
+                    updateEditTextBodyVisible(View.GONE);
+                    return;
+                }
+            }
+        });
+    }
+
+    private Loader mGankLoader;
+
+    private void getlist(int mypage) {
+        RegisterUser user =
+                Config.getInstance(getContext()).getUser();
+        Map<String, String> map = new HashMap<>();
+        if (user != null) {
+            map.put("userid", user.getUserid());
+            mDataBinding.head.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Intent intent = new Intent(getContext(), HistoryRecordActivity.class);
+                    intent.putExtra("userId", user.getUserid());
+                    intent.putExtra("userName", user.getNickname());
+                    intent.putExtra("title", user.getNickname());
+                    startActivity(intent);
+                }
+            });
+        } else {
+            map.put("userid", 0 + "");
+        }
+        map.put("app", "Goods");
+        map.put("class", "GoodsLists");
+        map.put("page", mypage + "");
+        map.put("sign", Md5.md5("Goods" + "GoodsLists" + Md5.secret));
+        getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), mypage);
+
+    }
+
+    private void addCart(String goods_id, String product_code, String goodsNum) {
+        RegisterUser user =
+                Config.getInstance(getContext()).getUser();
+        Map<String, String> map = new HashMap<>();
+        if (user != null) {
+            map.put("userid", user.getUserid());
+        } else {
+            map.put("userid", 0 + "");
+        }
+        map.put("app", "Goods");
+        map.put("class", "AddCart");
+        map.put("goods_id", goods_id);
+        map.put("product_code", product_code);
+        map.put("num", goodsNum);
+        map.put("sign", Md5.md5("Goods" + "AddCart" + Md5.secret));
+        progressDialog.setMessage("提交中");
+        progressDialog.setCancelable(false);
+        mGankLoader = new Loader();
+        Subscription subscribe = mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {
+            @Override
+            public void call(Resultcode resultcode) {
+                progressDialog.dismiss();
+                if (resultcode.status == 0) {
+                    baseActivity.setToast(0, "成功加入购物车");
+                } else {
+                    baseActivity.setToast(3, resultcode.msg);
+                }
+            }
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                progressDialog.dismiss();
+                baseActivity.setToast(2, "提交失败");
+                throwable.printStackTrace();
+            }
+        });
+        baseActivity.addSubscription(subscribe);
+    }
+
+    private void like(String goodsId, final int position) {
+        final RegisterUser user =
+                Config.getInstance(getContext()).getUser();
+        Map<String, String> map = new HashMap<>();
+        if (user != null) {
+            map.put("userid", user.getUserid());
+        } else {
+            map.put("userid", 0 + "");
+        }
+        map.put("app", "Goods");
+        map.put("class", "AddUp");
+        map.put("goods_id", goodsId);
+        map.put("sign", Md5.md5("Goods" + "AddUp" + Md5.secret));
+        progressDialog.setMessage("提交中");
+        progressDialog.setCancelable(false);
+//        progressDialog.show();
+
+        mGankLoader = new Loader();
+        Subscription subscription = mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {
+
+
+            @Override
+            public void call(Resultcode resultcode) {
+
+                progressDialog.dismiss();
+                if (!(resultcode.status == 0)) {
+                    baseActivity.setToast(1, resultcode.msg);
+                }
+                if (resultcode.status == 0) {
+                    BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
+                    if (discoveryListEntities.get(position).getIs_like() == 1) {
+                        discoveryListEntities.get(position).setIs_like(0);
+                        ArrayList<DiscoveryListEntity.Like> like = discoveryListEntities.get(position).getLike();
+                        for (int i = 0; i < like.size(); i++) {
+                            if (user.getUserid().equals(like.get(i).getUserid())) {
+                                like.remove(i);
+                                break;
+                            }
+                        }
+                        discoveryListEntities.get(position).setLike(like);
+                    } else {
+                        discoveryListEntities.get(position).setIs_like(1);
+                        DiscoveryListEntity.Like like = new DiscoveryListEntity.Like();
+                        like.setNickname(user.getNickname());
+                        like.setUserid(user.getUserid());
+                        discoveryListEntities.get(position).getLike().add(like);
+                    }
+
+                    adapter.upDateOne(position, discoveryListEntities.get(position));
+                }
+
+            }
+
+
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                progressDialog.dismiss();
+                baseActivity.setToast(2, "提交失败");
+                throwable.printStackTrace();
+            }
+        });
+
+        baseActivity.addSubscription(subscription);
+
+    }
+
+    /**
+     * 获取控件左上顶点Y坐标
+     *
+     * @param view
+     * @return
+     */
+    private int getCoordinateY(View view) {
+        int[] coordinate = new int[2];
+        view.getLocationOnScreen(coordinate);
+        return coordinate[1];
+    }
+
+    private int commentPosition = -1;
+
+    private void intRecycleView() {
+        mDataBinding.tvSendComment.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                setViewTreeObserver();
+            }
+        });
+        mDataBinding.sv.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                if (mDataBinding.llComment.getVisibility() == View.VISIBLE) {
+                    updateEditTextBodyVisible(View.GONE);
+                    return true;
+                }
+                return false;
+            }
+        });
+
+        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(baseActivity);
+        mDataBinding.recyView.setNestedScrollingEnabled(false);//禁止rcyc嵌套滑动
+        mDataBinding.recyView.setLayoutManager(linearLayoutManager);
+        BaseRecycleViewAdapter<DiscoveryListEntity, ItemDiscoveryBinding> baseRecycleViewAdapter = new BaseRecycleViewAdapter(getActivity(), R.layout.item_discovery);
+        baseRecycleViewAdapter.setHasStableIds(true);
+
+        discoveryListEntities = new ArrayList<>();
+        baseRecycleViewAdapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() {
+            @Override
+            public void onBindViewHolder(Object b, final int position) {
+                if (!(position >= discoveryListEntities.size())) {
+                    final ItemDiscoveryBinding homeGridAdapterItemBinding = (ItemDiscoveryBinding) b;
+                    //       homeGridAdapterItemBinding.setMyentity(discoveryListEntities.get(position));
+                    final DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
+                    homeGridAdapterItemBinding.tvNikeName.setText(discoveryListEntity.getNickname());
+                    homeGridAdapterItemBinding.tvContent.setText(discoveryListEntity.getGoods_detail());
+
+//                    Picasso.with(getActivity()).load(discoveryListEntity.getAvatar())
+//                            .placeholder(R.mipmap.icon_default_rectangle)
+//                            .transform(new PicassoRoundTransform())
+//                            .into(homeGridAdapterItemBinding.imageHead);
+
+                    homeGridAdapterItemBinding.ivComment.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(final View v) {
+                            final CommentDialog commentDialog = new CommentDialog(baseActivity);
+                            commentDialog.setShowBug(discoveryListEntity.getType().equals("2"));
+                            commentDialog.setPraise(discoveryListEntity.getIs_like() == 1);
+                            final int mBottomY = getCoordinateY(homeGridAdapterItemBinding.ivComment) + homeGridAdapterItemBinding.ivComment.getHeight();
+                            commentDialog.setOnCommentOperateListener(new CommentDialog.OnCommentOperateListener() {
+                                @Override
+                                public void click(int type) {
+
+                                    if (type == 1 || type == 2) {
+                                        //点赞/取消
+                                        commentDialog.dismiss();
+                                        like(discoveryListEntity.getGoods_id(), position);
+                                    } else if (type == 3) {
+                                        itemIndex = -1;
+                                        mDataBinding.llComment.setVisibility(View.VISIBLE);
+                                        mDataBinding.etComment.requestFocus();
+                                        mDataBinding.etComment.setHint("评论");
+                                        if (getActivity() instanceof MainTabActivity) {
+                                            MainTabActivity activity = (MainTabActivity) getActivity();
+                                            activity.visibilyBottom(View.GONE);
+                                        }
+                                        KeyboardUtil.showSoftInput(getContext());
+                                        commentPosition = position;
+                                        commentDialog.dismiss();
+                                        mDataBinding.etComment.setText("");
+                                        homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() {
+                                            @Override
+                                            public void run() {
+                                                int y = getCoordinateY(mDataBinding.llComment) - 20;
+                                                //评论时滑动到对应item底部和输入框顶部对齐
+                                                mDataBinding.sv.smoothScrollBy(0, mBottomY - y);
+                                            }
+                                        }, 300);
+
+//                                        mDataBinding.llComment.setVisibility(View.VISIBLE);
+//                                        mDataBinding.etComment.requestFocus();
+//                                        mDataBinding.etComment.setHint("评论");
+//                                        MainTabActivity activity = (MainTabActivity) getActivity();
+//                                        KeyboardUtil.showSoftInput(getContext());
+//                                        activity.visibilyBottom(View.GONE);
+//
+//                                        commentDialog.dismiss();
+//                                        mDataBinding.etComment.setText("");
+//                                        commentPosition = position;
+//                                        homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() {
+//                                            @Override
+//                                            public void run() {
+//                                                int y = getCoordinateY(mDataBinding.llComment) - 20;
+//                                                //评论时滑动到对应item底部和输入框顶部对齐
+//                                                mDataBinding.sv.smoothScrollBy(0, mBottomY - y);
+//
+//                                            }
+//                                        }, 300);
+
+
+                                    } else if (type == 4) {
+                                        //   addCart(discoveryListEntity.getGoods_id(),discoveryListEntity.)
+                                        getGoodsDetail(discoveryListEntity.getGoods_id(), discoveryListEntity, type);
+                                        commentDialog.dismiss();
+
+                                    } else if (type == 5) {
+                                        getGoodsDetail(discoveryListEntity.getGoods_id(), discoveryListEntity, type);
+                                        commentDialog.dismiss();
+                                    }
+                                }
+                            });
+                            new XPopup.Builder(baseActivity).hasShadowBg(false).atView(homeGridAdapterItemBinding.ivComment)
+                                    .asCustom(commentDialog)
+                                    .show();
+
+                        }
+                    });
+                    homeGridAdapterItemBinding.tvTime.setText(TimeUtils.getRecentTimeSpanByNow(TimeUtils.dataOne(discoveryListEntity.getCtime())));
+
+                    if (discoveryListEntity.getLike().isEmpty()) {
+                        homeGridAdapterItemBinding.tvLike.setVisibility(View.GONE);
+                    } else {
+                        homeGridAdapterItemBinding.tvLike.setVisibility(View.VISIBLE);
+                        StringBuilder likeString = new StringBuilder();
+                        for (int i = 0; i < discoveryListEntity.getLike().size(); i++) {
+                            //  if (i != 0 && i != discoveryListEntity.getLike().size() - 1) {
+                            //     likeString.append(",");
+                            //  }
+
+                            if (i != 0) {
+                                likeString.append(",");
+                            }
+                            likeString.append(discoveryListEntity.getLike().get(i).getNickname());
+
+                        }
+                        homeGridAdapterItemBinding.tvLike.setText(likeString.toString());
+                        //    TimeUtils.getRecentTimeSpanByNow(TimeUtils.dataOne(discoveryListEntity.getCtime()))
+
+
+                    }
+                    if (discoveryListEntity.getDis_content().isEmpty()) {
+                        homeGridAdapterItemBinding.rvComment.setVisibility(View.GONE);
+                    } else {
+                        homeGridAdapterItemBinding.rvComment.setVisibility(View.VISIBLE);
+                        FullyGridLayoutManager mgr = new FullyGridLayoutManager(getActivity(), 1);
+                        mgr.setOrientation(FullyGridLayoutManager.VERTICAL);
+                        mgr.setSmoothScrollbarEnabled(true);
+                        homeGridAdapterItemBinding.rvComment.setLayoutManager(mgr);
+                        BaseRecycleViewAdapter<DiscoveryListEntity.Dis_content, ItemCommentBinding> baseRecycleViewAdapter = new BaseRecycleViewAdapter(getActivity(), R.layout.item_comment);
+                        homeGridAdapterItemBinding.rvComment.setAdapter(baseRecycleViewAdapter);
+                        final ArrayList<DiscoveryListEntity.Dis_content> dis_content = discoveryListEntity.getDis_content();
+                        baseRecycleViewAdapter.setOnBindViewHolder(new BaseRecycleViewAdapter.BindView() {
+                            @Override
+                            public void onBindViewHolder(Object b, final int itemPosition) {
+                                ItemCommentBinding itemCommentBinding = (ItemCommentBinding) b;
+//                                itemCommentBinding.tvName.setText(dis_content.get(position).getNickname() + ":  ");
+//                                itemCommentBinding.tvInfo.setText(dis_content.get(position).getContents());
+//                                if (dis_content.get(position).getReply().isEmpty()) {
+//                                    itemCommentBinding.llHf.setVisibility(View.GONE);
+//
+//                                } else {
+//                                    itemCommentBinding.llHf.setVisibility(View.VISIBLE);
+//                                    itemCommentBinding.tvName2.setText(discoveryListEntity.getNickname());
+//                                    itemCommentBinding.tvInfo2.setText("回复");
+//                                    itemCommentBinding.tvName3.setText(dis_content.get(position).getNickname() + ":");
+//                                    itemCommentBinding.tvInfo3.setText(dis_content.get(position).getReply());
+//
+//                                }
+                                if (TextUtils.isEmpty(dis_content.get(itemPosition).getReply())) {
+                                    itemCommentBinding.llHf.setVisibility(View.GONE);
+                                    itemCommentBinding.ll.setVisibility(View.VISIBLE);
+                                    itemCommentBinding.tvName.setText(dis_content.get(itemPosition).getNickname() + ":  ");
+                                    itemCommentBinding.tvInfo.setText(dis_content.get(itemPosition).getContents());
+                                } else {
+                                    itemCommentBinding.ll.setVisibility(View.GONE);
+                                    itemCommentBinding.llHf.setVisibility(View.VISIBLE);
+                                    itemCommentBinding.tvName2.setText(dis_content.get(itemPosition).getNickname());
+                                    itemCommentBinding.tvInfo2.setText("回复");
+                                    itemCommentBinding.tvName3.setText(dis_content.get(itemPosition).getReply() + ":");
+                                    itemCommentBinding.tvInfo3.setText(dis_content.get(itemPosition).getContents());
+
+                                }
+                                itemCommentBinding.llItem.setOnClickListener(new View.OnClickListener() {
+                                    @Override
+                                    public void onClick(View v) {
+                                        final RegisterUser registerUser = Config.getInstance(getContext()).getUser();
+                                        if (registerUser == null) {
+                                            return;
+                                        }
+
+                                        final int mBottomY = getCoordinateY(homeGridAdapterItemBinding.ivComment) + homeGridAdapterItemBinding.ivComment.getHeight();
+
+                                        if (dis_content.get(itemPosition).getFrom_id() == null
+                                                || registerUser.getUserid().equals(dis_content.get(itemPosition).getFrom_id())) {
+                                            mDataBinding.llComment.setVisibility(View.GONE);
+                                            DeleteCommentDialog deleteCommentDialog = new DeleteCommentDialog(getContext());
+                                            deleteCommentDialog.setOnSelectListener(new SelectDialog.OnSelectListener() {
+                                                @Override
+                                                public void select(int type) {
+                                                    deleteComment(dis_content.get(itemPosition).getDis_id(), registerUser.getUserid(), position, itemPosition);
+                                                }
+                                            });
+                                            new XPopup.Builder(getContext()).asCustom(deleteCommentDialog).show();
+                                        } else {
+                                            itemIndex = itemPosition;
+
+                                            mDataBinding.llComment.setVisibility(View.VISIBLE);
+                                            mDataBinding.etComment.requestFocus();
+                                            mDataBinding.etComment.setHint("回复 " + dis_content.get(itemPosition).getNickname());
+                                            if (getActivity() instanceof MainTabActivity) {
+                                                MainTabActivity activity = (MainTabActivity) getActivity();
+                                                activity.visibilyBottom(View.GONE);
+                                            }
+                                            KeyboardUtil.showSoftInput(getContext());
+                                            commentPosition = position;
+                                            // commentDialog.dismiss();
+                                            mDataBinding.etComment.setText("");
+                                            homeGridAdapterItemBinding.ivComment.postDelayed(new Runnable() {
+                                                @Override
+                                                public void run() {
+                                                    int y = getCoordinateY(mDataBinding.llComment) - 20;
+                                                    //评论时滑动到对应item底部和输入框顶部对齐
+                                                    mDataBinding.sv.smoothScrollBy(0, mBottomY - y);
+                                                }
+                                            }, 300);
+
+                                        }
+
+
+                                    }
+                                });
+                            }
+                        });
+                        baseRecycleViewAdapter.setData(dis_content);
+
+                    }
+
+
+                    RequestOptions requestOptions = new RequestOptions();
+                    requestOptions.placeholder(R.mipmap.icon_default_rectangle);
+                    requestOptions.error(R.mipmap.icon_default_rectangle);
+
+                    Glide.with(getContext()).load(discoveryListEntity.getAvatar())
+                            .apply(requestOptions)
+                            .into(homeGridAdapterItemBinding.imageHead);
+                    homeGridAdapterItemBinding.imageHead.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            Intent intent = new Intent(getContext(), HistoryRecordActivity.class);
+                            intent.putExtra("userId", discoveryListEntity.getUserid());
+                            intent.putExtra("userName", discoveryListEntity.getNickname());
+                            intent.putExtra("title", discoveryListEntity.getNickname());
+                            startActivity(intent);
+                        }
+                    });
+                    ArrayList<ImageInfo> imageInfos = new ArrayList<>();
+
+                    if (discoveryListEntity.getPic().size() > 0) {
+
+                        //  Log.e("pic", discoveryListEntity.getPic().get(0));
+                        for (int i = 0; i < discoveryListEntity.getPic().size(); i++) {
+                            if (discoveryListEntity.getPic().get(i).endsWith(".mp4") || discoveryListEntity.getPic().get(i).endsWith(".avi")) {
+                                ImageInfo imageInfo = new ImageInfo();
+                                imageInfo.setType(2);
+                                imageInfo.setBigImageUrl(discoveryListEntity.getPic().get(i));
+                                imageInfo.setThumbnailUrl(discoveryListEntity.getPic().get(i));
+                                imageInfos.add(imageInfo);
+                            } else {
+                                ImageInfo imageInfo = new ImageInfo();
+                                imageInfo.setType(1);
+                                imageInfo.setBigImageUrl(discoveryListEntity.getPic().get(i));
+                                imageInfo.setThumbnailUrl(discoveryListEntity.getPic().get(i));
+                                imageInfos.add(imageInfo);
+                            }
+
+                        }
+
+                    } else if (!TextUtils.isEmpty(discoveryListEntity.getThumb())) {
+                        ImageInfo imageInfo = new ImageInfo();
+                        imageInfo.setType(1);
+                        imageInfo.setBigImageUrl(discoveryListEntity.getThumb());
+                        imageInfo.setThumbnailUrl(discoveryListEntity.getThumb());
+                        imageInfos.add(imageInfo);
+                    }
+                    homeGridAdapterItemBinding.nineGrid.setAdapter(new NineGridViewClickAdapter(getContext(), imageInfos));
+                }
+            }
+        });
+        mDataBinding.recyView.setAdapter(baseRecycleViewAdapter);
+
+        baseRecycleViewAdapter.setData(discoveryListEntities);
+        mDataBinding.tvSendComment.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                // discoveryListEntity.
+                if (commentPosition != -1) {
+                    MainTabActivity activity = (MainTabActivity) getActivity();
+                    CommonUtils.hideSoftInput(getContext(), mDataBinding.etComment);
+                    mDataBinding.llComment.setVisibility(View.GONE);
+                    activity.visibilyBottom(View.VISIBLE);
+                    Log.e("xxx", discoveryListEntities.get(commentPosition).getGoods_id());
+                    comment(discoveryListEntities.get(commentPosition).getGoods_id(), commentPosition, itemIndex, mDataBinding.etComment.getText().toString());
+                }
+
+            }
+        });
+    }
+
+    private void getGankList(String myurl, Map<String, String> map, String msg, final int requstecode) {
+        progressDialog.setMessage(msg);
+        progressDialog.setCancelable(false);
+//        if (page>1){
+//            progressDialog.show();
+//        }
+
+
+        mGankLoader = new Loader();
+        Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
+
+
+            @Override
+            public void call(Resultcode resultcode) {
+
+                mDataBinding.dw.finishRefresh();
+                mDataBinding.dw.finishLoadMore();
+                progressDialog.dismiss();
+                if (!(resultcode.status == 0)) {
+                    baseActivity.setToast(1, resultcode.msg);
+                }
+                if (resultcode.status == 0) {
+                    // intRecycleView();
+                    Gson gs = new Gson();
+                    LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
+                    String s = gs.toJson(adta);
+
+                    //    String s = new GetJsonDataUtil().getJson(getActivity(), "controlStatus.json");//获取assets目录下的json文件数据
+                    try {
+                        DiscoverEntity discoverEntity = gs.fromJson(s, DiscoverEntity.class);
+                        //        JSONObject jsonObject = new JSONObject(s);
+                        //        org.json.JSONArray array = jsonObject.getJSONArray("info");
+                        //        Type type = new TypeToken<ArrayList<DiscoveryListEntity>>() {
+                        //       }.getType();
+                        if (page == 1) {
+                            String fengmian = discoverEntity.getFengmian();
+                            String avatar = discoverEntity.getAvatar();
+                            if (!TextUtils.isEmpty(fengmian)) {
+                                Picasso.with(getActivity()).load(fengmian)
+                                        .placeholder(R.mipmap.icon_default_rectangle)
+                                        .into(target);
+                            }
+                            if (!TextUtils.isEmpty(avatar)) {
+                                Picasso.with(getActivity()).load(avatar)
+                                        .placeholder(R.mipmap.icon_default_rectangle)
+                                        .transform(new PicassoRoundTransform())
+                                        .into(mDataBinding.head);
+                            }
+
+                            List<DiscoveryListEntity> info = discoverEntity.getInfo();
+                            discoveryListEntities.clear();
+                            discoveryListEntities.addAll(info);
+                            BaseRecycleViewAdapter baseRecycleViewAdapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
+                            baseRecycleViewAdapter.setData(discoveryListEntities);
+                            page++;
+
+                        } else {
+                            //  ArrayList<DiscoveryListEntity> o = new Gson().fromJson(array.toString(), type);
+                            List<DiscoveryListEntity> info = discoverEntity.getInfo();
+                            discoveryListEntities.addAll(info);
+
+                            BaseRecycleViewAdapter baseRecycleViewAdapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
+                            baseRecycleViewAdapter.setData(discoveryListEntities);
+                            //    Log.e("sizi", discoveryListEntities.size() + "");
+                            //   int count = jsonObject.getInt("count");
+                            if (info.isEmpty()) {
+                                mDataBinding.dw.finishLoadMoreWithNoMoreData();
+                            } else {
+
+                                page++;
+
+                            }
+                        }
+
+
+                    } catch (Exception e) {
+                        e.fillInStackTrace();
+                    }
+                }
+
+            }
+
+
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                progressDialog.dismiss();
+                mDataBinding.dw.finishRefresh();
+                mDataBinding.dw.finishLoadMore();
+                baseActivity.setToast(2, getString(R.string.getdatafailure));
+                throwable.printStackTrace();
+            }
+        });
+
+        baseActivity.addSubscription(subscription);
+    }
+
+    private Target target = new Target() {
+        @Override
+        public void onBitmapLoaded(Bitmap bitmap, Picasso.LoadedFrom from) {
+            Drawable drawable = new BitmapDrawable(bitmap);
+            mDataBinding.v.setBackground(drawable);
+
+
+        }
+
+        @Override
+        public void onBitmapFailed(Drawable errorDrawable) {
+        }
+
+        @Override
+        public void onPrepareLoad(Drawable placeHolderDrawable) {
+        }
+    };
+
+    public static DiscoveryFragment newInstance(String param1, String param2) {
+        DiscoveryFragment fragment = new DiscoveryFragment();
+        Bundle args = new Bundle();
+        args.putString(ARG_PARAM1, param1);
+        args.putString(ARG_PARAM2, param2);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (getArguments() != null) {
+            mParam1 = getArguments().getString(ARG_PARAM1);
+            mParam2 = getArguments().getString(ARG_PARAM2);
+        }
+
+    }
+
+    @Override
+    public boolean onTouch(MotionEvent ev) {
+        switch (ev.getAction()) {
+
+            case MotionEvent.ACTION_DOWN:
+                //点击空白处隐藏键盘，隐藏输入框相关
+                if (getActivity().getCurrentFocus() != null && getActivity().getCurrentFocus().getId() == R.id.tv_send_comment) {
+                    return false;
+                }
+                boolean b = UtilHelpers.hideKeyboard(ev, getActivity().getCurrentFocus(), getActivity());
+                if (b) {
+                    CommonUtils.hideSoftInput(mDataBinding.etComment.getContext(), mDataBinding.etComment);
+                    MainTabActivity activity = (MainTabActivity) getActivity();
+                    activity.visibilyBottom(View.VISIBLE);
+                    mDataBinding.llComment.setVisibility(View.GONE);
+                }
+                break;
+        }
+        return false;
+    }
+
+    private void getGoodsDetail(final String goodsId, final DiscoveryListEntity entity, final int goodtype) {
+        final RegisterUser user =
+                Config.getInstance(getContext()).getUser();
+        Map<String, String> map = new HashMap<>();
+        if (user != null) {
+            map.put("userid", user.getUserid());
+        } else {
+            map.put("userid", 0 + "");
+        }
+        map.put("app", "Goods");
+        map.put("class", "GoodsInfo");
+        map.put("goods_id", goodsId);
+        map.put("sign", Md5.md5("Goods" + "GoodsInfo" + Md5.secret));
+        progressDialog.setMessage("获取信息中");
+        progressDialog.setCancelable(false);
+        mGankLoader = new Loader();
+        Subscription subscription = mGankLoader.getMovie(ApiConfig.BASE_URL, map)
+                .subscribe(new Action1<Resultcode>() {
+                    @Override
+                    public void call(Resultcode resultcode) {
+                        progressDialog.dismiss();
+                        if (resultcode.status == 0) {
+                            Gson gs = new Gson();
+                            LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
+                            String s = gs.toJson(adta);
+
+                            try {
+
+                                JSONObject jsonObject = new JSONObject(s);
+                                org.json.JSONArray array = jsonObject.getJSONArray("info");
+                                final Type type = new TypeToken<ArrayList<GoodsDetailEntity>>() {
+                                }.getType();
+                                ArrayList<GoodsDetailEntity> o = gs.fromJson(array.toString(), type);
+
+                                GoodsInfoDialog goodsInfoDialog = new GoodsInfoDialog(baseActivity, entity, o);
+                                goodsInfoDialog.setOnConfirmListener(new GoodsInfoDialog.OnGoodsSelectPropertyListener() {
+                                    @Override
+                                    public void onSelect(String code, int num) {
+                                        if (goodtype == 4) {
+                                            Intent intent = new Intent(baseActivity, SettleActivity.class);
+                                            intent.putExtra("goodsType", 1);
+                                            intent.putExtra("goods_id", goodsId);
+                                            intent.putExtra("product_code", code);
+                                            intent.putExtra("sale_num", num + "");
+                                            startActivity(intent);
+                                        } else if (goodtype == 5) {
+                                            addCart(goodsId, code, num + "");
+                                        }
+
+                                    }
+                                });
+                                new XPopup.Builder(baseActivity).asCustom(goodsInfoDialog).show();
+
+                            } catch (JSONException e) {
+                                e.printStackTrace();
+                            }
+
+                        } else {
+                            baseActivity.setToast(resultcode.msg);
+                        }
+                    }
+                }, new Action1<Throwable>() {
+                    @Override
+                    public void call(Throwable throwable) {
+                        progressDialog.dismiss();
+                        baseActivity.setToast(2, "获取信息失败");
+                        throwable.printStackTrace();
+                    }
+                });
+        baseActivity.addSubscription(subscription);
+    }
+
+    private int itemIndex = -1;
+
+    private void comment(String goodsId, final int position, final int itemIndex, final String content) {
+        final RegisterUser user =
+                Config.getInstance(getContext()).getUser();
+        Map<String, String> map = new HashMap<>();
+        if (user != null) {
+            map.put("userid", user.getUserid());
+
+        } else {
+            map.put("userid", 0 + "");
+        }
+        map.put("app", "Goods");
+        map.put("class", "DisGoods");
+        map.put("goods_id", goodsId);
+        if (itemIndex != -1) {
+            DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
+            ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
+            String from_id = dis_content1.get(itemIndex).getFrom_id();
+            if (!TextUtils.isEmpty(from_id)) {
+                map.put("reply_id", from_id);
+            }
+        }
+
+        map.put("contents", content);
+        map.put("sign", Md5.md5("Goods" + "DisGoods" + Md5.secret));
+        progressDialog.setMessage("提交中");
+        progressDialog.setCancelable(false);
+//        progressDialog.show();
+
+        mGankLoader = new Loader();
+        Subscription subscription = mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {
+
+
+            @Override
+            public void call(Resultcode resultcode) {
+
+                progressDialog.dismiss();
+                if (!(resultcode.status == 0)) {
+                    baseActivity.setToast(1, resultcode.msg);
+                }
+                if (resultcode.status == 0) {
+                    String nickname = user.getNickname();
+                    BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
+                    DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content();
+                    dis_content.setContents(content);
+                    dis_content.setNickname(nickname);
+
+                    DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
+                    ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
+                    if (itemIndex != -1) {
+                        dis_content.setReply(dis_content1.get(itemIndex).getNickname());
+                    }
+                    dis_content1.add(dis_content);
+                    discoveryListEntity.setDis_content(dis_content1);
+                    adapter.upDateOne(position, discoveryListEntity);
+//                    String nickname = user.getNickname();
+//                    BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
+//                    DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content();
+//                    dis_content.setContents(content);
+//                    dis_content.setNickname(nickname);
+//                    dis_content.setReply("");
+//                    DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(position);
+//                    ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
+//                    dis_content1.add(dis_content);
+//
+//                    discoveryListEntity.setDis_content(dis_content1);
+//                    adapter.upDateOne(position, discoveryListEntity);
+//                    BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
+//                    if (discoveryListEntities.get(position).getDis_content().isEmpty()) {
+//                        DiscoveryListEntity.Dis_content dis_content = new DiscoveryListEntity.Dis_content();
+//                        dis_content.setContents(content);
+//
+//                    }
+//
+//                    adapter.upDateOne(position, discoveryListEntities.get(position));
+                }
+
+            }
+
+
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                progressDialog.dismiss();
+                baseActivity.setToast(2, "提交失败");
+                throwable.printStackTrace();
+            }
+        });
+
+        baseActivity.addSubscription(subscription);
+
+    }
+
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 14 && resultCode == 200) {
+            page = 1;
+            getlist(1);
+        } else if (requestCode == 191) {
+            //选取图片回调
+            if (data==null){
+                return;
+            }
+            List<String> strings = Matisse.obtainPathResult(data);
+            if (!strings.isEmpty()){
+                try {
+
+                    List<File> list = Luban.with(baseActivity).load(strings).ignoreBy(100).setTargetDir(baseActivity.getCacheDir().getAbsolutePath()).get();
+                    if (null != list && list.size() > 0) {
+                    File    file = list.get(0);
+                       // Bitmap bitmap = BitmapFactory.decodeFile(file.toString());
+                        Picasso.with(getActivity()).load(file)
+                                .placeholder(R.mipmap.icon_default_rectangle)
+                                .into(target);
+                    }
+                }catch (Exception e){
+
+                }
+
+            }
+        }
+
+    }
+
+    private void deleteComment(String dis_id, String userid, final int superPosition, final int itemPosition) {
+        Map<String, String> map = new HashMap<>();
+
+        progressDialog.show();
+        map.put("app", "Goods");
+
+        map.put("class", "DelDis");
+        map.put("sign", Md5.md5("Goods" + "DelDis" + Md5.secret));
+        map.put("dis_id", dis_id);
+        map.put("userid", userid);
+        mGankLoader.getMovie(ApiConfig.BASE_URL, map).subscribe(new Action1<Resultcode>() {
+            @Override
+            public void call(Resultcode resultcode) {
+                progressDialog.dismiss();
+                if (!(resultcode.status == 0)) {
+                    Toast.makeText(getContext(), resultcode.msg, Toast.LENGTH_SHORT).show();
+                } else {
+                    BaseRecycleViewAdapter adapter = (BaseRecycleViewAdapter) mDataBinding.recyView.getAdapter();
+                    DiscoveryListEntity discoveryListEntity = discoveryListEntities.get(superPosition);
+                    ArrayList<DiscoveryListEntity.Dis_content> dis_content1 = discoveryListEntity.getDis_content();
+                    dis_content1.remove(itemPosition);
+                    discoveryListEntity.setDis_content(dis_content1);
+                    adapter.upDateOne(superPosition, discoveryListEntity);
+                }
+            }
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                Toast.makeText(getContext(), getString(R.string.getdatafailure), Toast.LENGTH_SHORT).show();
+            }
+        });
+    }
+}
diff --git a/app/src/main/java/com/sl/house_property/f1/AddAcarActivity.java b/app/src/main/java/com/sl/house_property/f1/AddAcarActivity.java
index 9d7d9d7..6acfab0 100644
--- a/app/src/main/java/com/sl/house_property/f1/AddAcarActivity.java
+++ b/app/src/main/java/com/sl/house_property/f1/AddAcarActivity.java
@@ -1,223 +1,222 @@
-package com.sl.house_property.f1;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
-
-import com.sl.house_property.BaseActivity;
-import com.sl.house_property.R;
-import com.sl.house_property.databinding.ActivityAddAcarBinding;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import entity.RegisterUser;
-import my_loader.Loader;
-import my_loader.Resultcode;
-import tools.Config;
-import http.ApiConfig;
-import rx.Subscription;
-import rx.functions.Action1;
-import utils.EditInputtype;
-import utils.Md5;
-import utils.KeyboardUtil;
-
-import com.cutil.*;
-
-public class AddAcarActivity extends BaseActivity<ActivityAddAcarBinding> implements View.OnClickListener {
-
-    private Loader mGankLoader;
-
-    private KeyboardUtil keyboardUtil;
-
-    private EditText mEditText;
-
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_add_acar;
-    }
-
-    private int type;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        String title = getIntent().getStringExtra("titile");
-
-        setAbr(title, new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                finish();
-            }
-        }, 0, null, 0, null, 0, null, "");
-        mDataBinding.save.setOnClickListener(this);
-        if (title.contains("车位")) {
-            mDataBinding.carmeg.setText("车库信息");
-            mDataBinding.carpai.setText("车库编号");
-            mDataBinding.editcarnumber.setHint("请输入车库信息");
-            type = 0;
-        } else if (title.contains("车辆")) {
-            mDataBinding.editcarnumber.setHint("请输入车牌号");
-            type = 1;
-        }
-
-        mEditText = findViewById(R.id.editcarnumber);
-
-        if (type == 1) {
-            mEditText.setOnFocusChangeListener(new android.view.View.OnFocusChangeListener() {
-                @Override
-                public void onFocusChange(View v, boolean hasFocus) {
-                    hideKeyboard(v);
-                    if (hasFocus) {
-                        showCarNoInput();
-                    } else {
-                        keyboardUtil.hideKeyboard();
-                    }
-                }
-            });
-        }
-    }
-
-    public static void hideKeyboard(View view) {
-        InputMethodManager imm = (InputMethodManager) view.getContext()
-                .getSystemService(Context.INPUT_METHOD_SERVICE);
-        if (imm != null) {
-            imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
-        }
-    }
-
-    private void showCarNoInput() {
-//        if (keyboardUtil == null) {
-        keyboardUtil = new KeyboardUtil(AddAcarActivity.this, mEditText);
-        keyboardUtil.hideSoftInputMethod();
-        keyboardUtil.showKeyboard();
-//        } else {
-//            keyboardUtil.hideSoftInputMethod();
-//            keyboardUtil.showKeyboard();
-//        }
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_BACK) {
-            if (keyboardUtil != null && keyboardUtil.isShow()) {
-                keyboardUtil.hideKeyboard();
-            } else {
-                finish();
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.save:
-                if (mDataBinding.editcarnumber.getText().toString().length() < 2) {
-                    setToast(2, mDataBinding.editcarnumber.getHint().toString());
-                    return;
-                }
-                if (mDataBinding.addaname.getText().toString().length() < 2) {
-                    setToast(2, mDataBinding.addaname.getHint().toString());
-                    return;
-                }
-                if (mDataBinding.addaphone.getText().toString().length() == 0) {
-                    setToast(getString(R.string.me_input_phone_tip));
-                    return;
-                }
-                if (!RegexUtils.isMobileExact(mDataBinding.addaphone.getText().toString())) {
-                    setToast(getString(R.string.me_input_phone_error_tip));
-                    return;
-                }
-                RegisterUser user =
-                        Config.getInstance(AddAcarActivity.this).getUser();
-                Map<String, String> map = new HashMap<>();
-                if (user != null) {
-                    map.put("userid", user.getUserid());
-                } else {
-                    map.put("userid", 0 + "");
-                }
-                map.put("phone", mDataBinding.addaphone.getText().toString());
-                map.put("name", mDataBinding.addaname.getText().toString());
-                if (type == 0) {
-                    map.put("app", "Garage");
-                    map.put("class", "AddMyGarage");
-                    map.put("garage_sn", mDataBinding.editcarnumber.getText().toString());
-                    map.put("sign", Md5.md5("Garage" + "AddMyGarage" + Md5.secret));
-                }
-                if (type == 1) {
-                    String editcarnumber = mDataBinding.editcarnumber.getText().toString();
-                    String carfirst = editcarnumber.substring(0, 1);
-                    String carsecond = editcarnumber.substring(1, 2);
-                    if (!EditInputtype.isChinese(carfirst)) {
-                        setToast(2, getString(R.string.pleasefirstchinese));
-                        return;
-                    }
-                    if (!EditInputtype.isAZaz(carsecond)) {
-                        setToast(2, getString(R.string.pleasefirstisaz));
-                        return;
-                    }
-
-                    map.put("app", "Garage");
-                    map.put("class", "AddMyCar");
-                    map.put("plate_first", carfirst);
-                    map.put("number_plate", editcarnumber.substring(1));
-                    map.put("sign", Md5.md5("Garage" + "AddMyCar" + Md5.secret));
-                }
-
-
-                getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.save), type);
-                break;
-        }
-    }
-
-    private void getGankList(String myurl, Map<String, String> map, String msg, final int requstecode) {
-
-        progressDialog.setMessage(msg);
-        progressDialog.setCancelable(false);
-        progressDialog.show();
-        mGankLoader = new Loader();
-        Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
-            @Override
-            public void call(Resultcode resultcode) {
-                progressDialog.dismiss();
-
-                if (!(resultcode.status == 0)) {
-                    setToast(1, resultcode.msg);
-                }
-                if (resultcode.status == 0) {
-//                    mDataBinding.getRoot().postDelayed(new Runnable() {
-//                        @Override
-//                        public void run() {
-                    //数据是使用Intent返回
-                    Intent intent = new Intent();
-                    //设置返回数据
-                    AddAcarActivity.this.setResult(RESULT_OK, intent);
-                    finish();
-//                        }
-//                    }, 1000);
-                }
-            }
-
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                progressDialog.dismiss();
-
-                setToast(2, getString(R.string.getdatafailure));
-                throwable.printStackTrace();
-            }
-        });
-
-        addSubscription(subscription);
-    }
-}
-
+package com.sl.house_property.f1;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+
+import com.sl.house_property.BaseActivity;
+import com.sl.house_property.R;
+import com.sl.house_property.databinding.ActivityAddAcarBinding;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import entity.RegisterUser;
+import my_loader.Loader;
+import my_loader.Resultcode;
+import tools.Config;
+import http.ApiConfig;
+import rx.Subscription;
+import rx.functions.Action1;
+import utils.EditInputtype;
+import utils.Md5;
+import utils.KeyboardUtil;
+
+import com.cutil.*;
+
+public class AddAcarActivity extends BaseActivity<ActivityAddAcarBinding> implements View.OnClickListener {
+
+    private Loader mGankLoader;
+
+    private KeyboardUtil keyboardUtil;
+
+    private EditText mEditText;
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_add_acar;
+    }
+
+    private int type;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        String title = getIntent().getStringExtra("titile");
+
+        setAbr(title, new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        }, 0, null, 0, null, 0, null, "");
+        mDataBinding.save.setOnClickListener(this);
+        if (title.contains("车位")) {
+            mDataBinding.carmeg.setText("车库信息");
+            mDataBinding.carpai.setText("车库编号");
+            mDataBinding.editcarnumber.setHint("请输入车库信息");
+            type = 0;
+        } else if (title.contains("车辆")) {
+            mDataBinding.editcarnumber.setHint("请输入车牌号");
+            type = 1;
+        }
+
+        mEditText = findViewById(R.id.editcarnumber);
+
+        if (type == 1) {
+            mEditText.setOnFocusChangeListener(new android.view.View.OnFocusChangeListener() {
+                @Override
+                public void onFocusChange(View v, boolean hasFocus) {
+                    hideKeyboard(v);
+                    if (hasFocus) {
+                        showCarNoInput();
+                    } else {
+                        keyboardUtil.hideKeyboard();
+                    }
+                }
+            });
+        }
+    }
+
+    public static void hideKeyboard(View view) {
+        InputMethodManager imm = (InputMethodManager) view.getContext()
+                .getSystemService(Context.INPUT_METHOD_SERVICE);
+        if (imm != null) {
+            imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+        }
+    }
+
+    private void showCarNoInput() {
+//        if (keyboardUtil == null) {
+        keyboardUtil = new KeyboardUtil(AddAcarActivity.this, mEditText);
+        keyboardUtil.hideSoftInputMethod();
+        keyboardUtil.showKeyboard();
+//        } else {
+//            keyboardUtil.hideSoftInputMethod();
+//            keyboardUtil.showKeyboard();
+//        }
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            if (keyboardUtil != null && keyboardUtil.isShow()) {
+                keyboardUtil.hideKeyboard();
+            } else {
+                finish();
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void onClick(View view) {
+        int id = view.getId();
+        if (id == R.id.save) {
+                if (mDataBinding.editcarnumber.getText().toString().length() < 2) {
+                    setToast(2, mDataBinding.editcarnumber.getHint().toString());
+                    return;
+                }
+                if (mDataBinding.addaname.getText().toString().length() < 2) {
+                    setToast(2, mDataBinding.addaname.getHint().toString());
+                    return;
+                }
+                if (mDataBinding.addaphone.getText().toString().length() == 0) {
+                    setToast(getString(R.string.me_input_phone_tip));
+                    return;
+                }
+                if (!RegexUtils.isMobileExact(mDataBinding.addaphone.getText().toString())) {
+                    setToast(getString(R.string.me_input_phone_error_tip));
+                    return;
+                }
+                RegisterUser user =
+                        Config.getInstance(AddAcarActivity.this).getUser();
+                Map<String, String> map = new HashMap<>();
+                if (user != null) {
+                    map.put("userid", user.getUserid());
+                } else {
+                    map.put("userid", 0 + "");
+                }
+                map.put("phone", mDataBinding.addaphone.getText().toString());
+                map.put("name", mDataBinding.addaname.getText().toString());
+                if (type == 0) {
+                    map.put("app", "Garage");
+                    map.put("class", "AddMyGarage");
+                    map.put("garage_sn", mDataBinding.editcarnumber.getText().toString());
+                    map.put("sign", Md5.md5("Garage" + "AddMyGarage" + Md5.secret));
+                }
+                if (type == 1) {
+                    String editcarnumber = mDataBinding.editcarnumber.getText().toString();
+                    String carfirst = editcarnumber.substring(0, 1);
+                    String carsecond = editcarnumber.substring(1, 2);
+                    if (!EditInputtype.isChinese(carfirst)) {
+                        setToast(2, getString(R.string.pleasefirstchinese));
+                        return;
+                    }
+                    if (!EditInputtype.isAZaz(carsecond)) {
+                        setToast(2, getString(R.string.pleasefirstisaz));
+                        return;
+                    }
+
+                    map.put("app", "Garage");
+                    map.put("class", "AddMyCar");
+                    map.put("plate_first", carfirst);
+                    map.put("number_plate", editcarnumber.substring(1));
+                    map.put("sign", Md5.md5("Garage" + "AddMyCar" + Md5.secret));
+                }
+
+
+                getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.save), type);
+        }
+    }
+
+    private void getGankList(String myurl, Map<String, String> map, String msg, final int requstecode) {
+
+        progressDialog.setMessage(msg);
+        progressDialog.setCancelable(false);
+        progressDialog.show();
+        mGankLoader = new Loader();
+        Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
+            @Override
+            public void call(Resultcode resultcode) {
+                progressDialog.dismiss();
+
+                if (!(resultcode.status == 0)) {
+                    setToast(1, resultcode.msg);
+                }
+                if (resultcode.status == 0) {
+//                    mDataBinding.getRoot().postDelayed(new Runnable() {
+//                        @Override
+//                        public void run() {
+                    //数据是使用Intent返回
+                    Intent intent = new Intent();
+                    //设置返回数据
+                    AddAcarActivity.this.setResult(RESULT_OK, intent);
+                    finish();
+//                        }
+//                    }, 1000);
+                }
+            }
+
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                progressDialog.dismiss();
+
+                setToast(2, getString(R.string.getdatafailure));
+                throwable.printStackTrace();
+            }
+        });
+
+        addSubscription(subscription);
+    }
+}
+
diff --git a/app/src/main/java/com/sl/house_property/f3/HousekeepingActivity.java b/app/src/main/java/com/sl/house_property/f3/HousekeepingActivity.java
index 7c82c86..100a5de 100644
--- a/app/src/main/java/com/sl/house_property/f3/HousekeepingActivity.java
+++ b/app/src/main/java/com/sl/house_property/f3/HousekeepingActivity.java
@@ -1,455 +1,454 @@
-package com.sl.house_property.f3;
-
-import android.app.DatePickerDialog;
-import android.app.TimePickerDialog;
-import android.content.Intent;
-import android.graphics.Color;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.Gravity;
-import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.DatePicker;
-import android.widget.ProgressBar;
-import android.widget.TimePicker;
-
-import com.selectpicker.OptionsPopupWindow;
-import com.google.gson.Gson;
-import com.google.gson.internal.LinkedTreeMap;
-import com.google.gson.reflect.TypeToken;
-import com.sl.house_property.BR;
-import com.sl.house_property.BaseActivity;
-import com.sl.house_property.NewsDetailActivity;
-import com.sl.house_property.R;
-import com.sl.house_property.f2.FeeActivity;
-import com.sl.house_property.user.MyChargeActivity;
-import com.sl.house_property.databinding.ActivityHousekeepingBinding;
-import com.sl.house_property.user.MyPayActivity;
-import com.squareup.picasso.Picasso;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import entity.FeeEntity;
-import entity.HomeEntity;
-import entity.HousekeepingItemDetailEntity;
-import entity.MySimpleHomequEntity;
-import entity.RegisterUser;
-import my_loader.Loader;
-import my_loader.Resultcode;
-import tools.Config;
-import tools.DateTimeUtils;
-import http.ApiConfig;
-import rx.Subscription;
-import rx.functions.Action1;
-import utils.Constants;
-import utils.Md5;
-
-public class HousekeepingActivity extends BaseActivity<ActivityHousekeepingBinding> {
-    private String serve_content_id;
-    private Loader mGankLoader;
-    private HousekeepingItemDetailEntity housekeepingItemDetailEntity;
-    private String[] a = new String[1];
-    private String user_home_id = "";
-    private OptionsPopupWindow alarmOptionPop;
-    private ProgressBar progressBar;
-
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_housekeeping;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setAbr(getIntent().getStringExtra("titile"), new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                finish();
-            }
-        }, 0, null, 0, null, 0, null, "");
-        serve_content_id = getIntent().getStringExtra("serve_content_id");
-        Picasso.with(this).load("http://www.kenli.gov.cn/_mediafile/admin/2014/08/13/24hbbuc1yt.jpg").into(mDataBinding.myImage);
-
-        mDataBinding.address.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                RegisterUser user =
-                        Config.getInstance(HousekeepingActivity.this).getUser();
-                Map<String, String> map = new HashMap<>();
-                if (user != null) {
-                    map.put("userid", user.getUserid());
-                } else {
-                    map.put("userid", 0 + "");
-                }
-                map.put("app", "Cas");
-                map.put("class", "GetMyAddress");
-
-                map.put("sign", Md5.md5("Cas" + "GetMyAddress" + Md5.secret));
-                getGankListAddress(ApiConfig.BASE_URL, map, getResources().getString(R.string.loading), 0);
-            }
-        });
-
-
-        mDataBinding.mycount.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-
-                RegisterUser user =
-                        Config.getInstance(HousekeepingActivity.this).getUser();
-                Map<String, String> map = new HashMap<>();
-                if (housekeepingItemDetailEntity == null) {
-                    return;
-                }
-                if (user != null) {
-                    map.put("userid", user.getUserid());
-                } else {
-                    map.put("userid", 0 + "");
-                }
-                map.put("app", "Serve");
-                map.put("class", "Serve_an_AddServeOrder");
-                map.put("sign", Md5.md5("Serve" + "Serve_an_AddServeOrder" + Md5.secret));
-                map.put("serve_content_id", serve_content_id);
-                map.put("serve_type", 1 + "");
-                if (mDataBinding.name.getText().toString().equals("")) {
-                    setToast("请输入姓名");
-                    return;
-                }
-
-                if (mDataBinding.phone.getText().toString().length() != 11) {
-                    setToast("请输入手机号");
-                    return;
-                }
-
-                if (!isMobileNO(mDataBinding.phone.getText().toString())) {
-                    setToast("请输入有效的手机号");
-                    return;
-
-                }
-
-                if (mDataBinding.time.getText().toString().equals("")) {
-                    setToast("请输入时间");
-                    return;
-                }
-                if (mDataBinding.address.getText().toString().equals("")) {
-                    setToast("请输入地址");
-                    return;
-                }
-                if ("".equals(user_home_id)) {
-                    setToast("请选择房间");
-                    return;
-                }
-
-                map.put("serve_user_name", mDataBinding.name.getText().toString());
-                map.put("serve_user_phone", mDataBinding.phone.getText().toString());
-                map.put("serve_start_time", mDataBinding.time.getText().toString());
-
-                map.put("user_home_id", user_home_id);
-
-                map.put("serve_room_square", mDataBinding.erq.getText().toString());
-                map.put("serve_address", mDataBinding.address.getText().toString());
-                map.put("serve_order_money", housekeepingItemDetailEntity.getServe_content_price());
-
-                map.put("serve_order_note", mDataBinding.notice.getText().toString() + "");
-
-                //分类类型 企业 firm ，个人 personal
-                getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), 1);
-
-
-            }
-        });
-        Map<String, String> map = new HashMap<>();
-        RegisterUser user =
-                Config.getInstance(this).getUser();
-
-        if (user != null) {
-            map.put("userid", user.getUserid());
-        } else {
-            map.put("userid", 0 + "");
-        }
-        map.put("app", "Serve");
-        map.put("class", "Serve_an_ServeContent");
-        map.put("sign", Md5.md5("Serve" + "Serve_an_ServeContent" + Md5.secret));
-        map.put("serve_content_id", serve_content_id);
-        //分类类型 企业 firm ，个人 personal
-        getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), 0);
-        /*$request = array(
-                'app' => $app,
-                'class' => $class,
-                'sign' => $sign,
-                *//* 修改这里 - 下方为接口所要传递的参数 *//*
-                'userid' => '10', //用户ID
-                'serve_order_id' => '10', //服务ID*/
-        mDataBinding.time.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                final DateTimeUtils dateTimeUtils = new DateTimeUtils(HousekeepingActivity.this);
-                dateTimeUtils.showDackPickerDialog(new DatePickerDialog.OnDateSetListener() {
-                    @Override
-                    public void onDateSet(DatePicker datePicker, int i, int i1, int i2) {
-                        int ii = i1 + 1;
-                        a[0] = i + "-" + ii + "-" + i2 + " ";
-                        dateTimeUtils.showTimePickerDialog(new TimePickerDialog.OnTimeSetListener() {
-                            @Override
-                            public void onTimeSet(TimePicker timePicker, int i, int i1) {
-
-                                a[0] = a[0] + i + ":" + i1;
-                                mDataBinding.time.setText(a[0]);
-                            }
-                        })
-                        ;
-                    }
-                });
-            }
-        });
-
-
-    }
-
-    private void getGankListAddress(String myurl, Map<String, String> map, String msg, final int requstecode) {
-        progressDialog.setMessage(msg);
-        progressDialog.setCancelable(false);
-        progressDialog.show();
-
-        mGankLoader = new Loader();
-        Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
-
-
-            @Override
-            public void call(Resultcode resultcode) {
-                progressDialog.dismiss();
-                if (!(resultcode.status == 0)) {
-                    setToast(resultcode.msg);
-                }
-                if (resultcode.status == 0) {
-
-                    if (requstecode == 0) {
-                        Gson gs = new Gson();
-                        LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
-                        String s = gs.toJson(adta);
-
-                        try {
-                            JSONObject jsonObject = new JSONObject(s);
-                            org.json.JSONArray array = jsonObject.getJSONArray("home");
-                            Type type = new TypeToken<ArrayList<MySimpleHomequEntity>>() {
-                            }.getType();
-                            final ArrayList<MySimpleHomequEntity> list = new Gson().fromJson(array.toString(), type);
-                            final ArrayList<String> strings = new ArrayList<>();
-                            for (int i = 0; i < list.size(); i++) {
-                                strings.add(list.get(i).getAddress());
-                            }
-                            alarmOptionPop = new OptionsPopupWindow(HousekeepingActivity.this);
-                            alarmOptionPop.setPicker(strings);
-
-                            alarmOptionPop.setOnoptionsSelectListener(new OptionsPopupWindow.OnOptionsSelectListener() {
-                                @Override
-                                public void onOptionsSelect(int position, int option2, int options3) {
-                                    if (list.size() > 0) {
-                                        user_home_id = list.get(position).getUser_home_id();
-                                        if (user_home_id != null) {
-                                            mDataBinding.address.setText(list.get(position).getAddress());
-                                            mDataBinding.erq.setText(list.get(position).getArea());
-                                        }
-                                    }
-//                                }
-                                }
-                            });
-                        } catch (JSONException e) {
-                            e.printStackTrace();
-                        }
-
-
-                        alarmOptionPop.showAtLocation(mDataBinding.getRoot(), Gravity.BOTTOM, 0, 0);
-                    }
-                    if (requstecode == 1) {
-                        setToast("success");
-                        mDataBinding.getRoot().postDelayed(new Runnable() {
-                            @Override
-                            public void run() {
-                                Intent intent = new Intent();
-                                setResult(100, intent);
-                                finish();
-                            }
-                        }, 1000);
-
-                    }
-                }
-
-            }
-
-
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                progressDialog.dismiss();
-
-                setToast(getString(R.string.getdatafailure));
-                throwable.printStackTrace();
-            }
-        });
-
-        addSubscription(subscription);
-    }
-
-
-    public static boolean isMobileNO(String mobileNums) {
-        String telRegex = "^((13[0-9])|(14[5,7,9])|(15[^4])|(18[0-9])|(17[0,1,3,5,6,7,8]))\\d{8}$";
-        if (TextUtils.isEmpty(mobileNums))
-            return false;
-        else
-            return mobileNums.matches(telRegex);
-    }
-
-
-    private void setWebView(String data) {
-        WebView webview = mDataBinding.intruduce;
-        webview.setBackgroundColor(Color.WHITE);
-        // webview.loadDataWithBaseURL(null, data, "text/html" , "utf-8", null);
-        // webview.loadData(data,"text/html" ,"utf-8");
-        webview.loadUrl(data);
-        WebSettings webSettings = webview.getSettings();
-        //如果访问的页面中要与Javascript交互，则webview必须设置支持Javascript
-        webSettings.setJavaScriptEnabled(true);
-
-        //设置自适应屏幕，两者合用
-        webSettings.setUseWideViewPort(true); //将图片调整到适合webview的大小
-        webSettings.setLoadWithOverviewMode(true); // 缩放至屏幕的大小
-        //缩放操作
-        webSettings.setSupportZoom(true); //支持缩放，默认为true。是下面那个的前提。
-        webSettings.setBuiltInZoomControls(true); //设置内置的缩放控件。若为false，则该WebView不可缩放
-        webSettings.setDisplayZoomControls(false); //隐藏原生的缩放控件
-
-//其他细节操作
-        webSettings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK); //关闭webview中缓存
-        webSettings.setAllowFileAccess(true); //设置可以访问文件
-        webSettings.setJavaScriptCanOpenWindowsAutomatically(true); //支持通过JS打开新窗口
-        webSettings.setLoadsImagesAutomatically(true); //支持自动加载图片
-        webSettings.setDefaultTextEncodingName("utf-8");//设置编码格式
-        webSettings.setAppCachePath(getPackageCodePath() + "/myapp");
-        webSettings.setAppCacheMaxSize(10000);
-        //webview.loadUrl("www.baidu.com");
-        webview.setWebViewClient(new WebViewClient() {
-            @Override
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                view.loadUrl(url);
-                return super.shouldOverrideUrlLoading(view, url);
-            }
-        });
-        webview.setWebChromeClient(new WebChromeClient() {
-            @Override
-
-            public void onProgressChanged(WebView view, int newProgress) {
-                if (newProgress < 100) {
-
-                    //progressBar.setProgress(newProgress);
-                } else {
-                    //progressBar.setVisibility(View.GONE);
-
-                }
-            }
-
-
-        });
-    }
-
-    private void getGankList(String myurl, Map<String, String> map, String msg, final int requstecode) {
-
-        progressDialog.setMessage(msg);
-        progressDialog.setCancelable(false);
-        //progressDialog.show();
-        mGankLoader = new Loader();
-        Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
-            @Override
-            public void call(Resultcode resultcode) {
-                // progressDialog.dismiss();
-
-                if (!(resultcode.status == 0)) {
-                    setToast(1, resultcode.msg);
-
-                }
-                if (resultcode.status == 0) {
-                    setToast(0, resultcode.msg);
-                    if (requstecode == 0) {
-                        Gson gs = new Gson();
-                        LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
-                        String s = gs.toJson(adta);
-                        try {
-                            JSONObject jsonObject = (new JSONObject(s)).getJSONObject("serve_content");
-                            Type type = new TypeToken<HousekeepingItemDetailEntity>() {
-                            }.getType();
-                            housekeepingItemDetailEntity = new Gson().fromJson(jsonObject.toString(), type);
-
-                            Picasso.with(HousekeepingActivity.this).load(housekeepingItemDetailEntity.getServe_pic()).into(mDataBinding.myImage);
-                            mDataBinding.setVariable(BR.myentity, housekeepingItemDetailEntity);
-                            setWebView(housekeepingItemDetailEntity.getServe_content_introduce().toString());
-
-                            mDataBinding.intruduce.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View view) {
-                                    Intent intent = new Intent(HousekeepingActivity.this, NewsDetailActivity.class);
-                                    //intent.putExtra("url",mDataBinding.intruduce.getText().toString());
-                                    intent.putExtra("titile", housekeepingItemDetailEntity.getServe_category_name());
-                                    //intent.putExtra("homegridentity",homegridentityvArrayList.get(position));
-                                    startActivity(intent);
-                                    //mDataBinding.intruduce.getText().toString();
-                                }
-                            });
-                        } catch (JSONException e) {
-                            e.printStackTrace();
-                        }
-
-
-                    }
-                    if (requstecode == 1) {
-                        LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
-                        String s = new Gson().toJson(adta);
-                        ArrayList<HomeEntity> list = null;
-                        ArrayList<FeeEntity> fee_list = null;
-                        try {
-                            JSONObject jsonObject = new JSONObject(s);
-                            String serveOrderNumber = jsonObject.getString("serve_order_number");
-
-                            Intent intent = new Intent(HousekeepingActivity.this, MyPayActivity.class);
-                            intent.putExtra("payNumber", housekeepingItemDetailEntity.getServe_content_price());
-                            intent.putExtra("title", "家政缴费");
-                            intent.putExtra("feeCategory", Constants.FeeCategory.HOUSEKEEPING);
-                            intent.putExtra("serve_order_number", serveOrderNumber);
-                            startActivityForResult(intent, Constants.PAY_REQUEST_CODE);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-
-            }
-
-
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                progressDialog.dismiss();
-
-                setToast(2, getString(R.string.getdatafailure));
-                throwable.printStackTrace();
-            }
-        });
-
-        addSubscription(subscription);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (Constants.PAY_REQUEST_CODE == requestCode && Constants.PayResultCode.OK == resultCode) {
-            finish();
-        }
-    }
-
-}
+package com.sl.house_property.f3;
+
+import android.app.DatePickerDialog;
+import android.app.TimePickerDialog;
+import android.content.Intent;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.View;
+import android.webkit.WebChromeClient;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.DatePicker;
+import android.widget.ProgressBar;
+import android.widget.TimePicker;
+
+import com.selectpicker.OptionsPopupWindow;
+import com.google.gson.Gson;
+import com.google.gson.internal.LinkedTreeMap;
+import com.google.gson.reflect.TypeToken;
+import com.sl.house_property.BR;
+import com.sl.house_property.BaseActivity;
+import com.sl.house_property.NewsDetailActivity;
+import com.sl.house_property.R;
+import com.sl.house_property.f2.FeeActivity;
+import com.sl.house_property.user.MyChargeActivity;
+import com.sl.house_property.databinding.ActivityHousekeepingBinding;
+import com.sl.house_property.user.MyPayActivity;
+import com.squareup.picasso.Picasso;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import entity.FeeEntity;
+import entity.HomeEntity;
+import entity.HousekeepingItemDetailEntity;
+import entity.MySimpleHomequEntity;
+import entity.RegisterUser;
+import my_loader.Loader;
+import my_loader.Resultcode;
+import tools.Config;
+import tools.DateTimeUtils;
+import http.ApiConfig;
+import rx.Subscription;
+import rx.functions.Action1;
+import utils.Constants;
+import utils.Md5;
+
+public class HousekeepingActivity extends BaseActivity<ActivityHousekeepingBinding> {
+    private String serve_content_id;
+    private Loader mGankLoader;
+    private HousekeepingItemDetailEntity housekeepingItemDetailEntity;
+    private String[] a = new String[1];
+    private String user_home_id = "";
+    private OptionsPopupWindow alarmOptionPop;
+    private ProgressBar progressBar;
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_housekeeping;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setAbr(getIntent().getStringExtra("titile"), new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        }, 0, null, 0, null, 0, null, "");
+        serve_content_id = getIntent().getStringExtra("serve_content_id");
+        Picasso.with(this).load("http://www.kenli.gov.cn/_mediafile/admin/2014/08/13/24hbbuc1yt.jpg").into(mDataBinding.myImage);
+
+        mDataBinding.address.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                RegisterUser user =
+                        Config.getInstance(HousekeepingActivity.this).getUser();
+                Map<String, String> map = new HashMap<>();
+                if (user != null) {
+                    map.put("userid", user.getUserid());
+                } else {
+                    map.put("userid", 0 + "");
+                }
+                map.put("app", "Cas");
+                map.put("class", "GetMyAddress");
+
+                map.put("sign", Md5.md5("Cas" + "GetMyAddress" + Md5.secret));
+                getGankListAddress(ApiConfig.BASE_URL, map, getResources().getString(R.string.loading), 0);
+            }
+        });
+
+
+        mDataBinding.mycount.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+
+                RegisterUser user =
+                        Config.getInstance(HousekeepingActivity.this).getUser();
+                Map<String, String> map = new HashMap<>();
+                if (housekeepingItemDetailEntity == null) {
+                    return;
+                }
+                if (user != null) {
+                    map.put("userid", user.getUserid());
+                } else {
+                    map.put("userid", 0 + "");
+                }
+                map.put("app", "Serve");
+                map.put("class", "Serve_an_AddServeOrder");
+                map.put("sign", Md5.md5("Serve" + "Serve_an_AddServeOrder" + Md5.secret));
+                map.put("serve_content_id", serve_content_id);
+                map.put("serve_type", 1 + "");
+                if (mDataBinding.name.getText().toString().equals("")) {
+                    setToast("请输入姓名");
+                    return;
+                }
+
+                if (mDataBinding.phone.getText().toString().length() != 11) {
+                    setToast("请输入手机号");
+                    return;
+                }
+
+                if (!isMobileNO(mDataBinding.phone.getText().toString())) {
+                    setToast("请输入有效的手机号");
+                    return;
+
+                }
+
+                if (mDataBinding.time.getText().toString().equals("")) {
+                    setToast("请输入时间");
+                    return;
+                }
+                if (mDataBinding.address.getText().toString().equals("")) {
+                    setToast("请输入地址");
+                    return;
+                }
+                if ("".equals(user_home_id)) {
+                    setToast("请选择房间");
+                    return;
+                }
+
+                map.put("serve_user_name", mDataBinding.name.getText().toString());
+                map.put("serve_user_phone", mDataBinding.phone.getText().toString());
+                map.put("serve_start_time", mDataBinding.time.getText().toString());
+
+                map.put("user_home_id", user_home_id);
+
+                map.put("serve_room_square", mDataBinding.erq.getText().toString());
+                map.put("serve_address", mDataBinding.address.getText().toString());
+                map.put("serve_order_money", housekeepingItemDetailEntity.getServe_content_price());
+
+                map.put("serve_order_note", mDataBinding.notice.getText().toString() + "");
+
+                //分类类型 企业 firm ，个人 personal
+                getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), 1);
+
+
+            }
+        });
+        Map<String, String> map = new HashMap<>();
+        RegisterUser user =
+                Config.getInstance(this).getUser();
+
+        if (user != null) {
+            map.put("userid", user.getUserid());
+        } else {
+            map.put("userid", 0 + "");
+        }
+        map.put("app", "Serve");
+        map.put("class", "Serve_an_ServeContent");
+        map.put("sign", Md5.md5("Serve" + "Serve_an_ServeContent" + Md5.secret));
+        map.put("serve_content_id", serve_content_id);
+        //分类类型 企业 firm ，个人 personal
+        getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), 0);
+        /*$request = array(
+                'app' => $app,
+                'class' => $class,
+                'sign' => $sign,
+                *//* 修改这里 - 下方为接口所要传递的参数 *//*
+                'userid' => '10', //用户ID
+                'serve_order_id' => '10', //服务ID*/
+        mDataBinding.time.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                final DateTimeUtils dateTimeUtils = new DateTimeUtils(HousekeepingActivity.this);
+                dateTimeUtils.showDackPickerDialog(new DatePickerDialog.OnDateSetListener() {
+                    @Override
+                    public void onDateSet(DatePicker datePicker, int i, int i1, int i2) {
+                        int ii = i1 + 1;
+                        a[0] = i + "-" + ii + "-" + i2 + " ";
+                        dateTimeUtils.showTimePickerDialog(new TimePickerDialog.OnTimeSetListener() {
+                            @Override
+                            public void onTimeSet(TimePicker timePicker, int i, int i1) {
+
+                                a[0] = a[0] + i + ":" + i1;
+                                mDataBinding.time.setText(a[0]);
+                            }
+                        })
+                        ;
+                    }
+                });
+            }
+        });
+
+
+    }
+
+    private void getGankListAddress(String myurl, Map<String, String> map, String msg, final int requstecode) {
+        progressDialog.setMessage(msg);
+        progressDialog.setCancelable(false);
+        progressDialog.show();
+
+        mGankLoader = new Loader();
+        Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
+
+
+            @Override
+            public void call(Resultcode resultcode) {
+                progressDialog.dismiss();
+                if (!(resultcode.status == 0)) {
+                    setToast(resultcode.msg);
+                }
+                if (resultcode.status == 0) {
+
+                    if (requstecode == 0) {
+                        Gson gs = new Gson();
+                        LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
+                        String s = gs.toJson(adta);
+
+                        try {
+                            JSONObject jsonObject = new JSONObject(s);
+                            org.json.JSONArray array = jsonObject.getJSONArray("home");
+                            Type type = new TypeToken<ArrayList<MySimpleHomequEntity>>() {
+                            }.getType();
+                            final ArrayList<MySimpleHomequEntity> list = new Gson().fromJson(array.toString(), type);
+                            final ArrayList<String> strings = new ArrayList<>();
+                            for (int i = 0; i < list.size(); i++) {
+                                strings.add(list.get(i).getAddress());
+                            }
+                            alarmOptionPop = new OptionsPopupWindow(HousekeepingActivity.this);
+                            alarmOptionPop.setPicker(strings);
+
+                            alarmOptionPop.setOnoptionsSelectListener(new OptionsPopupWindow.OnOptionsSelectListener() {
+                                @Override
+                                public void onOptionsSelect(int position, int option2, int options3) {
+                                    if (list.size() > 0) {
+                                        user_home_id = list.get(position).getUser_home_id();
+                                        if (user_home_id != null) {
+                                            mDataBinding.address.setText(list.get(position).getAddress());
+                                            mDataBinding.erq.setText(list.get(position).getArea());
+                                        }
+                                    }
+//                                }
+                                }
+                            });
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+
+
+                        alarmOptionPop.showAtLocation(mDataBinding.getRoot(), Gravity.BOTTOM, 0, 0);
+                    }
+                    if (requstecode == 1) {
+                        setToast("success");
+                        mDataBinding.getRoot().postDelayed(new Runnable() {
+                            @Override
+                            public void run() {
+                                Intent intent = new Intent();
+                                setResult(100, intent);
+                                finish();
+                            }
+                        }, 1000);
+
+                    }
+                }
+
+            }
+
+
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                progressDialog.dismiss();
+
+                setToast(getString(R.string.getdatafailure));
+                throwable.printStackTrace();
+            }
+        });
+
+        addSubscription(subscription);
+    }
+
+
+    public static boolean isMobileNO(String mobileNums) {
+        String telRegex = "^((13[0-9])|(14[5,7,9])|(15[^4])|(18[0-9])|(17[0,1,3,5,6,7,8]))\\d{8}$";
+        if (TextUtils.isEmpty(mobileNums))
+            return false;
+        else
+            return mobileNums.matches(telRegex);
+    }
+
+
+    private void setWebView(String data) {
+        WebView webview = mDataBinding.intruduce;
+        webview.setBackgroundColor(Color.WHITE);
+        // webview.loadDataWithBaseURL(null, data, "text/html" , "utf-8", null);
+        // webview.loadData(data,"text/html" ,"utf-8");
+        webview.loadUrl(data);
+        WebSettings webSettings = webview.getSettings();
+        //如果访问的页面中要与Javascript交互，则webview必须设置支持Javascript
+        webSettings.setJavaScriptEnabled(true);
+
+        //设置自适应屏幕，两者合用
+        webSettings.setUseWideViewPort(true); //将图片调整到适合webview的大小
+        webSettings.setLoadWithOverviewMode(true); // 缩放至屏幕的大小
+        //缩放操作
+        webSettings.setSupportZoom(true); //支持缩放，默认为true。是下面那个的前提。
+        webSettings.setBuiltInZoomControls(true); //设置内置的缩放控件。若为false，则该WebView不可缩放
+        webSettings.setDisplayZoomControls(false); //隐藏原生的缩放控件
+
+//其他细节操作
+        webSettings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK); //关闭webview中缓存
+        webSettings.setAllowFileAccess(true); //设置可以访问文件
+        webSettings.setJavaScriptCanOpenWindowsAutomatically(true); //支持通过JS打开新窗口
+        webSettings.setLoadsImagesAutomatically(true); //支持自动加载图片
+        webSettings.setDefaultTextEncodingName("utf-8");//设置编码格式
+        // setAppCachePath 和 setAppCacheMaxSize 已在 API 33 中移除，使用默认缓存设置
+        //webview.loadUrl("www.baidu.com");
+        webview.setWebViewClient(new WebViewClient() {
+            @Override
+            public boolean shouldOverrideUrlLoading(WebView view, String url) {
+                view.loadUrl(url);
+                return super.shouldOverrideUrlLoading(view, url);
+            }
+        });
+        webview.setWebChromeClient(new WebChromeClient() {
+            @Override
+
+            public void onProgressChanged(WebView view, int newProgress) {
+                if (newProgress < 100) {
+
+                    //progressBar.setProgress(newProgress);
+                } else {
+                    //progressBar.setVisibility(View.GONE);
+
+                }
+            }
+
+
+        });
+    }
+
+    private void getGankList(String myurl, Map<String, String> map, String msg, final int requstecode) {
+
+        progressDialog.setMessage(msg);
+        progressDialog.setCancelable(false);
+        //progressDialog.show();
+        mGankLoader = new Loader();
+        Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
+            @Override
+            public void call(Resultcode resultcode) {
+                // progressDialog.dismiss();
+
+                if (!(resultcode.status == 0)) {
+                    setToast(1, resultcode.msg);
+
+                }
+                if (resultcode.status == 0) {
+                    setToast(0, resultcode.msg);
+                    if (requstecode == 0) {
+                        Gson gs = new Gson();
+                        LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
+                        String s = gs.toJson(adta);
+                        try {
+                            JSONObject jsonObject = (new JSONObject(s)).getJSONObject("serve_content");
+                            Type type = new TypeToken<HousekeepingItemDetailEntity>() {
+                            }.getType();
+                            housekeepingItemDetailEntity = new Gson().fromJson(jsonObject.toString(), type);
+
+                            Picasso.with(HousekeepingActivity.this).load(housekeepingItemDetailEntity.getServe_pic()).into(mDataBinding.myImage);
+                            mDataBinding.setVariable(BR.myentity, housekeepingItemDetailEntity);
+                            setWebView(housekeepingItemDetailEntity.getServe_content_introduce().toString());
+
+                            mDataBinding.intruduce.setOnClickListener(new View.OnClickListener() {
+                                @Override
+                                public void onClick(View view) {
+                                    Intent intent = new Intent(HousekeepingActivity.this, NewsDetailActivity.class);
+                                    //intent.putExtra("url",mDataBinding.intruduce.getText().toString());
+                                    intent.putExtra("titile", housekeepingItemDetailEntity.getServe_category_name());
+                                    //intent.putExtra("homegridentity",homegridentityvArrayList.get(position));
+                                    startActivity(intent);
+                                    //mDataBinding.intruduce.getText().toString();
+                                }
+                            });
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+
+
+                    }
+                    if (requstecode == 1) {
+                        LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
+                        String s = new Gson().toJson(adta);
+                        ArrayList<HomeEntity> list = null;
+                        ArrayList<FeeEntity> fee_list = null;
+                        try {
+                            JSONObject jsonObject = new JSONObject(s);
+                            String serveOrderNumber = jsonObject.getString("serve_order_number");
+
+                            Intent intent = new Intent(HousekeepingActivity.this, MyPayActivity.class);
+                            intent.putExtra("payNumber", housekeepingItemDetailEntity.getServe_content_price());
+                            intent.putExtra("title", "家政缴费");
+                            intent.putExtra("feeCategory", Constants.FeeCategory.HOUSEKEEPING);
+                            intent.putExtra("serve_order_number", serveOrderNumber);
+                            startActivityForResult(intent, Constants.PAY_REQUEST_CODE);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+
+            }
+
+
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                progressDialog.dismiss();
+
+                setToast(2, getString(R.string.getdatafailure));
+                throwable.printStackTrace();
+            }
+        });
+
+        addSubscription(subscription);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (Constants.PAY_REQUEST_CODE == requestCode && Constants.PayResultCode.OK == resultCode) {
+            finish();
+        }
+    }
+
+}
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 720d2e0..54f03ea 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
@@ -1,718 +1,711 @@
-package com.sl.house_property.user;
-
-import android.Manifest;
-import android.app.DatePickerDialog;
-import android.app.TimePickerDialog;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import androidx.databinding.DataBindingUtil;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.Handler;
-import android.os.Message;
-import android.provider.MediaStore;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.widget.DatePicker;
-import android.widget.TimePicker;
-
-import com.selectpicker.OptionsPopupWindow;
-import com.cutil.FileUtils;
-import com.cutil.ImageUtils;
-import com.cutil.RegexUtils;
-import com.cutil.SizeUtils;
-import com.google.gson.Gson;
-import com.google.gson.internal.LinkedTreeMap;
-import com.google.gson.reflect.TypeToken;
-import com.sl.house_property.BaseActivity;
-import com.sl.house_property.R;
-import com.sl.house_property.databinding.ActivityAddAnewGranteeBinding;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Type;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-import entity.MySimpleHomequEntity;
-import entity.RegisterUser;
-import imageselector.FullScreenPreviewActivity;
-import imageselector.utils.ImageSelector;
-import my_loader.Loader;
-import my_loader.Resultcode;
-import my_view.MyBottomSheetDialog;
-import my_view.RecyclerViewSpacesItemDecoration;
-import my_view.SelectPictureWayDialog;
-import my_view.SelectRepairWayDialog;
-import my_view.tao_bao_refresh.my_drag_recyle_view.example.listener.OnItemOnclikListener;
-import my_view.tao_bao_refresh.my_drag_recyle_view.example.callback.ItemDragHelperCallback;
-import my_view.tao_bao_refresh.my_drag_recyle_view.recycle.MyRecyclerView;
-import my_view.tao_bao_refresh.my_drag_recyle_view.recyledapter.RecycleAdapter;
-import rx.Subscription;
-import rx.functions.Action1;
-import tools.Config;
-import tools.DateTimeUtils;
-import tools.time.CustomTimePicker;
-import http.ApiConfig;
-import http.FileUpLoad.retrofit.HttpStaticApi;
-import http.FileUpLoad.retrofit.RetrofitCallBack;
-import http.FileUpLoad.retrofit.RetrofitHttpUpLoad;
-import okhttp3.RequestBody;
-import retrofit2.Response;
-import utils.BitmapTools;
-import utils.Md5;
-import utils.SelectPicDanimicActivity;
-
-public class AddAnewGranteeActivity extends BaseActivity<ActivityAddAnewGranteeBinding> implements View.OnClickListener, RetrofitCallBack {
-
-    private Loader mGankLoader;
-    private OptionsPopupWindow alarmOptionPop;
-    private String otherphoto = "otherphoto.jpg";
-    private ArrayList<File> topRecleList;
-    private RecycleAdapter topadapter;
-    private int userImgeREQUST = 10000;
-    private ArrayList<String> deletePath = new ArrayList<>();
-    private String address = "";
-    private CustomTimePicker customDatePicker;
-    private int type;
-    private int maxPictureCount = 4;
-    private int resultCodeFromlist = 1000;
-    private int progressmes = 1000;
-    private String takePicturePath;//拍照存放本地路径
-    private static final int REQUEST_CODE_TAKE_PICTURE = 100;
-    private static final int REQUEST_CODE_SELECT_PICTURE = 101;
-    private Handler handler = new Handler() {
-        @Override
-        public void handleMessage(final Message msg) {
-            super.handleMessage(msg);
-            if (msg.what == progressmes) {
-                if (progressDialog != null && progressDialog.isShowing()) {
-                    runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            progressDialog.setMessage((String) msg.obj);
-                        }
-                    });
-
-                }
-            }
-        }
-    };
-
-
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_add_anew_grantee;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        topRecleList = new ArrayList<File>();
-        topRecleList.add(null);
-        setAbr("新增报修", new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                finish();
-            }
-        }, 0, null, 0, null, 0, null, "");
-
-        //1部分的recycle进行初始化
-        MyRecyclerView recyclerView = mDataBinding.recyleTop;
-        topadapter = new RecycleAdapter(topRecleList, this.getApplication());
-        LinearLayoutManager ms = new LinearLayoutManager(this);
-        ms.setOrientation(LinearLayoutManager.HORIZONTAL);
-        HashMap<String, Integer> stringIntegerHashMap = new HashMap<>();
-        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.TOP_DECORATION, 0);//top间距
-        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.BOTTOM_DECORATION, 0);//底部间距
-        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.LEFT_DECORATION, SizeUtils.dp2px(8));//左间距
-        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.RIGHT_DECORATION, SizeUtils.dp2px(8));//右间距
-        recyclerView.addItemDecoration(new RecyclerViewSpacesItemDecoration(stringIntegerHashMap));
-        recyclerView.setLayoutManager(ms);
-        //设置监听
-        ItemDragHelperCallback callback = new ItemDragHelperCallback(topadapter);
-        ItemTouchHelper touchHelper = new ItemTouchHelper(callback);
-        touchHelper.attachToRecyclerView(recyclerView);
-        recyclerView.setAdapter(topadapter);
-        listenDragView(recyclerView, topadapter, topRecleList, touchHelper);
-        mDataBinding.save.setOnClickListener(this);
-        mDataBinding.time.setOnClickListener(this);
-        mDataBinding.typeText.setOnClickListener(this);
-        mDataBinding.address.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                RegisterUser user =
-                        Config.getInstance(AddAnewGranteeActivity.this).getUser();
-                Map<String, String> map = new HashMap<>();
-                if (user != null) {
-                    map.put("userid", user.getUserid());
-                } else {
-                    map.put("userid", 0 + "");
-                }
-                map.put("app", "Cas");
-                map.put("class", "BeforeFamilyMember");
-
-                map.put("sign", Md5.md5("Cas" + "BeforeFamilyMember" + Md5.secret));
-                getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.loading), 0);
-            }
-        });
-        takePicturePath = Environment.getExternalStorageDirectory().getPath() + "/house";
-        FileUtils.createOrExistsDir(takePicturePath);
-    }
-
-    private void initDatePicker() {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.CHINA);
-
-        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");// 设置日期格式
-        mDataBinding.time.setText(df.format(new Date()) + "");
-        final String[] a = {""};
-
-        final DateTimeUtils dateTimeUtils = new DateTimeUtils(AddAnewGranteeActivity.this);
-        dateTimeUtils.showDackPickerDialog(new DatePickerDialog.OnDateSetListener() {
-            @Override
-            public void onDateSet(DatePicker datePicker, int i, int i1, int i2) {
-                int ii = i1 + 1;
-                a[0] = i + "-" + ii + "-" + i2 + " ";
-                dateTimeUtils.showTimePickerDialog(new TimePickerDialog.OnTimeSetListener() {
-                    @Override
-                    public void onTimeSet(TimePicker timePicker, int i, int i1) {
-
-                        a[0] = a[0] + i + ":" + i1;
-                        if(isPastDate(a[0])){
-                            setToast("只能选择当前时间之后的时间");
-                        }else {
-                            mDataBinding.time.setText(a[0]);
-                        }
-
-                    }
-                })
-                ;
-            }
-        });
-    }
-
-
-
-
-    public static boolean isPastDate(String str){
-
-        boolean flag = false;
-        Date nowDate = new Date();
-        Date pastDate = null;
-        //格式化日期
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm", Locale.CHINA);
-        //在日期字符串非空时执行
-        if (str != null && !"".equals(str)) {
-            try {
-                //将字符串转为日期格式，如果此处字符串为非合法日期就会抛出异常。
-                pastDate = sdf.parse(str);
-                //调用Date里面的before方法来做判断
-                flag = pastDate.before(nowDate);
-            } catch (ParseException e) {
-                e.printStackTrace();
-            }
-        }else {
-            System.out.println("日期参数不可为空");
-        }
-        return flag;
-    }
-
-
-    private void listenDragView(final MyRecyclerView recyclerView, final RecycleAdapter topadapter, final ArrayList<File> topRecleList, final ItemTouchHelper touchHelper) {
-       /* FullyGridLayoutManager mgr = new FullyGridLayoutManager(this,4);
-        mgr.setOrientation(FullyGridLayoutManager.VERTICAL);
-        mgr.setSmoothScrollbarEnabled(true);
-        recyclerView.setLayoutManager(mgr);*/
-        final boolean[] flag = {false};
-        recyclerView.mHandler.postDelayed(recyclerView.mLongClickRunnable, 10);
-        flag[0] = true;
-        topadapter.SetOnClikListener(new OnItemOnclikListener() {
-
-            public void OnItemLongClik(MyRecyclerView.ViewHolder holder, View view, int postion) {
-
-            }
-
-            public void OnItemClik(View view, int postion) {
-                if (view.getId() == R.id.item) {
-                    if (topRecleList.get(postion) == null) {
-                        selectPictureTip();
-                    } else {
-                        previewPicture(postion);
-                    }
-                } else if (view.getId() == R.id.img_delete) {
-
-                    topadapter.deletesmData(postion);
-                    topadapter.changeAllImg(flag[0]);
-                    topRecleList.set(topRecleList.size() - 1, null);
-                    topadapter.setmData(topRecleList);
-                    topadapter.notifyDataSetChanged();
-                }
-
-            }
-
-            @Override
-            public void OnItemChangeOver() {
-
-            }
-        });
-
-        //手指抬起监听，防止拖动完后position没有改变，删除的话会删错
-        recyclerView.setOnEventUpLis(new MyRecyclerView.onEventUpLis() {
-            @Override
-            public void onEventUp() {
-                topadapter.changeAllImg(flag[0]);
-                topadapter.setmData(topRecleList);
-                topadapter.notifyDataSetChanged();
-            }
-        });
-        topadapter.setmData(topRecleList);
-
-
-    }
-
-    private void selectPictureTip() {
-        final MyBottomSheetDialog dialog = new MyBottomSheetDialog(this);
-        SelectPictureWayDialog selectGenderDialog = new SelectPictureWayDialog(this, new SelectPictureWayDialog.SelectedItemOnClickListener() {
-            @Override
-            public void selected(int index) {
-                dialog.dismiss();
-                if (index == 0) {
-                    checkCameraPermission();
-                } else if (index == 1) {
-                    checkAlbumPermission();
-                }
-
-
-            }
-
-            @Override
-            public void selectedCancel() {
-                dialog.dismiss();
-            }
-        });
-        dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-        dialog.applyStyle(com.rey.material.R.style.Material_App_BottomSheetDialog).contentView(selectGenderDialog).cancelable(true).inDuration(100).heightParam(ViewGroup.LayoutParams.WRAP_CONTENT).show();
-
-    }
-
-    //浏览已选择图片
-    void previewPicture(int position) {
-        if (topRecleList.size() <= 1) {
-            return;
-        }
-        ArrayList<File> list = new ArrayList<>();
-        for (int i = 0; i < topRecleList.size(); i++) {
-            File file = topRecleList.get(i);
-            if (file != null) {
-                list.add(file);
-            }
-        }
-        if (list.size() > 0) {
-            FullScreenPreviewActivity.openActivity(this, list, position);
-        }
-
-    }
-
-    /*
-     * 检查相机权限
-     * */
-    private void checkCameraPermission() {
-        if( Build.VERSION.SDK_INT < Build.VERSION_CODES.M){
-            startCamera();
-            return;
-        }
-        //判断是否开户相册权限
-        if (PackageManager.PERMISSION_GRANTED == ContextCompat.checkSelfPermission(this, android.Manifest.permission.CAMERA)) {
-            startCamera();
-        } else {
-            //提示用户开户权限
-            String[] perms = {"android.permission.CAMERA"};
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                requestPermissions(new String[]{Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
-            }
-        }
-
-    }
-
-    /*
-     * 检查访问相册权限
-     * */
-    private void checkAlbumPermission() {
-        if( Build.VERSION.SDK_INT < Build.VERSION_CODES.M){
-            selectAlbum();
-            return;
-        }
-        if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-            //权限还没有授予，需要在这里写申请权限的代码
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 2);
-            }
-
-        } else {
-            selectAlbum();
-        }
-    }
-
-
-    @Override
-    public void onRequestPermissionsResult(int permsRequestCode, String[] permissions, int[] grantResults) {
-        switch (permsRequestCode) {
-            case 1:
-                boolean cameraAccepted = grantResults[0] == PackageManager.PERMISSION_GRANTED;
-                if (cameraAccepted) {
-                    startCamera();
-                }
-                break;
-            case 2:
-                boolean albumAccepted = grantResults[0] == PackageManager.PERMISSION_GRANTED;
-                if (albumAccepted) {
-                    selectAlbum();
-                }
-                break;
-        }
-    }
-
-    //拍照
-    private void startCamera() {
-        Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-        intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);
-        otherphoto = System.currentTimeMillis() + ".jpg";
-        intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri
-                .fromFile(new File(takePicturePath + "/" + otherphoto)));
-        startActivityForResult(intent, REQUEST_CODE_TAKE_PICTURE);
-    }
-
-    //选择照片
-    private void selectAlbum() {
-        int size = topRecleList.size();
-        int selectCount;
-        if (size < maxPictureCount) {
-            selectCount = maxPictureCount - (size - 1);
-        } else if (size == maxPictureCount) {
-            if (topRecleList.get(size - 1) == null) {
-                selectCount = 1;
-            } else {
-                return;
-            }
-        } else {
-            return;
-        }
-        ImageSelector.builder()
-                .useCamera(false) // 设置是否使用拍照
-                .setSingle(false)  //设置是否单选
-                .setViewImage(true) //是否点击放大图片查看,，默认为true
-                .setMaxSelectCount(selectCount) // 图片的最大选择数量，小于等于0时，不限数量。
-                .start(AddAnewGranteeActivity.this, REQUEST_CODE_SELECT_PICTURE); // 打开相册
-    }
-
-    private void takeMyPhoto(int userImgeREQUST) {
-        //拍照
-        Intent intent = new Intent(AddAnewGranteeActivity.this,
-                SelectPicDanimicActivity.class);
-        intent.putExtra("photoid", userImgeREQUST);
-        intent.putExtra("crop", true);
-        intent.putExtra("cropx", 300);
-        intent.putExtra("cropy", 300);
-        startActivityForResult(intent, userImgeREQUST);
-        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);
-        progressDialog.show();
-
-        mGankLoader = new Loader();
-        Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
-
-
-            @Override
-            public void call(Resultcode resultcode) {
-                progressDialog.dismiss();
-                if (!(resultcode.status == 0)) {
-                    setToast(resultcode.msg);
-                }
-                if (resultcode.status == 0) {
-
-                    if (requstecode == 0) {
-                        Gson gs = new Gson();
-                        ArrayList<LinkedTreeMap> adta = (ArrayList) resultcode.data;
-                        String s = gs.toJson(adta);
-                        Type type = new TypeToken<ArrayList<MySimpleHomequEntity>>() {
-                        }.getType();
-                        final ArrayList<MySimpleHomequEntity> list = new Gson().fromJson(s, type);
-                        final ArrayList<String> strings = new ArrayList<>();
-                        for (int i = 0; i < list.size(); i++) {
-                            strings.add(list.get(i).getAddress());
-                        }
-                        alarmOptionPop = new OptionsPopupWindow(AddAnewGranteeActivity.this);
-                        alarmOptionPop.setPicker(strings);
-
-                        alarmOptionPop.setOnoptionsSelectListener(new OptionsPopupWindow.OnOptionsSelectListener() {
-                            @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());
-                            }
-                        });
-
-                        alarmOptionPop.showAtLocation(mDataBinding.getRoot(), Gravity.BOTTOM, 0, 0);
-                    }
-                    if (requstecode == 1) {
-
-                        mDataBinding.getRoot().postDelayed(new Runnable() {
-                            @Override
-                            public void run() {
-                                Intent intent = new Intent();
-                                setResult(100, intent);
-                                finish();
-                            }
-                        }, 1000);
-
-                    }
-                }
-
-            }
-
-
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                progressDialog.dismiss();
-
-                setToast(getString(R.string.getdatafailure));
-                throwable.printStackTrace();
-            }
-        });
-
-        addSubscription(subscription);
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (resultCode != RESULT_OK) {
-            return;
-        }
-        if (requestCode == REQUEST_CODE_TAKE_PICTURE) {
-            Bitmap image = null;
-            File file = null;
-            image = ImageUtils.getBitmap(new File(takePicturePath + "/" + otherphoto));
-            try {
-                file = BitmapTools.saveFile(image, takePicturePath, otherphoto);
-                topRecleList.remove(topRecleList.size() - 1);
-                topRecleList.add(file);
-                if (topRecleList.size() < maxPictureCount) {
-                    topRecleList.add(null);
-                }
-                topadapter.setmData(topRecleList);
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        } else if (requestCode == REQUEST_CODE_SELECT_PICTURE && data != null) {
-            ArrayList<String> images = data.getStringArrayListExtra(ImageSelector.SELECT_RESULT);
-            topRecleList.remove(topRecleList.size() - 1);//先取消增加
-            for (int i = 0; i < images.size(); i++) {
-                String itemUrl = images.get(i);
-                Bitmap image = null;
-                File file = null;
-                image = ImageUtils.getBitmap(new File(itemUrl));
-                try {
-                    file = BitmapTools.saveFile(image, itemUrl);
-                    topRecleList.add(file);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-
-            if (topRecleList.size() < maxPictureCount) {
-                topRecleList.add(null);
-            }
-            topadapter.setmData(topRecleList);
-        }
-
-
-    }
-
-    /**
-     * 上传编辑或删除后的数据
-     */
-    @Override
-    protected void onDestroy() {
-
-//        if (deletePath != null) {
-//            for (int i = 0; i < deletePath.size(); i++) {
-//                BitmapTools.deleteFile(new File(deletePath.get(i)));
-//            }
-//        }
-//        for (int i = 0; i < topRecleList.size() - 1; i++) {
-//            BitmapTools.deleteFile(topRecleList.get(i));
-//
-//        }
-        FileUtils.deleteDir(takePicturePath);
-        super.onDestroy();
-    }
-
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.save:
-                if (mDataBinding.titile.getText().toString().trim().length() < 1) {
-                    setToast("请输入标题");
-                    return;
-                }
-                if (mDataBinding.titile.getText().toString().trim().length() > 20) {
-                    setToast("标题最多可以输入20个字");
-                    return;
-                }
-                if (mDataBinding.address.getText().toString().trim().length() < 1) {
-                    setToast("请选择地址");
-                    return;
-                }
-                if (mDataBinding.typeText.getText().toString().trim().length() < 2) {
-                    setToast("请选择类型");
-                    return;
-                }
-                if (mDataBinding.user.getText().toString().trim().length() < 1) {
-                    setToast( getString(R.string.pleaseeditname));
-                    return;
-                }
-                if (mDataBinding.phone.getText().toString().trim().length() <1) {
-                    setToast("请输入手机号");
-                    return;
-                }
-                if (!RegexUtils.isMobileExact(mDataBinding.phone.getText().toString().trim())) {
-                    setToast("请输入有效的手机号");
-                    return;
-                }
-                if (mDataBinding.time.getText().toString().trim().length() < 3) {
-                    setToast( getString(R.string.pleaseedittime));
-                    return;
-                }
-                if (mDataBinding.content.getText().toString().trim().length() < 3) {
-                    setToast("请输入报修详情");
-                    return;
-                }
-
-                douploadimges();
-                break;
-            case R.id.time:
-                initDatePicker();
-                break;
-
-            case R.id.typeText: {
-
-                final MyBottomSheetDialog dialog = new MyBottomSheetDialog(this);
-                SelectRepairWayDialog selectGenderDialog = new SelectRepairWayDialog(this, new SelectRepairWayDialog.SelectedItemOnClickListener() {
-                    @Override
-                    public void selected(int index) {
-                        dialog.dismiss();
-                        if (index == 0) {
-                            type = 2;
-                            mDataBinding.typeText.setText("公共");
-                        } else if (index == 1) {
-                            type = 1;
-                            mDataBinding.typeText.setText("个人");
-                        }
-                    }
-
-                    @Override
-                    public void selectedCancel() {
-                        dialog.dismiss();
-                    }
-                });
-                dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-                dialog.applyStyle(com.rey.material.R.style.Material_App_BottomSheetDialog).contentView(selectGenderDialog).cancelable(true).inDuration(100).heightParam(ViewGroup.LayoutParams.WRAP_CONTENT).show();
-
-            }
-            break;
-        }
-    }
-
-    private void douploadimges() {
-        progressDialog.setMessage(getString(R.string.requsting));
-        progressDialog.setCancelable(false);
-        progressDialog.show();
-        RetrofitHttpUpLoad retrofitHttpUpLoad = RetrofitHttpUpLoad.getInstance();
-        retrofitHttpUpLoad.clear();
-        Map<String, Object> map = new HashMap<>();
-        RegisterUser user =
-                Config.getInstance(this).getUser();
-        if (user != null) {
-            map.put("userid", user.getUserid());
-        } else {
-            map.put("userid", 0 + "");
-        }
-        map.put("app", "Serve");
-        map.put("class", "Serve_an_AddRepair");
-        map.put("sign", Md5.md5("Serve" + "Serve_an_AddRepair" + Md5.secret));
-        map.put("repair_user_phone", mDataBinding.phone.getText().toString().trim());
-        map.put("repair_time", mDataBinding.time.getText().toString().trim());
-        map.put("repair_name", mDataBinding.phone.getText().toString().trim());
-        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 + "");
-        for (int i = 0; i < topRecleList.size(); i++) {
-            if (topRecleList.get(i) != null) {
-                map.put("repair_img" + i, topRecleList.get(i));
-            }
-        }
-        Map<String, RequestBody> params = retrofitHttpUpLoad.addParameter(map).bulider();
-        retrofitHttpUpLoad.setHandler(handler);
-        retrofitHttpUpLoad.addToEnqueue(retrofitHttpUpLoad.mHttpService.upLoadAgree(ApiConfig.BASE_URL, params),
-                this, HttpStaticApi.HTTP_UPLOADIMAGE);
-
-
-    }
-
-    @Override
-    public void onResponse(Response response, int method) {
-        progressDialog.dismiss();
-        switch (method) {
-            case HttpStaticApi.HTTP_UPLOADIMAGE:
-
-                Resultcode resultcode = (Resultcode) response.body();
-                if (0 == (resultcode.status)) {
-                    setToast("添加成功");
-                    Intent intent = new Intent();
-                    intent.putExtra("onreflash", true);
-                    setResult(resultCodeFromlist, intent);
-                    finish();
-                } else {
-                    setToast( resultcode.msg);
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-    @Override
-    public void onFailure(Response response, int method) {
-        progressDialog.dismiss();
-        setToast( "添加失败");
-    }
-
-
-}
+package com.sl.house_property.user;
+
+import android.Manifest;
+import android.app.DatePickerDialog;
+import android.app.TimePickerDialog;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import androidx.databinding.DataBindingUtil;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.Message;
+import android.provider.MediaStore;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.DatePicker;
+import android.widget.TimePicker;
+
+import com.selectpicker.OptionsPopupWindow;
+import com.cutil.FileUtils;
+import com.cutil.ImageUtils;
+import com.cutil.RegexUtils;
+import com.cutil.SizeUtils;
+import com.google.gson.Gson;
+import com.google.gson.internal.LinkedTreeMap;
+import com.google.gson.reflect.TypeToken;
+import com.sl.house_property.BaseActivity;
+import com.sl.house_property.R;
+import com.sl.house_property.databinding.ActivityAddAnewGranteeBinding;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+import entity.MySimpleHomequEntity;
+import entity.RegisterUser;
+import imageselector.FullScreenPreviewActivity;
+import imageselector.utils.ImageSelector;
+import my_loader.Loader;
+import my_loader.Resultcode;
+import my_view.MyBottomSheetDialog;
+import my_view.RecyclerViewSpacesItemDecoration;
+import my_view.SelectPictureWayDialog;
+import my_view.SelectRepairWayDialog;
+import my_view.tao_bao_refresh.my_drag_recyle_view.example.listener.OnItemOnclikListener;
+import my_view.tao_bao_refresh.my_drag_recyle_view.example.callback.ItemDragHelperCallback;
+import my_view.tao_bao_refresh.my_drag_recyle_view.recycle.MyRecyclerView;
+import my_view.tao_bao_refresh.my_drag_recyle_view.recyledapter.RecycleAdapter;
+import rx.Subscription;
+import rx.functions.Action1;
+import tools.Config;
+import tools.DateTimeUtils;
+import tools.time.CustomTimePicker;
+import http.ApiConfig;
+import http.FileUpLoad.retrofit.HttpStaticApi;
+import http.FileUpLoad.retrofit.RetrofitCallBack;
+import http.FileUpLoad.retrofit.RetrofitHttpUpLoad;
+import okhttp3.RequestBody;
+import retrofit2.Response;
+import utils.BitmapTools;
+import utils.Md5;
+import utils.SelectPicDanimicActivity;
+
+public class AddAnewGranteeActivity extends BaseActivity<ActivityAddAnewGranteeBinding> implements View.OnClickListener, RetrofitCallBack {
+
+    private Loader mGankLoader;
+    private OptionsPopupWindow alarmOptionPop;
+    private String otherphoto = "otherphoto.jpg";
+    private ArrayList<File> topRecleList;
+    private RecycleAdapter topadapter;
+    private int userImgeREQUST = 10000;
+    private ArrayList<String> deletePath = new ArrayList<>();
+    private String address = "";
+    private CustomTimePicker customDatePicker;
+    private int type;
+    private int maxPictureCount = 4;
+    private int resultCodeFromlist = 1000;
+    private int progressmes = 1000;
+    private String takePicturePath;//拍照存放本地路径
+    private static final int REQUEST_CODE_TAKE_PICTURE = 100;
+    private static final int REQUEST_CODE_SELECT_PICTURE = 101;
+    private Handler handler = new Handler() {
+        @Override
+        public void handleMessage(final Message msg) {
+            super.handleMessage(msg);
+            if (msg.what == progressmes) {
+                if (progressDialog != null && progressDialog.isShowing()) {
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            progressDialog.setMessage((String) msg.obj);
+                        }
+                    });
+
+                }
+            }
+        }
+    };
+
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_add_anew_grantee;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        topRecleList = new ArrayList<File>();
+        topRecleList.add(null);
+        setAbr("新增报修", new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        }, 0, null, 0, null, 0, null, "");
+
+        //1部分的recycle进行初始化
+        MyRecyclerView recyclerView = mDataBinding.recyleTop;
+        topadapter = new RecycleAdapter(topRecleList, this.getApplication());
+        LinearLayoutManager ms = new LinearLayoutManager(this);
+        ms.setOrientation(LinearLayoutManager.HORIZONTAL);
+        HashMap<String, Integer> stringIntegerHashMap = new HashMap<>();
+        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.TOP_DECORATION, 0);//top间距
+        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.BOTTOM_DECORATION, 0);//底部间距
+        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.LEFT_DECORATION, SizeUtils.dp2px(8));//左间距
+        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.RIGHT_DECORATION, SizeUtils.dp2px(8));//右间距
+        recyclerView.addItemDecoration(new RecyclerViewSpacesItemDecoration(stringIntegerHashMap));
+        recyclerView.setLayoutManager(ms);
+        //设置监听
+        ItemDragHelperCallback callback = new ItemDragHelperCallback(topadapter);
+        ItemTouchHelper touchHelper = new ItemTouchHelper(callback);
+        touchHelper.attachToRecyclerView(recyclerView);
+        recyclerView.setAdapter(topadapter);
+        listenDragView(recyclerView, topadapter, topRecleList, touchHelper);
+        mDataBinding.save.setOnClickListener(this);
+        mDataBinding.time.setOnClickListener(this);
+        mDataBinding.typeText.setOnClickListener(this);
+        mDataBinding.address.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                RegisterUser user =
+                        Config.getInstance(AddAnewGranteeActivity.this).getUser();
+                Map<String, String> map = new HashMap<>();
+                if (user != null) {
+                    map.put("userid", user.getUserid());
+                } else {
+                    map.put("userid", 0 + "");
+                }
+                map.put("app", "Cas");
+                map.put("class", "BeforeFamilyMember");
+
+                map.put("sign", Md5.md5("Cas" + "BeforeFamilyMember" + Md5.secret));
+                getGankList(ApiConfig.BASE_URL, map, getResources().getString(R.string.loading), 0);
+            }
+        });
+        takePicturePath = Environment.getExternalStorageDirectory().getPath() + "/house";
+        FileUtils.createOrExistsDir(takePicturePath);
+    }
+
+    private void initDatePicker() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.CHINA);
+
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");// 设置日期格式
+        mDataBinding.time.setText(df.format(new Date()) + "");
+        final String[] a = {""};
+
+        final DateTimeUtils dateTimeUtils = new DateTimeUtils(AddAnewGranteeActivity.this);
+        dateTimeUtils.showDackPickerDialog(new DatePickerDialog.OnDateSetListener() {
+            @Override
+            public void onDateSet(DatePicker datePicker, int i, int i1, int i2) {
+                int ii = i1 + 1;
+                a[0] = i + "-" + ii + "-" + i2 + " ";
+                dateTimeUtils.showTimePickerDialog(new TimePickerDialog.OnTimeSetListener() {
+                    @Override
+                    public void onTimeSet(TimePicker timePicker, int i, int i1) {
+
+                        a[0] = a[0] + i + ":" + i1;
+                        if(isPastDate(a[0])){
+                            setToast("只能选择当前时间之后的时间");
+                        }else {
+                            mDataBinding.time.setText(a[0]);
+                        }
+
+                    }
+                })
+                ;
+            }
+        });
+    }
+
+
+
+
+    public static boolean isPastDate(String str){
+
+        boolean flag = false;
+        Date nowDate = new Date();
+        Date pastDate = null;
+        //格式化日期
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm", Locale.CHINA);
+        //在日期字符串非空时执行
+        if (str != null && !"".equals(str)) {
+            try {
+                //将字符串转为日期格式，如果此处字符串为非合法日期就会抛出异常。
+                pastDate = sdf.parse(str);
+                //调用Date里面的before方法来做判断
+                flag = pastDate.before(nowDate);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+        }else {
+            System.out.println("日期参数不可为空");
+        }
+        return flag;
+    }
+
+
+    private void listenDragView(final MyRecyclerView recyclerView, final RecycleAdapter topadapter, final ArrayList<File> topRecleList, final ItemTouchHelper touchHelper) {
+       /* FullyGridLayoutManager mgr = new FullyGridLayoutManager(this,4);
+        mgr.setOrientation(FullyGridLayoutManager.VERTICAL);
+        mgr.setSmoothScrollbarEnabled(true);
+        recyclerView.setLayoutManager(mgr);*/
+        final boolean[] flag = {false};
+        recyclerView.mHandler.postDelayed(recyclerView.mLongClickRunnable, 10);
+        flag[0] = true;
+        topadapter.SetOnClikListener(new OnItemOnclikListener() {
+
+            public void OnItemLongClik(MyRecyclerView.ViewHolder holder, View view, int postion) {
+
+            }
+
+            public void OnItemClik(View view, int postion) {
+                if (view.getId() == R.id.item) {
+                    if (topRecleList.get(postion) == null) {
+                        selectPictureTip();
+                    } else {
+                        previewPicture(postion);
+                    }
+                } else if (view.getId() == R.id.img_delete) {
+
+                    topadapter.deletesmData(postion);
+                    topadapter.changeAllImg(flag[0]);
+                    topRecleList.set(topRecleList.size() - 1, null);
+                    topadapter.setmData(topRecleList);
+                    topadapter.notifyDataSetChanged();
+                }
+
+            }
+
+            @Override
+            public void OnItemChangeOver() {
+
+            }
+        });
+
+        //手指抬起监听，防止拖动完后position没有改变，删除的话会删错
+        recyclerView.setOnEventUpLis(new MyRecyclerView.onEventUpLis() {
+            @Override
+            public void onEventUp() {
+                topadapter.changeAllImg(flag[0]);
+                topadapter.setmData(topRecleList);
+                topadapter.notifyDataSetChanged();
+            }
+        });
+        topadapter.setmData(topRecleList);
+
+
+    }
+
+    private void selectPictureTip() {
+        final MyBottomSheetDialog dialog = new MyBottomSheetDialog(this);
+        SelectPictureWayDialog selectGenderDialog = new SelectPictureWayDialog(this, new SelectPictureWayDialog.SelectedItemOnClickListener() {
+            @Override
+            public void selected(int index) {
+                dialog.dismiss();
+                if (index == 0) {
+                    checkCameraPermission();
+                } else if (index == 1) {
+                    checkAlbumPermission();
+                }
+
+
+            }
+
+            @Override
+            public void selectedCancel() {
+                dialog.dismiss();
+            }
+        });
+        dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+        dialog.applyStyle(com.rey.material.R.style.Material_App_BottomSheetDialog).contentView(selectGenderDialog).cancelable(true).inDuration(100).heightParam(ViewGroup.LayoutParams.WRAP_CONTENT).show();
+
+    }
+
+    //浏览已选择图片
+    void previewPicture(int position) {
+        if (topRecleList.size() <= 1) {
+            return;
+        }
+        ArrayList<File> list = new ArrayList<>();
+        for (int i = 0; i < topRecleList.size(); i++) {
+            File file = topRecleList.get(i);
+            if (file != null) {
+                list.add(file);
+            }
+        }
+        if (list.size() > 0) {
+            FullScreenPreviewActivity.openActivity(this, list, position);
+        }
+
+    }
+
+    /*
+     * 检查相机权限
+     * */
+    private void checkCameraPermission() {
+        if( Build.VERSION.SDK_INT < Build.VERSION_CODES.M){
+            startCamera();
+            return;
+        }
+        //判断是否开户相册权限
+        if (PackageManager.PERMISSION_GRANTED == ContextCompat.checkSelfPermission(this, android.Manifest.permission.CAMERA)) {
+            startCamera();
+        } else {
+            //提示用户开户权限
+            String[] perms = {"android.permission.CAMERA"};
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                requestPermissions(new String[]{Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
+            }
+        }
+
+    }
+
+    /*
+     * 检查访问相册权限
+     * */
+    private void checkAlbumPermission() {
+        if( Build.VERSION.SDK_INT < Build.VERSION_CODES.M){
+            selectAlbum();
+            return;
+        }
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+            //权限还没有授予，需要在这里写申请权限的代码
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 2);
+            }
+
+        } else {
+            selectAlbum();
+        }
+    }
+
+
+    @Override
+    public void onRequestPermissionsResult(int permsRequestCode, String[] permissions, int[] grantResults) {
+        switch (permsRequestCode) {
+            case 1:
+                boolean cameraAccepted = grantResults[0] == PackageManager.PERMISSION_GRANTED;
+                if (cameraAccepted) {
+                    startCamera();
+                }
+                break;
+            case 2:
+                boolean albumAccepted = grantResults[0] == PackageManager.PERMISSION_GRANTED;
+                if (albumAccepted) {
+                    selectAlbum();
+                }
+                break;
+        }
+    }
+
+    //拍照
+    private void startCamera() {
+        Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+        intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);
+        otherphoto = System.currentTimeMillis() + ".jpg";
+        intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri
+                .fromFile(new File(takePicturePath + "/" + otherphoto)));
+        startActivityForResult(intent, REQUEST_CODE_TAKE_PICTURE);
+    }
+
+    //选择照片
+    private void selectAlbum() {
+        int size = topRecleList.size();
+        int selectCount;
+        if (size < maxPictureCount) {
+            selectCount = maxPictureCount - (size - 1);
+        } else if (size == maxPictureCount) {
+            if (topRecleList.get(size - 1) == null) {
+                selectCount = 1;
+            } else {
+                return;
+            }
+        } else {
+            return;
+        }
+        ImageSelector.builder()
+                .useCamera(false) // 设置是否使用拍照
+                .setSingle(false)  //设置是否单选
+                .setViewImage(true) //是否点击放大图片查看,，默认为true
+                .setMaxSelectCount(selectCount) // 图片的最大选择数量，小于等于0时，不限数量。
+                .start(AddAnewGranteeActivity.this, REQUEST_CODE_SELECT_PICTURE); // 打开相册
+    }
+
+    private void takeMyPhoto(int userImgeREQUST) {
+        //拍照
+        Intent intent = new Intent(AddAnewGranteeActivity.this,
+                SelectPicDanimicActivity.class);
+        intent.putExtra("photoid", userImgeREQUST);
+        intent.putExtra("crop", true);
+        intent.putExtra("cropx", 300);
+        intent.putExtra("cropy", 300);
+        startActivityForResult(intent, userImgeREQUST);
+        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);
+        progressDialog.show();
+
+        mGankLoader = new Loader();
+        Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
+
+
+            @Override
+            public void call(Resultcode resultcode) {
+                progressDialog.dismiss();
+                if (!(resultcode.status == 0)) {
+                    setToast(resultcode.msg);
+                }
+                if (resultcode.status == 0) {
+
+                    if (requstecode == 0) {
+                        Gson gs = new Gson();
+                        ArrayList<LinkedTreeMap> adta = (ArrayList) resultcode.data;
+                        String s = gs.toJson(adta);
+                        Type type = new TypeToken<ArrayList<MySimpleHomequEntity>>() {
+                        }.getType();
+                        final ArrayList<MySimpleHomequEntity> list = new Gson().fromJson(s, type);
+                        final ArrayList<String> strings = new ArrayList<>();
+                        for (int i = 0; i < list.size(); i++) {
+                            strings.add(list.get(i).getAddress());
+                        }
+                        alarmOptionPop = new OptionsPopupWindow(AddAnewGranteeActivity.this);
+                        alarmOptionPop.setPicker(strings);
+
+                        alarmOptionPop.setOnoptionsSelectListener(new OptionsPopupWindow.OnOptionsSelectListener() {
+                            @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());
+                            }
+                        });
+
+                        alarmOptionPop.showAtLocation(mDataBinding.getRoot(), Gravity.BOTTOM, 0, 0);
+                    }
+                    if (requstecode == 1) {
+
+                        mDataBinding.getRoot().postDelayed(new Runnable() {
+                            @Override
+                            public void run() {
+                                Intent intent = new Intent();
+                                setResult(100, intent);
+                                finish();
+                            }
+                        }, 1000);
+
+                    }
+                }
+
+            }
+
+
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                progressDialog.dismiss();
+
+                setToast(getString(R.string.getdatafailure));
+                throwable.printStackTrace();
+            }
+        });
+
+        addSubscription(subscription);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode != RESULT_OK) {
+            return;
+        }
+        if (requestCode == REQUEST_CODE_TAKE_PICTURE) {
+            Bitmap image = null;
+            File file = null;
+            image = ImageUtils.getBitmap(new File(takePicturePath + "/" + otherphoto));
+            try {
+                file = BitmapTools.saveFile(image, takePicturePath, otherphoto);
+                topRecleList.remove(topRecleList.size() - 1);
+                topRecleList.add(file);
+                if (topRecleList.size() < maxPictureCount) {
+                    topRecleList.add(null);
+                }
+                topadapter.setmData(topRecleList);
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        } else if (requestCode == REQUEST_CODE_SELECT_PICTURE && data != null) {
+            ArrayList<String> images = data.getStringArrayListExtra(ImageSelector.SELECT_RESULT);
+            topRecleList.remove(topRecleList.size() - 1);//先取消增加
+            for (int i = 0; i < images.size(); i++) {
+                String itemUrl = images.get(i);
+                Bitmap image = null;
+                File file = null;
+                image = ImageUtils.getBitmap(new File(itemUrl));
+                try {
+                    file = BitmapTools.saveFile(image, itemUrl);
+                    topRecleList.add(file);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+
+            if (topRecleList.size() < maxPictureCount) {
+                topRecleList.add(null);
+            }
+            topadapter.setmData(topRecleList);
+        }
+
+
+    }
+
+    /**
+     * 上传编辑或删除后的数据
+     */
+    @Override
+    protected void onDestroy() {
+
+//        if (deletePath != null) {
+//            for (int i = 0; i < deletePath.size(); i++) {
+//                BitmapTools.deleteFile(new File(deletePath.get(i)));
+//            }
+//        }
+//        for (int i = 0; i < topRecleList.size() - 1; i++) {
+//            BitmapTools.deleteFile(topRecleList.get(i));
+//
+//        }
+        FileUtils.deleteDir(takePicturePath);
+        super.onDestroy();
+    }
+
+    @Override
+    public void onClick(View view) {
+        int id = view.getId();
+        if (id == R.id.save) {
+            if (mDataBinding.titile.getText().toString().trim().length() < 1) {
+                setToast("请输入标题");
+                return;
+            }
+            if (mDataBinding.titile.getText().toString().trim().length() > 20) {
+                setToast("标题最多可以输入20个字");
+                return;
+            }
+            if (mDataBinding.address.getText().toString().trim().length() < 1) {
+                setToast("请选择地址");
+                return;
+            }
+            if (mDataBinding.typeText.getText().toString().trim().length() < 2) {
+                setToast("请选择类型");
+                return;
+            }
+            if (mDataBinding.user.getText().toString().trim().length() < 1) {
+                setToast( getString(R.string.pleaseeditname));
+                return;
+            }
+            if (mDataBinding.phone.getText().toString().trim().length() <1) {
+                setToast("请输入手机号");
+                return;
+            }
+            if (!RegexUtils.isMobileExact(mDataBinding.phone.getText().toString().trim())) {
+                setToast("请输入有效的手机号");
+                return;
+            }
+            if (mDataBinding.time.getText().toString().trim().length() < 3) {
+                setToast( getString(R.string.pleaseedittime));
+                return;
+            }
+            if (mDataBinding.content.getText().toString().trim().length() < 3) {
+                setToast("请输入报修详情");
+                return;
+            }
+
+            douploadimges();
+        } else if (id == R.id.time) {
+            initDatePicker();
+        } else if (id == R.id.typeText) {
+            final MyBottomSheetDialog dialog = new MyBottomSheetDialog(this);
+            SelectRepairWayDialog selectGenderDialog = new SelectRepairWayDialog(this, new SelectRepairWayDialog.SelectedItemOnClickListener() {
+                @Override
+                public void selected(int index) {
+                    dialog.dismiss();
+                    if (index == 0) {
+                        type = 2;
+                        mDataBinding.typeText.setText("公共");
+                    } else if (index == 1) {
+                        type = 1;
+                        mDataBinding.typeText.setText("个人");
+                    }
+                }
+
+                @Override
+                public void selectedCancel() {
+                    dialog.dismiss();
+                }
+            });
+            dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+            dialog.applyStyle(com.rey.material.R.style.Material_App_BottomSheetDialog).contentView(selectGenderDialog).cancelable(true).inDuration(100).heightParam(ViewGroup.LayoutParams.WRAP_CONTENT).show();
+        }
+    }
+
+    private void douploadimges() {
+        progressDialog.setMessage(getString(R.string.requsting));
+        progressDialog.setCancelable(false);
+        progressDialog.show();
+        RetrofitHttpUpLoad retrofitHttpUpLoad = RetrofitHttpUpLoad.getInstance();
+        retrofitHttpUpLoad.clear();
+        Map<String, Object> map = new HashMap<>();
+        RegisterUser user =
+                Config.getInstance(this).getUser();
+        if (user != null) {
+            map.put("userid", user.getUserid());
+        } else {
+            map.put("userid", 0 + "");
+        }
+        map.put("app", "Serve");
+        map.put("class", "Serve_an_AddRepair");
+        map.put("sign", Md5.md5("Serve" + "Serve_an_AddRepair" + Md5.secret));
+        map.put("repair_user_phone", mDataBinding.phone.getText().toString().trim());
+        map.put("repair_time", mDataBinding.time.getText().toString().trim());
+        map.put("repair_name", mDataBinding.phone.getText().toString().trim());
+        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 + "");
+        for (int i = 0; i < topRecleList.size(); i++) {
+            if (topRecleList.get(i) != null) {
+                map.put("repair_img" + i, topRecleList.get(i));
+            }
+        }
+        Map<String, RequestBody> params = retrofitHttpUpLoad.addParameter(map).bulider();
+        retrofitHttpUpLoad.setHandler(handler);
+        retrofitHttpUpLoad.addToEnqueue(retrofitHttpUpLoad.mHttpService.upLoadAgree(ApiConfig.BASE_URL, params),
+                this, HttpStaticApi.HTTP_UPLOADIMAGE);
+
+
+    }
+
+    @Override
+    public void onResponse(Response response, int method) {
+        progressDialog.dismiss();
+        switch (method) {
+            case HttpStaticApi.HTTP_UPLOADIMAGE:
+
+                Resultcode resultcode = (Resultcode) response.body();
+                if (0 == (resultcode.status)) {
+                    setToast("添加成功");
+                    Intent intent = new Intent();
+                    intent.putExtra("onreflash", true);
+                    setResult(resultCodeFromlist, intent);
+                    finish();
+                } else {
+                    setToast( resultcode.msg);
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    @Override
+    public void onFailure(Response response, int method) {
+        progressDialog.dismiss();
+        setToast( "添加失败");
+    }
+
+
+}
diff --git a/app/src/main/java/com/sl/house_property/user/MyUserMessage.java b/app/src/main/java/com/sl/house_property/user/MyUserMessage.java
index 5627b9e..44fe8f9 100644
--- a/app/src/main/java/com/sl/house_property/user/MyUserMessage.java
+++ b/app/src/main/java/com/sl/house_property/user/MyUserMessage.java
@@ -1,609 +1,601 @@
-package com.sl.house_property.user;
-
-import android.app.DatePickerDialog;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.Handler;
-import android.os.Message;
-import android.text.Editable;
-import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.widget.DatePicker;
-import android.widget.Toast;
-
-import com.cutil.StringUtils;
-import com.google.gson.Gson;
-import com.google.gson.internal.LinkedTreeMap;
-import com.sl.house_property.BaseActivity;
-import com.sl.house_property.MainTabActivity;
-import com.sl.house_property.R;
-import com.sl.house_property.databinding.ActivityMyUserMessageBinding;
-import com.squareup.picasso.Picasso;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-import entity.RegisterUser;
-import entity.UserInfo;
-import my_loader.Loader;
-import my_loader.Resultcode;
-import my_view.MyBottomSheetDialog;
-import my_view.SelectGenderDialog;
-import tools.Config;
-import tools.DateTimeUtils;
-import tools.ImageCompress;
-import http.ApiConfig;
-import http.FileUpLoad.retrofit.HttpStaticApi;
-import http.FileUpLoad.retrofit.RetrofitCallBack;
-import http.FileUpLoad.retrofit.RetrofitHttpUpLoad;
-import okhttp3.RequestBody;
-import retrofit2.Response;
-import rx.Subscription;
-import rx.functions.Action1;
-import utils.BitmapTools;
-import utils.Md5;
-import utils.MyPhoneValue;
-import utils.SelectPicDanimicActivity;
-
-public class MyUserMessage extends BaseActivity<ActivityMyUserMessageBinding>
-        implements   RetrofitCallBack,View.OnClickListener {
-    private String otherphoto = "otherphoto.jpg";
-
-    private ArrayList<String> deletePath=new ArrayList<>();
-    private Loader mGankLoader;
-    private RegisterUser user;
-    private String genderIndex;
-    private boolean updatePortrait;
-    private UserInfo userInfo;
-
-    @Override
-    protected int getLayoutResId() {
-        return    R.layout.activity_my_user_message;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        String usertitile=getIntent().getStringExtra("usertitile");
-        setAbr(usertitile, new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        if(updatePortrait){
-                            Intent intent = new Intent();
-                            setResult(MainTabActivity.RESUlT_CODE_4, intent);
-                        }
-                        finish();
-                    }
-                }, 0, null, 0, null, 0,
-                new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                      saveMEASSAGE();
-                    }
-                },getString(R.string.save));
-
-          mDataBinding.myphoto.setOnClickListener(new View.OnClickListener() {
-              @Override
-              public void onClick(View view) {
-                  takeMyPhoto(1000);
-              }
-          });
-        mDataBinding.mybirthday.setOnClickListener(this);
-        user = Config.getInstance(this).getUser();
-        if(user.getBirthday()!=null&&user.getBirthday().length()>0)
-        mDataBinding.mybirthday.setText(user.getBirthday().split(" ")[0]);
-        mDataBinding.mybirthday.setOnClickListener(this);
-        genderIndex = user.getGender();
-        refreshGender();
-        mDataBinding.mymale.setOnClickListener(this);
-
-        mDataBinding.mynickname.setText(user.getNickname());
-        mDataBinding.mynickname.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-
-            }
-
-            @Override
-            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-
-            }
-
-            @Override
-            public void afterTextChanged(Editable editable) {
-                if (TextUtils.isEmpty(editable.toString())) {
-                    mDataBinding.mynickname.setGravity(Gravity.START | Gravity.CENTER_VERTICAL);
-                    mDataBinding.mynickname.setTextDirection(View.TEXT_DIRECTION_RTL);
-                } else {
-                    mDataBinding.mynickname.setGravity(Gravity.END | Gravity.CENTER_VERTICAL);
-                    mDataBinding.mynickname.setTextDirection(View.TEXT_DIRECTION_LTR);
-                }
-            }
-        });
-
-        if(user.getAddress()==null){
-            mDataBinding.myaddress.setText("");
-        }else {
-            mDataBinding.myaddress.setText(user.getAddress());
-        }
-
-        mDataBinding.myaddress.setOnClickListener(this);
-        if(StringUtils.isEmpty(user.getAvatar())){
-            Picasso.with(MyUserMessage.this).load(R.mipmap.head).error(R.mipmap.head).placeholder(R.mipmap.head).into(mDataBinding.myphoto);
-
-        }else {
-            Picasso.with(MyUserMessage.this).load(user.getAvatar()).error(R.mipmap.head).placeholder(R.mipmap.head).into(mDataBinding.myphoto);
-
-        }
-        getUserInfo();
-    }
-
-
-    private void getUserInfo(){
-        RetrofitHttpUpLoad retrofitHttpUpLoad = RetrofitHttpUpLoad.getInstance();
-        retrofitHttpUpLoad.clear();
-        Map<String, String> map = new HashMap<>();
-        RegisterUser user =
-                Config.getInstance(this).getUser();
-        if (user != null) {
-            map.put("userid", user.getUserid());
-        } else {
-            map.put("userid", 0 + "");
-        }
-        map.put("app", "Cas");
-        map.put("class", "GetUserInfo");
-        map.put("sign", Md5.md5("Cas"+"GetUserInfo"+Md5.secret));
-        getUserInfo(ApiConfig.BASE_URL,map);
-    }
-
-    private void getUserInfo(String myurl, Map<String,String> map){
-        mGankLoader = new Loader();
-        Subscription subscription = mGankLoader.getMovie(myurl,map).subscribe(new Action1<Resultcode>() {
-            @Override
-            public void call(Resultcode resultcode) {
-
-                if(!(resultcode.status==0)){
-                }
-                if(resultcode.status==0){
-                        Gson gs = new Gson();
-                        LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
-                        String s = gs.toJson(adta);
-                        userInfo = gs.fromJson(s, UserInfo.class);
-                        updateData();
-                    }
-            }
-
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                throwable.printStackTrace();
-            }
-        });
-
-        addSubscription(subscription);
-    }
-
-    private void updateData(){
-        if(userInfo==null)
-            return;
-        user = Config.getInstance(this).getUser();
-        if(userInfo.getBirthday()!=null&&userInfo.getBirthday().length()>0)
-            mDataBinding.mybirthday.setText(userInfo.getBirthday().split(" ")[0]);
-        mDataBinding.myaddress.setText(userInfo.getAddress());
-        user.setAddress(userInfo.getAddress());
-        mDataBinding.mynickname.setText(userInfo.getNickname());
-        user.setNickname(userInfo.getNickname());
-        genderIndex = userInfo.getGender();
-        user.setGender(userInfo.getGender());
-        refreshGender();
-        Picasso.with(MyUserMessage.this).load(userInfo.getAvatar()).error(R.mipmap.head).placeholder(R.mipmap.head).into(mDataBinding.myphoto);
-        user.setAvatar(userInfo.getAvatar());
-
-    }
-
-
-
-    private void refreshGender(){
-        if(genderIndex==null){
-            mDataBinding.mymale.setText("保密");
-        }else if(genderIndex.equals("0")){
-            mDataBinding.mymale.setText("保密");
-        }else if(genderIndex.equals("1")){
-            mDataBinding.mymale.setText("男");
-        }else if(genderIndex.equals("2")){
-            mDataBinding.mymale.setText("女");
-        }else{
-            mDataBinding.mymale.setText("保密");
-        }
-    }
-
-    public void nickNameEvent(View view){
-        mDataBinding.mynickname.setFocusable(true);
-        mDataBinding.mynickname.setFocusableInTouchMode(true);
-        mDataBinding.mynickname.requestFocus();
-        String nikeName = mDataBinding.mynickname.getText().toString();
-        mDataBinding.mynickname.setText(nikeName);
-        mDataBinding.mynickname.setSelection(nikeName.length());
-    }
-
-    private void saveMEASSAGE() {
-        progressDialog.setMessage(getString(R.string.requsting));
-        progressDialog.setCancelable(false);
-        progressDialog.show();
-        RetrofitHttpUpLoad retrofitHttpUpLoad = RetrofitHttpUpLoad.getInstance();
-        retrofitHttpUpLoad.clear();
-        Map<String, String> map = new HashMap<>();
-        RegisterUser user =
-                Config.getInstance(this).getUser();
-        if (user != null) {
-            map.put("userid", user.getUserid());
-        } else {
-            map.put("userid", 0 + "");
-        }
-        map.put("userid", user.getUserid());
-        map.put("app", "Cas");
-        map.put("class", "UpdateUserDetail");
-        map.put("sign", Md5.md5("Cas"+"UpdateUserDetail"+Md5.secret));
-        map.put("nickname", mDataBinding.mynickname.getText().toString());
-        map.put("birthday", mDataBinding.mybirthday.getText().toString());
-        map.put("gender", genderIndex);
-        getGankList(ApiConfig.BASE_URL,map, getResources().getString(R.string.saveing),100000);
-    }
-
-
-    private void takeMyPhoto(int userImgeREQUST) {
-        //拍照
-        Intent intent = new Intent(MyUserMessage.this,
-                SelectPicDanimicActivity.class);
-        intent.putExtra("photoid", userImgeREQUST);
-        intent.putExtra("crop", true);
-        intent.putExtra("cropx", 100);
-        intent.putExtra("cropy", 100);
-        startActivityForResult(intent, userImgeREQUST);
-        overridePendingTransition(R.anim.slide_from_bottom,
-                R.anim.slide_out_bottom);
-    }
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        try {
-            if (!(data == null)) {
-                setIconDataFromIntent(data, requestCode,resultCode);
-            }
-        } catch (Exception e
-                ) {
-            e.printStackTrace();
-        }
-
-
-    }
-    private void setIconDataFromIntent(Intent data, int requestCode, int code) {
-        Bitmap image = null;//BitmapTools.decodeUriAsBitmap(MyDynamicActivity.this,data.getData(),1);  //extras.getParcelable("data");
-        deletePath.add(BitmapTools.getPathByUri(this,data.getData()));
-        String itmepath=  System.currentTimeMillis()+"";
-        File file=null;
-            /* try {
-                 file = BitmapTools.saveFile(image, Environment.getExternalStorageDirectory().getPath() + "/newgao", itmepath+requestCode + otherphoto);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }*/
-        ImageCompress compress = new ImageCompress();
-        ImageCompress.CompressOptions options = new ImageCompress.CompressOptions();
-        options.uri = data.getData();
-        int   width= MyPhoneValue.getScreeWidth(this);
-        options.maxWidth=width;
-        options.maxHeight=width;
-        image = compress.compressFromUri(this, options);
-
-        mDataBinding.myphoto.setImageBitmap(image);
-        try {
-
-            file = BitmapTools.saveFile(image, Environment.getExternalStorageDirectory().getPath() + "/haotian", itmepath+requestCode + otherphoto);
-            Picasso.with(MyUserMessage.this).load(file).into(mDataBinding.myphoto);
-            uploaduPuserImage(file);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-
-        final File finalFile = file;
-       /* mdialog.show();
-        mdialog.setLoadng();
-
-
-        upImage(finalFile);
-        changepic.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                //mdialog=new LoadingDialog(AccoutActivity.this);
-                mdialog.show();
-                mdialog.setLoadng();
-
-
-                upImage(finalFile);
-            }
-        });*/
-    }
-
-    private int progressmes=1000;
-    private Handler handler=new Handler(){
-        @Override
-        public void handleMessage(final Message msg) {
-            super.handleMessage(msg);
-            if(msg.what==progressmes){
-                if(progressDialog!=null&&progressDialog.isShowing()){
-                    runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            progressDialog.setMessage((String)msg.obj);
-                        }
-                    });
-
-                }
-            }
-        }
-    };
-    private void uploaduPuserImage(File file) {
-        progressDialog.setMessage(getString(R.string.requsting));
-        progressDialog.setCancelable(false);
-        progressDialog.show();
-        RetrofitHttpUpLoad retrofitHttpUpLoad = RetrofitHttpUpLoad.getInstance();
-        retrofitHttpUpLoad.clear();
-        Map<String, Object> map = new HashMap<>();
-        RegisterUser user =
-                Config.getInstance(this).getUser();
-        if (user != null) {
-            map.put("userid", user.getUserid());
-        } else {
-            map.put("userid", 0 + "");
-        }
-        map.put("app", "Cas");
-        map.put("class", "UploadAvatar");
-        map.put("sign", Md5.md5("Cas" + "UploadAvatar" + Md5.secret));
-         
-       
-        map.put("avatar", file);
-        
-        Map<String, RequestBody> params = retrofitHttpUpLoad.addParameter(map).bulider();
-        retrofitHttpUpLoad.setHandler(handler);
-        retrofitHttpUpLoad.addToEnqueue(retrofitHttpUpLoad.mHttpService.upLoadAgree(ApiConfig.BASE_URL, params),
-                this, HttpStaticApi.HTTP_UPLOADIMAGE);
-
-    }
-
-    @Override
-    protected void onDestroy() {
-
-        if(deletePath!=null){
-            for (int i = 0; i <deletePath.size() ; i++) {
-                BitmapTools.deleteFile(new File(deletePath.get(i)));
-            }
-        }
-        super.onDestroy();
-    }
-    @Override
-    public void onResponse(Response response, int method) {
-        progressDialog.dismiss();
-        switch (method) {
-            case HttpStaticApi.HTTP_UPLOADIMAGE:
-
-                Resultcode resultcode =  (Resultcode)response.body();
-                if (0==(resultcode.status)) {
-                    setToast("修改成功");
-                    updatePortrait = true;
-                     RegisterUser user=Config.getInstance(MyUserMessage.this).getUser();
-                     user.setAvatar((String)resultcode.data);
-                     Config.getInstance(MyUserMessage.this).putUser(user);
-                } else {
-                    setToast(resultcode.msg);
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-    public static boolean isPastDate(String str){
-
-        boolean flag = false;
-        Date nowDate = new Date();
-        Date pastDate = null;
-        //格式化日期
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA);
-        //在日期字符串非空时执行
-        if (str != null && !"".equals(str)) {
-            try {
-                //将字符串转为日期格式，如果此处字符串为非合法日期就会抛出异常。
-                pastDate = sdf.parse(str);
-                //调用Date里面的before方法来做判断
-                flag = pastDate.before(nowDate);
-            } catch (ParseException e) {
-                e.printStackTrace();
-            }
-        }else {
-            System.out.println("日期参数不可为空");
-        }
-        return flag;
-    }
-
-    @Override
-    public void onFailure(Response response, int method) {
-        progressDialog.dismiss();
-        setToast(getString(R.string.getdatafailure));
-    }
-
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.mybirthday:
-
-                final String[] a = {""};
-
-                final DateTimeUtils dateTimeUtils = new DateTimeUtils(MyUserMessage.this);
-
-                dateTimeUtils.showDackPickerDialog(new DatePickerDialog.OnDateSetListener() {
-                    @Override
-                    public void onDateSet(DatePicker datePicker, int i, int i1, int i2) {
-                        int ii = i1 + 1;
-                        String m;
-                        if(ii<10){
-                            m = "0"+ii;
-                        }else {
-                            m = ""+ii;
-                        }
-                        String d;
-                        if(i2<10){
-                            d = "0"+i2;
-                        }else {
-                            d = ""+i2;
-                        }
-
-                            a[0] = i + "-" + m + "-" + d;
-                        if(isPastDate(a[0])){
-                            mDataBinding.mybirthday.setText(a[0]);
-                        }else {
-                            setToast("只能选择当前日期之前的日期");
-                        }
-
-                    }
-                });
-
-                break;
-            case R.id.mymale:
-
-//                final PopwindowLayoutGenderBinding popView = DataBindingUtil.inflate(LayoutInflater.from(this), R.layout.popwindow_layout_gender, null, false);
-//
-//                final PopupWindowHelper popupWindowHelper = new PopupWindowHelper(popView.getRoot());
-//                popupWindowHelper.showAsDropDown(mDataBinding.mymale);
-//                popView.radioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
-//                    @Override
-//                    public void onCheckedChanged(RadioGroup radioGroup, int i) {
-//                        if(i==R.id.bt_item1){
-//
-//                            mDataBinding.mymale.setText(popView.btItem1.getText().toString().trim());
-//                            popupWindowHelper.dismiss();
-//                        }
-//                        if(i==R.id.bt_item2){
-//
-//                            mDataBinding.mymale.setText(popView.btItem2.getText().toString().trim());
-//                            popupWindowHelper.dismiss();
-//                        }
-//                        if(i==R.id.bt_item3){
-//
-//                            mDataBinding.mymale.setText(popView.btItem3.getText().toString().trim());
-//                            popupWindowHelper.dismiss();
-//                        }
-//
-//
-//                    }
-//                });
-
-                final MyBottomSheetDialog dialog = new MyBottomSheetDialog(this);
-                SelectGenderDialog selectGenderDialog = new SelectGenderDialog(this, new SelectGenderDialog.SelectedItemOnClickListener() {
-                    @Override
-                    public void selected(String index) {
-                        dialog.dismiss();
-                        genderIndex = index;
-                        refreshGender();
-                    }
-
-                    @Override
-                    public void selectedCancel() {
-                        dialog.dismiss();
-                    }
-                });
-                dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-                dialog.applyStyle(com.rey.material.R.style.Material_App_BottomSheetDialog).contentView(selectGenderDialog).cancelable(true).inDuration(100).heightParam(ViewGroup.LayoutParams.WRAP_CONTENT).show();
-
-                break;
-
-            case R.id.nickNameView:
-
-
-        }
-        }
-
-    private void getGankList(String myurl, Map<String,String> map, String msg, final int requstecode){
-
-        progressDialog.setMessage(msg);
-        progressDialog.setCancelable(false);
-        progressDialog.show();
-        mGankLoader = new Loader();
-        Subscription subscription = mGankLoader.getMovie(myurl,map).subscribe(new Action1<Resultcode>() {
-            @Override
-            public void call(Resultcode resultcode) {
-                progressDialog.dismiss();
-
-                if(!(resultcode.status==0)){
-                    setToast(resultcode.msg);
-                }
-                if(resultcode.status==0){
-                    setToast(resultcode.msg);
-
-                    if(requstecode==100000) {
-                        Gson gs = new Gson();
-                        LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
-                        String s = gs.toJson(adta);
-                        try {
-
-                            JSONObject jsonObject=new JSONObject(s);
-                            user.setGender(jsonObject.optString("gender","0"));
-                            user.setNickname(jsonObject.optString("nickname","0"));
-                            user.setBirthday(jsonObject.optString("birthday","0"));
-
-                            Config.getInstance(MyUserMessage.this).putUser(user);
-//                            Intent intent = new Intent();
-//                            setResult(MainTabActivity.RESUlT_CODE_4, intent);
-//                            finish();
-                        } catch (JSONException e) {
-                            e.printStackTrace();
-                        }
-                        updatePortrait = true;
-//                        Intent intent = new Intent();
-//                        setResult(MainTabActivity.RESUlT_CODE_4, intent);
-//                        finish();
-
-                    }
-
-                }
-            }
-
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                progressDialog.dismiss();
-                setToast(getString(R.string.getdatafailure));
-                throwable.printStackTrace();
-            }
-        });
-
-        addSubscription(subscription);
-    }
-
-    @Override
-    public void onBackPressed() { ;
-        if(updatePortrait){
-            Intent intent = new Intent();
-            setResult(MainTabActivity.RESUlT_CODE_4, intent);
-        }
-        finish();
-    }
-}
-
+package com.sl.house_property.user;
+
+import android.app.DatePickerDialog;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.Message;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.DatePicker;
+import android.widget.Toast;
+
+import com.cutil.StringUtils;
+import com.google.gson.Gson;
+import com.google.gson.internal.LinkedTreeMap;
+import com.sl.house_property.BaseActivity;
+import com.sl.house_property.MainTabActivity;
+import com.sl.house_property.R;
+import com.sl.house_property.databinding.ActivityMyUserMessageBinding;
+import com.squareup.picasso.Picasso;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
+import entity.RegisterUser;
+import entity.UserInfo;
+import my_loader.Loader;
+import my_loader.Resultcode;
+import my_view.MyBottomSheetDialog;
+import my_view.SelectGenderDialog;
+import tools.Config;
+import tools.DateTimeUtils;
+import tools.ImageCompress;
+import http.ApiConfig;
+import http.FileUpLoad.retrofit.HttpStaticApi;
+import http.FileUpLoad.retrofit.RetrofitCallBack;
+import http.FileUpLoad.retrofit.RetrofitHttpUpLoad;
+import okhttp3.RequestBody;
+import retrofit2.Response;
+import rx.Subscription;
+import rx.functions.Action1;
+import utils.BitmapTools;
+import utils.Md5;
+import utils.MyPhoneValue;
+import utils.SelectPicDanimicActivity;
+
+public class MyUserMessage extends BaseActivity<ActivityMyUserMessageBinding>
+        implements   RetrofitCallBack,View.OnClickListener {
+    private String otherphoto = "otherphoto.jpg";
+
+    private ArrayList<String> deletePath=new ArrayList<>();
+    private Loader mGankLoader;
+    private RegisterUser user;
+    private String genderIndex;
+    private boolean updatePortrait;
+    private UserInfo userInfo;
+
+    @Override
+    protected int getLayoutResId() {
+        return    R.layout.activity_my_user_message;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        String usertitile=getIntent().getStringExtra("usertitile");
+        setAbr(usertitile, new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        if(updatePortrait){
+                            Intent intent = new Intent();
+                            setResult(MainTabActivity.RESUlT_CODE_4, intent);
+                        }
+                        finish();
+                    }
+                }, 0, null, 0, null, 0,
+                new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                      saveMEASSAGE();
+                    }
+                },getString(R.string.save));
+
+          mDataBinding.myphoto.setOnClickListener(new View.OnClickListener() {
+              @Override
+              public void onClick(View view) {
+                  takeMyPhoto(1000);
+              }
+          });
+        mDataBinding.mybirthday.setOnClickListener(this);
+        user = Config.getInstance(this).getUser();
+        if(user.getBirthday()!=null&&user.getBirthday().length()>0)
+        mDataBinding.mybirthday.setText(user.getBirthday().split(" ")[0]);
+        mDataBinding.mybirthday.setOnClickListener(this);
+        genderIndex = user.getGender();
+        refreshGender();
+        mDataBinding.mymale.setOnClickListener(this);
+
+        mDataBinding.mynickname.setText(user.getNickname());
+        mDataBinding.mynickname.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable editable) {
+                if (TextUtils.isEmpty(editable.toString())) {
+                    mDataBinding.mynickname.setGravity(Gravity.START | Gravity.CENTER_VERTICAL);
+                    mDataBinding.mynickname.setTextDirection(View.TEXT_DIRECTION_RTL);
+                } else {
+                    mDataBinding.mynickname.setGravity(Gravity.END | Gravity.CENTER_VERTICAL);
+                    mDataBinding.mynickname.setTextDirection(View.TEXT_DIRECTION_LTR);
+                }
+            }
+        });
+
+        if(user.getAddress()==null){
+            mDataBinding.myaddress.setText("");
+        }else {
+            mDataBinding.myaddress.setText(user.getAddress());
+        }
+
+        mDataBinding.myaddress.setOnClickListener(this);
+        if(StringUtils.isEmpty(user.getAvatar())){
+            Picasso.with(MyUserMessage.this).load(R.mipmap.head).error(R.mipmap.head).placeholder(R.mipmap.head).into(mDataBinding.myphoto);
+
+        }else {
+            Picasso.with(MyUserMessage.this).load(user.getAvatar()).error(R.mipmap.head).placeholder(R.mipmap.head).into(mDataBinding.myphoto);
+
+        }
+        getUserInfo();
+    }
+
+
+    private void getUserInfo(){
+        RetrofitHttpUpLoad retrofitHttpUpLoad = RetrofitHttpUpLoad.getInstance();
+        retrofitHttpUpLoad.clear();
+        Map<String, String> map = new HashMap<>();
+        RegisterUser user =
+                Config.getInstance(this).getUser();
+        if (user != null) {
+            map.put("userid", user.getUserid());
+        } else {
+            map.put("userid", 0 + "");
+        }
+        map.put("app", "Cas");
+        map.put("class", "GetUserInfo");
+        map.put("sign", Md5.md5("Cas"+"GetUserInfo"+Md5.secret));
+        getUserInfo(ApiConfig.BASE_URL,map);
+    }
+
+    private void getUserInfo(String myurl, Map<String,String> map){
+        mGankLoader = new Loader();
+        Subscription subscription = mGankLoader.getMovie(myurl,map).subscribe(new Action1<Resultcode>() {
+            @Override
+            public void call(Resultcode resultcode) {
+
+                if(!(resultcode.status==0)){
+                }
+                if(resultcode.status==0){
+                        Gson gs = new Gson();
+                        LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
+                        String s = gs.toJson(adta);
+                        userInfo = gs.fromJson(s, UserInfo.class);
+                        updateData();
+                    }
+            }
+
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                throwable.printStackTrace();
+            }
+        });
+
+        addSubscription(subscription);
+    }
+
+    private void updateData(){
+        if(userInfo==null)
+            return;
+        user = Config.getInstance(this).getUser();
+        if(userInfo.getBirthday()!=null&&userInfo.getBirthday().length()>0)
+            mDataBinding.mybirthday.setText(userInfo.getBirthday().split(" ")[0]);
+        mDataBinding.myaddress.setText(userInfo.getAddress());
+        user.setAddress(userInfo.getAddress());
+        mDataBinding.mynickname.setText(userInfo.getNickname());
+        user.setNickname(userInfo.getNickname());
+        genderIndex = userInfo.getGender();
+        user.setGender(userInfo.getGender());
+        refreshGender();
+        Picasso.with(MyUserMessage.this).load(userInfo.getAvatar()).error(R.mipmap.head).placeholder(R.mipmap.head).into(mDataBinding.myphoto);
+        user.setAvatar(userInfo.getAvatar());
+
+    }
+
+
+
+    private void refreshGender(){
+        if(genderIndex==null){
+            mDataBinding.mymale.setText("保密");
+        }else if(genderIndex.equals("0")){
+            mDataBinding.mymale.setText("保密");
+        }else if(genderIndex.equals("1")){
+            mDataBinding.mymale.setText("男");
+        }else if(genderIndex.equals("2")){
+            mDataBinding.mymale.setText("女");
+        }else{
+            mDataBinding.mymale.setText("保密");
+        }
+    }
+
+    public void nickNameEvent(View view){
+        mDataBinding.mynickname.setFocusable(true);
+        mDataBinding.mynickname.setFocusableInTouchMode(true);
+        mDataBinding.mynickname.requestFocus();
+        String nikeName = mDataBinding.mynickname.getText().toString();
+        mDataBinding.mynickname.setText(nikeName);
+        mDataBinding.mynickname.setSelection(nikeName.length());
+    }
+
+    private void saveMEASSAGE() {
+        progressDialog.setMessage(getString(R.string.requsting));
+        progressDialog.setCancelable(false);
+        progressDialog.show();
+        RetrofitHttpUpLoad retrofitHttpUpLoad = RetrofitHttpUpLoad.getInstance();
+        retrofitHttpUpLoad.clear();
+        Map<String, String> map = new HashMap<>();
+        RegisterUser user =
+                Config.getInstance(this).getUser();
+        if (user != null) {
+            map.put("userid", user.getUserid());
+        } else {
+            map.put("userid", 0 + "");
+        }
+        map.put("userid", user.getUserid());
+        map.put("app", "Cas");
+        map.put("class", "UpdateUserDetail");
+        map.put("sign", Md5.md5("Cas"+"UpdateUserDetail"+Md5.secret));
+        map.put("nickname", mDataBinding.mynickname.getText().toString());
+        map.put("birthday", mDataBinding.mybirthday.getText().toString());
+        map.put("gender", genderIndex);
+        getGankList(ApiConfig.BASE_URL,map, getResources().getString(R.string.saveing),100000);
+    }
+
+
+    private void takeMyPhoto(int userImgeREQUST) {
+        //拍照
+        Intent intent = new Intent(MyUserMessage.this,
+                SelectPicDanimicActivity.class);
+        intent.putExtra("photoid", userImgeREQUST);
+        intent.putExtra("crop", true);
+        intent.putExtra("cropx", 100);
+        intent.putExtra("cropy", 100);
+        startActivityForResult(intent, userImgeREQUST);
+        overridePendingTransition(R.anim.slide_from_bottom,
+                R.anim.slide_out_bottom);
+    }
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        try {
+            if (!(data == null)) {
+                setIconDataFromIntent(data, requestCode,resultCode);
+            }
+        } catch (Exception e
+                ) {
+            e.printStackTrace();
+        }
+
+
+    }
+    private void setIconDataFromIntent(Intent data, int requestCode, int code) {
+        Bitmap image = null;//BitmapTools.decodeUriAsBitmap(MyDynamicActivity.this,data.getData(),1);  //extras.getParcelable("data");
+        deletePath.add(BitmapTools.getPathByUri(this,data.getData()));
+        String itmepath=  System.currentTimeMillis()+"";
+        File file=null;
+            /* try {
+                 file = BitmapTools.saveFile(image, Environment.getExternalStorageDirectory().getPath() + "/newgao", itmepath+requestCode + otherphoto);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }*/
+        ImageCompress compress = new ImageCompress();
+        ImageCompress.CompressOptions options = new ImageCompress.CompressOptions();
+        options.uri = data.getData();
+        int   width= MyPhoneValue.getScreeWidth(this);
+        options.maxWidth=width;
+        options.maxHeight=width;
+        image = compress.compressFromUri(this, options);
+
+        mDataBinding.myphoto.setImageBitmap(image);
+        try {
+
+            file = BitmapTools.saveFile(image, Environment.getExternalStorageDirectory().getPath() + "/haotian", itmepath+requestCode + otherphoto);
+            Picasso.with(MyUserMessage.this).load(file).into(mDataBinding.myphoto);
+            uploaduPuserImage(file);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+
+        final File finalFile = file;
+       /* mdialog.show();
+        mdialog.setLoadng();
+
+
+        upImage(finalFile);
+        changepic.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                //mdialog=new LoadingDialog(AccoutActivity.this);
+                mdialog.show();
+                mdialog.setLoadng();
+
+
+                upImage(finalFile);
+            }
+        });*/
+    }
+
+    private int progressmes=1000;
+    private Handler handler=new Handler(){
+        @Override
+        public void handleMessage(final Message msg) {
+            super.handleMessage(msg);
+            if(msg.what==progressmes){
+                if(progressDialog!=null&&progressDialog.isShowing()){
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            progressDialog.setMessage((String)msg.obj);
+                        }
+                    });
+
+                }
+            }
+        }
+    };
+    private void uploaduPuserImage(File file) {
+        progressDialog.setMessage(getString(R.string.requsting));
+        progressDialog.setCancelable(false);
+        progressDialog.show();
+        RetrofitHttpUpLoad retrofitHttpUpLoad = RetrofitHttpUpLoad.getInstance();
+        retrofitHttpUpLoad.clear();
+        Map<String, Object> map = new HashMap<>();
+        RegisterUser user =
+                Config.getInstance(this).getUser();
+        if (user != null) {
+            map.put("userid", user.getUserid());
+        } else {
+            map.put("userid", 0 + "");
+        }
+        map.put("app", "Cas");
+        map.put("class", "UploadAvatar");
+        map.put("sign", Md5.md5("Cas" + "UploadAvatar" + Md5.secret));
+         
+       
+        map.put("avatar", file);
+        
+        Map<String, RequestBody> params = retrofitHttpUpLoad.addParameter(map).bulider();
+        retrofitHttpUpLoad.setHandler(handler);
+        retrofitHttpUpLoad.addToEnqueue(retrofitHttpUpLoad.mHttpService.upLoadAgree(ApiConfig.BASE_URL, params),
+                this, HttpStaticApi.HTTP_UPLOADIMAGE);
+
+    }
+
+    @Override
+    protected void onDestroy() {
+
+        if(deletePath!=null){
+            for (int i = 0; i <deletePath.size() ; i++) {
+                BitmapTools.deleteFile(new File(deletePath.get(i)));
+            }
+        }
+        super.onDestroy();
+    }
+    @Override
+    public void onResponse(Response response, int method) {
+        progressDialog.dismiss();
+        switch (method) {
+            case HttpStaticApi.HTTP_UPLOADIMAGE:
+
+                Resultcode resultcode =  (Resultcode)response.body();
+                if (0==(resultcode.status)) {
+                    setToast("修改成功");
+                    updatePortrait = true;
+                     RegisterUser user=Config.getInstance(MyUserMessage.this).getUser();
+                     user.setAvatar((String)resultcode.data);
+                     Config.getInstance(MyUserMessage.this).putUser(user);
+                } else {
+                    setToast(resultcode.msg);
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    public static boolean isPastDate(String str){
+
+        boolean flag = false;
+        Date nowDate = new Date();
+        Date pastDate = null;
+        //格式化日期
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd", Locale.CHINA);
+        //在日期字符串非空时执行
+        if (str != null && !"".equals(str)) {
+            try {
+                //将字符串转为日期格式，如果此处字符串为非合法日期就会抛出异常。
+                pastDate = sdf.parse(str);
+                //调用Date里面的before方法来做判断
+                flag = pastDate.before(nowDate);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+        }else {
+            System.out.println("日期参数不可为空");
+        }
+        return flag;
+    }
+
+    @Override
+    public void onFailure(Response response, int method) {
+        progressDialog.dismiss();
+        setToast(getString(R.string.getdatafailure));
+    }
+
+    @Override
+    public void onClick(View view) {
+        int id = view.getId();
+        if (id == R.id.mybirthday) {
+            final String[] a = {""};
+
+            final DateTimeUtils dateTimeUtils = new DateTimeUtils(MyUserMessage.this);
+
+            dateTimeUtils.showDackPickerDialog(new DatePickerDialog.OnDateSetListener() {
+                @Override
+                public void onDateSet(DatePicker datePicker, int i, int i1, int i2) {
+                    int ii = i1 + 1;
+                    String m;
+                    if(ii<10){
+                        m = "0"+ii;
+                    }else {
+                        m = ""+ii;
+                    }
+                    String d;
+                    if(i2<10){
+                        d = "0"+i2;
+                    }else {
+                        d = ""+i2;
+                    }
+
+                        a[0] = i + "-" + m + "-" + d;
+                    if(isPastDate(a[0])){
+                        mDataBinding.mybirthday.setText(a[0]);
+                    }else {
+                        setToast("只能选择当前日期之前的日期");
+                    }
+
+                }
+            });
+        } else if (id == R.id.mymale) {
+//                final PopwindowLayoutGenderBinding popView = DataBindingUtil.inflate(LayoutInflater.from(this), R.layout.popwindow_layout_gender, null, false);
+//
+//                final PopupWindowHelper popupWindowHelper = new PopupWindowHelper(popView.getRoot());
+//                popupWindowHelper.showAsDropDown(mDataBinding.mymale);
+//                popView.radioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+//                    @Override
+//                    public void onCheckedChanged(RadioGroup radioGroup, int i) {
+//                        if(i==R.id.bt_item1){
+//
+//                            mDataBinding.mymale.setText(popView.btItem1.getText().toString().trim());
+//                            popupWindowHelper.dismiss();
+//                        }
+//                        if(i==R.id.bt_item2){
+//
+//                            mDataBinding.mymale.setText(popView.btItem2.getText().toString().trim());
+//                            popupWindowHelper.dismiss();
+//                        }
+//                        if(i==R.id.bt_item3){
+//
+//                            mDataBinding.mymale.setText(popView.btItem3.getText().toString().trim());
+//                            popupWindowHelper.dismiss();
+//                        }
+//
+//
+//                    }
+//                });
+
+            final MyBottomSheetDialog dialog = new MyBottomSheetDialog(this);
+            SelectGenderDialog selectGenderDialog = new SelectGenderDialog(this, new SelectGenderDialog.SelectedItemOnClickListener() {
+                @Override
+                public void selected(String index) {
+                    dialog.dismiss();
+                    genderIndex = index;
+                    refreshGender();
+                }
+
+                @Override
+                public void selectedCancel() {
+                    dialog.dismiss();
+                }
+            });
+            dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+            dialog.applyStyle(com.rey.material.R.style.Material_App_BottomSheetDialog).contentView(selectGenderDialog).cancelable(true).inDuration(100).heightParam(ViewGroup.LayoutParams.WRAP_CONTENT).show();
+        } else if (id == R.id.nickNameView) {
+            // Handle nickNameView click
+        }
+    }
+
+    private void getGankList(String myurl, Map<String,String> map, String msg, final int requstecode){
+
+        progressDialog.setMessage(msg);
+        progressDialog.setCancelable(false);
+        progressDialog.show();
+        mGankLoader = new Loader();
+        Subscription subscription = mGankLoader.getMovie(myurl,map).subscribe(new Action1<Resultcode>() {
+            @Override
+            public void call(Resultcode resultcode) {
+                progressDialog.dismiss();
+
+                if(!(resultcode.status==0)){
+                    setToast(resultcode.msg);
+                }
+                if(resultcode.status==0){
+                    setToast(resultcode.msg);
+
+                    if(requstecode==100000) {
+                        Gson gs = new Gson();
+                        LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
+                        String s = gs.toJson(adta);
+                        try {
+
+                            JSONObject jsonObject=new JSONObject(s);
+                            user.setGender(jsonObject.optString("gender","0"));
+                            user.setNickname(jsonObject.optString("nickname","0"));
+                            user.setBirthday(jsonObject.optString("birthday","0"));
+
+                            Config.getInstance(MyUserMessage.this).putUser(user);
+//                            Intent intent = new Intent();
+//                            setResult(MainTabActivity.RESUlT_CODE_4, intent);
+//                            finish();
+                        } catch (JSONException e) {
+                            e.printStackTrace();
+                        }
+                        updatePortrait = true;
+//                        Intent intent = new Intent();
+//                        setResult(MainTabActivity.RESUlT_CODE_4, intent);
+//                        finish();
+
+                    }
+
+                }
+            }
+
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                progressDialog.dismiss();
+                setToast(getString(R.string.getdatafailure));
+                throwable.printStackTrace();
+            }
+        });
+
+        addSubscription(subscription);
+    }
+
+    @Override
+    public void onBackPressed() { ;
+        if(updatePortrait){
+            Intent intent = new Intent();
+            setResult(MainTabActivity.RESUlT_CODE_4, intent);
+        }
+        finish();
+    }
+}
+
diff --git a/app/src/main/java/com/sl/house_property/user/MyshopEditAcitivity.java b/app/src/main/java/com/sl/house_property/user/MyshopEditAcitivity.java
index c5c2e9b..d103b5a 100644
--- a/app/src/main/java/com/sl/house_property/user/MyshopEditAcitivity.java
+++ b/app/src/main/java/com/sl/house_property/user/MyshopEditAcitivity.java
@@ -1,520 +1,515 @@
-package com.sl.house_property.user;
-
-import android.Manifest;
-import android.app.ProgressDialog;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.Handler;
-import android.os.Message;
-import android.provider.MediaStore;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import android.text.Editable;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-
-import com.cutil.FileUtils;
-import com.cutil.ImageUtils;
-import com.cutil.RegexUtils;
-import com.cutil.SizeUtils;
-import com.sl.house_property.BaseActivity;
-import com.sl.house_property.R;
-import com.sl.house_property.databinding.ActivityMyshopEditAcitivityBinding;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import entity.RegisterUser;
-import imageselector.FullScreenPreviewActivity;
-import imageselector.utils.ImageSelector;
-import my_loader.Resultcode;
-import my_view.MyBottomSheetDialog;
-import my_view.RecyclerViewSpacesItemDecoration;
-import my_view.SelectPictureWayDialog;
-import my_view.tao_bao_refresh.my_drag_recyle_view.example.listener.OnItemOnclikListener;
-import my_view.tao_bao_refresh.my_drag_recyle_view.example.callback.ItemDragHelperCallback;
-import my_view.tao_bao_refresh.my_drag_recyle_view.example.divider.RecyclerViewDivider;
-import my_view.tao_bao_refresh.my_drag_recyle_view.recycle.MyRecyclerView;
-import my_view.tao_bao_refresh.my_drag_recyle_view.recyledapter.RecycleAdapter;
-import tools.Config;
-import http.ApiConfig;
-import http.FileUpLoad.retrofit.HttpStaticApi;
-import http.FileUpLoad.retrofit.RetrofitCallBack;
-import http.FileUpLoad.retrofit.RetrofitHttpUpLoad;
-import okhttp3.RequestBody;
-import retrofit2.Response;
-import utils.BitmapTools;
-import utils.IndentTextWatcher;
-import utils.Md5;
-
-public class MyshopEditAcitivity extends BaseActivity<ActivityMyshopEditAcitivityBinding> implements View.OnClickListener, RetrofitCallBack {
-    private static final int REQUEST_CODE = 0x00000011;
-    private String otherphoto = "otherphoto.jpg";
-    private ArrayList<File> topRecleList;
-    private RecycleAdapter topadapter;
-    private int userImgeREQUST = 10000;
-    private int maxPictureCount = 4;
-    private ArrayList<String> deletePath = new ArrayList<>();
-    private String takePicturePath;//拍照存放本地路径
-    private static final int REQUEST_CODE_TAKE_PICTURE = 100;
-    private static final int REQUEST_CODE_SELECT_PICTURE = 101;
-
-    private int progressmes = 1000;
-    private Handler handler = new Handler() {
-        @Override
-        public void handleMessage(final Message msg) {
-            super.handleMessage(msg);
-            if (msg.what == progressmes) {
-                if (progressDialog != null && progressDialog.isShowing()) {
-                    runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            progressDialog.setMessage((String) msg.obj);
-                        }
-                    });
-
-                }
-            }
-        }
-    };
-    private int resultCodeFromlist = 1000;
-
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_myshop_edit_acitivity;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        progressDialog = new ProgressDialog(MyshopEditAcitivity.this);
-        topRecleList = new ArrayList<>();
-        topRecleList.add(null);
-        setAbr(getString(R.string.editAdd), new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Intent intent = new Intent();
-                intent.putExtra("onreflash", false);
-                setResult(resultCodeFromlist, intent);
-                finish();
-            }
-        }, 0, null, 0, null, 0, null, "");
-        RecyclerViewDivider dividerV = new RecyclerViewDivider(this, LinearLayoutManager.VERTICAL, 1, ContextCompat.getColor(this, R.color.transparent));
-        RecyclerViewDivider dividerH = new RecyclerViewDivider(this, LinearLayoutManager.HORIZONTAL, 1, ContextCompat.getColor(this, R.color.transparent));
-
-        //1部分的recycle进行初始化
-        MyRecyclerView recyclerView = mDataBinding.recyleTop;
-        topadapter = new RecycleAdapter(topRecleList, this.getApplication());
-        LinearLayoutManager ms = new LinearLayoutManager(this);
-        ms.setOrientation(LinearLayoutManager.HORIZONTAL);
-        HashMap<String, Integer> stringIntegerHashMap = new HashMap<>();
-        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.TOP_DECORATION, 0);//top间距
-
-        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.BOTTOM_DECORATION, 0);//底部间距
-
-        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.LEFT_DECORATION, SizeUtils.dp2px(8));//左间距
-
-        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.RIGHT_DECORATION, SizeUtils.dp2px(8));//右间距
-
-        recyclerView.addItemDecoration(new RecyclerViewSpacesItemDecoration(stringIntegerHashMap));
-
-
-        recyclerView.setLayoutManager(ms);
-        //设置监听
-        ItemDragHelperCallback callback = new ItemDragHelperCallback(topadapter);
-        ItemTouchHelper touchHelper = new ItemTouchHelper(callback);
-        touchHelper.attachToRecyclerView(recyclerView);
-        recyclerView.setAdapter(topadapter);
-        listenDragView(recyclerView, topadapter, topRecleList, touchHelper);
-        mDataBinding.save.setOnClickListener(this);
-        takePicturePath = Environment.getExternalStorageDirectory().getPath() + "/house";
-        FileUtils.createOrExistsDir(takePicturePath);
-
-        mDataBinding.editContent.addTextChangedListener(new IndentTextWatcher());
-
-        mDataBinding.editContent.setOnKeyListener(new View.OnKeyListener() {
-            @Override
-            public boolean onKey(View v, int keyCode, KeyEvent event) {
-                if (keyCode == KeyEvent.KEYCODE_ENTER) {
-                    if ((event.getAction() == KeyEvent.ACTION_UP)) {
-                        int end = mDataBinding.editContent.getSelectionEnd();
-                        Editable editableText = mDataBinding.editContent.getEditableText();
-                        editableText.insert(end, "\r\n    ");
-                    }
-                    return true;
-                }
-                return false;
-            }
-        });
-    }
-
-    private void listenDragView(final MyRecyclerView recyclerView,
-                                final RecycleAdapter topadapter, final ArrayList<File> topRecleList,
-                                final ItemTouchHelper touchHelper) {
-
-        final boolean[] flag = {false};
-        recyclerView.mHandler.postDelayed(recyclerView.mLongClickRunnable, 10);
-        flag[0] = true;
-        topadapter.SetOnClikListener(new OnItemOnclikListener() {
-
-            public void OnItemLongClik(MyRecyclerView.ViewHolder holder, View view, int postion) {
-
-            }
-
-            public void OnItemClik(View view, int postion) {
-                if (view.getId() == R.id.item) {
-                    if (topRecleList.get(postion) == null) {
-                        selectPictureTip();
-                    } else {
-                        previewPicture(postion);
-                    }
-
-                } else if (view.getId() == R.id.img_delete) {
-
-                    topadapter.deletesmData(postion);
-                    topadapter.changeAllImg(flag[0]);
-                    topRecleList.set(topRecleList.size() - 1, null);
-                    topadapter.setmData(topRecleList);
-                    topadapter.notifyDataSetChanged();
-                }
-            }
-
-            @Override
-            public void OnItemChangeOver() {
-
-            }
-        });
-
-        //手指抬起监听，防止拖动完后position没有改变，删除的话会删错
-        recyclerView.setOnEventUpLis(new MyRecyclerView.onEventUpLis() {
-            @Override
-            public void onEventUp() {
-                topadapter.changeAllImg(flag[0]);
-                topadapter.setmData(topRecleList);
-                topadapter.notifyDataSetChanged();
-            }
-        });
-        topadapter.setmData(topRecleList);
-
-
-    }
-
-
-    private void selectPictureTip() {
-        final MyBottomSheetDialog dialog = new MyBottomSheetDialog(this);
-        SelectPictureWayDialog selectGenderDialog = new SelectPictureWayDialog(this, new SelectPictureWayDialog.SelectedItemOnClickListener() {
-            @Override
-            public void selected(int index) {
-                dialog.dismiss();
-                if (index == 0) {
-                    checkCameraPermission();
-                } else if (index == 1) {
-                    checkAlbumPermission();
-                }
-            }
-
-            @Override
-            public void selectedCancel() {
-                dialog.dismiss();
-            }
-        });
-        dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-        dialog.applyStyle(com.rey.material.R.style.Material_App_BottomSheetDialog).contentView(selectGenderDialog).cancelable(true).inDuration(100).heightParam(ViewGroup.LayoutParams.WRAP_CONTENT).show();
-
-    }
-
-    //浏览已选择图片
-    void previewPicture(int position) {
-        if (topRecleList.size() <= 1) {
-            return;
-        }
-        ArrayList<File> list = new ArrayList<>();
-        for (int i = 0; i < topRecleList.size(); i++) {
-            File file = topRecleList.get(i);
-            if (file != null) {
-                list.add(file);
-            }
-        }
-        if (list.size() > 0) {
-            FullScreenPreviewActivity.openActivity(this, list, position);
-        }
-
-    }
-
-    /*
-     * 检查相机权限
-     * */
-    private void checkCameraPermission() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-            startCamera();
-            return;
-        }
-        //判断是否开户相册权限
-        if (PackageManager.PERMISSION_GRANTED == ContextCompat.checkSelfPermission(this, android.Manifest.permission.CAMERA)) {
-            startCamera();
-        } else {
-            //提示用户开户权限
-            String[] perms = {"android.permission.CAMERA"};
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                requestPermissions(new String[]{Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
-            }
-        }
-
-    }
-
-    /*
-     * 检查访问相册权限
-     * */
-    private void checkAlbumPermission() {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-            selectAlbum();
-            return;
-        }
-        if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-            //权限还没有授予，需要在这里写申请权限的代码
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 2);
-            }
-
-        } else {
-            selectAlbum();
-        }
-    }
-
-
-    @Override
-    public void onRequestPermissionsResult(int permsRequestCode, String[] permissions,
-                                           int[] grantResults) {
-        switch (permsRequestCode) {
-            case 1:
-                boolean cameraAccepted = grantResults[0] == PackageManager.PERMISSION_GRANTED;
-                if (cameraAccepted) {
-                    startCamera();
-                }
-                break;
-            case 2:
-                boolean albumAccepted = grantResults[0] == PackageManager.PERMISSION_GRANTED;
-                if (albumAccepted) {
-                    selectAlbum();
-                }
-                break;
-        }
-    }
-
-    //拍照
-    private void startCamera() {
-        Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-        intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);
-        otherphoto = System.currentTimeMillis() + ".jpg";
-        intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri
-                .fromFile(new File(takePicturePath + "/" + otherphoto)));
-        startActivityForResult(intent, REQUEST_CODE_TAKE_PICTURE);
-    }
-
-    //选择照片
-    private void selectAlbum() {
-        int size = topRecleList.size();
-        int selectCount;
-        if (size < maxPictureCount) {
-            selectCount = maxPictureCount - (size - 1);
-        } else if (size == maxPictureCount) {
-            if (topRecleList.get(size - 1) == null) {
-                selectCount = 1;
-            } else {
-                return;
-            }
-        } else {
-            return;
-        }
-        ImageSelector.builder()
-                .useCamera(false) // 设置是否使用拍照
-                .setSingle(false)  //设置是否单选
-                .setViewImage(true) //是否点击放大图片查看,，默认为true
-                .setMaxSelectCount(selectCount) // 图片的最大选择数量，小于等于0时，不限数量。
-                .start(MyshopEditAcitivity.this, REQUEST_CODE_SELECT_PICTURE); // 打开相册
-
-    }
-
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (resultCode != RESULT_OK) {
-            return;
-        }
-        if (requestCode == REQUEST_CODE_TAKE_PICTURE) {
-            Bitmap image = null;
-            File file = null;
-            image = ImageUtils.getBitmap(new File(takePicturePath + "/" + otherphoto));
-            try {
-                file = BitmapTools.saveFile(image, takePicturePath, otherphoto);
-                topRecleList.remove(topRecleList.size() - 1);
-                topRecleList.add(file);
-                if (topRecleList.size() < maxPictureCount) {
-                    topRecleList.add(null);
-                }
-                topadapter.setmData(topRecleList);
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        } else if (requestCode == REQUEST_CODE_SELECT_PICTURE && data != null) {
-            ArrayList<String> images = data.getStringArrayListExtra(ImageSelector.SELECT_RESULT);
-            topRecleList.remove(topRecleList.size() - 1);//先取消增加
-            for (int i = 0; i < images.size(); i++) {
-                String itemUrl = images.get(i);
-                Bitmap image = null;
-                File file = null;
-                image = ImageUtils.getBitmap(new File(itemUrl));
-                if (image == null)
-                    continue;
-                try {
-                    file = BitmapTools.saveFile(image, itemUrl);
-                    topRecleList.add(file);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-
-            if (topRecleList.size() < maxPictureCount) {
-                topRecleList.add(null);
-            }
-            topadapter.setmData(topRecleList);
-        }
-
-    }
-
-    /**
-     * 上传编辑或删除后的数据
-     */
-    @Override
-    protected void onDestroy() {
-//        if (deletePath != null) {
-//            for (int i = 0; i < deletePath.size(); i++) {
-//
-//                BitmapTools.deleteFile(new File(deletePath.get(i)));
-//            }
-//
-//        }
-//        for (int i = 0; i < topRecleList.size() - 1; i++) {
-//            try {
-//                BitmapTools.deleteFile(topRecleList.get(i));
-//            } catch (Exception e) {
-//
-//            }
-//
-//
-//        }
-//        FileUtils.deleteDir(takePicturePath);
-        super.onDestroy();
-
-    }
-
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.save:
-
-                if (mDataBinding.editTitile.getText().toString().trim().length() < 1) {
-                    setToast("请输入标题");
-                    return;
-                }
-                if (mDataBinding.editTitile.getText().toString().trim().length() > 20) {
-                    setToast("标题最多可以输入20个字");
-                    return;
-                }
-                if (mDataBinding.editPhone.getText().toString().trim().length() != 11) {
-                    setToast("请输入手机号");
-                    return;
-                }
-                if (!RegexUtils.isMobileExact(mDataBinding.editPhone.getText().toString().trim())) {
-                    setToast("请输入有效的手机号");
-                    return;
-                }
-                if (mDataBinding.editContent.getText().toString().trim().length() < 2) {
-                    setToast("请输入内容详情");
-                    return;
-                }
-                douploadimges();
-
-                break;
-
-
-        }
-    }
-
-    private void douploadimges() {
-        progressDialog.setMessage(getString(R.string.requsting));
-        progressDialog.setCancelable(false);
-        progressDialog.show();
-        RetrofitHttpUpLoad retrofitHttpUpLoad = RetrofitHttpUpLoad.getInstance();
-        retrofitHttpUpLoad.clear();
-        Map<String, Object> map = new HashMap<>();
-        RegisterUser user =
-                Config.getInstance(this).getUser();
-        if (user != null) {
-            map.put("userid", user.getUserid());
-        } else {
-            map.put("userid", 0 + "");
-        }
-        map.put("app", "Advertorial");
-        map.put("class", "Advertorial_an_AddAdvertorial");
-        map.put("sign", Md5.md5("Advertorial" + "Advertorial_an_AddAdvertorial" + Md5.secret));
-        map.put("advertorial_author_phone", mDataBinding.editPhone.getText().toString().trim());
-        map.put("advertorial_title", mDataBinding.editTitile.getText().toString().trim());
-        map.put("advertorial_content", mDataBinding.editContent.getText().toString().trim());
-        int a = topRecleList.size() - 1;
-        map.put("advertorial_picture_count", a + "");
-        for (int i = 0; i < topRecleList.size(); i++) {
-            if (topRecleList.get(i) != null) {
-                map.put("advertorial_picture" + i, topRecleList.get(i));
-            }
-        }
-        Map<String, RequestBody> params = retrofitHttpUpLoad.addParameter(map).bulider();
-        retrofitHttpUpLoad.setHandler(handler);
-        retrofitHttpUpLoad.addToEnqueue(retrofitHttpUpLoad.mHttpService.upLoadAgree(ApiConfig.BASE_URL, params),
-                this, HttpStaticApi.HTTP_UPLOADIMAGE);
-
-    }
-
-    @Override
-    public void onResponse(Response response, int method) {
-        progressDialog.dismiss();
-        switch (method) {
-            case HttpStaticApi.HTTP_UPLOADIMAGE:
-
-                Resultcode resultcode = (Resultcode) response.body();
-                if (0 == (resultcode.status)) {
-                    setToast(getString(R.string.addSuccess));
-                    Intent intent = new Intent();
-                    intent.putExtra("onreflash", false);
-                    setResult(resultCodeFromlist, intent);
-                    finish();
-                } else {
-                    setToast(resultcode.msg);
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-    @Override
-    public void onFailure(Response response, int method) {
-        progressDialog.dismiss();
-        setToast(getString(R.string.getdatafailure));
-    }
-
-
-}
+package com.sl.house_property.user;
+
+import android.Manifest;
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.Message;
+import android.provider.MediaStore;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import android.text.Editable;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+
+import com.cutil.FileUtils;
+import com.cutil.ImageUtils;
+import com.cutil.RegexUtils;
+import com.cutil.SizeUtils;
+import com.sl.house_property.BaseActivity;
+import com.sl.house_property.R;
+import com.sl.house_property.databinding.ActivityMyshopEditAcitivityBinding;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import entity.RegisterUser;
+import imageselector.FullScreenPreviewActivity;
+import imageselector.utils.ImageSelector;
+import my_loader.Resultcode;
+import my_view.MyBottomSheetDialog;
+import my_view.RecyclerViewSpacesItemDecoration;
+import my_view.SelectPictureWayDialog;
+import my_view.tao_bao_refresh.my_drag_recyle_view.example.listener.OnItemOnclikListener;
+import my_view.tao_bao_refresh.my_drag_recyle_view.example.callback.ItemDragHelperCallback;
+import my_view.tao_bao_refresh.my_drag_recyle_view.example.divider.RecyclerViewDivider;
+import my_view.tao_bao_refresh.my_drag_recyle_view.recycle.MyRecyclerView;
+import my_view.tao_bao_refresh.my_drag_recyle_view.recyledapter.RecycleAdapter;
+import tools.Config;
+import http.ApiConfig;
+import http.FileUpLoad.retrofit.HttpStaticApi;
+import http.FileUpLoad.retrofit.RetrofitCallBack;
+import http.FileUpLoad.retrofit.RetrofitHttpUpLoad;
+import okhttp3.RequestBody;
+import retrofit2.Response;
+import utils.BitmapTools;
+import utils.IndentTextWatcher;
+import utils.Md5;
+
+public class MyshopEditAcitivity extends BaseActivity<ActivityMyshopEditAcitivityBinding> implements View.OnClickListener, RetrofitCallBack {
+    private static final int REQUEST_CODE = 0x00000011;
+    private String otherphoto = "otherphoto.jpg";
+    private ArrayList<File> topRecleList;
+    private RecycleAdapter topadapter;
+    private int userImgeREQUST = 10000;
+    private int maxPictureCount = 4;
+    private ArrayList<String> deletePath = new ArrayList<>();
+    private String takePicturePath;//拍照存放本地路径
+    private static final int REQUEST_CODE_TAKE_PICTURE = 100;
+    private static final int REQUEST_CODE_SELECT_PICTURE = 101;
+
+    private int progressmes = 1000;
+    private Handler handler = new Handler() {
+        @Override
+        public void handleMessage(final Message msg) {
+            super.handleMessage(msg);
+            if (msg.what == progressmes) {
+                if (progressDialog != null && progressDialog.isShowing()) {
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            progressDialog.setMessage((String) msg.obj);
+                        }
+                    });
+
+                }
+            }
+        }
+    };
+    private int resultCodeFromlist = 1000;
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_myshop_edit_acitivity;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        progressDialog = new ProgressDialog(MyshopEditAcitivity.this);
+        topRecleList = new ArrayList<>();
+        topRecleList.add(null);
+        setAbr(getString(R.string.editAdd), new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent();
+                intent.putExtra("onreflash", false);
+                setResult(resultCodeFromlist, intent);
+                finish();
+            }
+        }, 0, null, 0, null, 0, null, "");
+        RecyclerViewDivider dividerV = new RecyclerViewDivider(this, LinearLayoutManager.VERTICAL, 1, ContextCompat.getColor(this, R.color.transparent));
+        RecyclerViewDivider dividerH = new RecyclerViewDivider(this, LinearLayoutManager.HORIZONTAL, 1, ContextCompat.getColor(this, R.color.transparent));
+
+        //1部分的recycle进行初始化
+        MyRecyclerView recyclerView = mDataBinding.recyleTop;
+        topadapter = new RecycleAdapter(topRecleList, this.getApplication());
+        LinearLayoutManager ms = new LinearLayoutManager(this);
+        ms.setOrientation(LinearLayoutManager.HORIZONTAL);
+        HashMap<String, Integer> stringIntegerHashMap = new HashMap<>();
+        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.TOP_DECORATION, 0);//top间距
+
+        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.BOTTOM_DECORATION, 0);//底部间距
+
+        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.LEFT_DECORATION, SizeUtils.dp2px(8));//左间距
+
+        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.RIGHT_DECORATION, SizeUtils.dp2px(8));//右间距
+
+        recyclerView.addItemDecoration(new RecyclerViewSpacesItemDecoration(stringIntegerHashMap));
+
+
+        recyclerView.setLayoutManager(ms);
+        //设置监听
+        ItemDragHelperCallback callback = new ItemDragHelperCallback(topadapter);
+        ItemTouchHelper touchHelper = new ItemTouchHelper(callback);
+        touchHelper.attachToRecyclerView(recyclerView);
+        recyclerView.setAdapter(topadapter);
+        listenDragView(recyclerView, topadapter, topRecleList, touchHelper);
+        mDataBinding.save.setOnClickListener(this);
+        takePicturePath = Environment.getExternalStorageDirectory().getPath() + "/house";
+        FileUtils.createOrExistsDir(takePicturePath);
+
+        mDataBinding.editContent.addTextChangedListener(new IndentTextWatcher());
+
+        mDataBinding.editContent.setOnKeyListener(new View.OnKeyListener() {
+            @Override
+            public boolean onKey(View v, int keyCode, KeyEvent event) {
+                if (keyCode == KeyEvent.KEYCODE_ENTER) {
+                    if ((event.getAction() == KeyEvent.ACTION_UP)) {
+                        int end = mDataBinding.editContent.getSelectionEnd();
+                        Editable editableText = mDataBinding.editContent.getEditableText();
+                        editableText.insert(end, "\r\n    ");
+                    }
+                    return true;
+                }
+                return false;
+            }
+        });
+    }
+
+    private void listenDragView(final MyRecyclerView recyclerView,
+                                final RecycleAdapter topadapter, final ArrayList<File> topRecleList,
+                                final ItemTouchHelper touchHelper) {
+
+        final boolean[] flag = {false};
+        recyclerView.mHandler.postDelayed(recyclerView.mLongClickRunnable, 10);
+        flag[0] = true;
+        topadapter.SetOnClikListener(new OnItemOnclikListener() {
+
+            public void OnItemLongClik(MyRecyclerView.ViewHolder holder, View view, int postion) {
+
+            }
+
+            public void OnItemClik(View view, int postion) {
+                if (view.getId() == R.id.item) {
+                    if (topRecleList.get(postion) == null) {
+                        selectPictureTip();
+                    } else {
+                        previewPicture(postion);
+                    }
+
+                } else if (view.getId() == R.id.img_delete) {
+
+                    topadapter.deletesmData(postion);
+                    topadapter.changeAllImg(flag[0]);
+                    topRecleList.set(topRecleList.size() - 1, null);
+                    topadapter.setmData(topRecleList);
+                    topadapter.notifyDataSetChanged();
+                }
+            }
+
+            @Override
+            public void OnItemChangeOver() {
+
+            }
+        });
+
+        //手指抬起监听，防止拖动完后position没有改变，删除的话会删错
+        recyclerView.setOnEventUpLis(new MyRecyclerView.onEventUpLis() {
+            @Override
+            public void onEventUp() {
+                topadapter.changeAllImg(flag[0]);
+                topadapter.setmData(topRecleList);
+                topadapter.notifyDataSetChanged();
+            }
+        });
+        topadapter.setmData(topRecleList);
+
+
+    }
+
+
+    private void selectPictureTip() {
+        final MyBottomSheetDialog dialog = new MyBottomSheetDialog(this);
+        SelectPictureWayDialog selectGenderDialog = new SelectPictureWayDialog(this, new SelectPictureWayDialog.SelectedItemOnClickListener() {
+            @Override
+            public void selected(int index) {
+                dialog.dismiss();
+                if (index == 0) {
+                    checkCameraPermission();
+                } else if (index == 1) {
+                    checkAlbumPermission();
+                }
+            }
+
+            @Override
+            public void selectedCancel() {
+                dialog.dismiss();
+            }
+        });
+        dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+        dialog.applyStyle(com.rey.material.R.style.Material_App_BottomSheetDialog).contentView(selectGenderDialog).cancelable(true).inDuration(100).heightParam(ViewGroup.LayoutParams.WRAP_CONTENT).show();
+
+    }
+
+    //浏览已选择图片
+    void previewPicture(int position) {
+        if (topRecleList.size() <= 1) {
+            return;
+        }
+        ArrayList<File> list = new ArrayList<>();
+        for (int i = 0; i < topRecleList.size(); i++) {
+            File file = topRecleList.get(i);
+            if (file != null) {
+                list.add(file);
+            }
+        }
+        if (list.size() > 0) {
+            FullScreenPreviewActivity.openActivity(this, list, position);
+        }
+
+    }
+
+    /*
+     * 检查相机权限
+     * */
+    private void checkCameraPermission() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            startCamera();
+            return;
+        }
+        //判断是否开户相册权限
+        if (PackageManager.PERMISSION_GRANTED == ContextCompat.checkSelfPermission(this, android.Manifest.permission.CAMERA)) {
+            startCamera();
+        } else {
+            //提示用户开户权限
+            String[] perms = {"android.permission.CAMERA"};
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                requestPermissions(new String[]{Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
+            }
+        }
+
+    }
+
+    /*
+     * 检查访问相册权限
+     * */
+    private void checkAlbumPermission() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            selectAlbum();
+            return;
+        }
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+            //权限还没有授予，需要在这里写申请权限的代码
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 2);
+            }
+
+        } else {
+            selectAlbum();
+        }
+    }
+
+
+    @Override
+    public void onRequestPermissionsResult(int permsRequestCode, String[] permissions,
+                                           int[] grantResults) {
+        switch (permsRequestCode) {
+            case 1:
+                boolean cameraAccepted = grantResults[0] == PackageManager.PERMISSION_GRANTED;
+                if (cameraAccepted) {
+                    startCamera();
+                }
+                break;
+            case 2:
+                boolean albumAccepted = grantResults[0] == PackageManager.PERMISSION_GRANTED;
+                if (albumAccepted) {
+                    selectAlbum();
+                }
+                break;
+        }
+    }
+
+    //拍照
+    private void startCamera() {
+        Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+        intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);
+        otherphoto = System.currentTimeMillis() + ".jpg";
+        intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri
+                .fromFile(new File(takePicturePath + "/" + otherphoto)));
+        startActivityForResult(intent, REQUEST_CODE_TAKE_PICTURE);
+    }
+
+    //选择照片
+    private void selectAlbum() {
+        int size = topRecleList.size();
+        int selectCount;
+        if (size < maxPictureCount) {
+            selectCount = maxPictureCount - (size - 1);
+        } else if (size == maxPictureCount) {
+            if (topRecleList.get(size - 1) == null) {
+                selectCount = 1;
+            } else {
+                return;
+            }
+        } else {
+            return;
+        }
+        ImageSelector.builder()
+                .useCamera(false) // 设置是否使用拍照
+                .setSingle(false)  //设置是否单选
+                .setViewImage(true) //是否点击放大图片查看,，默认为true
+                .setMaxSelectCount(selectCount) // 图片的最大选择数量，小于等于0时，不限数量。
+                .start(MyshopEditAcitivity.this, REQUEST_CODE_SELECT_PICTURE); // 打开相册
+
+    }
+
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode != RESULT_OK) {
+            return;
+        }
+        if (requestCode == REQUEST_CODE_TAKE_PICTURE) {
+            Bitmap image = null;
+            File file = null;
+            image = ImageUtils.getBitmap(new File(takePicturePath + "/" + otherphoto));
+            try {
+                file = BitmapTools.saveFile(image, takePicturePath, otherphoto);
+                topRecleList.remove(topRecleList.size() - 1);
+                topRecleList.add(file);
+                if (topRecleList.size() < maxPictureCount) {
+                    topRecleList.add(null);
+                }
+                topadapter.setmData(topRecleList);
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        } else if (requestCode == REQUEST_CODE_SELECT_PICTURE && data != null) {
+            ArrayList<String> images = data.getStringArrayListExtra(ImageSelector.SELECT_RESULT);
+            topRecleList.remove(topRecleList.size() - 1);//先取消增加
+            for (int i = 0; i < images.size(); i++) {
+                String itemUrl = images.get(i);
+                Bitmap image = null;
+                File file = null;
+                image = ImageUtils.getBitmap(new File(itemUrl));
+                if (image == null)
+                    continue;
+                try {
+                    file = BitmapTools.saveFile(image, itemUrl);
+                    topRecleList.add(file);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+
+            if (topRecleList.size() < maxPictureCount) {
+                topRecleList.add(null);
+            }
+            topadapter.setmData(topRecleList);
+        }
+
+    }
+
+    /**
+     * 上传编辑或删除后的数据
+     */
+    @Override
+    protected void onDestroy() {
+//        if (deletePath != null) {
+//            for (int i = 0; i < deletePath.size(); i++) {
+//
+//                BitmapTools.deleteFile(new File(deletePath.get(i)));
+//            }
+//
+//        }
+//        for (int i = 0; i < topRecleList.size() - 1; i++) {
+//            try {
+//                BitmapTools.deleteFile(topRecleList.get(i));
+//            } catch (Exception e) {
+//
+//            }
+//
+//
+//        }
+//        FileUtils.deleteDir(takePicturePath);
+        super.onDestroy();
+
+    }
+
+    @Override
+    public void onClick(View view) {
+        int id = view.getId();
+        if (id == R.id.save) {
+            if (mDataBinding.editTitile.getText().toString().trim().length() < 1) {
+                setToast("请输入标题");
+                return;
+            }
+            if (mDataBinding.editTitile.getText().toString().trim().length() > 20) {
+                setToast("标题最多可以输入20个字");
+                return;
+            }
+            if (mDataBinding.editPhone.getText().toString().trim().length() != 11) {
+                setToast("请输入手机号");
+                return;
+            }
+            if (!RegexUtils.isMobileExact(mDataBinding.editPhone.getText().toString().trim())) {
+                setToast("请输入有效的手机号");
+                return;
+            }
+            if (mDataBinding.editContent.getText().toString().trim().length() < 2) {
+                setToast("请输入内容详情");
+                return;
+            }
+            douploadimges();
+        }
+    }
+
+    private void douploadimges() {
+        progressDialog.setMessage(getString(R.string.requsting));
+        progressDialog.setCancelable(false);
+        progressDialog.show();
+        RetrofitHttpUpLoad retrofitHttpUpLoad = RetrofitHttpUpLoad.getInstance();
+        retrofitHttpUpLoad.clear();
+        Map<String, Object> map = new HashMap<>();
+        RegisterUser user =
+                Config.getInstance(this).getUser();
+        if (user != null) {
+            map.put("userid", user.getUserid());
+        } else {
+            map.put("userid", 0 + "");
+        }
+        map.put("app", "Advertorial");
+        map.put("class", "Advertorial_an_AddAdvertorial");
+        map.put("sign", Md5.md5("Advertorial" + "Advertorial_an_AddAdvertorial" + Md5.secret));
+        map.put("advertorial_author_phone", mDataBinding.editPhone.getText().toString().trim());
+        map.put("advertorial_title", mDataBinding.editTitile.getText().toString().trim());
+        map.put("advertorial_content", mDataBinding.editContent.getText().toString().trim());
+        int a = topRecleList.size() - 1;
+        map.put("advertorial_picture_count", a + "");
+        for (int i = 0; i < topRecleList.size(); i++) {
+            if (topRecleList.get(i) != null) {
+                map.put("advertorial_picture" + i, topRecleList.get(i));
+            }
+        }
+        Map<String, RequestBody> params = retrofitHttpUpLoad.addParameter(map).bulider();
+        retrofitHttpUpLoad.setHandler(handler);
+        retrofitHttpUpLoad.addToEnqueue(retrofitHttpUpLoad.mHttpService.upLoadAgree(ApiConfig.BASE_URL, params),
+                this, HttpStaticApi.HTTP_UPLOADIMAGE);
+
+    }
+
+    @Override
+    public void onResponse(Response response, int method) {
+        progressDialog.dismiss();
+        switch (method) {
+            case HttpStaticApi.HTTP_UPLOADIMAGE:
+
+                Resultcode resultcode = (Resultcode) response.body();
+                if (0 == (resultcode.status)) {
+                    setToast(getString(R.string.addSuccess));
+                    Intent intent = new Intent();
+                    intent.putExtra("onreflash", false);
+                    setResult(resultCodeFromlist, intent);
+                    finish();
+                } else {
+                    setToast(resultcode.msg);
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    @Override
+    public void onFailure(Response response, int method) {
+        progressDialog.dismiss();
+        setToast(getString(R.string.getdatafailure));
+    }
+
+
+}
diff --git a/app/src/main/java/com/sl/house_property/user/MyshopModifyAcitivity.java b/app/src/main/java/com/sl/house_property/user/MyshopModifyAcitivity.java
index 3f03cb5..bf42b34 100644
--- a/app/src/main/java/com/sl/house_property/user/MyshopModifyAcitivity.java
+++ b/app/src/main/java/com/sl/house_property/user/MyshopModifyAcitivity.java
@@ -1,502 +1,497 @@
-package com.sl.house_property.user;
-
-import android.Manifest;
-import android.app.ProgressDialog;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.Handler;
-import android.os.Message;
-import android.provider.MediaStore;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.ItemTouchHelper;
-
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-
-import com.cutil.FileUtils;
-import com.cutil.ImageUtils;
-import com.cutil.RegexUtils;
-import com.cutil.SizeUtils;
-import com.sl.house_property.BaseActivity;
-import com.sl.house_property.R;
-import com.sl.house_property.databinding.ActivityMyshopEditAcitivityBinding;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import entity.RegisterUser;
-import http.ApiConfig;
-import http.FileUpLoad.retrofit.HttpStaticApi;
-import http.FileUpLoad.retrofit.RetrofitCallBack;
-import http.FileUpLoad.retrofit.RetrofitHttpUpLoad;
-import imageselector.FullScreenPreviewActivity;
-import imageselector.utils.ImageSelector;
-import my_loader.Resultcode;
-import my_view.MyBottomSheetDialog;
-import my_view.RecyclerViewSpacesItemDecoration;
-import my_view.SelectPictureWayDialog;
-import my_view.tao_bao_refresh.my_drag_recyle_view.example.callback.ItemDragHelperCallback;
-import my_view.tao_bao_refresh.my_drag_recyle_view.example.divider.RecyclerViewDivider;
-import my_view.tao_bao_refresh.my_drag_recyle_view.example.listener.OnItemOnclikListener;
-import my_view.tao_bao_refresh.my_drag_recyle_view.recycle.MyRecyclerView;
-import my_view.tao_bao_refresh.my_drag_recyle_view.recyledapter.RecycleAdapter;
-import okhttp3.RequestBody;
-import retrofit2.Response;
-import tools.Config;
-import utils.BitmapTools;
-import utils.Md5;
-
-public class MyshopModifyAcitivity extends BaseActivity<ActivityMyshopEditAcitivityBinding> implements View.OnClickListener, RetrofitCallBack {
-    private static final int REQUEST_CODE = 0x00000011;
-    private String otherphoto = "otherphoto.jpg";
-    private ArrayList<File> topRecleList;
-    private RecycleAdapter topadapter;
-    private int userImgeREQUST = 10000;
-    private int maxPictureCount = 4;
-    private ArrayList<String> deletePath = new ArrayList<>();
-    private String takePicturePath;//拍照存放本地路径
-    private static final int REQUEST_CODE_TAKE_PICTURE = 100;
-    private static final int REQUEST_CODE_SELECT_PICTURE = 101;
-    private String contentId;
-    private String content;
-    private String title;
-    private String phone;
-    private int progressmes = 1000;
-    private Handler handler = new Handler() {
-        @Override
-        public void handleMessage(final Message msg) {
-            super.handleMessage(msg);
-            if (msg.what == progressmes) {
-                if (progressDialog != null && progressDialog.isShowing()) {
-                    runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            progressDialog.setMessage((String) msg.obj);
-                        }
-                    });
-
-                }
-            }
-        }
-    };
-    private int resultCodeFromlist = 1000;
-
-    @Override
-    protected int getLayoutResId() {
-        return R.layout.activity_myshop_edit_acitivity;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        progressDialog = new ProgressDialog(MyshopModifyAcitivity.this);
-        topRecleList = new ArrayList<>();
-        topRecleList.add(null);
-        setAbr(getString(R.string.editshop), new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Intent intent = new Intent();
-                intent.putExtra("onreflash", false);
-                setResult(resultCodeFromlist, intent);
-                finish();
-            }
-        }, 0, null, 0, null, 0, null, "");
-        RecyclerViewDivider dividerV = new RecyclerViewDivider(this, LinearLayoutManager.VERTICAL, 1, ContextCompat.getColor(this, R.color.transparent));
-        RecyclerViewDivider dividerH = new RecyclerViewDivider(this, LinearLayoutManager.HORIZONTAL, 1, ContextCompat.getColor(this, R.color.transparent));
-
-        //1部分的recycle进行初始化
-        MyRecyclerView recyclerView = mDataBinding.recyleTop;
-        topadapter = new RecycleAdapter(topRecleList, this.getApplication());
-        LinearLayoutManager ms = new LinearLayoutManager(this);
-        ms.setOrientation(LinearLayoutManager.HORIZONTAL);
-        HashMap<String, Integer> stringIntegerHashMap = new HashMap<>();
-        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.TOP_DECORATION, 0);//top间距
-
-        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.BOTTOM_DECORATION, 0);//底部间距
-
-        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.LEFT_DECORATION, SizeUtils.dp2px(8));//左间距
-
-        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.RIGHT_DECORATION, SizeUtils.dp2px(8));//右间距
-
-        recyclerView.addItemDecoration(new RecyclerViewSpacesItemDecoration(stringIntegerHashMap));
-
-
-        recyclerView.setLayoutManager(ms);
-        //设置监听
-        ItemDragHelperCallback callback = new ItemDragHelperCallback(topadapter);
-        ItemTouchHelper touchHelper = new ItemTouchHelper(callback);
-        touchHelper.attachToRecyclerView(recyclerView);
-        recyclerView.setAdapter(topadapter);
-        listenDragView(recyclerView, topadapter, topRecleList, touchHelper);
-        mDataBinding.save.setOnClickListener(this);
-        takePicturePath = Environment.getExternalStorageDirectory().getPath() + "/house";
-        FileUtils.createOrExistsDir(takePicturePath);
-        title = getIntent().getStringExtra("title");
-        content = getIntent().getStringExtra("content");
-        contentId = getIntent().getStringExtra("contentId");
-        phone = getIntent().getStringExtra("phone");
-        mDataBinding.editTitile.setText(title);
-        mDataBinding.editPhone.setText(phone);
-        mDataBinding.editContent.setText(content);
-
-    }
-
-    private void listenDragView(final MyRecyclerView recyclerView, final RecycleAdapter topadapter, final ArrayList<File> topRecleList, final ItemTouchHelper touchHelper) {
-
-        final boolean[] flag = {false};
-        recyclerView.mHandler.postDelayed(recyclerView.mLongClickRunnable, 10);
-        flag[0] = true;
-        topadapter.SetOnClikListener(new OnItemOnclikListener() {
-
-            public void OnItemLongClik(MyRecyclerView.ViewHolder holder, View view, int postion) {
-
-            }
-
-            public void OnItemClik(View view, int postion) {
-                if (view.getId() == R.id.item) {
-                    if (topRecleList.get(postion) == null) {
-                        selectPictureTip();
-                    } else {
-                        previewPicture(postion);
-                    }
-
-                } else if (view.getId() == R.id.img_delete) {
-
-                    topadapter.deletesmData(postion);
-                    topadapter.changeAllImg(flag[0]);
-                    topRecleList.set(topRecleList.size() - 1, null);
-                    topadapter.setmData(topRecleList);
-                    topadapter.notifyDataSetChanged();
-                }
-            }
-
-            @Override
-            public void OnItemChangeOver() {
-
-            }
-        });
-
-        //手指抬起监听，防止拖动完后position没有改变，删除的话会删错
-        recyclerView.setOnEventUpLis(new MyRecyclerView.onEventUpLis() {
-            @Override
-            public void onEventUp() {
-                topadapter.changeAllImg(flag[0]);
-                topadapter.setmData(topRecleList);
-                topadapter.notifyDataSetChanged();
-            }
-        });
-        topadapter.setmData(topRecleList);
-
-
-    }
-
-
-    private void selectPictureTip() {
-        final MyBottomSheetDialog dialog = new MyBottomSheetDialog(this);
-        SelectPictureWayDialog selectGenderDialog = new SelectPictureWayDialog(this, new SelectPictureWayDialog.SelectedItemOnClickListener() {
-            @Override
-            public void selected(int index) {
-                dialog.dismiss();
-                if (index == 0) {
-                    checkCameraPermission();
-                } else if (index == 1) {
-                    checkAlbumPermission();
-                }
-            }
-
-            @Override
-            public void selectedCancel() {
-                dialog.dismiss();
-            }
-        });
-        dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-        dialog.applyStyle(com.rey.material.R.style.Material_App_BottomSheetDialog).contentView(selectGenderDialog).cancelable(true).inDuration(100).heightParam(ViewGroup.LayoutParams.WRAP_CONTENT).show();
-
-    }
-
-    //浏览已选择图片
-    void previewPicture(int position){
-        if(topRecleList.size()<=1){
-            return;
-        }
-        ArrayList<File> list = new ArrayList<>();
-        for(int i=0;i<topRecleList.size();i++){
-            File file = topRecleList.get(i);
-            if(file!=null){
-                list.add(file);
-            }
-        }
-        if(list.size()>0){
-            FullScreenPreviewActivity.openActivity(this,list,position);
-        }
-
-    }
-
-    /*
-     * 检查相机权限
-     * */
-    private void checkCameraPermission() {
-        //判断是否开户相册权限
-        if (PackageManager.PERMISSION_GRANTED == ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA)) {
-            startCamera();
-        } else {
-            //提示用户开户权限
-            String[] perms = {"android.permission.CAMERA"};
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                requestPermissions(new String[]{Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
-            }
-        }
-
-    }
-
-    /*
-     * 检查访问相册权限
-     * */
-    private void checkAlbumPermission() {
-        if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-            //权限还没有授予，需要在这里写申请权限的代码
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 2);
-            }
-
-        } else {
-            selectAlbum();
-        }
-    }
-
-
-    @Override
-    public void onRequestPermissionsResult(int permsRequestCode, String[] permissions, int[] grantResults) {
-        switch (permsRequestCode) {
-            case 1:
-                boolean cameraAccepted = grantResults[0] == PackageManager.PERMISSION_GRANTED;
-                if (cameraAccepted) {
-                    startCamera();
-                }
-                break;
-            case 2:
-                boolean albumAccepted = grantResults[0] == PackageManager.PERMISSION_GRANTED;
-                if (albumAccepted) {
-                    selectAlbum();
-                }
-                break;
-        }
-    }
-
-    //拍照
-    private void startCamera() {
-        Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-        intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);
-        otherphoto = System.currentTimeMillis() + ".jpg";
-        intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri
-                .fromFile(new File(takePicturePath + "/" + otherphoto)));
-        startActivityForResult(intent, REQUEST_CODE_TAKE_PICTURE);
-    }
-
-    //选择照片
-    private void selectAlbum() {
-        int size = topRecleList.size();
-        int selectCount;
-        if (size < maxPictureCount) {
-            selectCount = maxPictureCount - (size - 1);
-        } else if (size == maxPictureCount) {
-            if (topRecleList.get(size - 1) == null) {
-                selectCount = 1;
-            } else {
-                return;
-            }
-        } else {
-            return;
-        }
-        ImageSelector.builder()
-                .useCamera(false) // 设置是否使用拍照
-                .setSingle(false)  //设置是否单选
-                .setViewImage(true) //是否点击放大图片查看,，默认为true
-                .setMaxSelectCount(selectCount) // 图片的最大选择数量，小于等于0时，不限数量。
-                .start(MyshopModifyAcitivity.this, REQUEST_CODE_SELECT_PICTURE); // 打开相册
-
-    }
-
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (resultCode != RESULT_OK) {
-            return;
-        }
-        if (requestCode == REQUEST_CODE_TAKE_PICTURE) {
-            Bitmap image = null;
-            File file = null;
-            image = ImageUtils.getBitmap(new File(takePicturePath + "/" + otherphoto));
-            try {
-                file = BitmapTools.saveFile(image, takePicturePath, otherphoto);
-                topRecleList.remove(topRecleList.size() - 1);
-                topRecleList.add(file);
-                if (topRecleList.size() < maxPictureCount) {
-                    topRecleList.add(null);
-                }
-                topadapter.setmData(topRecleList);
-
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        } else if (requestCode == REQUEST_CODE_SELECT_PICTURE && data != null) {
-            ArrayList<String> images = data.getStringArrayListExtra(ImageSelector.SELECT_RESULT);
-            topRecleList.remove(topRecleList.size() - 1);//先取消增加
-            for (int i = 0; i < images.size(); i++) {
-                String itemUrl = images.get(i);
-                Bitmap image = null;
-                File file = null;
-                image = ImageUtils.getBitmap(new File(itemUrl));
-                try {
-                    file = BitmapTools.saveFile(image, itemUrl);
-                    topRecleList.add(file);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-
-            if (topRecleList.size() < maxPictureCount) {
-                topRecleList.add(null);
-            }
-            topadapter.setmData(topRecleList);
-        }
-
-    }
-
-    /**
-     * 上传编辑或删除后的数据
-     *
-     *
-     */
-    @Override
-    protected void onDestroy() {
-//        if (deletePath != null) {
-//            for (int i = 0; i < deletePath.size(); i++) {
-//
-//                BitmapTools.deleteFile(new File(deletePath.get(i)));
-//            }
-//
-//        }
-//        for (int i = 0; i < topRecleList.size() - 1; i++) {
-//            try {
-//                BitmapTools.deleteFile(topRecleList.get(i));
-//            } catch (Exception e) {
-//
-//            }
-//
-//
-//        }
-//        FileUtils.deleteDir(takePicturePath);
-        super.onDestroy();
-
-    }
-
-    @Override
-    public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.save:
-
-                if (mDataBinding.editTitile.getText().toString().trim().length() < 1) {
-                    setToast("请输入标题");
-                    return;
-                }
-                if (mDataBinding.editTitile.getText().toString().trim().length() > 20) {
-                    setToast("标题最多可以输入20个字");
-                    return;
-                }
-                if (mDataBinding.editPhone.getText().toString().trim().length() != 11) {
-                    setToast("请输入手机号");
-                    return;
-                }
-                if (!RegexUtils.isMobileExact(mDataBinding.editPhone.getText().toString().trim())) {
-                    setToast("请输入有效的手机号");
-                    return;
-                }
-                if (mDataBinding.editContent.getText().toString().trim().length() < 2) {
-                    setToast("请输入内容详情");
-                    return;
-                }
-                douploadimges();
-
-                break;
-
-
-        }
-    }
-
-    private void douploadimges() {
-        progressDialog.setMessage(getString(R.string.requsting));
-        progressDialog.setCancelable(false);
-        progressDialog.show();
-        RetrofitHttpUpLoad retrofitHttpUpLoad = RetrofitHttpUpLoad.getInstance();
-        retrofitHttpUpLoad.clear();
-        Map<String, Object> map = new HashMap<>();
-        RegisterUser user =
-                Config.getInstance(this).getUser();
-        if (user != null) {
-            map.put("userid", user.getUserid());
-        } else {
-            map.put("userid", 0 + "");
-        }
-        map.put("app", "Advertorial");
-        map.put("class", "Advertorial_an_UpdateAdvertorial");
-        map.put("sign", Md5.md5("Advertorial" + "Advertorial_an_UpdateAdvertorial" + Md5.secret));
-        map.put("advertorial_author_phone", mDataBinding.editPhone.getText().toString().trim());
-        map.put("advertorial_content_id", contentId);
-        map.put("advertorial_title", mDataBinding.editTitile.getText().toString().trim());
-        map.put("advertorial_content", mDataBinding.editContent.getText().toString().trim());
-        int a = topRecleList.size() - 1;
-        map.put("advertorial_picture_count", a + "");
-        for (int i = 0; i < topRecleList.size(); i++) {
-            if (topRecleList.get(i) != null) {
-                map.put("advertorial_picture" + i, topRecleList.get(i));
-            }
-        }
-        Map<String, RequestBody> params = retrofitHttpUpLoad.addParameter(map).bulider();
-        retrofitHttpUpLoad.setHandler(handler);
-        retrofitHttpUpLoad.addToEnqueue(retrofitHttpUpLoad.mHttpService.upLoadAgree(ApiConfig.BASE_URL, params),
-                this, HttpStaticApi.HTTP_UPLOADIMAGE);
-
-    }
-
-    @Override
-    public void onResponse(Response response, int method) {
-        progressDialog.dismiss();
-        switch (method) {
-            case HttpStaticApi.HTTP_UPLOADIMAGE:
-
-                Resultcode resultcode = (Resultcode) response.body();
-                if (0 == (resultcode.status)) {
-                    MyMarketShopActivity.isRefrash = true;
-                    setToast( getString(R.string.editsuccess));
-                    Intent intent = new Intent();
-                    intent.putExtra("onreflash", false);
-                    setResult(resultCodeFromlist, intent);
-                    finish();
-                } else {
-                    setToast( resultcode.msg);
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
-    @Override
-    public void onFailure(Response response, int method) {
-        progressDialog.dismiss();
-        setToast( "编辑失败");
-    }
-
-}
+package com.sl.house_property.user;
+
+import android.Manifest;
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.Message;
+import android.provider.MediaStore;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.ItemTouchHelper;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+
+import com.cutil.FileUtils;
+import com.cutil.ImageUtils;
+import com.cutil.RegexUtils;
+import com.cutil.SizeUtils;
+import com.sl.house_property.BaseActivity;
+import com.sl.house_property.R;
+import com.sl.house_property.databinding.ActivityMyshopEditAcitivityBinding;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import entity.RegisterUser;
+import http.ApiConfig;
+import http.FileUpLoad.retrofit.HttpStaticApi;
+import http.FileUpLoad.retrofit.RetrofitCallBack;
+import http.FileUpLoad.retrofit.RetrofitHttpUpLoad;
+import imageselector.FullScreenPreviewActivity;
+import imageselector.utils.ImageSelector;
+import my_loader.Resultcode;
+import my_view.MyBottomSheetDialog;
+import my_view.RecyclerViewSpacesItemDecoration;
+import my_view.SelectPictureWayDialog;
+import my_view.tao_bao_refresh.my_drag_recyle_view.example.callback.ItemDragHelperCallback;
+import my_view.tao_bao_refresh.my_drag_recyle_view.example.divider.RecyclerViewDivider;
+import my_view.tao_bao_refresh.my_drag_recyle_view.example.listener.OnItemOnclikListener;
+import my_view.tao_bao_refresh.my_drag_recyle_view.recycle.MyRecyclerView;
+import my_view.tao_bao_refresh.my_drag_recyle_view.recyledapter.RecycleAdapter;
+import okhttp3.RequestBody;
+import retrofit2.Response;
+import tools.Config;
+import utils.BitmapTools;
+import utils.Md5;
+
+public class MyshopModifyAcitivity extends BaseActivity<ActivityMyshopEditAcitivityBinding> implements View.OnClickListener, RetrofitCallBack {
+    private static final int REQUEST_CODE = 0x00000011;
+    private String otherphoto = "otherphoto.jpg";
+    private ArrayList<File> topRecleList;
+    private RecycleAdapter topadapter;
+    private int userImgeREQUST = 10000;
+    private int maxPictureCount = 4;
+    private ArrayList<String> deletePath = new ArrayList<>();
+    private String takePicturePath;//拍照存放本地路径
+    private static final int REQUEST_CODE_TAKE_PICTURE = 100;
+    private static final int REQUEST_CODE_SELECT_PICTURE = 101;
+    private String contentId;
+    private String content;
+    private String title;
+    private String phone;
+    private int progressmes = 1000;
+    private Handler handler = new Handler() {
+        @Override
+        public void handleMessage(final Message msg) {
+            super.handleMessage(msg);
+            if (msg.what == progressmes) {
+                if (progressDialog != null && progressDialog.isShowing()) {
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            progressDialog.setMessage((String) msg.obj);
+                        }
+                    });
+
+                }
+            }
+        }
+    };
+    private int resultCodeFromlist = 1000;
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_myshop_edit_acitivity;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        progressDialog = new ProgressDialog(MyshopModifyAcitivity.this);
+        topRecleList = new ArrayList<>();
+        topRecleList.add(null);
+        setAbr(getString(R.string.editshop), new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent();
+                intent.putExtra("onreflash", false);
+                setResult(resultCodeFromlist, intent);
+                finish();
+            }
+        }, 0, null, 0, null, 0, null, "");
+        RecyclerViewDivider dividerV = new RecyclerViewDivider(this, LinearLayoutManager.VERTICAL, 1, ContextCompat.getColor(this, R.color.transparent));
+        RecyclerViewDivider dividerH = new RecyclerViewDivider(this, LinearLayoutManager.HORIZONTAL, 1, ContextCompat.getColor(this, R.color.transparent));
+
+        //1部分的recycle进行初始化
+        MyRecyclerView recyclerView = mDataBinding.recyleTop;
+        topadapter = new RecycleAdapter(topRecleList, this.getApplication());
+        LinearLayoutManager ms = new LinearLayoutManager(this);
+        ms.setOrientation(LinearLayoutManager.HORIZONTAL);
+        HashMap<String, Integer> stringIntegerHashMap = new HashMap<>();
+        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.TOP_DECORATION, 0);//top间距
+
+        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.BOTTOM_DECORATION, 0);//底部间距
+
+        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.LEFT_DECORATION, SizeUtils.dp2px(8));//左间距
+
+        stringIntegerHashMap.put(RecyclerViewSpacesItemDecoration.RIGHT_DECORATION, SizeUtils.dp2px(8));//右间距
+
+        recyclerView.addItemDecoration(new RecyclerViewSpacesItemDecoration(stringIntegerHashMap));
+
+
+        recyclerView.setLayoutManager(ms);
+        //设置监听
+        ItemDragHelperCallback callback = new ItemDragHelperCallback(topadapter);
+        ItemTouchHelper touchHelper = new ItemTouchHelper(callback);
+        touchHelper.attachToRecyclerView(recyclerView);
+        recyclerView.setAdapter(topadapter);
+        listenDragView(recyclerView, topadapter, topRecleList, touchHelper);
+        mDataBinding.save.setOnClickListener(this);
+        takePicturePath = Environment.getExternalStorageDirectory().getPath() + "/house";
+        FileUtils.createOrExistsDir(takePicturePath);
+        title = getIntent().getStringExtra("title");
+        content = getIntent().getStringExtra("content");
+        contentId = getIntent().getStringExtra("contentId");
+        phone = getIntent().getStringExtra("phone");
+        mDataBinding.editTitile.setText(title);
+        mDataBinding.editPhone.setText(phone);
+        mDataBinding.editContent.setText(content);
+
+    }
+
+    private void listenDragView(final MyRecyclerView recyclerView, final RecycleAdapter topadapter, final ArrayList<File> topRecleList, final ItemTouchHelper touchHelper) {
+
+        final boolean[] flag = {false};
+        recyclerView.mHandler.postDelayed(recyclerView.mLongClickRunnable, 10);
+        flag[0] = true;
+        topadapter.SetOnClikListener(new OnItemOnclikListener() {
+
+            public void OnItemLongClik(MyRecyclerView.ViewHolder holder, View view, int postion) {
+
+            }
+
+            public void OnItemClik(View view, int postion) {
+                if (view.getId() == R.id.item) {
+                    if (topRecleList.get(postion) == null) {
+                        selectPictureTip();
+                    } else {
+                        previewPicture(postion);
+                    }
+
+                } else if (view.getId() == R.id.img_delete) {
+
+                    topadapter.deletesmData(postion);
+                    topadapter.changeAllImg(flag[0]);
+                    topRecleList.set(topRecleList.size() - 1, null);
+                    topadapter.setmData(topRecleList);
+                    topadapter.notifyDataSetChanged();
+                }
+            }
+
+            @Override
+            public void OnItemChangeOver() {
+
+            }
+        });
+
+        //手指抬起监听，防止拖动完后position没有改变，删除的话会删错
+        recyclerView.setOnEventUpLis(new MyRecyclerView.onEventUpLis() {
+            @Override
+            public void onEventUp() {
+                topadapter.changeAllImg(flag[0]);
+                topadapter.setmData(topRecleList);
+                topadapter.notifyDataSetChanged();
+            }
+        });
+        topadapter.setmData(topRecleList);
+
+
+    }
+
+
+    private void selectPictureTip() {
+        final MyBottomSheetDialog dialog = new MyBottomSheetDialog(this);
+        SelectPictureWayDialog selectGenderDialog = new SelectPictureWayDialog(this, new SelectPictureWayDialog.SelectedItemOnClickListener() {
+            @Override
+            public void selected(int index) {
+                dialog.dismiss();
+                if (index == 0) {
+                    checkCameraPermission();
+                } else if (index == 1) {
+                    checkAlbumPermission();
+                }
+            }
+
+            @Override
+            public void selectedCancel() {
+                dialog.dismiss();
+            }
+        });
+        dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+        dialog.applyStyle(com.rey.material.R.style.Material_App_BottomSheetDialog).contentView(selectGenderDialog).cancelable(true).inDuration(100).heightParam(ViewGroup.LayoutParams.WRAP_CONTENT).show();
+
+    }
+
+    //浏览已选择图片
+    void previewPicture(int position){
+        if(topRecleList.size()<=1){
+            return;
+        }
+        ArrayList<File> list = new ArrayList<>();
+        for(int i=0;i<topRecleList.size();i++){
+            File file = topRecleList.get(i);
+            if(file!=null){
+                list.add(file);
+            }
+        }
+        if(list.size()>0){
+            FullScreenPreviewActivity.openActivity(this,list,position);
+        }
+
+    }
+
+    /*
+     * 检查相机权限
+     * */
+    private void checkCameraPermission() {
+        //判断是否开户相册权限
+        if (PackageManager.PERMISSION_GRANTED == ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA)) {
+            startCamera();
+        } else {
+            //提示用户开户权限
+            String[] perms = {"android.permission.CAMERA"};
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                requestPermissions(new String[]{Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
+            }
+        }
+
+    }
+
+    /*
+     * 检查访问相册权限
+     * */
+    private void checkAlbumPermission() {
+        if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+            //权限还没有授予，需要在这里写申请权限的代码
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 2);
+            }
+
+        } else {
+            selectAlbum();
+        }
+    }
+
+
+    @Override
+    public void onRequestPermissionsResult(int permsRequestCode, String[] permissions, int[] grantResults) {
+        switch (permsRequestCode) {
+            case 1:
+                boolean cameraAccepted = grantResults[0] == PackageManager.PERMISSION_GRANTED;
+                if (cameraAccepted) {
+                    startCamera();
+                }
+                break;
+            case 2:
+                boolean albumAccepted = grantResults[0] == PackageManager.PERMISSION_GRANTED;
+                if (albumAccepted) {
+                    selectAlbum();
+                }
+                break;
+        }
+    }
+
+    //拍照
+    private void startCamera() {
+        Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+        intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);
+        otherphoto = System.currentTimeMillis() + ".jpg";
+        intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri
+                .fromFile(new File(takePicturePath + "/" + otherphoto)));
+        startActivityForResult(intent, REQUEST_CODE_TAKE_PICTURE);
+    }
+
+    //选择照片
+    private void selectAlbum() {
+        int size = topRecleList.size();
+        int selectCount;
+        if (size < maxPictureCount) {
+            selectCount = maxPictureCount - (size - 1);
+        } else if (size == maxPictureCount) {
+            if (topRecleList.get(size - 1) == null) {
+                selectCount = 1;
+            } else {
+                return;
+            }
+        } else {
+            return;
+        }
+        ImageSelector.builder()
+                .useCamera(false) // 设置是否使用拍照
+                .setSingle(false)  //设置是否单选
+                .setViewImage(true) //是否点击放大图片查看,，默认为true
+                .setMaxSelectCount(selectCount) // 图片的最大选择数量，小于等于0时，不限数量。
+                .start(MyshopModifyAcitivity.this, REQUEST_CODE_SELECT_PICTURE); // 打开相册
+
+    }
+
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode != RESULT_OK) {
+            return;
+        }
+        if (requestCode == REQUEST_CODE_TAKE_PICTURE) {
+            Bitmap image = null;
+            File file = null;
+            image = ImageUtils.getBitmap(new File(takePicturePath + "/" + otherphoto));
+            try {
+                file = BitmapTools.saveFile(image, takePicturePath, otherphoto);
+                topRecleList.remove(topRecleList.size() - 1);
+                topRecleList.add(file);
+                if (topRecleList.size() < maxPictureCount) {
+                    topRecleList.add(null);
+                }
+                topadapter.setmData(topRecleList);
+
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        } else if (requestCode == REQUEST_CODE_SELECT_PICTURE && data != null) {
+            ArrayList<String> images = data.getStringArrayListExtra(ImageSelector.SELECT_RESULT);
+            topRecleList.remove(topRecleList.size() - 1);//先取消增加
+            for (int i = 0; i < images.size(); i++) {
+                String itemUrl = images.get(i);
+                Bitmap image = null;
+                File file = null;
+                image = ImageUtils.getBitmap(new File(itemUrl));
+                try {
+                    file = BitmapTools.saveFile(image, itemUrl);
+                    topRecleList.add(file);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+
+            if (topRecleList.size() < maxPictureCount) {
+                topRecleList.add(null);
+            }
+            topadapter.setmData(topRecleList);
+        }
+
+    }
+
+    /**
+     * 上传编辑或删除后的数据
+     *
+     *
+     */
+    @Override
+    protected void onDestroy() {
+//        if (deletePath != null) {
+//            for (int i = 0; i < deletePath.size(); i++) {
+//
+//                BitmapTools.deleteFile(new File(deletePath.get(i)));
+//            }
+//
+//        }
+//        for (int i = 0; i < topRecleList.size() - 1; i++) {
+//            try {
+//                BitmapTools.deleteFile(topRecleList.get(i));
+//            } catch (Exception e) {
+//
+//            }
+//
+//
+//        }
+//        FileUtils.deleteDir(takePicturePath);
+        super.onDestroy();
+
+    }
+
+    @Override
+    public void onClick(View view) {
+        int id = view.getId();
+        if (id == R.id.save) {
+            if (mDataBinding.editTitile.getText().toString().trim().length() < 1) {
+                setToast("请输入标题");
+                return;
+            }
+            if (mDataBinding.editTitile.getText().toString().trim().length() > 20) {
+                setToast("标题最多可以输入20个字");
+                return;
+            }
+            if (mDataBinding.editPhone.getText().toString().trim().length() != 11) {
+                setToast("请输入手机号");
+                return;
+            }
+            if (!RegexUtils.isMobileExact(mDataBinding.editPhone.getText().toString().trim())) {
+                setToast("请输入有效的手机号");
+                return;
+            }
+            if (mDataBinding.editContent.getText().toString().trim().length() < 2) {
+                setToast("请输入内容详情");
+                return;
+            }
+            douploadimges();
+        }
+    }
+
+    private void douploadimges() {
+        progressDialog.setMessage(getString(R.string.requsting));
+        progressDialog.setCancelable(false);
+        progressDialog.show();
+        RetrofitHttpUpLoad retrofitHttpUpLoad = RetrofitHttpUpLoad.getInstance();
+        retrofitHttpUpLoad.clear();
+        Map<String, Object> map = new HashMap<>();
+        RegisterUser user =
+                Config.getInstance(this).getUser();
+        if (user != null) {
+            map.put("userid", user.getUserid());
+        } else {
+            map.put("userid", 0 + "");
+        }
+        map.put("app", "Advertorial");
+        map.put("class", "Advertorial_an_UpdateAdvertorial");
+        map.put("sign", Md5.md5("Advertorial" + "Advertorial_an_UpdateAdvertorial" + Md5.secret));
+        map.put("advertorial_author_phone", mDataBinding.editPhone.getText().toString().trim());
+        map.put("advertorial_content_id", contentId);
+        map.put("advertorial_title", mDataBinding.editTitile.getText().toString().trim());
+        map.put("advertorial_content", mDataBinding.editContent.getText().toString().trim());
+        int a = topRecleList.size() - 1;
+        map.put("advertorial_picture_count", a + "");
+        for (int i = 0; i < topRecleList.size(); i++) {
+            if (topRecleList.get(i) != null) {
+                map.put("advertorial_picture" + i, topRecleList.get(i));
+            }
+        }
+        Map<String, RequestBody> params = retrofitHttpUpLoad.addParameter(map).bulider();
+        retrofitHttpUpLoad.setHandler(handler);
+        retrofitHttpUpLoad.addToEnqueue(retrofitHttpUpLoad.mHttpService.upLoadAgree(ApiConfig.BASE_URL, params),
+                this, HttpStaticApi.HTTP_UPLOADIMAGE);
+
+    }
+
+    @Override
+    public void onResponse(Response response, int method) {
+        progressDialog.dismiss();
+        switch (method) {
+            case HttpStaticApi.HTTP_UPLOADIMAGE:
+
+                Resultcode resultcode = (Resultcode) response.body();
+                if (0 == (resultcode.status)) {
+                    MyMarketShopActivity.isRefrash = true;
+                    setToast( getString(R.string.editsuccess));
+                    Intent intent = new Intent();
+                    intent.putExtra("onreflash", false);
+                    setResult(resultCodeFromlist, intent);
+                    finish();
+                } else {
+                    setToast( resultcode.msg);
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    @Override
+    public void onFailure(Response response, int method) {
+        progressDialog.dismiss();
+        setToast( "编辑失败");
+    }
+
+}
diff --git a/app/src/main/java/my_view/ConfirmCarmoneyDialog.java b/app/src/main/java/my_view/ConfirmCarmoneyDialog.java
index 88228ad..6ef9471 100644
--- a/app/src/main/java/my_view/ConfirmCarmoneyDialog.java
+++ b/app/src/main/java/my_view/ConfirmCarmoneyDialog.java
@@ -1,545 +1,543 @@
-package my_view;
-
-
-import android.app.Activity;
-import android.app.Dialog;
-import android.app.ProgressDialog;
-import android.app.TimePickerDialog;
-import android.content.Context;
-import android.content.Intent;
-import android.inputmethodservice.KeyboardView;
-import android.os.Bundle;
-import android.text.InputType;
-import android.util.DisplayMetrics;
-import android.view.Gravity;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.TimePicker;
-
-import com.cutil.StringUtils;
-import com.google.gson.Gson;
-import com.google.gson.internal.LinkedTreeMap;
-import com.selectpicker.OptionsPopupWindow;
-import com.sl.house_property.R;
-import com.sl.house_property.f1.CarragelistActivity;
-import com.sl.house_property.f2.PropertyFeeActivity;
-import com.sl.house_property.user.MyPayActivity;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import entity.RegisterUser;
-import http.ApiConfig;
-import my_loader.Loader;
-import my_loader.Resultcode;
-import rx.Subscription;
-import rx.functions.Action1;
-import tools.Config;
-import tools.DateTimeUtils;
-import utils.Constants;
-import utils.KeyboardUtil;
-import utils.Md5;
-
-
-public class ConfirmCarmoneyDialog extends Dialog {
-
-    private CarragelistActivity context;
-    private String title1;
-    private String title2;
-    private String title3;
-    private String title4;
-    private String confirmButtonText;
-    private String cacelButtonText;
-    private ClickListenerInterface clickListenerInterface;
-
-    private KeyboardUtil keyboardUtil;
-    private EditText carNoEditText;
-
-    private EditText starttimeText, endtimeText;
-
-    private View rootView;
-
-    private OptionsPopupWindow alarmOptionPop;
-
-    private ProgressDialog progressDialog;
-    private Loader mGankLoader;
-
-    private String rentId;
-    private String defaultStartTime;
-    private String defaultEndTime;
-    private double price;
-
-    public interface ClickListenerInterface {
-
-        public void doConfirm();
-
-        public void doCancel();
-    }
-
-    public ConfirmCarmoneyDialog(CarragelistActivity context, String title1, String rent_id, String startTime, String endTime, double price) {
-        super(context, R.style.MyDialog);
-        progressDialog = new ProgressDialog(context);
-        this.context = context;
-        this.title1 = title1;
-        this.rentId = rent_id;
-        this.defaultStartTime = startTime;
-        this.defaultEndTime = endTime;
-        this.price = price;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        // TODO Auto-generated method stub
-        super.onCreate(savedInstanceState);
-
-        init();
-
-        carNoEditText = (EditText) findViewById(R.id.car_no_input);
-        carNoEditText.setOnFocusChangeListener(new android.view.View.OnFocusChangeListener() {
-            @Override
-            public void onFocusChange(View v, boolean hasFocus) {
-                if (hasFocus) {
-                    hideKeyboard(v);
-                    showCarNoInput();
-                } else {
-                    keyboardUtil.hideKeyboard();
-                }
-            }
-        });
-
-        carNoEditText.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (keyboardUtil != null && !keyboardUtil.isShow()) {
-                    showCarNoInput();
-                }
-            }
-        });
-
-        starttimeText = (EditText) findViewById(R.id.starttime);
-        starttimeText.setInputType(InputType.TYPE_NULL);
-        starttimeText.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                showStartTimeDialog();
-            }
-        });
-        starttimeText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-            @Override
-            public void onFocusChange(View v, boolean hasFocus) {
-                if (hasFocus) {
-                    showStartTimeDialog();
-                }
-            }
-        });
-        endtimeText = (EditText) findViewById(R.id.endtime);
-        endtimeText.setInputType(InputType.TYPE_NULL);
-        endtimeText.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                showEndTimeDialog();
-            }
-        });
-        endtimeText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-            @Override
-            public void onFocusChange(View v, boolean hasFocus) {
-                if (hasFocus) {
-                    showEndTimeDialog();
-                }
-            }
-        });
-
-        findViewById(R.id.confirmBtn).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                submitData();
-            }
-        });
-    }
-
-    private boolean checkTimeRange(String startTime, String endTime, String selectTime) {
-        String[] startTimeArray = startTime.split(":");
-        String[] endTimeArray = endTime.split(":");
-        String[] selectTimeArray = selectTime.split(":");
-        // 统一转化为分钟进行对比
-        Long startTimeM = Long.parseLong(startTimeArray[0]) * 60 + Long.parseLong(startTimeArray[1]);
-        Long endTimeM = Long.parseLong(endTimeArray[0]) * 60 + Long.parseLong(endTimeArray[1]);
-        Long selectTimeM = Long.parseLong(selectTimeArray[0]) * 60 + Long.parseLong(selectTimeArray[1]);
-        if (selectTimeM < startTimeM || selectTimeM > endTimeM) {
-            return false;
-        }
-        return true;
-    }
-
-    private void showEndTimeDialog() {
-        CharSequence timeObj = endtimeText.getText();
-        String timeStr = timeObj.toString().trim();
-        String[] timeArr = timeStr.split(":");
-        final DateTimeUtils dateTimeUtils = new DateTimeUtils(context);
-        if (timeObj != null && !"".equals(timeObj.toString().trim())) {
-            dateTimeUtils.showTimePickerDialog(new TimePickerDialog.OnTimeSetListener() {
-                @Override
-                public void onTimeSet(TimePicker timePicker, int i, int i1) {
-                    endTimeSelected(i, i1);
-                }
-            }, Integer.parseInt(timeArr[0]), Integer.parseInt(timeArr[1]));
-        } else {
-            dateTimeUtils.showTimePickerDialog(new TimePickerDialog.OnTimeSetListener() {
-                @Override
-                public void onTimeSet(TimePicker timePicker, int i, int i1) {
-                    endTimeSelected(i, i1);
-                }
-            });
-        }
-    }
-
-    /**
-     * 结束时间选中业务处理
-     * @param i
-     * @param i1
-     */
-    private void endTimeSelected(int i, int i1) {
-        String min = "0";
-        if (i1 < 10) {
-            min += i1;
-        } else {
-            min = i1 + "";
-        }
-        String selectTime = i + ":" + min;
-        if (!checkTimeRange(defaultStartTime, defaultEndTime, selectTime)) {
-            context.setToast("请选择规定范围内的时间!");
-            return;
-        }
-        if (!checkHalfHour(starttimeText.getText().toString(),selectTime)){
-            context.setToast("停车时间不能小于30分钟!");
-            return;
-        }
-        endtimeText.setText(selectTime);
-        updateAmount();
-    }
-
-    private void showStartTimeDialog() {
-        CharSequence timeObj = starttimeText.getText();
-        final DateTimeUtils dateTimeUtils = new DateTimeUtils(context);
-        if (timeObj != null && !"".equals(timeObj.toString().trim())) {
-            String timeStr = timeObj.toString().trim();
-            String[] timeArr = timeStr.split(":");
-            dateTimeUtils.showTimePickerDialog(new TimePickerDialog.OnTimeSetListener() {
-                @Override
-                public void onTimeSet(TimePicker timePicker, int i, int i1) {
-                    startTimeSelected(i, i1);
-                }
-            }, Integer.parseInt(timeArr[0]), Integer.parseInt(timeArr[1]));
-        } else {
-            dateTimeUtils.showTimePickerDialog(new TimePickerDialog.OnTimeSetListener() {
-                @Override
-                public void onTimeSet(TimePicker timePicker, int i, int i1) {
-                    startTimeSelected(i, i1);
-                }
-            });
-        }
-    }
-
-    /**
-     * 开始时间选择业务处理
-     * @param i
-     * @param i1
-     */
-    private void startTimeSelected(int i, int i1) {
-        String min = "0";
-        if (i1 < 10) {
-            min += i1;
-        } else {
-            min = i1 + "";
-        }
-        String selectTime = i + ":" + min;
-        if (!checkTimeRange(defaultStartTime, defaultEndTime, selectTime)) {
-            context.setToast("请选择规定范围内的时间!");
-            return;
-        }
-        if (!checkHalfHour(selectTime,endtimeText.getText().toString())){
-            context.setToast("停车时间不能小于30分钟!");
-            return;
-        }
-        starttimeText.setText(selectTime);
-        updateAmount();
-    }
-
-
-    private void showTimeAlert() {
-        final ArrayList<String> stringList = new ArrayList();
-        for (int i = 1; i <= 12; i++) {
-            stringList.add(i + "小时");
-        }
-        alarmOptionPop = new OptionsPopupWindow(context);
-        alarmOptionPop.setPicker(stringList);
-
-        alarmOptionPop.setOnoptionsSelectListener(new OptionsPopupWindow.OnOptionsSelectListener() {
-            @Override
-            public void onOptionsSelect(int position, int option2, int options3) {
-//                ((EditText) findViewById(R.id.hour_stop)).setText(stringList.get(position));
-            }
-        });
-        int height = alarmOptionPop.getContentView().getMeasuredHeight();
-
-        alarmOptionPop.getContentView().measure(0, 0);
-        alarmOptionPop.showAtLocation(carNoEditText, Gravity.BOTTOM, 0, -height);
-    }
-
-    private void showCarNoInput() {
-        keyboardUtil = new KeyboardUtil((Activity) context, (KeyboardView) rootView.findViewById(R.id.keyboard_view), carNoEditText);
-        keyboardUtil.hideSoftInputMethod();
-        keyboardUtil.showKeyboard();
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_BACK) {
-            if (keyboardUtil != null && keyboardUtil.isShow()) {
-                keyboardUtil.hideKeyboard();
-            } else {
-                cancel();
-            }
-        }
-        return false;
-    }
-
-    public static void hideKeyboard(View view) {
-        InputMethodManager imm = (InputMethodManager) view.getContext()
-                .getSystemService(Context.INPUT_METHOD_SERVICE);
-        if (imm != null) {
-            imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
-        }
-    }
-
-    public void init() {
-        LayoutInflater inflater = LayoutInflater.from(context);
-        rootView = inflater.inflate(R.layout.confirmcarmoney, null);
-        setContentView(rootView);
-
-        Window dialogWindow = getWindow();
-        WindowManager.LayoutParams lp = dialogWindow.getAttributes();
-        DisplayMetrics d = context.getResources().getDisplayMetrics(); // 获取屏幕宽、高用
-        lp.width = (int) (d.widthPixels); // 高度设置为屏幕的0.6
-        dialogWindow.setAttributes(lp);
-    }
-
-    public void setClicklistener(ClickListenerInterface clickListenerInterface) {
-        this.clickListenerInterface = clickListenerInterface;
-    }
-
-    private class ClickListener implements View.OnClickListener {
-        @Override
-        public void onClick(View v) {
-            // TODO Auto-generated method stub
-            int id = v.getId();
-            switch (id) {
-                case R.id.title1:
-                    clickListenerInterface.doConfirm();
-                    break;
-            }
-        }
-    }
-
-    private void updateAmount() {
-        String startTime = starttimeText.getText().toString();
-        String endTime = endtimeText.getText().toString();
-        if (!com.cutil.StringUtils.isTrimEmpty(startTime) && !com.cutil.StringUtils.isTrimEmpty(endTime)) {
-            StopResultInfo stopResultInfo = culAmount();
-            if (stopResultInfo != null && stopResultInfo.getStopAmount() != null) {
-                ((TextView) findViewById(R.id.amountText)).setText("¥" + stopResultInfo.getStopAmount() + "");
-            }
-        } else {
-            ((TextView) findViewById(R.id.amountText)).setText("¥0");
-        }
-    }
-
-    private boolean checkHalfHour(String startTimeStr,String endTimeStr) {
-        StopResultInfo stopResultInfo = null;
-        if (!com.cutil.StringUtils.isTrimEmpty(startTimeStr) && !com.cutil.StringUtils.isTrimEmpty(endTimeStr)) {
-            String[] startTimeArray = startTimeStr.split(":");
-            String[] endTimeArray = endTimeStr.split(":");
-            int startHour = Integer.parseInt(startTimeArray[0]);
-            int endHour = Integer.parseInt(endTimeArray[0]);
-            int startM = Integer.parseInt(startTimeArray[1]);
-            int endM = Integer.parseInt(endTimeArray[1]);
-            // 分钟计算
-            int timeLong = (endHour - startHour) * 60 + (endM - startM);
-            // 计算小时计费单位（超过30分钟算一个小时,不足30分钟不计费）
-            if (timeLong < 30) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private StopResultInfo culAmount() {
-        StopResultInfo stopResultInfo = null;
-        String startTime = starttimeText.getText().toString();
-        if (com.cutil.StringUtils.isTrimEmpty(startTime)) {
-            context.setToast("请选择开始时间!");
-            return stopResultInfo;
-        }
-        String endTime = endtimeText.getText().toString();
-        if (com.cutil.StringUtils.isTrimEmpty(endTime)) {
-            context.setToast("请选择结束时间!");
-            return stopResultInfo;
-        }
-
-        String[] startTimeArray = startTime.split(":");
-        String[] endTimeArray = endTime.split(":");
-        int startHour = Integer.parseInt(startTimeArray[0]);
-        int endHour = Integer.parseInt(endTimeArray[0]);
-        if (startHour > endHour) {
-            context.setToast("开始时间必须小于结束时间!");
-            return stopResultInfo;
-        }
-        int startM = Integer.parseInt(startTimeArray[1]);
-        int endM = Integer.parseInt(endTimeArray[1]);
-        if (startHour == endHour && startM >= endM) {
-            context.setToast("开始时间必须小于结束时间!");
-            return stopResultInfo;
-        }
-
-        // 分钟计算
-        int timeLong = (endHour - startHour) * 60 + (endM - startM);
-        // 计算小时计费单位（超过30分钟算一个小时,不足30分钟不计费）
-        if (timeLong < 30) {
-            context.setToast("停车时间不能小于30分钟!");
-            return stopResultInfo;
-        }
-        // 计费规则可以理解为没个小时的后半个小时才开始叠加计费，所以可以用如下算法来表示
-
-        long unitTime = ((timeLong - 30) / 60) + 1;
-        double amount = unitTime * price;
-        return new StopResultInfo(timeLong, amount);
-    }
-
-    private void submitData() {
-        // check data
-        String carNo = carNoEditText.getText().toString();
-        if (com.cutil.StringUtils.isTrimEmpty(carNo)) {
-            context.setToast("请输入车牌号!");
-            return;
-        }
-
-        StopResultInfo stopResultInfo = culAmount();
-        if (stopResultInfo == null) {
-            return;
-        }
-
-        RegisterUser user =
-                Config.getInstance(context).getUser();
-        Map<String, String> map = new HashMap<>();
-        if (user != null) {
-            map.put("userid", user.getUserid());
-        } else {
-            map.put("userid", 0 + "");
-        }
-        map.put("rent_id", rentId);
-        map.put("cart_number", carNo);
-        map.put("stop_time", stopResultInfo.getStopLong() + "");
-        map.put("stop_amount", stopResultInfo.getStopAmount() + "");
-        map.put("start_stop_time", defaultStartTime);
-        map.put("end_stop_time", defaultEndTime);
-        map.put("app", "Garage");
-        map.put("class", "Garage_an_AddGarageOrder");
-        map.put("sign", Md5.md5("Garage" + "Garage_an_AddGarageOrder" + Md5.secret));
-
-        getGankList(ApiConfig.BASE_URL, map, "数据提交中...", carNoEditText.getId());
-    }
-
-    private void getGankList(String myurl, Map<String, String> map, String msg, final int requstecode) {
-
-        progressDialog.setMessage(msg);
-        progressDialog.setCancelable(false);
-        progressDialog.show();
-        mGankLoader = new Loader();
-        Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
-            @Override
-            public void call(Resultcode resultcode) {
-                progressDialog.dismiss();
-
-                if (!(resultcode.status == 0)) {
-                    context.setToast(1, resultcode.msg);
-                }
-                if (resultcode.status == 0) {
-//                    context.setToast("提交成功!");
-                    LinkedTreeMap data = (LinkedTreeMap) resultcode.data;
-                    String s = new Gson().toJson(data);
-                    try {
-                        JSONObject jsonObject = new JSONObject(s);
-                        String orderSn = jsonObject.getString("order_sn");
-                        String stopAmount = jsonObject.getString("stop_amount");
-
-                        gotoPay(orderSn, stopAmount);
-                    } catch (JSONException e) {
-                        e.printStackTrace();
-                    }
-                    dismiss();
-                }
-            }
-        }, new Action1<Throwable>() {
-            @Override
-            public void call(Throwable throwable) {
-                progressDialog.dismiss();
-
-                context.setToast(2, context.getString(R.string.getdatafailure));
-                throwable.printStackTrace();
-            }
-        });
-
-        context.addSubscription(subscription);
-    }
-
-    private void gotoPay(String orderSn, String stopAmount) {
-        // 跳转支付选择界面
-        Intent intent = new Intent(context, MyPayActivity.class);
-        if (StringUtils.isTrimEmpty(orderSn) || StringUtils.isTrimEmpty(stopAmount) || Double.parseDouble(stopAmount) <= 0) {
-            context.setToast(2, "数据异常！");
-            return;
-        }
-        intent.putExtra("payNumber", stopAmount);
-        intent.putExtra("title", "停车费");
-        intent.putExtra("orderSn", orderSn);
-        intent.putExtra("feeCategory", Constants.FeeCategory.PARKING_FEE);
-        context.startActivityForResult(intent,Constants.PAY_REQUEST_CODE);
-    }
-
-    public class StopResultInfo {
-        private Integer stopLong;
-        private Double stopAmount;
-
-        private StopResultInfo(Integer stopLong, Double stopAmount) {
-            this.stopAmount = stopAmount;
-            this.stopLong = stopLong;
-        }
-
-        public Integer getStopLong() {
-            return stopLong;
-        }
-
-        public void setStopLong(Integer stopLong) {
-            this.stopLong = stopLong;
-        }
-
-        public Double getStopAmount() {
-            return stopAmount;
-        }
-
-        public void setStopAmount(Double stopAmount) {
-            this.stopAmount = stopAmount;
-        }
-    }
-
+package my_view;
+
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.app.ProgressDialog;
+import android.app.TimePickerDialog;
+import android.content.Context;
+import android.content.Intent;
+import android.inputmethodservice.KeyboardView;
+import android.os.Bundle;
+import android.text.InputType;
+import android.util.DisplayMetrics;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+import android.widget.TextView;
+import android.widget.TimePicker;
+
+import com.cutil.StringUtils;
+import com.google.gson.Gson;
+import com.google.gson.internal.LinkedTreeMap;
+import com.selectpicker.OptionsPopupWindow;
+import com.sl.house_property.R;
+import com.sl.house_property.f1.CarragelistActivity;
+import com.sl.house_property.f2.PropertyFeeActivity;
+import com.sl.house_property.user.MyPayActivity;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import entity.RegisterUser;
+import http.ApiConfig;
+import my_loader.Loader;
+import my_loader.Resultcode;
+import rx.Subscription;
+import rx.functions.Action1;
+import tools.Config;
+import tools.DateTimeUtils;
+import utils.Constants;
+import utils.KeyboardUtil;
+import utils.Md5;
+
+
+public class ConfirmCarmoneyDialog extends Dialog {
+
+    private CarragelistActivity context;
+    private String title1;
+    private String title2;
+    private String title3;
+    private String title4;
+    private String confirmButtonText;
+    private String cacelButtonText;
+    private ClickListenerInterface clickListenerInterface;
+
+    private KeyboardUtil keyboardUtil;
+    private EditText carNoEditText;
+
+    private EditText starttimeText, endtimeText;
+
+    private View rootView;
+
+    private OptionsPopupWindow alarmOptionPop;
+
+    private ProgressDialog progressDialog;
+    private Loader mGankLoader;
+
+    private String rentId;
+    private String defaultStartTime;
+    private String defaultEndTime;
+    private double price;
+
+    public interface ClickListenerInterface {
+
+        public void doConfirm();
+
+        public void doCancel();
+    }
+
+    public ConfirmCarmoneyDialog(CarragelistActivity context, String title1, String rent_id, String startTime, String endTime, double price) {
+        super(context, R.style.MyDialog);
+        progressDialog = new ProgressDialog(context);
+        this.context = context;
+        this.title1 = title1;
+        this.rentId = rent_id;
+        this.defaultStartTime = startTime;
+        this.defaultEndTime = endTime;
+        this.price = price;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        // TODO Auto-generated method stub
+        super.onCreate(savedInstanceState);
+
+        init();
+
+        carNoEditText = (EditText) findViewById(R.id.car_no_input);
+        carNoEditText.setOnFocusChangeListener(new android.view.View.OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View v, boolean hasFocus) {
+                if (hasFocus) {
+                    hideKeyboard(v);
+                    showCarNoInput();
+                } else {
+                    keyboardUtil.hideKeyboard();
+                }
+            }
+        });
+
+        carNoEditText.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (keyboardUtil != null && !keyboardUtil.isShow()) {
+                    showCarNoInput();
+                }
+            }
+        });
+
+        starttimeText = (EditText) findViewById(R.id.starttime);
+        starttimeText.setInputType(InputType.TYPE_NULL);
+        starttimeText.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showStartTimeDialog();
+            }
+        });
+        starttimeText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View v, boolean hasFocus) {
+                if (hasFocus) {
+                    showStartTimeDialog();
+                }
+            }
+        });
+        endtimeText = (EditText) findViewById(R.id.endtime);
+        endtimeText.setInputType(InputType.TYPE_NULL);
+        endtimeText.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showEndTimeDialog();
+            }
+        });
+        endtimeText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View v, boolean hasFocus) {
+                if (hasFocus) {
+                    showEndTimeDialog();
+                }
+            }
+        });
+
+        findViewById(R.id.confirmBtn).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                submitData();
+            }
+        });
+    }
+
+    private boolean checkTimeRange(String startTime, String endTime, String selectTime) {
+        String[] startTimeArray = startTime.split(":");
+        String[] endTimeArray = endTime.split(":");
+        String[] selectTimeArray = selectTime.split(":");
+        // 统一转化为分钟进行对比
+        Long startTimeM = Long.parseLong(startTimeArray[0]) * 60 + Long.parseLong(startTimeArray[1]);
+        Long endTimeM = Long.parseLong(endTimeArray[0]) * 60 + Long.parseLong(endTimeArray[1]);
+        Long selectTimeM = Long.parseLong(selectTimeArray[0]) * 60 + Long.parseLong(selectTimeArray[1]);
+        if (selectTimeM < startTimeM || selectTimeM > endTimeM) {
+            return false;
+        }
+        return true;
+    }
+
+    private void showEndTimeDialog() {
+        CharSequence timeObj = endtimeText.getText();
+        String timeStr = timeObj.toString().trim();
+        String[] timeArr = timeStr.split(":");
+        final DateTimeUtils dateTimeUtils = new DateTimeUtils(context);
+        if (timeObj != null && !"".equals(timeObj.toString().trim())) {
+            dateTimeUtils.showTimePickerDialog(new TimePickerDialog.OnTimeSetListener() {
+                @Override
+                public void onTimeSet(TimePicker timePicker, int i, int i1) {
+                    endTimeSelected(i, i1);
+                }
+            }, Integer.parseInt(timeArr[0]), Integer.parseInt(timeArr[1]));
+        } else {
+            dateTimeUtils.showTimePickerDialog(new TimePickerDialog.OnTimeSetListener() {
+                @Override
+                public void onTimeSet(TimePicker timePicker, int i, int i1) {
+                    endTimeSelected(i, i1);
+                }
+            });
+        }
+    }
+
+    /**
+     * 结束时间选中业务处理
+     * @param i
+     * @param i1
+     */
+    private void endTimeSelected(int i, int i1) {
+        String min = "0";
+        if (i1 < 10) {
+            min += i1;
+        } else {
+            min = i1 + "";
+        }
+        String selectTime = i + ":" + min;
+        if (!checkTimeRange(defaultStartTime, defaultEndTime, selectTime)) {
+            context.setToast("请选择规定范围内的时间!");
+            return;
+        }
+        if (!checkHalfHour(starttimeText.getText().toString(),selectTime)){
+            context.setToast("停车时间不能小于30分钟!");
+            return;
+        }
+        endtimeText.setText(selectTime);
+        updateAmount();
+    }
+
+    private void showStartTimeDialog() {
+        CharSequence timeObj = starttimeText.getText();
+        final DateTimeUtils dateTimeUtils = new DateTimeUtils(context);
+        if (timeObj != null && !"".equals(timeObj.toString().trim())) {
+            String timeStr = timeObj.toString().trim();
+            String[] timeArr = timeStr.split(":");
+            dateTimeUtils.showTimePickerDialog(new TimePickerDialog.OnTimeSetListener() {
+                @Override
+                public void onTimeSet(TimePicker timePicker, int i, int i1) {
+                    startTimeSelected(i, i1);
+                }
+            }, Integer.parseInt(timeArr[0]), Integer.parseInt(timeArr[1]));
+        } else {
+            dateTimeUtils.showTimePickerDialog(new TimePickerDialog.OnTimeSetListener() {
+                @Override
+                public void onTimeSet(TimePicker timePicker, int i, int i1) {
+                    startTimeSelected(i, i1);
+                }
+            });
+        }
+    }
+
+    /**
+     * 开始时间选择业务处理
+     * @param i
+     * @param i1
+     */
+    private void startTimeSelected(int i, int i1) {
+        String min = "0";
+        if (i1 < 10) {
+            min += i1;
+        } else {
+            min = i1 + "";
+        }
+        String selectTime = i + ":" + min;
+        if (!checkTimeRange(defaultStartTime, defaultEndTime, selectTime)) {
+            context.setToast("请选择规定范围内的时间!");
+            return;
+        }
+        if (!checkHalfHour(selectTime,endtimeText.getText().toString())){
+            context.setToast("停车时间不能小于30分钟!");
+            return;
+        }
+        starttimeText.setText(selectTime);
+        updateAmount();
+    }
+
+
+    private void showTimeAlert() {
+        final ArrayList<String> stringList = new ArrayList();
+        for (int i = 1; i <= 12; i++) {
+            stringList.add(i + "小时");
+        }
+        alarmOptionPop = new OptionsPopupWindow(context);
+        alarmOptionPop.setPicker(stringList);
+
+        alarmOptionPop.setOnoptionsSelectListener(new OptionsPopupWindow.OnOptionsSelectListener() {
+            @Override
+            public void onOptionsSelect(int position, int option2, int options3) {
+//                ((EditText) findViewById(R.id.hour_stop)).setText(stringList.get(position));
+            }
+        });
+        int height = alarmOptionPop.getContentView().getMeasuredHeight();
+
+        alarmOptionPop.getContentView().measure(0, 0);
+        alarmOptionPop.showAtLocation(carNoEditText, Gravity.BOTTOM, 0, -height);
+    }
+
+    private void showCarNoInput() {
+        keyboardUtil = new KeyboardUtil((Activity) context, (KeyboardView) rootView.findViewById(R.id.keyboard_view), carNoEditText);
+        keyboardUtil.hideSoftInputMethod();
+        keyboardUtil.showKeyboard();
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            if (keyboardUtil != null && keyboardUtil.isShow()) {
+                keyboardUtil.hideKeyboard();
+            } else {
+                cancel();
+            }
+        }
+        return false;
+    }
+
+    public static void hideKeyboard(View view) {
+        InputMethodManager imm = (InputMethodManager) view.getContext()
+                .getSystemService(Context.INPUT_METHOD_SERVICE);
+        if (imm != null) {
+            imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+        }
+    }
+
+    public void init() {
+        LayoutInflater inflater = LayoutInflater.from(context);
+        rootView = inflater.inflate(R.layout.confirmcarmoney, null);
+        setContentView(rootView);
+
+        Window dialogWindow = getWindow();
+        WindowManager.LayoutParams lp = dialogWindow.getAttributes();
+        DisplayMetrics d = context.getResources().getDisplayMetrics(); // 获取屏幕宽、高用
+        lp.width = (int) (d.widthPixels); // 高度设置为屏幕的0.6
+        dialogWindow.setAttributes(lp);
+    }
+
+    public void setClicklistener(ClickListenerInterface clickListenerInterface) {
+        this.clickListenerInterface = clickListenerInterface;
+    }
+
+    private class ClickListener implements View.OnClickListener {
+        @Override
+        public void onClick(View v) {
+            // TODO Auto-generated method stub
+            int id = v.getId();
+            if (id == R.id.title1) {
+                clickListenerInterface.doConfirm();
+            }
+        }
+    }
+
+    private void updateAmount() {
+        String startTime = starttimeText.getText().toString();
+        String endTime = endtimeText.getText().toString();
+        if (!com.cutil.StringUtils.isTrimEmpty(startTime) && !com.cutil.StringUtils.isTrimEmpty(endTime)) {
+            StopResultInfo stopResultInfo = culAmount();
+            if (stopResultInfo != null && stopResultInfo.getStopAmount() != null) {
+                ((TextView) findViewById(R.id.amountText)).setText("¥" + stopResultInfo.getStopAmount() + "");
+            }
+        } else {
+            ((TextView) findViewById(R.id.amountText)).setText("¥0");
+        }
+    }
+
+    private boolean checkHalfHour(String startTimeStr,String endTimeStr) {
+        StopResultInfo stopResultInfo = null;
+        if (!com.cutil.StringUtils.isTrimEmpty(startTimeStr) && !com.cutil.StringUtils.isTrimEmpty(endTimeStr)) {
+            String[] startTimeArray = startTimeStr.split(":");
+            String[] endTimeArray = endTimeStr.split(":");
+            int startHour = Integer.parseInt(startTimeArray[0]);
+            int endHour = Integer.parseInt(endTimeArray[0]);
+            int startM = Integer.parseInt(startTimeArray[1]);
+            int endM = Integer.parseInt(endTimeArray[1]);
+            // 分钟计算
+            int timeLong = (endHour - startHour) * 60 + (endM - startM);
+            // 计算小时计费单位（超过30分钟算一个小时,不足30分钟不计费）
+            if (timeLong < 30) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private StopResultInfo culAmount() {
+        StopResultInfo stopResultInfo = null;
+        String startTime = starttimeText.getText().toString();
+        if (com.cutil.StringUtils.isTrimEmpty(startTime)) {
+            context.setToast("请选择开始时间!");
+            return stopResultInfo;
+        }
+        String endTime = endtimeText.getText().toString();
+        if (com.cutil.StringUtils.isTrimEmpty(endTime)) {
+            context.setToast("请选择结束时间!");
+            return stopResultInfo;
+        }
+
+        String[] startTimeArray = startTime.split(":");
+        String[] endTimeArray = endTime.split(":");
+        int startHour = Integer.parseInt(startTimeArray[0]);
+        int endHour = Integer.parseInt(endTimeArray[0]);
+        if (startHour > endHour) {
+            context.setToast("开始时间必须小于结束时间!");
+            return stopResultInfo;
+        }
+        int startM = Integer.parseInt(startTimeArray[1]);
+        int endM = Integer.parseInt(endTimeArray[1]);
+        if (startHour == endHour && startM >= endM) {
+            context.setToast("开始时间必须小于结束时间!");
+            return stopResultInfo;
+        }
+
+        // 分钟计算
+        int timeLong = (endHour - startHour) * 60 + (endM - startM);
+        // 计算小时计费单位（超过30分钟算一个小时,不足30分钟不计费）
+        if (timeLong < 30) {
+            context.setToast("停车时间不能小于30分钟!");
+            return stopResultInfo;
+        }
+        // 计费规则可以理解为没个小时的后半个小时才开始叠加计费，所以可以用如下算法来表示
+
+        long unitTime = ((timeLong - 30) / 60) + 1;
+        double amount = unitTime * price;
+        return new StopResultInfo(timeLong, amount);
+    }
+
+    private void submitData() {
+        // check data
+        String carNo = carNoEditText.getText().toString();
+        if (com.cutil.StringUtils.isTrimEmpty(carNo)) {
+            context.setToast("请输入车牌号!");
+            return;
+        }
+
+        StopResultInfo stopResultInfo = culAmount();
+        if (stopResultInfo == null) {
+            return;
+        }
+
+        RegisterUser user =
+                Config.getInstance(context).getUser();
+        Map<String, String> map = new HashMap<>();
+        if (user != null) {
+            map.put("userid", user.getUserid());
+        } else {
+            map.put("userid", 0 + "");
+        }
+        map.put("rent_id", rentId);
+        map.put("cart_number", carNo);
+        map.put("stop_time", stopResultInfo.getStopLong() + "");
+        map.put("stop_amount", stopResultInfo.getStopAmount() + "");
+        map.put("start_stop_time", defaultStartTime);
+        map.put("end_stop_time", defaultEndTime);
+        map.put("app", "Garage");
+        map.put("class", "Garage_an_AddGarageOrder");
+        map.put("sign", Md5.md5("Garage" + "Garage_an_AddGarageOrder" + Md5.secret));
+
+        getGankList(ApiConfig.BASE_URL, map, "数据提交中...", carNoEditText.getId());
+    }
+
+    private void getGankList(String myurl, Map<String, String> map, String msg, final int requstecode) {
+
+        progressDialog.setMessage(msg);
+        progressDialog.setCancelable(false);
+        progressDialog.show();
+        mGankLoader = new Loader();
+        Subscription subscription = mGankLoader.getMovie(myurl, map).subscribe(new Action1<Resultcode>() {
+            @Override
+            public void call(Resultcode resultcode) {
+                progressDialog.dismiss();
+
+                if (!(resultcode.status == 0)) {
+                    context.setToast(1, resultcode.msg);
+                }
+                if (resultcode.status == 0) {
+//                    context.setToast("提交成功!");
+                    LinkedTreeMap data = (LinkedTreeMap) resultcode.data;
+                    String s = new Gson().toJson(data);
+                    try {
+                        JSONObject jsonObject = new JSONObject(s);
+                        String orderSn = jsonObject.getString("order_sn");
+                        String stopAmount = jsonObject.getString("stop_amount");
+
+                        gotoPay(orderSn, stopAmount);
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                    }
+                    dismiss();
+                }
+            }
+        }, new Action1<Throwable>() {
+            @Override
+            public void call(Throwable throwable) {
+                progressDialog.dismiss();
+
+                context.setToast(2, context.getString(R.string.getdatafailure));
+                throwable.printStackTrace();
+            }
+        });
+
+        context.addSubscription(subscription);
+    }
+
+    private void gotoPay(String orderSn, String stopAmount) {
+        // 跳转支付选择界面
+        Intent intent = new Intent(context, MyPayActivity.class);
+        if (StringUtils.isTrimEmpty(orderSn) || StringUtils.isTrimEmpty(stopAmount) || Double.parseDouble(stopAmount) <= 0) {
+            context.setToast(2, "数据异常！");
+            return;
+        }
+        intent.putExtra("payNumber", stopAmount);
+        intent.putExtra("title", "停车费");
+        intent.putExtra("orderSn", orderSn);
+        intent.putExtra("feeCategory", Constants.FeeCategory.PARKING_FEE);
+        context.startActivityForResult(intent,Constants.PAY_REQUEST_CODE);
+    }
+
+    public class StopResultInfo {
+        private Integer stopLong;
+        private Double stopAmount;
+
+        private StopResultInfo(Integer stopLong, Double stopAmount) {
+            this.stopAmount = stopAmount;
+            this.stopLong = stopLong;
+        }
+
+        public Integer getStopLong() {
+            return stopLong;
+        }
+
+        public void setStopLong(Integer stopLong) {
+            this.stopLong = stopLong;
+        }
+
+        public Double getStopAmount() {
+            return stopAmount;
+        }
+
+        public void setStopAmount(Double stopAmount) {
+            this.stopAmount = stopAmount;
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/my_view/ConfirmDialog.java b/app/src/main/java/my_view/ConfirmDialog.java
index 9e4f6dd..6188697 100644
--- a/app/src/main/java/my_view/ConfirmDialog.java
+++ b/app/src/main/java/my_view/ConfirmDialog.java
@@ -1,103 +1,99 @@
-package my_view;
-
-
-import android.app.Dialog;
-import android.content.Context;
-import android.os.Bundle;
-import android.util.DisplayMetrics;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.TextView;
-
-import com.sl.house_property.R;
-
-
-public class ConfirmDialog extends Dialog {
-
-    private Context context;
-    private String title1;
-    private String title2;
-    private String title3;
-    private String title4;
-    private String confirmButtonText;
-    private String cacelButtonText;
-    private ClickListenerInterface clickListenerInterface;
-
-    public interface ClickListenerInterface {
-
-        public void doConfirm();
-
-        public void doCancel();
-    }
-
-    public ConfirmDialog(Context context, String title1, String title2, String title3,String  title4) {
-        super(context, R.style.MyDialog);
-        this.context = context;
-        this.title1 = title1;
-        this.title2 = title2;
-        this.title3 = title3;
-        this.title4 = title4;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        // TODO Auto-generated method stub
-        super.onCreate(savedInstanceState);
-
-        init();
-    }
-
-    public void init() {
-        LayoutInflater inflater = LayoutInflater.from(context);
-        View view = inflater.inflate(R.layout.confirm_dialog, null);
-        setContentView(view);
-
-        TextView tvTitle1 = (TextView) view.findViewById(R.id.title1);
-        TextView tvTitle2 = (TextView) view.findViewById(R.id.title2);
-        TextView tvTitle3 = (TextView) view.findViewById(R.id.title3);
-        TextView tvTitle4 = (TextView) view.findViewById(R.id.title4);
-
-
-
-        tvTitle1.setText(title1);
-        tvTitle2.setText(title2);
-        tvTitle3.setText(title3);
-        tvTitle4.setText(title4);
-
-        tvTitle4.setOnClickListener(new clickListener());
-        tvTitle4.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                dismiss();
-            }
-        });
-        Window dialogWindow = getWindow();
-        WindowManager.LayoutParams lp = dialogWindow.getAttributes();
-        DisplayMetrics d = context.getResources().getDisplayMetrics(); // 获取屏幕宽、高用
-        lp.width = (int) (d.widthPixels * 0.8); // 高度设置为屏幕的0.6
-        dialogWindow.setAttributes(lp);
-    }
-
-    public void setClicklistener(ClickListenerInterface clickListenerInterface) {
-        this.clickListenerInterface = clickListenerInterface;
-    }
-
-    private class clickListener implements View.OnClickListener {
-        @Override
-        public void onClick(View v) {
-            // TODO Auto-generated method stub
-            int id = v.getId();
-            switch (id) {
-                case R.id.title1:
-                    clickListenerInterface.doConfirm();
-                    break;
-
-
-            }
-        }
-
-    };
-
+package my_view;
+
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.util.DisplayMetrics;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.TextView;
+
+import com.sl.house_property.R;
+
+
+public class ConfirmDialog extends Dialog {
+
+    private Context context;
+    private String title1;
+    private String title2;
+    private String title3;
+    private String title4;
+    private String confirmButtonText;
+    private String cacelButtonText;
+    private ClickListenerInterface clickListenerInterface;
+
+    public interface ClickListenerInterface {
+
+        public void doConfirm();
+
+        public void doCancel();
+    }
+
+    public ConfirmDialog(Context context, String title1, String title2, String title3,String  title4) {
+        super(context, R.style.MyDialog);
+        this.context = context;
+        this.title1 = title1;
+        this.title2 = title2;
+        this.title3 = title3;
+        this.title4 = title4;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        // TODO Auto-generated method stub
+        super.onCreate(savedInstanceState);
+
+        init();
+    }
+
+    public void init() {
+        LayoutInflater inflater = LayoutInflater.from(context);
+        View view = inflater.inflate(R.layout.confirm_dialog, null);
+        setContentView(view);
+
+        TextView tvTitle1 = (TextView) view.findViewById(R.id.title1);
+        TextView tvTitle2 = (TextView) view.findViewById(R.id.title2);
+        TextView tvTitle3 = (TextView) view.findViewById(R.id.title3);
+        TextView tvTitle4 = (TextView) view.findViewById(R.id.title4);
+
+
+
+        tvTitle1.setText(title1);
+        tvTitle2.setText(title2);
+        tvTitle3.setText(title3);
+        tvTitle4.setText(title4);
+
+        tvTitle4.setOnClickListener(new clickListener());
+        tvTitle4.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                dismiss();
+            }
+        });
+        Window dialogWindow = getWindow();
+        WindowManager.LayoutParams lp = dialogWindow.getAttributes();
+        DisplayMetrics d = context.getResources().getDisplayMetrics(); // 获取屏幕宽、高用
+        lp.width = (int) (d.widthPixels * 0.8); // 高度设置为屏幕的0.6
+        dialogWindow.setAttributes(lp);
+    }
+
+    public void setClicklistener(ClickListenerInterface clickListenerInterface) {
+        this.clickListenerInterface = clickListenerInterface;
+    }
+
+    private class clickListener implements View.OnClickListener {
+        @Override
+        public void onClick(View v) {
+            // TODO Auto-generated method stub
+            int id = v.getId();
+            if (id == R.id.title1) {
+                clickListenerInterface.doConfirm();
+            }
+        }
+
+    };
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/my_view/ConfirmForGaranteeDetailDialog.java b/app/src/main/java/my_view/ConfirmForGaranteeDetailDialog.java
index 5b51d5a..6ac2644 100644
--- a/app/src/main/java/my_view/ConfirmForGaranteeDetailDialog.java
+++ b/app/src/main/java/my_view/ConfirmForGaranteeDetailDialog.java
@@ -1,100 +1,96 @@
-package my_view;
-
-
-import android.app.Dialog;
-import android.content.Context;
-import android.os.Bundle;
-import android.util.DisplayMetrics;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.EditText;
-import android.widget.TextView;
-
-import com.sl.house_property.R;
-
-
-public class ConfirmForGaranteeDetailDialog extends Dialog {
-
-    private  View.OnClickListener onClickListener;
-    private Context context;
-    private String title1;
-    private String title2;
-    private String title3;
-    private String title4;
-    private String confirmButtonText;
-    private String cacelButtonText;
-    private ClickListenerInterface clickListenerInterface;
-
-    public interface ClickListenerInterface {
-
-        public void doConfirm();
-
-        public void doCancel();
-    }
-
-    public ConfirmForGaranteeDetailDialog(Context context, String title1 ) {
-        super(context, R.style.MyDialog);
-        this.context = context;
-        this.title1 = title1;
-
-
-    }
-
-    public void setonClickListener(View.OnClickListener onClickListener) {
-        this.onClickListener = onClickListener;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        // TODO Auto-generated method stub
-        super.onCreate(savedInstanceState);
-
-        init();
-    }
-
-    public void init() {
-        LayoutInflater inflater = LayoutInflater.from(context);
-        View view = inflater.inflate(R.layout.confirmforgaantee, null);
-        setContentView(view);
-
-        TextView tvTitle1 = (TextView) view.findViewById(R.id.title1);
-      TextView  textView4=(TextView) view.findViewById(R.id.title4);
-        EditText count=
-                (EditText)findViewById(R.id.count);
-        count.setText(title1);
-        textView4.setOnClickListener(onClickListener);
-
-
-       // tvTitle1.setText(title1);
-
-
-        Window dialogWindow = getWindow();
-        WindowManager.LayoutParams lp = dialogWindow.getAttributes();
-        DisplayMetrics d = context.getResources().getDisplayMetrics(); // 获取屏幕宽、高用
-        lp.width = (int) (d.widthPixels * 0.8); // 高度设置为屏幕的0.6
-        dialogWindow.setAttributes(lp);
-    }
-
-    public void setClicklistener(ClickListenerInterface clickListenerInterface) {
-        this.clickListenerInterface = clickListenerInterface;
-    }
-
-    private class clickListener implements View.OnClickListener {
-        @Override
-        public void onClick(View v) {
-            // TODO Auto-generated method stub
-            int id = v.getId();
-            switch (id) {
-                case R.id.title1:
-                    clickListenerInterface.doConfirm();
-                    break;
-
-
-            }
-        }
-
-    };
-
+package my_view;
+
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.util.DisplayMetrics;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import com.sl.house_property.R;
+
+
+public class ConfirmForGaranteeDetailDialog extends Dialog {
+
+    private  View.OnClickListener onClickListener;
+    private Context context;
+    private String title1;
+    private String title2;
+    private String title3;
+    private String title4;
+    private String confirmButtonText;
+    private String cacelButtonText;
+    private ClickListenerInterface clickListenerInterface;
+
+    public interface ClickListenerInterface {
+
+        public void doConfirm();
+
+        public void doCancel();
+    }
+
+    public ConfirmForGaranteeDetailDialog(Context context, String title1 ) {
+        super(context, R.style.MyDialog);
+        this.context = context;
+        this.title1 = title1;
+
+
+    }
+
+    public void setonClickListener(View.OnClickListener onClickListener) {
+        this.onClickListener = onClickListener;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        // TODO Auto-generated method stub
+        super.onCreate(savedInstanceState);
+
+        init();
+    }
+
+    public void init() {
+        LayoutInflater inflater = LayoutInflater.from(context);
+        View view = inflater.inflate(R.layout.confirmforgaantee, null);
+        setContentView(view);
+
+        TextView tvTitle1 = (TextView) view.findViewById(R.id.title1);
+      TextView  textView4=(TextView) view.findViewById(R.id.title4);
+        EditText count=
+                (EditText)findViewById(R.id.count);
+        count.setText(title1);
+        textView4.setOnClickListener(onClickListener);
+
+
+       // tvTitle1.setText(title1);
+
+
+        Window dialogWindow = getWindow();
+        WindowManager.LayoutParams lp = dialogWindow.getAttributes();
+        DisplayMetrics d = context.getResources().getDisplayMetrics(); // 获取屏幕宽、高用
+        lp.width = (int) (d.widthPixels * 0.8); // 高度设置为屏幕的0.6
+        dialogWindow.setAttributes(lp);
+    }
+
+    public void setClicklistener(ClickListenerInterface clickListenerInterface) {
+        this.clickListenerInterface = clickListenerInterface;
+    }
+
+    private class clickListener implements View.OnClickListener {
+        @Override
+        public void onClick(View v) {
+            // TODO Auto-generated method stub
+            int id = v.getId();
+            if (id == R.id.title1) {
+                clickListenerInterface.doConfirm();
+            }
+        }
+
+    };
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/my_view/ConfirmViewDialog.java b/app/src/main/java/my_view/ConfirmViewDialog.java
index 5d49bdc..06b302e 100644
--- a/app/src/main/java/my_view/ConfirmViewDialog.java
+++ b/app/src/main/java/my_view/ConfirmViewDialog.java
@@ -1,108 +1,104 @@
-package my_view;
-
-
-import android.app.Dialog;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.os.Bundle;
-import android.util.DisplayMetrics;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.sl.house_property.R;
-
-
-public class ConfirmViewDialog extends Dialog {
-
-    private Context context;
-    private String title1;
-    private String title2;
-    private String title3;
-    private String title4;
-    private String confirmButtonText;
-    private String cacelButtonText;
-    private ClickListenerInterface clickListenerInterface;
-    private Bitmap bitmap;
-
-    public interface ClickListenerInterface {
-
-        public void doConfirm();
-
-        public void doCancel();
-    }
-
-    public ConfirmViewDialog(Context context, String title1, String title2, String title3, String  title4, Bitmap bitmap) {
-        super(context, R.style.MyDialog);
-        this.context = context;
-        this.title1 = title1;
-        this.title2 = title2;
-        this.title3 = title3;
-        this.title4 = title4;
-        this.bitmap=bitmap;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        // TODO Auto-generated method stub
-        super.onCreate(savedInstanceState);
-
-        init();
-    }
-
-    public void init() {
-        LayoutInflater inflater = LayoutInflater.from(context);
-        View view = inflater.inflate(R.layout.confirmview_dialog, null);
-        setContentView(view);
-
-        TextView tvTitle1 = (TextView) view.findViewById(R.id.title1);
-        TextView tvTitle2 = (TextView) view.findViewById(R.id.title2);
-        TextView tvTitle3 = (TextView) view.findViewById(R.id.title3);
-        TextView tvTitle4 = (TextView) view.findViewById(R.id.title4);
-
-        ImageView  imageView=(ImageView)view.findViewById(R.id.myImage);
-
-        tvTitle1.setText(title1);
-        tvTitle2.setText(title2);
-        tvTitle3.setText(title3);
-        tvTitle4.setText(title4);
-        if(bitmap!=null)
-        imageView.setImageBitmap(bitmap);
-        tvTitle4.setOnClickListener(new clickListener());
-        tvTitle4.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                dismiss();
-            }
-        });
-        Window dialogWindow = getWindow();
-        WindowManager.LayoutParams lp = dialogWindow.getAttributes();
-        DisplayMetrics d = context.getResources().getDisplayMetrics(); // 获取屏幕宽、高用
-        lp.width = (int) (d.widthPixels * 0.8); // 高度设置为屏幕的0.6
-        dialogWindow.setAttributes(lp);
-    }
-
-    public void setClicklistener(ClickListenerInterface clickListenerInterface) {
-        this.clickListenerInterface = clickListenerInterface;
-    }
-
-    private class clickListener implements View.OnClickListener {
-        @Override
-        public void onClick(View v) {
-            // TODO Auto-generated method stub
-            int id = v.getId();
-            switch (id) {
-                case R.id.title1:
-                    clickListenerInterface.doConfirm();
-                    break;
-
-
-            }
-        }
-
-    };
-
+package my_view;
+
+
+import android.app.Dialog;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.util.DisplayMetrics;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.sl.house_property.R;
+
+
+public class ConfirmViewDialog extends Dialog {
+
+    private Context context;
+    private String title1;
+    private String title2;
+    private String title3;
+    private String title4;
+    private String confirmButtonText;
+    private String cacelButtonText;
+    private ClickListenerInterface clickListenerInterface;
+    private Bitmap bitmap;
+
+    public interface ClickListenerInterface {
+
+        public void doConfirm();
+
+        public void doCancel();
+    }
+
+    public ConfirmViewDialog(Context context, String title1, String title2, String title3, String  title4, Bitmap bitmap) {
+        super(context, R.style.MyDialog);
+        this.context = context;
+        this.title1 = title1;
+        this.title2 = title2;
+        this.title3 = title3;
+        this.title4 = title4;
+        this.bitmap=bitmap;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        // TODO Auto-generated method stub
+        super.onCreate(savedInstanceState);
+
+        init();
+    }
+
+    public void init() {
+        LayoutInflater inflater = LayoutInflater.from(context);
+        View view = inflater.inflate(R.layout.confirmview_dialog, null);
+        setContentView(view);
+
+        TextView tvTitle1 = (TextView) view.findViewById(R.id.title1);
+        TextView tvTitle2 = (TextView) view.findViewById(R.id.title2);
+        TextView tvTitle3 = (TextView) view.findViewById(R.id.title3);
+        TextView tvTitle4 = (TextView) view.findViewById(R.id.title4);
+
+        ImageView  imageView=(ImageView)view.findViewById(R.id.myImage);
+
+        tvTitle1.setText(title1);
+        tvTitle2.setText(title2);
+        tvTitle3.setText(title3);
+        tvTitle4.setText(title4);
+        if(bitmap!=null)
+        imageView.setImageBitmap(bitmap);
+        tvTitle4.setOnClickListener(new clickListener());
+        tvTitle4.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                dismiss();
+            }
+        });
+        Window dialogWindow = getWindow();
+        WindowManager.LayoutParams lp = dialogWindow.getAttributes();
+        DisplayMetrics d = context.getResources().getDisplayMetrics(); // 获取屏幕宽、高用
+        lp.width = (int) (d.widthPixels * 0.8); // 高度设置为屏幕的0.6
+        dialogWindow.setAttributes(lp);
+    }
+
+    public void setClicklistener(ClickListenerInterface clickListenerInterface) {
+        this.clickListenerInterface = clickListenerInterface;
+    }
+
+    private class clickListener implements View.OnClickListener {
+        @Override
+        public void onClick(View v) {
+            // TODO Auto-generated method stub
+            int id = v.getId();
+            if (id == R.id.title1) {
+                clickListenerInterface.doConfirm();
+            }
+        }
+
+    };
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/my_view/MyRadioButton.java b/app/src/main/java/my_view/MyRadioButton.java
index db356dc..0da6fb8 100644
--- a/app/src/main/java/my_view/MyRadioButton.java
+++ b/app/src/main/java/my_view/MyRadioButton.java
@@ -1,93 +1,87 @@
-package my_view;
-
-/**
- * Created by 90432 on 2018/2/1.
- */
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.drawable.Drawable;
-import android.util.AttributeSet;
-import android.widget.RadioButton;
-
-
-import com.sl.house_property.R;
-
-
-/**
- * Created by yechao on 2016/12/1.
- * Describe：可控制drawableTop等图片的大小
- */
-
-@SuppressLint("AppCompatCustomView")
-public class MyRadioButton extends RadioButton {
-
-    private int mDrawableSize;// xml文件中设置的大小
-
-    public MyRadioButton(Context context) {
-        this(context, null, 0);
-    }
-
-    public MyRadioButton(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public MyRadioButton(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        Drawable drawableLeft = null, drawableTop = null, drawableRight = null, drawableBottom = null;
-        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.MyRadioButton);
-
-        int n = a.getIndexCount();
-        for (int i = 0; i < n; i++) {
-            int attr = a.getIndex(i);
-            switch (attr) {
-                case  R.styleable.MyRadioButton_drawableSize:
-                    mDrawableSize = a.getDimensionPixelSize(R.styleable.MyRadioButton_drawableSize, 50);
-                    break;
-                case R.styleable.MyRadioButton_drawableTop:
-                    drawableTop = a.getDrawable(attr);
-                    break;
-                case R.styleable.MyRadioButton_drawableBottom:
-                    drawableRight = a.getDrawable(attr);
-                    break;
-                case R.styleable.MyRadioButton_drawableRight:
-                    drawableBottom = a.getDrawable(attr);
-                    break;
-                case R.styleable.MyRadioButton_drawableLeft:
-                    drawableLeft = a.getDrawable(attr);
-                    break;
-                default:
-                    break;
-            }
-        }
-        a.recycle();
-
-        setCompoundDrawablesWithIntrinsicBounds(drawableLeft, drawableTop, drawableRight, drawableBottom);
-
-    }
-
-    /**
-     * RadioButton上、下、左、右设置图标
-     */
-    public void setCompoundDrawablesWithIntrinsicBounds(Drawable left, Drawable top, Drawable right, Drawable bottom) {
-
-        if (left != null) {
-            left.setBounds(0, 0, mDrawableSize, mDrawableSize);
-        }
-        if (right != null) {
-            right.setBounds(0, 0, mDrawableSize, mDrawableSize);
-        }
-        if (top != null) {
-            top.setBounds(0, 0, mDrawableSize, mDrawableSize);
-        }
-        if (bottom != null) {
-            bottom.setBounds(0, 0, mDrawableSize, mDrawableSize);
-        }
-        setCompoundDrawables(left, top, right, bottom);
-    }
-
-public   void setmDrawableSize(int  size,  Drawable drawable[]){
-            mDrawableSize=size;
-    setCompoundDrawablesWithIntrinsicBounds(drawable[0], drawable[1], drawable[2], drawable[3]);
-}
-}
+package my_view;
+
+/**
+ * Created by 90432 on 2018/2/1.
+ */
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.widget.RadioButton;
+
+
+import com.sl.house_property.R;
+
+
+/**
+ * Created by yechao on 2016/12/1.
+ * Describe：可控制drawableTop等图片的大小
+ */
+
+@SuppressLint("AppCompatCustomView")
+public class MyRadioButton extends RadioButton {
+
+    private int mDrawableSize;// xml文件中设置的大小
+
+    public MyRadioButton(Context context) {
+        this(context, null, 0);
+    }
+
+    public MyRadioButton(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public MyRadioButton(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        Drawable drawableLeft = null, drawableTop = null, drawableRight = null, drawableBottom = null;
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.MyRadioButton);
+
+        int n = a.getIndexCount();
+        for (int i = 0; i < n; i++) {
+            int attr = a.getIndex(i);
+            if (attr == R.styleable.MyRadioButton_drawableSize) {
+                mDrawableSize = a.getDimensionPixelSize(R.styleable.MyRadioButton_drawableSize, 50);
+            } else if (attr == R.styleable.MyRadioButton_drawableTop) {
+                drawableTop = a.getDrawable(attr);
+            } else if (attr == R.styleable.MyRadioButton_drawableBottom) {
+                drawableRight = a.getDrawable(attr);
+            } else if (attr == R.styleable.MyRadioButton_drawableRight) {
+                drawableBottom = a.getDrawable(attr);
+            } else if (attr == R.styleable.MyRadioButton_drawableLeft) {
+                drawableLeft = a.getDrawable(attr);
+            } else {
+                    break;
+            }
+        }
+        a.recycle();
+
+        setCompoundDrawablesWithIntrinsicBounds(drawableLeft, drawableTop, drawableRight, drawableBottom);
+
+    }
+
+    /**
+     * RadioButton上、下、左、右设置图标
+     */
+    public void setCompoundDrawablesWithIntrinsicBounds(Drawable left, Drawable top, Drawable right, Drawable bottom) {
+
+        if (left != null) {
+            left.setBounds(0, 0, mDrawableSize, mDrawableSize);
+        }
+        if (right != null) {
+            right.setBounds(0, 0, mDrawableSize, mDrawableSize);
+        }
+        if (top != null) {
+            top.setBounds(0, 0, mDrawableSize, mDrawableSize);
+        }
+        if (bottom != null) {
+            bottom.setBounds(0, 0, mDrawableSize, mDrawableSize);
+        }
+        setCompoundDrawables(left, top, right, bottom);
+    }
+
+public   void setmDrawableSize(int  size,  Drawable drawable[]){
+            mDrawableSize=size;
+    setCompoundDrawablesWithIntrinsicBounds(drawable[0], drawable[1], drawable[2], drawable[3]);
+}
+}
diff --git a/app/src/main/java/utils/SelectPicDanimicActivity.java b/app/src/main/java/utils/SelectPicDanimicActivity.java
index 9869a66..537d020 100644
--- a/app/src/main/java/utils/SelectPicDanimicActivity.java
+++ b/app/src/main/java/utils/SelectPicDanimicActivity.java
@@ -1,528 +1,523 @@
-package utils;
-
-import android.Manifest;
-import android.app.Activity;
-import android.content.ActivityNotFoundException;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Environment;
-import android.provider.MediaStore;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.sl.house_property.R;
-import com.tbruyelle.rxpermissions2.RxPermissions;
-
-import java.io.File;
-import java.io.IOException;
-
-import io.reactivex.disposables.Disposable;
-
-
-public class SelectPicDanimicActivity extends Activity implements OnClickListener {
-    private TextView btn_take_photo, btn_pick_photo, btn_cancel;
-    private String fileolod1 = "cameraidface.jpg";
-    private String fileolod2 = "cameraidback.jpg";
-    private String fileolod33 = "cameraidworkface.jpg";
-    private String fileolod44 = "cameraidworkback.jpg";
-    private String filelodother = "otherphoto.jpg";
-    private String fileolod = "";
-    private LinearLayout layout;
-    private Intent intent;
-    private static final int PHOTO_REQUEST_CAMERA = 1;// 拍照
-    private static final int PHOTO_REQUEST_GALLERY = 2;// 从相册中选择
-    private static final int PHOTO_REQUEST_CUT = 3;// 结果
-    private int photeid;
-    private boolean crop;//裁剪
-    private int cropx, cropy;//裁剪的高和宽
-    private int entertype=1;//
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-
-        setContentView(R.layout.activity_select_pic_danimic);
-//        final String permission = Manifest.permission.CAMERA;  //相机权限
-//        final String permission1 = Manifest.permission.WRITE_EXTERNAL_STORAGE; //写入数据权限
-//        if (ContextCompat.checkSelfPermission(this, permission) != PackageManager.PERMISSION_GRANTED
-//                || ContextCompat.checkSelfPermission(this, permission1) != PackageManager.PERMISSION_GRANTED) {
-//            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-//                requestPermissions(new String[]{Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
-//            }
-//            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-//                requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 2);
-//            }
-//        }
-        getPermissions();
-        intent = getIntent();
-        btn_take_photo = (Button) this.findViewById(R.id.btn_take_photo);
-        btn_pick_photo = (Button) this.findViewById(R.id.btn_pick_photo);
-        btn_cancel = (Button) this.findViewById(R.id.btn_cancel);
-        layout = (LinearLayout) findViewById(R.id.pop_layout);
-        // 添加按钮监听
-        btn_cancel.setOnClickListener(this);
-        btn_pick_photo.setOnClickListener(this);
-        btn_take_photo.setOnClickListener(this);
-        Window win = getWindow();
-        win.getDecorView().setPadding(0, 0, 0, 0);
-        WindowManager.LayoutParams lp = win.getAttributes();
-        lp.width = WindowManager.LayoutParams.FILL_PARENT;//设置弹框的边界
-        lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
-        win.setAttributes(lp);
-
-        photeid
-                = getIntent().getIntExtra("photoid", 0);
-        String string = "/" + System.currentTimeMillis();
-        switch (photeid) {
-            case 0:
-                break;
-            /*case   R.id.iv_card_face:
-                fileolod=Environment.getExternalStorageDirectory().getPath()+string+fileolod1;
-                break;
-            case   R.id.iv_card_back:
-                fileolod=Environment.getExternalStorageDirectory().getPath()+string+fileolod2;
-                break;
-            case   R.id.iv_card_work_face:
-                fileolod= Environment.getExternalStorageDirectory().getPath()+string+fileolod33;
-                break;
-            case   R.id.iv_card_work_back:
-                fileolod= Environment.getExternalStorageDirectory().getPath()+string+fileolod44;
-                break;*/
-            default:
-                crop = getIntent().getBooleanExtra("crop", false);
-                cropx = getIntent().getIntExtra("cropx", 1);
-                cropy = getIntent().getIntExtra("cropy", 2);
-                entertype = getIntent().getIntExtra("entertype", 1);
-                fileolod = Environment.getExternalStorageDirectory().getPath() + string + filelodother;
-                break;
-        }
-
-
-
-
-//        if(entertype==100){
-//            try {
-//
-//
-//                Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-//                intent.putExtra("android.intent.extras.CAMERA_FACING", 1); // 调用前置摄像头
-//                intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);
-//                intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri
-//                        .fromFile(new File(fileolod)));
-//                startActivityForResult(intent, 1);
-//
-//
-//                //拍照我们用Action为MediaStore.ACTION_IMAGE_CAPTURE，
-//                //有些人使用其他的Action但我发现在有些机子中会出问题，所以优先选择这个
-//
-//
-//                  /*  Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-//                    intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(new File(
-//                            Environment.getExternalStorageDirectory(), "temp.jpg")));
-//                    System.out.println("=============" + Environment.getExternalStorageDirectory());*/
-//
-//            } catch (Exception e) {
-//                e.printStackTrace();
-//            }
-//        }
-
-        final String permission = Manifest.permission.CAMERA;  //相机权限
-        final String permission1 = Manifest.permission.WRITE_EXTERNAL_STORAGE; //写入数据权限
-        if (ContextCompat.checkSelfPermission(this, permission) != PackageManager.PERMISSION_GRANTED
-                || ContextCompat.checkSelfPermission(this, permission1) != PackageManager.PERMISSION_GRANTED) {  //先判断是否被赋予权限，没有则申请权限
-            if (ActivityCompat.shouldShowRequestPermissionRationale(this, permission)) {  //给出权限申请说明
-                Toast.makeText(SelectPicDanimicActivity.this, "No pemission", Toast.LENGTH_SHORT).show();
-            }else {
-
-            }
-        }else {
-            if(entertype==100){
-                try {
-
-
-                    Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-                    intent.putExtra("android.intent.extras.CAMERA_FACING", 1); // 调用前置摄像头
-                    intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);
-                    intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri
-                            .fromFile(new File(fileolod)));
-                    startActivityForResult(intent, 1);
-
-
-                    //拍照我们用Action为MediaStore.ACTION_IMAGE_CAPTURE，
-                    //有些人使用其他的Action但我发现在有些机子中会出问题，所以优先选择这个
-
-
-                  /*  Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-                    intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(new File(
-                            Environment.getExternalStorageDirectory(), "temp.jpg")));
-                    System.out.println("=============" + Environment.getExternalStorageDirectory());*/
-
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-
-    private void getPermissions() {
-
-
-        RxPermissions rxPermissions = new RxPermissions(this);
-        rxPermissions.request(Manifest.permission.CAMERA,Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                .subscribe(new io.reactivex.Observer<Boolean>() {
-                    @Override
-                    public void onSubscribe(Disposable d) {
-
-                    }
-
-                    @Override
-                    public void onNext(Boolean aBoolean) {
-                        if (aBoolean) {
-                            if(entertype==100){
-                                try {
-
-
-                                    Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-                                    intent.putExtra("android.intent.extras.CAMERA_FACING", 1); // 调用前置摄像头
-                                    intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);
-                                    intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri
-                                            .fromFile(new File(fileolod)));
-                                    startActivityForResult(intent, 1);
-
-
-                                    //拍照我们用Action为MediaStore.ACTION_IMAGE_CAPTURE，
-                                    //有些人使用其他的Action但我发现在有些机子中会出问题，所以优先选择这个
-
-
-                  /*  Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-                    intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(new File(
-                            Environment.getExternalStorageDirectory(), "temp.jpg")));
-                    System.out.println("=============" + Environment.getExternalStorageDirectory());*/
-
-                                } catch (Exception e) {
-                                    e.printStackTrace();
-                                }
-                            }
-                        } else {
-                            Toast.makeText(SelectPicDanimicActivity.this, "获取权限失败，请重新授权", Toast.LENGTH_SHORT).show();
-                        }
-                    }
-
-                    @Override
-                    public void onError(Throwable e) {
-
-                    }
-
-                    @Override
-                    public void onComplete() {
-
-                    }
-                });
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        finish();//消失
-        return true;
-    }
-
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (resultCode != RESULT_OK) {
-            finish();
-            return;
-        }
-        switch (requestCode) {
-            case 1:
-              /*  if(photeid==R.id.iv_card_face||photeid==R.id.iv_card_back){
-                    Intent intent=new Intent();
-                    intent.putExtra("path",fileolod);
-                    setResult(photeid,intent);
-                    finish();}
-                if(photeid==R.id.iv_card_work_face ||photeid==R.id.iv_card_work_back) {
-                    File temp = new File(fileolod);
-                    startPhotoZoom(Uri.fromFile(temp),photeid);
-                }
-
-                else{*/
-                if (crop) {//裁剪
-                    File temp = new File(fileolod);
-                    startPhotoZoom(Uri.fromFile(temp), photeid);
-                }
-                if (!crop) {
-                    Intent intent = new Intent();//不裁剪，直接返回
-                    intent.putExtra("path", fileolod);
-                    setResult(photeid, intent);
-                    finish();
-
-                }
-
-                /*}*/
-                break;
-            case 2:
-
-
-                /*if(photeid==R.id.iv_card_face||photeid==R.id.iv_card_back){
-                    Intent intent2=new Intent();
-                    String picturePath="";
-
-                    picturePath=BitmapTools.getPathByUri(SelectPicDanimicActivity.this,data.getData());
-
-                    intent2.putExtra("path",picturePath );
-                    setResult(photeid,intent2);
-                    finish();
-                }
-                if(photeid==R.id.iv_card_work_face ||photeid==R.id.iv_card_work_back) {
-                    String picturePath=BitmapTools.getPathByUri(SelectPicDanimicActivity.this,data.getData());//获得路径
-                    if(picturePath==null){
-                        CommonUtils.toastUtil(getString(R.string.cannotgetpath), SelectPicDanimicActivity.this);
-                        finish();
-                    }
-
-                    if(!(picturePath==null)) {File tempFile = new File(picturePath);
-                        // intent.putExtra("output", Uri.fromFile(tempFile));
-                        startPhotoZoom(Uri.fromFile(tempFile),photeid);}
-                }
-
-                else{*/
-                if (crop) {
-                    String picturePath = BitmapTools.getPathByUri(SelectPicDanimicActivity.this, data.getData());//获得路径
-                    if (picturePath == null) {
-                        Toast.makeText(SelectPicDanimicActivity.this, "Cannot get path", Toast.LENGTH_SHORT).show();
-
-                        finish();
-                    }
-
-                    if (!(picturePath == null)) {
-                        File tempFile = new File(picturePath);
-                        startPhotoZoom(Uri.fromFile(tempFile), photeid);
-                    }
-
-                }
-                if (!crop) {
-                    Intent intent2 = new Intent();
-                    String picturePath = "";
-
-                    picturePath = BitmapTools.getPathByUri(SelectPicDanimicActivity.this, data.getData());
-
-                    intent2.putExtra("path", picturePath);
-                    setResult(photeid, intent2);
-                    finish();
-                }
-
-                /*}*/
-                break;
-            case 200:
-                if (data.getData() == null) {
-                    data.setData(getTempUri());//华为手机调用不了，必须写上这一句
-                }
-                setResult(photeid, data);
-                finish();
-
-                break;
-        }
-
-    }
-
-    public void onClick(View v) {
-        final String permission = Manifest.permission.CAMERA;  //相机权限
-        final String permission1 = Manifest.permission.WRITE_EXTERNAL_STORAGE; //写入数据权限
-        if (ContextCompat.checkSelfPermission(this, permission) != PackageManager.PERMISSION_GRANTED
-                || ContextCompat.checkSelfPermission(this, permission1) != PackageManager.PERMISSION_GRANTED) {  //先判断是否被赋予权限，没有则申请权限
-            if (ActivityCompat.shouldShowRequestPermissionRationale(this, permission)) {  //给出权限申请说明
-              /*  ActivityCompat.requestPermissions(SelectPicDanimicActivity.this, new String[]{permission, permission1}, 1);
-                ActivityCompat.requestPermissions(SelectPicDanimicActivity.this, new String[]{permission1}, 1);*/
-                Toast.makeText(SelectPicDanimicActivity.this, "No pemission", Toast.LENGTH_SHORT).show();
-
-                finish();
-                return;
-            }
-        }
-
-        switch (v.getId()) {
-            case R.id.btn_take_photo:
-                try {
-
-
-                    Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-                    intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);
-                    intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri
-                            .fromFile(new File(fileolod)));
-                    startActivityForResult(intent, 1);
-
-
-                    //拍照我们用Action为MediaStore.ACTION_IMAGE_CAPTURE，
-                    //有些人使用其他的Action但我发现在有些机子中会出问题，所以优先选择这个
-
-
-                  /*  Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-                    intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(new File(
-                            Environment.getExternalStorageDirectory(), "temp.jpg")));
-                    System.out.println("=============" + Environment.getExternalStorageDirectory());*/
-
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                break;
-            case R.id.btn_pick_photo:
-                try {
-                    //选择照片的时候也一样，我们用Action为Intent.ACTION_GET_CONTENT，
-                    //有些人使用其他的Action但我发现在有些机子中会出问题，所以优先选择这个
-                   /* Intent intent = new Intent();
-
-                    intent.setAction(Intent.ACTION_GET_CONTENT);
-                    startActivityForResult(intent, 2);*/
-
-                    Intent intent = new Intent(Intent.ACTION_GET_CONTENT, null);
-                    intent.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
-                            "image/*");
-                    // intent.setType("image/*");
-                    /* intent.putExtra("return-data", false);*/
-                    startActivityForResult(intent, 2);
-                } catch (ActivityNotFoundException e) {
-                }
-                break;
-            case R.id.btn_cancel:
-                finish();
-                break;
-            default:
-                break;
-        }
-
-
-    }
-
-
-    /**
-     * 裁剪图片方法实现
-     *
-     * @param uri
-     */
-    public void startPhotoZoom(Uri uri, int nubmer) {
-        //String path= BitmapTools.getRealFilePath(SelectPicDanimicActivity.this,uri);
-        Intent intent = new Intent("com.android.camera.action.CROP");
-        intent.setDataAndType(uri, "image/*");
-        Bitmap bitmap = BitmapTools.decodeUriAsBitmap(SelectPicDanimicActivity.this, uri, 1);
-        if (bitmap == null) return;
-        int width = bitmap.getWidth();
-        int height = bitmap.getHeight();
-        int may = width <= height ? width : height;
-
-        //下面这个crop=true是设置在开启的Intent中设置显示的VIEW可裁剪
-        intent.putExtra("crop", "true");
-        // aspectX aspectY 是宽高的比例
-        switch (nubmer) {
-           /* case   R.id.iv_card_work_face:
-                intent.putExtra("aspectX", 10);
-                intent.putExtra("aspectY",10);
-                //intent.putExtra("path", path);
-                // outputX outputY 是裁剪图片宽高
-               *//* intent.putExtra("outputX", 300);
-                intent.putExtra("outputY", 300);*//*
-                double xy2=10/10;
-                intent.putExtra("outputX", (int)(may*xy2));
-                intent.putExtra("outputY", may);
-                break;
-            case   R.id.iv_card_work_back:
-                intent.putExtra("aspectX", 27);
-                intent.putExtra("aspectY",34);
-                //intent.putExtra("path", path);
-                // outputX outputY 是裁剪图片宽高
-              *//*  intent.putExtra("outputX", 270);
-                intent.putExtra("outputY", 340);*//*
-                double xy1=27.0/34.0;
-                intent.putExtra("outputX",(int)(may*xy1));
-                intent.putExtra("outputY", (int)(may));
-                break;*/
-            default:
-                int xx = 100;
-                if (cropx > 10 || cropy > 10) {
-                    xx = 10;
-                }
-                double xy = ((double) cropx / (double) cropy);
-                intent.putExtra("aspectX", cropx);
-                intent.putExtra("aspectY", cropy);
-                //intent.putExtra("path", path);
-                // outputX outputY 是裁剪图片宽高
-               /* intent.putExtra("outputX", cropx*xx);
-                intent.putExtra("outputY", cropy*xx);*/
-
-                /*intent.putExtra("outputX", (int)(may*xy));
-                intent.putExtra("outputY", (int)(may));*/
-                intent.putExtra("outputX", (cropx));
-                intent.putExtra("outputY", (cropy));
-                break;
-
-        }
-
-       /* String  string="/"+System.currentTimeMillis();
-               String fileolodone=Environment.getExternalStorageDirectory().getPath()+string+"tepm.jpg";
-      File tempFile = new File(fileolodone);
-        if(!tempFile.exists()){
-            tempFile.mkdir();
-        }*/
-        //intent.putExtra("output", Uri.fromFile(tempFile));// 保存到原文件*/
-        intent.putExtra(MediaStore.EXTRA_OUTPUT, getTempUri());//图像输出
-       /* String  tempFile=fileolod;
-        Uri imageUri = Uri.parse(tempFile);*/
-        //intent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
-        intent.putExtra("outputFormat", "JPEG");// 返回格式
-        intent.putExtra("return-data", false);//大图返回uri，小图返回data，data为true是小图，大图是false
-        intent.putExtra("noFaceDetection", true); // no face detection
-        intent.putExtra("scale", true);//黑边
-        intent.putExtra("scaleUpIfNeeded", true);//黑边
-        // intent.putExtra(MediaStore.EXTRA_OUTPUT, tempFile);
-        startActivityForResult(intent, 200);
-
-
-    }
-
-    private Uri getTempUri() {
-        return Uri.fromFile(getTempFile());
-    }
-
-    private File getTempFile() {
-        if (isSDCARDMounted()) {
-            File f = new File(Environment.getExternalStorageDirectory(),
-                    "tepm.jpg");
-            try {
-                f.createNewFile();
-            } catch (IOException e) {
-                // TODO Auto-generated catch block
-                Toast.makeText(SelectPicDanimicActivity.this, "No pemission", Toast.LENGTH_LONG)
-                        .show();
-            }
-            return f;
-        } else {
-            return null;
-        }
-    }
-
-    private boolean isSDCARDMounted() {
-        String status = Environment.getExternalStorageState();
-        if (status.equals(Environment.MEDIA_MOUNTED))
-            return true;
-        return false;
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        BitmapTools.deleteFile(new File(fileolod));
-    }
-}
+package utils;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.ActivityNotFoundException;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Environment;
+import android.provider.MediaStore;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.sl.house_property.R;
+import com.tbruyelle.rxpermissions2.RxPermissions;
+
+import java.io.File;
+import java.io.IOException;
+
+import io.reactivex.disposables.Disposable;
+
+
+public class SelectPicDanimicActivity extends Activity implements OnClickListener {
+    private TextView btn_take_photo, btn_pick_photo, btn_cancel;
+    private String fileolod1 = "cameraidface.jpg";
+    private String fileolod2 = "cameraidback.jpg";
+    private String fileolod33 = "cameraidworkface.jpg";
+    private String fileolod44 = "cameraidworkback.jpg";
+    private String filelodother = "otherphoto.jpg";
+    private String fileolod = "";
+    private LinearLayout layout;
+    private Intent intent;
+    private static final int PHOTO_REQUEST_CAMERA = 1;// 拍照
+    private static final int PHOTO_REQUEST_GALLERY = 2;// 从相册中选择
+    private static final int PHOTO_REQUEST_CUT = 3;// 结果
+    private int photeid;
+    private boolean crop;//裁剪
+    private int cropx, cropy;//裁剪的高和宽
+    private int entertype=1;//
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+
+        setContentView(R.layout.activity_select_pic_danimic);
+//        final String permission = Manifest.permission.CAMERA;  //相机权限
+//        final String permission1 = Manifest.permission.WRITE_EXTERNAL_STORAGE; //写入数据权限
+//        if (ContextCompat.checkSelfPermission(this, permission) != PackageManager.PERMISSION_GRANTED
+//                || ContextCompat.checkSelfPermission(this, permission1) != PackageManager.PERMISSION_GRANTED) {
+//            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+//                requestPermissions(new String[]{Manifest.permission.CAMERA, Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
+//            }
+//            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+//                requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 2);
+//            }
+//        }
+        getPermissions();
+        intent = getIntent();
+        btn_take_photo = (Button) this.findViewById(R.id.btn_take_photo);
+        btn_pick_photo = (Button) this.findViewById(R.id.btn_pick_photo);
+        btn_cancel = (Button) this.findViewById(R.id.btn_cancel);
+        layout = (LinearLayout) findViewById(R.id.pop_layout);
+        // 添加按钮监听
+        btn_cancel.setOnClickListener(this);
+        btn_pick_photo.setOnClickListener(this);
+        btn_take_photo.setOnClickListener(this);
+        Window win = getWindow();
+        win.getDecorView().setPadding(0, 0, 0, 0);
+        WindowManager.LayoutParams lp = win.getAttributes();
+        lp.width = WindowManager.LayoutParams.FILL_PARENT;//设置弹框的边界
+        lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        win.setAttributes(lp);
+
+        photeid
+                = getIntent().getIntExtra("photoid", 0);
+        String string = "/" + System.currentTimeMillis();
+        switch (photeid) {
+            case 0:
+                break;
+            /*case   R.id.iv_card_face:
+                fileolod=Environment.getExternalStorageDirectory().getPath()+string+fileolod1;
+                break;
+            case   R.id.iv_card_back:
+                fileolod=Environment.getExternalStorageDirectory().getPath()+string+fileolod2;
+                break;
+            case   R.id.iv_card_work_face:
+                fileolod= Environment.getExternalStorageDirectory().getPath()+string+fileolod33;
+                break;
+            case   R.id.iv_card_work_back:
+                fileolod= Environment.getExternalStorageDirectory().getPath()+string+fileolod44;
+                break;*/
+            default:
+                crop = getIntent().getBooleanExtra("crop", false);
+                cropx = getIntent().getIntExtra("cropx", 1);
+                cropy = getIntent().getIntExtra("cropy", 2);
+                entertype = getIntent().getIntExtra("entertype", 1);
+                fileolod = Environment.getExternalStorageDirectory().getPath() + string + filelodother;
+                break;
+        }
+
+
+
+
+//        if(entertype==100){
+//            try {
+//
+//
+//                Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+//                intent.putExtra("android.intent.extras.CAMERA_FACING", 1); // 调用前置摄像头
+//                intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);
+//                intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri
+//                        .fromFile(new File(fileolod)));
+//                startActivityForResult(intent, 1);
+//
+//
+//                //拍照我们用Action为MediaStore.ACTION_IMAGE_CAPTURE，
+//                //有些人使用其他的Action但我发现在有些机子中会出问题，所以优先选择这个
+//
+//
+//                  /*  Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+//                    intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(new File(
+//                            Environment.getExternalStorageDirectory(), "temp.jpg")));
+//                    System.out.println("=============" + Environment.getExternalStorageDirectory());*/
+//
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//            }
+//        }
+
+        final String permission = Manifest.permission.CAMERA;  //相机权限
+        final String permission1 = Manifest.permission.WRITE_EXTERNAL_STORAGE; //写入数据权限
+        if (ContextCompat.checkSelfPermission(this, permission) != PackageManager.PERMISSION_GRANTED
+                || ContextCompat.checkSelfPermission(this, permission1) != PackageManager.PERMISSION_GRANTED) {  //先判断是否被赋予权限，没有则申请权限
+            if (ActivityCompat.shouldShowRequestPermissionRationale(this, permission)) {  //给出权限申请说明
+                Toast.makeText(SelectPicDanimicActivity.this, "No pemission", Toast.LENGTH_SHORT).show();
+            }else {
+
+            }
+        }else {
+            if(entertype==100){
+                try {
+
+
+                    Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+                    intent.putExtra("android.intent.extras.CAMERA_FACING", 1); // 调用前置摄像头
+                    intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);
+                    intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri
+                            .fromFile(new File(fileolod)));
+                    startActivityForResult(intent, 1);
+
+
+                    //拍照我们用Action为MediaStore.ACTION_IMAGE_CAPTURE，
+                    //有些人使用其他的Action但我发现在有些机子中会出问题，所以优先选择这个
+
+
+                  /*  Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+                    intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(new File(
+                            Environment.getExternalStorageDirectory(), "temp.jpg")));
+                    System.out.println("=============" + Environment.getExternalStorageDirectory());*/
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    private void getPermissions() {
+
+
+        RxPermissions rxPermissions = new RxPermissions(this);
+        rxPermissions.request(Manifest.permission.CAMERA,Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                .subscribe(new io.reactivex.Observer<Boolean>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
+
+                    }
+
+                    @Override
+                    public void onNext(Boolean aBoolean) {
+                        if (aBoolean) {
+                            if(entertype==100){
+                                try {
+
+
+                                    Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+                                    intent.putExtra("android.intent.extras.CAMERA_FACING", 1); // 调用前置摄像头
+                                    intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);
+                                    intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri
+                                            .fromFile(new File(fileolod)));
+                                    startActivityForResult(intent, 1);
+
+
+                                    //拍照我们用Action为MediaStore.ACTION_IMAGE_CAPTURE，
+                                    //有些人使用其他的Action但我发现在有些机子中会出问题，所以优先选择这个
+
+
+                  /*  Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+                    intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(new File(
+                            Environment.getExternalStorageDirectory(), "temp.jpg")));
+                    System.out.println("=============" + Environment.getExternalStorageDirectory());*/
+
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                }
+                            }
+                        } else {
+                            Toast.makeText(SelectPicDanimicActivity.this, "获取权限失败，请重新授权", Toast.LENGTH_SHORT).show();
+                        }
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        finish();//消失
+        return true;
+    }
+
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode != RESULT_OK) {
+            finish();
+            return;
+        }
+        switch (requestCode) {
+            case 1:
+              /*  if(photeid==R.id.iv_card_face||photeid==R.id.iv_card_back){
+                    Intent intent=new Intent();
+                    intent.putExtra("path",fileolod);
+                    setResult(photeid,intent);
+                    finish();}
+                if(photeid==R.id.iv_card_work_face ||photeid==R.id.iv_card_work_back) {
+                    File temp = new File(fileolod);
+                    startPhotoZoom(Uri.fromFile(temp),photeid);
+                }
+
+                else{*/
+                if (crop) {//裁剪
+                    File temp = new File(fileolod);
+                    startPhotoZoom(Uri.fromFile(temp), photeid);
+                }
+                if (!crop) {
+                    Intent intent = new Intent();//不裁剪，直接返回
+                    intent.putExtra("path", fileolod);
+                    setResult(photeid, intent);
+                    finish();
+
+                }
+
+                /*}*/
+                break;
+            case 2:
+
+
+                /*if(photeid==R.id.iv_card_face||photeid==R.id.iv_card_back){
+                    Intent intent2=new Intent();
+                    String picturePath="";
+
+                    picturePath=BitmapTools.getPathByUri(SelectPicDanimicActivity.this,data.getData());
+
+                    intent2.putExtra("path",picturePath );
+                    setResult(photeid,intent2);
+                    finish();
+                }
+                if(photeid==R.id.iv_card_work_face ||photeid==R.id.iv_card_work_back) {
+                    String picturePath=BitmapTools.getPathByUri(SelectPicDanimicActivity.this,data.getData());//获得路径
+                    if(picturePath==null){
+                        CommonUtils.toastUtil(getString(R.string.cannotgetpath), SelectPicDanimicActivity.this);
+                        finish();
+                    }
+
+                    if(!(picturePath==null)) {File tempFile = new File(picturePath);
+                        // intent.putExtra("output", Uri.fromFile(tempFile));
+                        startPhotoZoom(Uri.fromFile(tempFile),photeid);}
+                }
+
+                else{*/
+                if (crop) {
+                    String picturePath = BitmapTools.getPathByUri(SelectPicDanimicActivity.this, data.getData());//获得路径
+                    if (picturePath == null) {
+                        Toast.makeText(SelectPicDanimicActivity.this, "Cannot get path", Toast.LENGTH_SHORT).show();
+
+                        finish();
+                    }
+
+                    if (!(picturePath == null)) {
+                        File tempFile = new File(picturePath);
+                        startPhotoZoom(Uri.fromFile(tempFile), photeid);
+                    }
+
+                }
+                if (!crop) {
+                    Intent intent2 = new Intent();
+                    String picturePath = "";
+
+                    picturePath = BitmapTools.getPathByUri(SelectPicDanimicActivity.this, data.getData());
+
+                    intent2.putExtra("path", picturePath);
+                    setResult(photeid, intent2);
+                    finish();
+                }
+
+                /*}*/
+                break;
+            case 200:
+                if (data.getData() == null) {
+                    data.setData(getTempUri());//华为手机调用不了，必须写上这一句
+                }
+                setResult(photeid, data);
+                finish();
+
+                break;
+        }
+
+    }
+
+    public void onClick(View v) {
+        final String permission = Manifest.permission.CAMERA;  //相机权限
+        final String permission1 = Manifest.permission.WRITE_EXTERNAL_STORAGE; //写入数据权限
+        if (ContextCompat.checkSelfPermission(this, permission) != PackageManager.PERMISSION_GRANTED
+                || ContextCompat.checkSelfPermission(this, permission1) != PackageManager.PERMISSION_GRANTED) {  //先判断是否被赋予权限，没有则申请权限
+            if (ActivityCompat.shouldShowRequestPermissionRationale(this, permission)) {  //给出权限申请说明
+              /*  ActivityCompat.requestPermissions(SelectPicDanimicActivity.this, new String[]{permission, permission1}, 1);
+                ActivityCompat.requestPermissions(SelectPicDanimicActivity.this, new String[]{permission1}, 1);*/
+                Toast.makeText(SelectPicDanimicActivity.this, "No pemission", Toast.LENGTH_SHORT).show();
+
+                finish();
+                return;
+            }
+        }
+
+        int id = v.getId();
+        if (id == R.id.btn_take_photo) {
+            try {
+
+
+                Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+                intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);
+                intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri
+                        .fromFile(new File(fileolod)));
+                startActivityForResult(intent, 1);
+
+
+                //拍照我们用Action为MediaStore.ACTION_IMAGE_CAPTURE，
+                //有些人使用其他的Action但我发现在有些机子中会出问题，所以优先选择这个
+
+
+              /*  Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+                intent.putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(new File(
+                        Environment.getExternalStorageDirectory(), "temp.jpg")));
+                System.out.println("=============" + Environment.getExternalStorageDirectory());*/
+
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        } else if (id == R.id.btn_pick_photo) {
+            try {
+                //选择照片的时候也一样，我们用Action为Intent.ACTION_GET_CONTENT，
+                //有些人使用其他的Action但我发现在有些机子中会出问题，所以优先选择这个
+               /* Intent intent = new Intent();
+
+                intent.setAction(Intent.ACTION_GET_CONTENT);
+                startActivityForResult(intent, 2);*/
+
+                Intent intent = new Intent(Intent.ACTION_GET_CONTENT, null);
+                intent.setDataAndType(MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
+                        "image/*");
+                // intent.setType("image/*");
+                /* intent.putExtra("return-data", false);*/
+                startActivityForResult(intent, 2);
+            } catch (ActivityNotFoundException e) {
+            }
+        } else if (id == R.id.btn_cancel) {
+            finish();
+        }
+
+
+    }
+
+
+    /**
+     * 裁剪图片方法实现
+     *
+     * @param uri
+     */
+    public void startPhotoZoom(Uri uri, int nubmer) {
+        //String path= BitmapTools.getRealFilePath(SelectPicDanimicActivity.this,uri);
+        Intent intent = new Intent("com.android.camera.action.CROP");
+        intent.setDataAndType(uri, "image/*");
+        Bitmap bitmap = BitmapTools.decodeUriAsBitmap(SelectPicDanimicActivity.this, uri, 1);
+        if (bitmap == null) return;
+        int width = bitmap.getWidth();
+        int height = bitmap.getHeight();
+        int may = width <= height ? width : height;
+
+        //下面这个crop=true是设置在开启的Intent中设置显示的VIEW可裁剪
+        intent.putExtra("crop", "true");
+        // aspectX aspectY 是宽高的比例
+        switch (nubmer) {
+           /* case   R.id.iv_card_work_face:
+                intent.putExtra("aspectX", 10);
+                intent.putExtra("aspectY",10);
+                //intent.putExtra("path", path);
+                // outputX outputY 是裁剪图片宽高
+               *//* intent.putExtra("outputX", 300);
+                intent.putExtra("outputY", 300);*//*
+                double xy2=10/10;
+                intent.putExtra("outputX", (int)(may*xy2));
+                intent.putExtra("outputY", may);
+                break;
+            case   R.id.iv_card_work_back:
+                intent.putExtra("aspectX", 27);
+                intent.putExtra("aspectY",34);
+                //intent.putExtra("path", path);
+                // outputX outputY 是裁剪图片宽高
+              *//*  intent.putExtra("outputX", 270);
+                intent.putExtra("outputY", 340);*//*
+                double xy1=27.0/34.0;
+                intent.putExtra("outputX",(int)(may*xy1));
+                intent.putExtra("outputY", (int)(may));
+                break;*/
+            default:
+                int xx = 100;
+                if (cropx > 10 || cropy > 10) {
+                    xx = 10;
+                }
+                double xy = ((double) cropx / (double) cropy);
+                intent.putExtra("aspectX", cropx);
+                intent.putExtra("aspectY", cropy);
+                //intent.putExtra("path", path);
+                // outputX outputY 是裁剪图片宽高
+               /* intent.putExtra("outputX", cropx*xx);
+                intent.putExtra("outputY", cropy*xx);*/
+
+                /*intent.putExtra("outputX", (int)(may*xy));
+                intent.putExtra("outputY", (int)(may));*/
+                intent.putExtra("outputX", (cropx));
+                intent.putExtra("outputY", (cropy));
+                break;
+
+        }
+
+       /* String  string="/"+System.currentTimeMillis();
+               String fileolodone=Environment.getExternalStorageDirectory().getPath()+string+"tepm.jpg";
+      File tempFile = new File(fileolodone);
+        if(!tempFile.exists()){
+            tempFile.mkdir();
+        }*/
+        //intent.putExtra("output", Uri.fromFile(tempFile));// 保存到原文件*/
+        intent.putExtra(MediaStore.EXTRA_OUTPUT, getTempUri());//图像输出
+       /* String  tempFile=fileolod;
+        Uri imageUri = Uri.parse(tempFile);*/
+        //intent.putExtra(MediaStore.EXTRA_OUTPUT, uri);
+        intent.putExtra("outputFormat", "JPEG");// 返回格式
+        intent.putExtra("return-data", false);//大图返回uri，小图返回data，data为true是小图，大图是false
+        intent.putExtra("noFaceDetection", true); // no face detection
+        intent.putExtra("scale", true);//黑边
+        intent.putExtra("scaleUpIfNeeded", true);//黑边
+        // intent.putExtra(MediaStore.EXTRA_OUTPUT, tempFile);
+        startActivityForResult(intent, 200);
+
+
+    }
+
+    private Uri getTempUri() {
+        return Uri.fromFile(getTempFile());
+    }
+
+    private File getTempFile() {
+        if (isSDCARDMounted()) {
+            File f = new File(Environment.getExternalStorageDirectory(),
+                    "tepm.jpg");
+            try {
+                f.createNewFile();
+            } catch (IOException e) {
+                // TODO Auto-generated catch block
+                Toast.makeText(SelectPicDanimicActivity.this, "No pemission", Toast.LENGTH_LONG)
+                        .show();
+            }
+            return f;
+        } else {
+            return null;
+        }
+    }
+
+    private boolean isSDCARDMounted() {
+        String status = Environment.getExternalStorageState();
+        if (status.equals(Environment.MEDIA_MOUNTED))
+            return true;
+        return false;
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        BitmapTools.deleteFile(new File(fileolod));
+    }
+}
diff --git a/app/src/main/res/drawable/picture_image_placeholder.xml b/app/src/main/res/drawable/picture_image_placeholder.xml
new file mode 100644
index 0000000..f4e9b65
--- /dev/null
+++ b/app/src/main/res/drawable/picture_image_placeholder.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#E0E0E0" />
+    <size
+        android:width="200dp"
+        android:height="200dp" />
+</shape>
+
diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml
index d1189a5..87c8a36 100644
--- a/app/src/main/res/values/attr.xml
+++ b/app/src/main/res/values/attr.xml
@@ -1,39 +1,45 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <declare-styleable name="SwipeMenuLayout">
-        <attr name="swipeEnable" format="boolean"/>
-        <attr name="ios" format="boolean"/>
-        <attr name="leftSwipe" format="boolean"/>
-    </declare-styleable>
-    <attr name="borderRadius" format="dimension" />
-    <attr name="type">
-        <enum name="circle" value="0" />
-        <enum name="round" value="1" />
-    </attr>
-
-    <declare-styleable name="RoundImageView">
-        <attr name="borderRadius" />
-        <attr name="type" />
-    </declare-styleable>
-    <declare-styleable name="TaoBaoView">
-
-        <attr name="ringProgressColor" format="color"/>
-
-        <attr name="ringWidth" format="dimension"/>
-
-        <attr name="ringImage" format="reference"/>
-
-        <attr name="ringmax" format="integer"/>
-
-    </declare-styleable>
-
-    <declare-styleable name="AmountView">
-        <!-- 左右2边+-按钮的宽度 -->
-        <attr name="btnWidth" format="dimension" />
-        <!-- 中间TextView的宽度 -->
-        <attr name="tvWidth" format="dimension" />
-        <!--<attr name="tvColor" format="color"/>-->
-        <attr name="tvTextSize" format="dimension"/>
-        <attr name="btnTextSize" format="dimension"/>
-    </declare-styleable>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="SwipeMenuLayout">
+        <attr name="swipeEnable" format="boolean"/>
+        <attr name="ios" format="boolean"/>
+        <attr name="leftSwipe" format="boolean"/>
+    </declare-styleable>
+    <attr name="borderRadius" format="dimension" />
+    <attr name="type">
+        <enum name="circle" value="0" />
+        <enum name="round" value="1" />
+    </attr>
+
+    <declare-styleable name="RoundImageView">
+        <attr name="borderRadius" />
+        <attr name="type" />
+    </declare-styleable>
+    <declare-styleable name="TaoBaoView">
+
+        <attr name="ringProgressColor" format="color"/>
+
+        <attr name="ringWidth" format="dimension"/>
+
+        <attr name="ringImage" format="reference"/>
+
+        <attr name="ringmax" format="integer"/>
+
+    </declare-styleable>
+
+    <declare-styleable name="AmountView">
+        <!-- 左右2边+-按钮的宽度 -->
+        <attr name="btnWidth" format="dimension" />
+        <!-- 中间TextView的宽度 -->
+        <attr name="tvWidth" format="dimension" />
+        <!--<attr name="tvColor" format="color"/>-->
+        <attr name="tvTextSize" format="dimension"/>
+        <attr name="btnTextSize" format="dimension"/>
+    </declare-styleable>
+    
+    <declare-styleable name="SnackbarLayout">
+        <attr name="android:maxWidth" />
+        <attr name="maxActionInlineWidth" format="dimension" />
+        <attr name="elevation" format="dimension" />
+    </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index a6b3dae..53ccfc7 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -1,2 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="design_snackbar_padding_vertical">14dp</dimen>
+    <dimen name="design_snackbar_padding_vertical_2lines">20dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e6ea6e3..0b00030 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,138 +1,145 @@
-<resources>
-
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="@style/MyThemeactonbar">
-        <!-- Customize your theme here. -->
-
-    </style>
-
-    <declare-styleable name="MyRadioButton">
-        <attr name="drawableSize" format="dimension" />
-        <attr name="drawableTop" format="reference" />
-        <attr name="drawableLeft" format="reference" />
-        <attr name="drawableRight" format="reference" />
-        <attr name="drawableBottom" format="reference" />
-    </declare-styleable>
-
-    <style name="myErrorDialogTheme" parent="Base.Theme.AppCompat.Dialog">
-        <item name="android:paddingLeft">0dip</item>
-        <item name="android:paddingRight">0dip</item>
-
-        <item name="android:windowBackground">@color/transparent</item>
-    </style>
-
-    <style name="MyTheme" parent="@style/Theme.AppCompat.DayNight.NoActionBar">
-        <!-- <style name="MyTheme" parent="@android:style/Theme.Black.NoTitleBar.Fullscreen">-->
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-
-        <item name="android:windowIsTranslucent">true</item>
-    </style>
-
-    <style name="MyThemeactonbar" parent="@style/Theme.AppCompat.Light.NoActionBar">
-
-        <!-- <style name="MyTheme" parent="@android:style/Theme.Black.NoTitleBar.Fullscreen">-->
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowIsTranslucent">true</item>
-    </style>
-    <style name="TAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <style name="main_publishdialog_style" parent="android:Theme.Holo.Light.Dialog">
-
-        <item name="android:windowBackground">@android:color/transparent</item>
-
-        <item name="android:windowNoTitle">true</item>
-
-        <item name="android:backgroundDimEnabled">false</item>
-
-        <item name="android:windowAnimationStyle">@null</item>
-    </style>
-
-    <style name="MyDialog" parent="@android:style/Theme.Holo.Dialog">
-        <!-- 是否有边框 -->
-        <item name="android:windowFrame">@null</item>
-        <!--是否在悬浮Activity之上  -->
-        <item name="android:windowIsFloating">true</item>
-        <!-- 标题 -->
-        <item name="android:windowNoTitle">true</item>
-        <!--阴影  -->
-        <item name="android:windowIsTranslucent">true</item><!--半透明-->
-        <!--背景透明-->
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <!-- 还可以加入一些弹出和退出的动画 (lan)-->
-    </style>
-
-    <style name="myDialogThememakephoto" parent="android:Theme.DeviceDefault.Dialog.NoActionBar">
-        <item name="android:windowBackground">@color/transparent</item>
-    </style>
-
-    <style name="AppTheme.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
-    <style name="time_dialog" parent="android:style/Theme.Dialog">
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowBackground">@color/f7</item>
-    </style>
-
-    <style name="AnimationFromTop">
-
-        <item name="android:windowEnterAnimation">@anim/drop_down_from_top</item>
-
-        <item name="android:windowExitAnimation">@anim/hide_to_top</item>
-
-    </style>
-    <style name="AnimationFromButtom">
-
-        <item name="android:windowEnterAnimation">@anim/popup_form_bottom</item>
-
-        <item name="android:windowExitAnimation">@anim/drop_down_to_bottom</item>
-
-    </style>
-    <style name="AnimationUpPopup">
-
-        <item name="android:windowEnterAnimation">@anim/grow_fade_in_from_bottom</item>
-
-        <item name="android:windowExitAnimation">@anim/shrink_fade_out_from_bottom</item>
-
-    </style>
-
-    <style name="PictureTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
-    <style name="PictureTheme.Main" parent="PictureTheme" />
-
-    <style name="DialogStyle" parent="@android:style/Theme.Dialog">
-        <item name="android:windowFrame">@null</item><!--  边框-->
-        <item name="android:windowIsFloating">true</item><!--是否浮现在activity之上-->
-        <item name="android:windowIsTranslucent">false</item><!--半透明-->
-        <item name="android:windowNoTitle">true</item><!--无标题-->
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowEnterAnimation">@anim/dialog_show</item>
-        <item name="android:windowExitAnimation">@anim/dialog_dismiss</item>
-
-    </style>
-    <!--解决微信支付回调部分机型黑屏闪烁的问题-->
-    <style name="wxPayTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowNoTitle">true</item>
-    </style>
-</resources>
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="@style/MyThemeactonbar">
+        <!-- Customize your theme here. -->
+
+    </style>
+
+    <declare-styleable name="MyRadioButton">
+        <attr name="drawableSize" format="dimension" />
+        <attr name="drawableTop" format="reference" />
+        <attr name="drawableLeft" format="reference" />
+        <attr name="drawableRight" format="reference" />
+        <attr name="drawableBottom" format="reference" />
+    </declare-styleable>
+
+    <style name="myErrorDialogTheme" parent="Base.Theme.AppCompat.Dialog">
+        <item name="android:paddingLeft">0dip</item>
+        <item name="android:paddingRight">0dip</item>
+
+        <item name="android:windowBackground">@color/transparent</item>
+    </style>
+
+    <style name="MyTheme" parent="@style/Theme.AppCompat.DayNight.NoActionBar">
+        <!-- <style name="MyTheme" parent="@android:style/Theme.Black.NoTitleBar.Fullscreen">-->
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+
+        <item name="android:windowIsTranslucent">true</item>
+    </style>
+
+    <style name="MyThemeactonbar" parent="@style/Theme.AppCompat.Light.NoActionBar">
+
+        <!-- <style name="MyTheme" parent="@android:style/Theme.Black.NoTitleBar.Fullscreen">-->
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+    </style>
+    <style name="TAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <style name="main_publishdialog_style" parent="android:Theme.Holo.Light.Dialog">
+
+        <item name="android:windowBackground">@android:color/transparent</item>
+
+        <item name="android:windowNoTitle">true</item>
+
+        <item name="android:backgroundDimEnabled">false</item>
+
+        <item name="android:windowAnimationStyle">@null</item>
+    </style>
+
+    <style name="MyDialog" parent="@android:style/Theme.Holo.Dialog">
+        <!-- 是否有边框 -->
+        <item name="android:windowFrame">@null</item>
+        <!--是否在悬浮Activity之上  -->
+        <item name="android:windowIsFloating">true</item>
+        <!-- 标题 -->
+        <item name="android:windowNoTitle">true</item>
+        <!--阴影  -->
+        <item name="android:windowIsTranslucent">true</item><!--半透明-->
+        <!--背景透明-->
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <!-- 还可以加入一些弹出和退出的动画 (lan)-->
+    </style>
+
+    <style name="myDialogThememakephoto" parent="android:Theme.DeviceDefault.Dialog.NoActionBar">
+        <item name="android:windowBackground">@color/transparent</item>
+    </style>
+
+    <style name="AppTheme.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+    <style name="time_dialog" parent="android:style/Theme.Dialog">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowBackground">@color/f7</item>
+    </style>
+
+    <style name="AnimationFromTop">
+
+        <item name="android:windowEnterAnimation">@anim/drop_down_from_top</item>
+
+        <item name="android:windowExitAnimation">@anim/hide_to_top</item>
+
+    </style>
+    <style name="AnimationFromButtom">
+
+        <item name="android:windowEnterAnimation">@anim/popup_form_bottom</item>
+
+        <item name="android:windowExitAnimation">@anim/drop_down_to_bottom</item>
+
+    </style>
+    <style name="AnimationUpPopup">
+
+        <item name="android:windowEnterAnimation">@anim/grow_fade_in_from_bottom</item>
+
+        <item name="android:windowExitAnimation">@anim/shrink_fade_out_from_bottom</item>
+
+    </style>
+
+    <style name="PictureTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+
+    <style name="PictureTheme.Main" parent="PictureTheme" />
+
+    <style name="DialogStyle" parent="@android:style/Theme.Dialog">
+        <item name="android:windowFrame">@null</item><!--  边框-->
+        <item name="android:windowIsFloating">true</item><!--是否浮现在activity之上-->
+        <item name="android:windowIsTranslucent">false</item><!--半透明-->
+        <item name="android:windowNoTitle">true</item><!--无标题-->
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowEnterAnimation">@anim/dialog_show</item>
+        <item name="android:windowExitAnimation">@anim/dialog_dismiss</item>
+
+    </style>
+    <!--解决微信支付回调部分机型黑屏闪烁的问题-->
+    <style name="wxPayTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowNoTitle">true</item>
+    </style>
+    
+    <!-- Matisse 图片选择器主题 -->
+    <style name="Matisse_Zhihu_Custom" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
+</resources>
diff --git a/build.gradle b/build.gradle
index 18158bb..4fde014 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,13 +2,23 @@
 
 buildscript {
     
+    ext {
+        agp_version = '8.7.3'
+        kotlin_version = '1.9.24'
+    }
     repositories {
+        maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' }
+        maven { url 'https://maven.aliyun.com/repository/public' }//jcenter
+        maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }//gradle-plugin
+        maven { url 'https://maven.aliyun.com/repository/central' }//central
+        maven { url 'https://maven.aliyun.com/repository/google' }//google
         google()
-        jcenter()
+        mavenCentral()
+        maven { url "https://jitpack.io" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
-        
+        classpath "com.android.tools.build:gradle:$agp_version"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -17,9 +27,21 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
-        maven { url "https://jitpack.io" }
+        maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' }
+        maven { url 'https://maven.aliyun.com/repository/public' }//jcenter
+        maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }//gradle-plugin
+        maven { url 'https://maven.aliyun.com/repository/central' }//central
+        maven { url 'https://maven.aliyun.com/repository/google' }//google
         google()
+        mavenCentral()
+        maven { url "https://jitpack.io" }
+    }
+    
+    // 统一配置所有 Kotlin 编译任务的 JVM 目标版本
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+        kotlinOptions {
+            jvmTarget = '1.8'
+        }
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 86064fb..b110d58 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,16 +1,29 @@
-# Project-wide Gradle settings.
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-android.injected.testOnly=false
-android.useAndroidX=true
-android.enableJetifier=true
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+android.injected.testOnly=false
+android.useAndroidX=true
+android.enableJetifier=true
+
+# SSL Certificate handling - fixes PKIX path building failed error
+# Use JKS for Java 11+ compatibility
+systemProp.javax.net.ssl.trustStoreType=JKS
+
+# If you still encounter SSL errors, you can temporarily disable SSL verification
+# WARNING: Only use this for development, not in production!
+# Uncomment the following lines as a last resort:
+# org.gradle.jvmargs=-Xmx1536m -Dtrust_all_cert=true
+
+android.enableJetifier=true
+# Suppress deprecation warnings for Java 8 source/target
+android.javaCompile.suppressSourceTargetDeprecationWarning=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9641cce..bb29b57 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Dec 08 14:35:23 CST 2021
-distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
-distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
+#Wed Jan 07 00:50:53 CST 2026
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/ninegridview/build.gradle b/ninegridview/build.gradle
index a767a50..0106181 100644
--- a/ninegridview/build.gradle
+++ b/ninegridview/build.gradle
@@ -1,34 +1,35 @@
-apply plugin: 'com.android.library'
-android {
-    compileSdkVersion 30
-    buildToolsVersion '30.0.2'
-
-    defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 27
-
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-}
-
-dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'androidx.appcompat:appcompat:1.0.0'
-    compile 'androidx.annotation:annotation:1.0.0'
-    compile 'com.github.chrisbanes.photoview:library:1.2.4'
-
-
-    implementation files('../app/libs/pldroid-player-2.1.9.jar')
-
-}
-
+apply plugin: 'com.android.library'
+android {
+    namespace "com.lzy.ninegrid"
+    compileSdkVersion 33
+    // buildToolsVersion 在 AGP 8.0+ 中不再需要，会自动使用默认版本
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 27
+
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.annotation:annotation:1.0.0'
+    implementation 'com.github.chrisbanes.photoview:library:1.2.4'
+
+
+    implementation files('../app/libs/pldroid-player-2.1.9.jar')
+
+}
+
 //apply from: '../bintray.gradle'
\ No newline at end of file
diff --git a/当前项目配置环境.txt b/当前项目配置环境.txt
new file mode 100644
index 0000000..56e5df6
--- /dev/null
+++ b/当前项目配置环境.txt
@@ -0,0 +1,452 @@
+# Android 项目配置环境文档
+
+## 一、项目基本信息
+
+### 1.1 项目信息
+- **项目名称**: HouseProperty (房产物业管理)
+- **包名**: com.sl.HouseProperty
+- **命名空间**: com.sl.house_property
+- **版本号**: 1.1.9
+- **版本代码**: 119
+- **项目路径**: D:\Users\86181\AndroidStudioProjects\HouseProperty
+
+### 1.2 应用配置
+- **ApplicationId**: com.sl.HouseProperty
+- **最小SDK版本**: 21 (Android 5.0 Lollipop)
+- **目标SDK版本**: 29 (Android 10)
+- **编译SDK版本**: 33 (Android 13)
+- **测试运行器**: androidx.test.runner.AndroidJUnitRunner
+
+---
+
+## 二、开发环境配置
+
+### 2.1 Java 环境
+- **系统Java版本**: 1.8.0_101 (Java 8)
+- **项目要求Java版本**: Java 11+ (推荐使用 Android Studio JDK 21)
+- **JAVA_HOME**: C:\Program Files\Android\Android Studio1\jbr
+- **编译目标**: Java 8 (sourceCompatibility & targetCompatibility)
+- **Kotlin JVM目标**: 1.8
+
+⚠️ **注意**: 项目要求Java 11+，但系统Java是1.8，需要使用Android Studio内置JDK
+
+### 2.2 Android SDK 环境
+- **ANDROID_HOME**: C:\Users\86181\AppData\Local\Android\Sdk
+- **SDK路径**: C:\Users\86181\AppData\Local\Android\Sdk
+- **NDK配置**: 
+  - ABI过滤器: armeabi-v7a
+  - 支持的架构: armeabi, armeabi-v7a, arm64-v8a, x86
+
+### 2.3 构建工具版本
+
+#### Gradle 配置
+- **Gradle版本**: 8.9
+- **Gradle分发URL**: https://services.gradle.org/distributions/gradle-8.9-bin.zip
+- **Gradle用户目录**: GRADLE_USER_HOME
+- **Gradle JVM参数**: -Xmx1536m
+
+#### Android Gradle Plugin (AGP)
+- **AGP版本**: 8.7.3
+- **构建工具**: 自动使用默认版本（AGP 8.0+不再需要buildToolsVersion）
+
+#### Kotlin 配置
+- **Kotlin版本**: 1.9.24
+- **Kotlin插件**: org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24
+- **Kotlin标准库**: kotlin-stdlib:1.9.24
+
+---
+
+## 三、项目模块结构
+
+### 3.1 模块列表
+```
+HouseProperty/
+├── app/                    # 主应用模块
+└── ninegridview/          # 自定义九宫格图片显示模块
+```
+
+### 3.2 模块配置
+- **主模块**: app (com.android.application)
+- **子模块**: ninegridview (library)
+- **模块依赖**: app 依赖 ninegridview
+
+---
+
+## 四、构建配置
+
+### 4.1 构建类型 (Build Types)
+
+#### Debug 构建
+- **代码混淆**: 禁用 (minifyEnabled false)
+- **签名配置**: defaultSignature
+- **调试信息**: 包含
+
+#### Release 构建
+- **代码混淆**: 禁用 (minifyEnabled false) ⚠️ **安全风险**
+- **签名配置**: 已注释（未启用）
+- **ProGuard规则**: proguard-android.txt + proguard-rules.pro
+
+### 4.2 签名配置
+```gradle
+signingConfigs {
+    defaultSignature {
+        keyAlias: 'key0'
+        keyPassword: 'haotian'
+        storeFile: 'haotian.jks'
+        storePassword: 'haotian'
+    }
+}
+```
+⚠️ **安全警告**: 签名密钥硬编码在build.gradle中，存在安全风险
+
+### 4.3 打包配置
+- **排除文件**:
+  - META-INF/DEPENDENCIES
+  - META-INF/NOTICE
+  - META-INF/LICENSE
+  - META-INF/LICENSE.txt
+  - META-INF/NOTICE.txt
+
+### 4.4 资源处理
+- **AAPT选项**: 
+  - cruncherEnabled: false
+  - useNewCruncher: false (已废弃)
+- **资源目录**:
+  - assets: src/main/assets
+  - jniLibs: libs
+
+### 4.5 Lint 配置
+- **错误中断**: 禁用 (abortOnError false)
+- **警告**: 不中断构建
+
+---
+
+## 五、功能特性配置
+
+### 5.1 已启用特性
+- ✅ **DataBinding**: 已启用
+- ✅ **MultiDex**: 已配置（androidx.multidex:multidex:2.0.1）
+- ✅ **AndroidX**: 已启用 (android.useAndroidX=true)
+- ✅ **Jetifier**: 已启用 (android.enableJetifier=true)
+
+### 5.2 Manifest占位符
+```gradle
+manifestPlaceholders = [
+    JPUSH_PKGNAME: applicationId,
+    JPUSH_APPKEY: "4b6e03f9cc9466efbc0b2528",
+    JPUSH_CHANNEL: "developer-default"
+]
+```
+
+---
+
+## 六、依赖库配置
+
+### 6.1 仓库配置 (Repositories)
+
+#### Maven 仓库
+1. **阿里云Maven镜像** (主要仓库)
+   - https://maven.aliyun.com/nexus/content/groups/public/
+   - https://maven.aliyun.com/repository/public
+   - https://maven.aliyun.com/repository/gradle-plugin
+   - https://maven.aliyun.com/repository/central
+   - https://maven.aliyun.com/repository/google
+
+2. **官方仓库**
+   - Google Maven
+   - Maven Central
+   - JitPack
+
+3. **本地仓库**
+   - flatDir: libs目录
+
+### 6.2 核心依赖库
+
+#### Kotlin 相关
+- kotlin-stdlib: 1.9.24
+- kotlin-gradle-plugin: 1.9.24
+
+#### AndroidX / Support Library
+- androidx.multidex:multidex: 2.0.1
+- com.android.support:appcompat-v7: 28.0.0 ⚠️ **应迁移到AndroidX**
+
+#### 网络请求
+- com.squareup.retrofit2:retrofit: 2.1.0 ⚠️ **版本过旧（2016年）**
+- com.squareup.retrofit2:converter-gson: 2.1.0
+- com.squareup.retrofit2:adapter-rxjava: 2.1.0
+- com.squareup.okhttp3:logging-interceptor: 3.4.1
+- com.lzy.net:okgo: 3.0.4
+- com.lzy.net:okrx2: 2.0.2
+
+#### 响应式编程
+- io.reactivex:rxjava: 1.1.0 ⚠️ **版本过旧，已停止维护**
+- io.reactivex:rxandroid: 1.1.0
+- io.reactivex.rxjava2:rxjava: 2.1.5 ⚠️ **混用RxJava 1和2**
+- io.reactivex.rxjava2:rxandroid: 2.1.1
+- com.trello:rxlifecycle: + (最新版本)
+- com.trello:rxlifecycle-components: + (最新版本)
+
+#### 图片加载
+- com.github.bumptech.glide:glide: 4.9.0 ✅
+- com.squareup.picasso:picasso: 2.5.2 ⚠️ **与Glide混用，建议移除**
+- com.github.chrisbanes:PhotoView: 2.0.0
+
+#### JSON 处理
+- com.google.code.gson:gson: 2.6.2 ⚠️ **版本过旧（2016年）**
+
+#### UI 组件
+- com.scwang.smartrefresh:SmartRefreshLayout: 1.1.0
+- com.gyf.immersionbar:immersionbar: 3.0.0
+- com.lxj:xpopup: 1.8.10
+- com.youth.banner:banner: 1.4.10
+- com.jcodecraeer:xrecyclerview: 1.3.2
+- com.github.CymChad:BaseRecyclerViewAdapterHelper: 2.9.30
+- com.nineoldandroids:library: 2.4.0
+
+#### 数据库
+- com.j256.ormlite:ormlite-core: 5.1
+- com.j256.ormlite:ormlite-android: 5.1
+
+#### 权限管理
+- com.hjq:xxpermissions: 5.5
+- com.tbruyelle.rxpermissions2:rxpermissions: 0.9.5
+
+#### 图片/视频选择
+- com.zhihu.android:matisse: 0.5.3-beta3
+- io.github.lucksiege:pictureselector: v2.7.3-rc05
+- fm.jiecao:jiecaovideoplayer: 4.8.3
+
+#### 支付相关
+- alipaySdk-15.5.9.aar (本地AAR)
+- com.tencent.mm.opensdk:wechat-sdk-android-without-mta: + (最新版本)
+
+#### 推送服务
+- cn.jiguang.sdk:jpush: 3.6.6
+- cn.jiguang.sdk:jcore: 2.3.8
+
+#### 其他工具库
+- com.tencent.bugly:crashreport: latest.release
+- top.zibin:Luban: 1.1.8 (图片压缩)
+- com.google.zxing:core: 3.3.0 (二维码)
+- tech.wangjie:qrcodetools: 1.0.0
+- liji.library.dev:citypickerview: 5.2.2
+- me.jessyan:autosize: 1.1.2 (屏幕适配)
+- com.arialyy.aria:Aria: 3.1.1 (下载框架)
+- net.dankito.richtexteditor:richtexteditor-android: 2.0.8
+
+### 6.3 本地依赖 (libs目录)
+
+#### AAR 文件
+- alipaySdk-15.5.9.aar (支付宝SDK)
+- cutil-release.aar (自定义工具库)
+- selectpicker-release.aar (选择器)
+- gifdecoder-4.5.0.aar
+- glide-4.5.0.aar
+- glide-4.6.1.aar
+- material-1.2.5.aar
+- PhotoView-2.0.0.aar
+
+#### JAR 文件
+- fastjson-1.2.7.jar
+- pldroid-player-2.1.9.jar (播放器SDK)
+
+#### 本地SO库 (Native Libraries)
+- **armeabi-v7a**:
+  - libqcOpenSSL.so
+  - libQPlayer.so
+- **armeabi**:
+  - libqcOpenSSL.so
+  - libQPlayer.so
+- **arm64-v8a**:
+  - libqcOpenSSL.so
+  - libQPlayer.so
+- **x86**:
+  - libqcOpenSSL.so
+  - libQPlayer.so
+
+---
+
+## 七、Gradle 配置详情
+
+### 7.1 gradle.properties 配置
+```properties
+# JVM参数
+org.gradle.jvmargs=-Xmx1536m
+
+# AndroidX配置
+android.useAndroidX=true
+android.enableJetifier=true
+
+# 测试配置
+android.injected.testOnly=false
+
+# Java编译配置
+android.javaCompile.suppressSourceTargetDeprecationWarning=true
+
+# SSL证书配置
+systemProp.javax.net.ssl.trustStoreType=JKS
+```
+
+### 7.2 local.properties 配置
+```properties
+sdk.dir=C\:\\Users\\86181\\AppData\\Local\\Android\\Sdk
+```
+
+### 7.3 settings.gradle 配置
+```gradle
+include ':app',':ninegridview'
+```
+
+---
+
+## 八、编译环境要求
+
+### 8.1 必需环境
+- ✅ **JDK**: Java 11+ (推荐 Android Studio JDK 21)
+- ✅ **Android SDK**: API Level 33
+- ✅ **Gradle**: 8.9
+- ✅ **Android Gradle Plugin**: 8.7.3
+- ✅ **Kotlin**: 1.9.24
+
+### 8.2 推荐环境变量设置
+```powershell
+# 设置Java环境（编译时使用）
+$env:JAVA_HOME="C:\Program Files\Android\Android Studio1\jbr"
+
+# 设置Android SDK路径
+$env:ANDROID_HOME="C:\Users\$env:USERNAME\AppData\Local\Android\Sdk"
+```
+
+### 8.3 编译命令
+```bash
+# Debug版本编译
+$env:JAVA_HOME="C:\Program Files\Android\Android Studio1\jbr"; $env:ANDROID_HOME="C:\Users\$env:USERNAME\AppData\Local\Android\Sdk"; .\gradlew.bat assembleDebug
+
+# Release版本编译
+$env:JAVA_HOME="C:\Program Files\Android\Android Studio1\jbr"; $env:ANDROID_HOME="C:\Users\$env:USERNAME\AppData\Local\Android\Sdk"; .\gradlew.bat assembleRelease
+
+# 清理项目
+.\gradlew.bat clean
+```
+
+---
+
+## 九、已知配置问题
+
+### 9.1 ⚠️ 高优先级问题
+
+1. **签名密钥硬编码**
+   - 位置: app/build.gradle
+   - 风险: 安全漏洞
+   - 建议: 移至gradle.properties或使用密钥管理服务
+
+2. **代码混淆未启用**
+   - Release版本: minifyEnabled false
+   - 风险: 代码容易被反编译
+   - 建议: 启用混淆并配置规则
+
+3. **依赖版本过旧**
+   - Retrofit: 2.1.0 (2016年)
+   - RxJava: 1.1.0 (已停止维护)
+   - Gson: 2.6.2 (存在安全漏洞)
+   - 建议: 升级到最新稳定版本
+
+4. **混用多个版本库**
+   - RxJava 1.x 和 RxJava 2.x 混用
+   - Glide 和 Picasso 混用
+   - 建议: 统一使用一个版本/库
+
+### 9.2 ⚠️ 中优先级问题
+
+1. **Support Library未完全迁移**
+   - 仍使用 com.android.support:appcompat-v7:28.0.0
+   - 建议: 完全迁移到AndroidX
+
+2. **targetSdkVersion过旧**
+   - 当前: 29 (Android 10)
+   - 建议: 升级到33+ (Android 13)
+
+3. **使用flatDir加载本地AAR**
+   - 不推荐使用flatDir
+   - 建议: 使用本地Maven仓库或发布到私有仓库
+
+### 9.3 ⚠️ 低优先级问题
+
+1. **Gradle JVM内存配置**
+   - 当前: 1536m
+   - 建议: 根据项目大小调整（建议2048m+）
+
+2. **NDK ABI过滤器**
+   - 当前: 仅支持 armeabi-v7a
+   - 建议: 根据需求添加 arm64-v8a
+
+---
+
+## 十、环境检查清单
+
+### 10.1 开发环境检查
+- [ ] JDK 11+ 已安装并配置
+- [ ] Android SDK 已安装（API 33）
+- [ ] Android Studio 已安装
+- [ ] Gradle 8.9 已下载
+- [ ] 环境变量已配置（JAVA_HOME, ANDROID_HOME）
+
+### 10.2 项目配置检查
+- [ ] build.gradle 配置正确
+- [ ] local.properties 配置正确
+- [ ] gradle.properties 配置正确
+- [ ] 签名文件存在（haotian.jks）
+- [ ] 依赖库可正常下载
+
+### 10.3 编译检查
+- [ ] 项目可正常同步
+- [ ] Debug版本可正常编译
+- [ ] Release版本可正常编译
+- [ ] 无编译错误和警告
+
+---
+
+## 十一、配置优化建议
+
+### 11.1 立即优化
+1. 移除硬编码的签名密钥
+2. 启用Release版本代码混淆
+3. 升级关键依赖库版本
+
+### 11.2 短期优化
+1. 统一依赖库版本（移除混用）
+2. 完全迁移到AndroidX
+3. 升级targetSdkVersion
+
+### 11.3 长期优化
+1. 使用依赖版本管理（Version Catalog）
+2. 建立CI/CD流程
+3. 配置代码质量检查工具
+
+---
+
+## 十二、配置参考
+
+### 12.1 推荐JDK配置
+```powershell
+# PowerShell环境变量设置（临时）
+$env:JAVA_HOME="C:\Program Files\Android\Android Studio1\jbr"
+$env:ANDROID_HOME="C:\Users\$env:USERNAME\AppData\Local\Android\Sdk"
+$env:PATH="$env:JAVA_HOME\bin;$env:ANDROID_HOME\platform-tools;$env:PATH"
+```
+
+### 12.2 推荐Gradle配置
+```properties
+# gradle.properties
+org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
+org.gradle.parallel=true
+org.gradle.caching=true
+org.gradle.daemon=true
+```
+
+---
+
+**文档生成时间**: 2025年1月
+**项目路径**: D:\Users\86181\AndroidStudioProjects\HouseProperty
+**配置检查**: 基于当前项目文件分析
+
diff --git a/项目点评.txt b/项目点评.txt
new file mode 100644
index 0000000..44fc40d
--- /dev/null
+++ b/项目点评.txt
@@ -0,0 +1,382 @@
+# Android 房产物业管理项目 - 项目点评报告
+
+## 项目概述
+- **项目名称**: HouseProperty (房产物业管理)
+- **包名**: com.sl.HouseProperty
+- **版本**: 1.1.9 (versionCode: 119)
+- **项目类型**: Android 原生应用
+- **开发语言**: Java + Kotlin 混合开发
+- **构建工具**: Gradle 8.9, Android Gradle Plugin 8.7.3
+
+---
+
+## 一、项目结构分析
+
+### 1.1 目录结构
+✅ **优点**:
+- 模块化设计，包含主应用模块和 ninegridview 自定义模块
+- 代码按功能分类（user、discovery、order、cart等）
+- 工具类和实体类分离清晰
+
+⚠️ **问题**:
+- 包结构层次较深，部分类组织不够清晰
+- 存在大量Activity类（122个Java文件），建议考虑Fragment化
+- 缺少统一的架构层（如Repository、ViewModel等）
+
+### 1.2 代码组织
+- **Activity数量**: 约50+个Activity，数量较多
+- **Fragment使用**: 部分使用Fragment，但不够统一
+- **自定义View**: 有较多自定义View组件
+- **工具类**: utils和tools包下有较多工具类
+
+---
+
+## 二、技术栈评估
+
+### 2.1 核心技术
+✅ **已采用**:
+- DataBinding（数据绑定）
+- Kotlin（部分使用）
+- Retrofit + RxJava（网络请求）
+- ORMLite（数据库）
+- Glide（图片加载）
+- 极光推送（JPush）
+
+### 2.2 依赖库分析
+
+#### ⚠️ **严重问题 - 依赖版本过旧**:
+
+1. **Retrofit 2.1.0** (2016年版本)
+   - 当前最新: 2.9.0+
+   - 风险: 存在安全漏洞，功能缺失
+
+2. **RxJava 1.1.0** (2016年版本)
+   - 当前最新: RxJava 3.x
+   - 风险: 已停止维护，性能问题
+
+3. **Gson 2.6.2** (2016年版本)
+   - 当前最新: 2.10.1+
+   - 风险: 安全漏洞
+
+4. **Picasso 2.5.2** (2016年版本)
+   - 建议: 统一使用Glide，移除Picasso
+
+5. **Support Library 28.0.0**
+   - 问题: 应迁移到AndroidX
+   - 当前项目已部分使用AndroidX，存在混用情况
+
+#### ✅ **依赖管理建议**:
+- 统一使用AndroidX，移除Support Library
+- 升级所有依赖到最新稳定版本
+- 移除未使用的依赖（如Picasso，项目已使用Glide）
+- 使用依赖版本管理（version catalog）
+
+### 2.3 第三方库使用情况
+- **网络库**: Retrofit + OkHttp + OkGo（混用，建议统一）
+- **图片加载**: Glide + Picasso（混用，建议只保留Glide）
+- **响应式编程**: RxJava 1.x + RxJava 2.x（混用，建议统一到RxJava 3）
+- **数据库**: ORMLite（较旧，建议迁移到Room）
+- **UI组件**: 大量自定义View和第三方UI库
+
+---
+
+## 三、代码质量分析
+
+### 3.1 编译问题（已修复）
+✅ **已解决**:
+- Matisse样式资源冲突（已重命名为Matisse_Zhihu_Custom）
+- Switch语句中使用R.id问题（已改为if-else）
+- 语法错误（多余的花括号）
+
+### 3.2 代码规范问题
+
+#### ⚠️ **命名规范**:
+- 部分类名拼写错误：`MyshopEditAcitivity` → `MyshopEditActivity`
+- 部分类名不符合规范：`AddAnewGranteeActivity`（建议：`AddGranteeActivity`）
+- 变量命名不够统一
+
+#### ⚠️ **代码结构**:
+- 大量Activity直接处理业务逻辑，缺少分层
+- 网络请求代码分散在各Activity中
+- 缺少统一的错误处理机制
+- 硬编码较多（如API地址、密钥等）
+
+#### ⚠️ **注释和文档**:
+- 代码注释较少
+- 缺少类和方法级别的文档注释
+- 部分注释为中文，部分为英文，不统一
+
+### 3.3 架构设计
+
+#### ❌ **当前架构问题**:
+1. **无明确架构模式**
+   - 传统MVC，但Model层不清晰
+   - 业务逻辑直接写在Activity中
+   - 缺少Repository层和ViewModel层
+
+2. **BaseActivity使用**
+   - ✅ 有BaseActivity基类，提供统一功能
+   - ⚠️ 但子类仍然承担过多职责
+
+3. **数据层**
+   - 使用ORMLite，但缺少统一的数据访问层
+   - 网络请求和本地存储逻辑分散
+
+#### ✅ **架构改进建议**:
+1. **采用MVVM架构**
+   - Activity/Fragment → ViewModel → Repository → DataSource
+   - 使用LiveData或RxJava进行数据观察
+
+2. **引入依赖注入**
+   - 使用Dagger Hilt或Koin
+   - 解耦组件依赖
+
+3. **统一数据层**
+   - Repository模式统一数据访问
+   - Room替代ORMLite
+   - 网络层统一封装
+
+---
+
+## 四、安全性分析
+
+### 4.1 ⚠️ **严重安全问题**
+
+1. **签名密钥硬编码**
+   ```gradle
+   signingConfigs {
+       defaultSignature {
+           keyAlias 'key0'
+           keyPassword 'haotian'
+           storeFile file('haotian.jks')
+           storePassword 'haotian'
+       }
+   }
+   ```
+   **风险**: 密钥泄露，任何人都可以签名应用
+   **建议**: 
+   - 使用gradle.properties存储密钥信息
+   - 添加到.gitignore
+   - 使用密钥管理服务
+
+2. **API密钥硬编码**
+   - JPush AppKey直接写在build.gradle中
+   - 建议使用BuildConfig或配置文件
+
+3. **ProGuard配置**
+   - Release版本未启用代码混淆（minifyEnabled false）
+   - 风险：代码容易被反编译
+   - 建议：启用混淆，配置混淆规则
+
+### 4.2 权限管理
+- 权限声明较多，部分可能未使用
+- 缺少运行时权限检查的统一封装
+- AndroidManifest中存在重复权限声明
+
+---
+
+## 五、性能分析
+
+### 5.1 构建配置
+
+#### ✅ **优点**:
+- 使用Gradle 8.9和AGP 8.7.3（较新版本）
+- 配置了Kotlin支持
+- 使用阿里云Maven镜像加速
+
+#### ⚠️ **问题**:
+- targetSdkVersion 29（较旧，建议升级到33+）
+- minSdkVersion 21（Android 5.0），可考虑提升
+- 未启用代码混淆和资源压缩
+- 使用flatDir加载本地AAR（不推荐）
+
+### 5.2 运行时性能
+
+#### ⚠️ **潜在问题**:
+1. **内存管理**
+   - Application中维护Activity列表（可能内存泄漏）
+   - 缺少内存泄漏检测工具（如LeakCanary）
+
+2. **网络请求**
+   - 混用多个网络库，可能造成重复请求
+   - 缺少请求缓存机制
+
+3. **图片加载**
+   - 同时使用Glide和Picasso，增加APK体积
+   - 缺少图片压缩和缓存策略
+
+4. **数据库**
+   - ORMLite性能不如Room
+   - 缺少数据库迁移机制
+
+---
+
+## 六、兼容性和维护性
+
+### 6.1 Android版本兼容
+- **minSdkVersion**: 21 (Android 5.0) - 覆盖约95%设备
+- **targetSdkVersion**: 29 (Android 10) - 需要升级到33+
+- **compileSdkVersion**: 33 - 正常
+
+### 6.2 代码维护性
+
+#### ❌ **问题**:
+1. **代码重复**
+   - 多个Activity中有相似的网络请求代码
+   - 缺少统一的工具类封装
+
+2. **耦合度高**
+   - Activity之间直接跳转，缺少路由管理
+   - 业务逻辑和UI耦合
+
+3. **测试覆盖**
+   - 未看到单元测试代码
+   - 缺少UI测试
+
+4. **版本控制**
+   - 可能存在大文件未使用.gitignore
+   - 签名文件应排除在版本控制外
+
+---
+
+## 七、功能完整性
+
+### 7.1 核心功能模块
+根据代码分析，项目包含以下功能：
+- ✅ 用户登录/注册
+- ✅ 房产管理
+- ✅ 物业服务（报修、缴费等）
+- ✅ 发现/社区功能
+- ✅ 购物车/订单
+- ✅ 消息推送
+- ✅ 支付功能（支付宝、微信）
+
+### 7.2 功能实现质量
+- 功能较完整，但代码组织需要优化
+- 部分功能可能存在边界情况处理不足
+
+---
+
+## 八、改进建议优先级
+
+### 🔴 **高优先级（必须修复）**
+
+1. **安全性问题**
+   - [ ] 移除硬编码的签名密钥
+   - [ ] 启用ProGuard代码混淆
+   - [ ] 将敏感信息移至配置文件
+
+2. **依赖升级**
+   - [ ] 升级Retrofit到2.9.0+
+   - [ ] 统一RxJava版本（建议RxJava 3）
+   - [ ] 迁移到AndroidX
+   - [ ] 升级Gson到最新版本
+
+3. **代码规范**
+   - [ ] 修复类名拼写错误
+   - [ ] 统一代码风格
+   - [ ] 添加代码注释
+
+### 🟡 **中优先级（建议修复）**
+
+1. **架构优化**
+   - [ ] 引入MVVM架构
+   - [ ] 统一网络请求层
+   - [ ] 引入依赖注入框架
+
+2. **性能优化**
+   - [ ] 移除未使用的依赖
+   - [ ] 统一图片加载库（只使用Glide）
+   - [ ] 添加内存泄漏检测
+
+3. **代码质量**
+   - [ ] 添加单元测试
+   - [ ] 引入代码检查工具（Lint、FindBugs）
+   - [ ] 统一错误处理机制
+
+### 🟢 **低优先级（可选优化）**
+
+1. **技术升级**
+   - [ ] 迁移ORMLite到Room
+   - [ ] 引入协程替代RxJava
+   - [ ] 使用Compose重构部分UI
+
+2. **开发体验**
+   - [ ] 添加CI/CD流程
+   - [ ] 完善项目文档
+   - [ ] 统一开发规范文档
+
+---
+
+## 九、总体评价
+
+### 9.1 项目评分（满分10分）
+
+| 评估项 | 得分 | 说明 |
+|--------|------|------|
+| **功能完整性** | 8/10 | 功能较完整，覆盖主要业务场景 |
+| **代码质量** | 5/10 | 存在较多问题，需要重构 |
+| **架构设计** | 4/10 | 缺少清晰架构，耦合度高 |
+| **安全性** | 3/10 | 存在严重安全隐患 |
+| **性能** | 6/10 | 基本满足需求，有优化空间 |
+| **可维护性** | 4/10 | 代码组织混乱，维护困难 |
+| **技术栈** | 5/10 | 依赖版本过旧，需要升级 |
+| **文档** | 3/10 | 缺少文档和注释 |
+
+**综合评分: 4.75/10**
+
+### 9.2 项目状态
+- **当前状态**: ⚠️ **需要重大改进**
+- **可维护性**: ❌ **较差**
+- **技术债务**: 🔴 **高**
+
+### 9.3 改进路线图
+
+#### 第一阶段（1-2个月）- 基础修复
+1. 修复安全性问题
+2. 升级关键依赖
+3. 修复编译错误和代码规范问题
+4. 启用代码混淆
+
+#### 第二阶段（2-3个月）- 架构优化
+1. 迁移到AndroidX
+2. 统一网络请求层
+3. 引入MVVM架构
+4. 添加单元测试
+
+#### 第三阶段（3-6个月）- 深度优化
+1. 重构核心模块
+2. 性能优化
+3. 完善文档
+4. 建立CI/CD
+
+---
+
+## 十、总结
+
+### 优点
+✅ 功能相对完整，能够满足业务需求
+✅ 使用了DataBinding等现代Android技术
+✅ 有BaseActivity等基础架构
+✅ 模块化设计有一定基础
+
+### 主要问题
+❌ 安全性存在严重隐患（密钥硬编码）
+❌ 依赖版本过旧，存在安全风险
+❌ 代码质量不高，缺少规范
+❌ 架构设计不清晰，耦合度高
+❌ 缺少测试和文档
+
+### 建议
+这是一个**功能完整但技术债务较高**的项目。建议：
+1. **立即修复安全性问题**
+2. **制定重构计划，分阶段执行**
+3. **建立代码规范和开发流程**
+4. **引入现代化架构和工具**
+
+---
+
+**报告生成时间**: 2025年1月
+**项目路径**: D:\Users\86181\AndroidStudioProjects\HouseProperty
+**分析工具**: 代码审查 + 静态分析
+