From a41e62a69ece4c96137cc3c358513861309bc574 Mon Sep 17 00:00:00 2001
From: 陶汉栋 <2821744554@qq.com>
Date: Sat, 28 Apr 2018 18:47:44 +0800
Subject: [PATCH] no message
---
.idea/misc.xml | 2 +-
.idea/modules.xml | 6 +++---
app/libs/processor.jar | Bin 5681 -> 0 bytes
app/sql.txt | 0
app/src/main/java/com/shunzhi/parent/AppConfig.java | 1 +
app/src/main/java/com/shunzhi/parent/AppContext.java | 7 ++++---
app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java | 1 +
build.gradle | 2 +-
gradle/wrapper/gradle-wrapper.properties | 4 ++--
9 files changed, 13 insertions(+), 10 deletions(-)
create mode 100644 app/sql.txt
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3963879..75dac50 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -24,7 +24,7 @@
</value>
</option>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" 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 9c7f509..3e1e223 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,10 +4,10 @@
<modules>
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/mvpsdk/mvpsdk.iml" filepath="$PROJECT_DIR$/mvpsdk/mvpsdk.iml" />
- <module fileurl="file://E:\parentwork\parentWorkHolper.iml" filepath="E:\parentwork\parentWorkHolper.iml" />
- <module fileurl="file://F:\parentwork\parentWorkHolper.iml" filepath="F:\parentwork\parentWorkHolper.iml" />
+ <module fileurl="file://F:/parentwork/parentWorkHolper.iml" filepath="F:/parentwork/parentWorkHolper.iml" />
+ <module fileurl="file://$PROJECT_DIR$/parentWorkHolper.iml" filepath="$PROJECT_DIR$/parentWorkHolper.iml" />
<module fileurl="file://$PROJECT_DIR$/parentwork.iml" filepath="$PROJECT_DIR$/parentwork.iml" />
- <module fileurl="file://F:\parentWorkHolper\parentwork.iml" filepath="F:\parentWorkHolper\parentwork.iml" />
+ <module fileurl="file://F:/parentWorkHolper/parentwork.iml" filepath="F:/parentWorkHolper/parentwork.iml" />
<module fileurl="file://$PROJECT_DIR$/processor/processor.iml" filepath="$PROJECT_DIR$/processor/processor.iml" />
<module fileurl="file://$PROJECT_DIR$/roundedimageview-2.2.1/roundedimageview-2.2.1.iml" filepath="$PROJECT_DIR$/roundedimageview-2.2.1/roundedimageview-2.2.1.iml" />
</modules>
diff --git a/app/libs/processor.jar b/app/libs/processor.jar
index 46b1996..a135915 100644
Binary files a/app/libs/processor.jar and b/app/libs/processor.jar differ
diff --git a/app/sql.txt b/app/sql.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/app/sql.txt
diff --git a/app/src/main/java/com/shunzhi/parent/AppConfig.java b/app/src/main/java/com/shunzhi/parent/AppConfig.java
index 6d15b6f..5a1e080 100644
--- a/app/src/main/java/com/shunzhi/parent/AppConfig.java
+++ b/app/src/main/java/com/shunzhi/parent/AppConfig.java
@@ -26,6 +26,7 @@ public class AppConfig {
public static String NIM_CONFIG_SOUND = "nim_config_sound";//收到通知响铃
public static String ISBINDING = "isbinding";
public static String CURRCHILDJSONSTR = "";
+ public static String DISTRICT="district";
public static boolean ISLOGIN = false;
diff --git a/app/src/main/java/com/shunzhi/parent/AppContext.java b/app/src/main/java/com/shunzhi/parent/AppContext.java
index 37d9521..a535819 100644
--- a/app/src/main/java/com/shunzhi/parent/AppContext.java
+++ b/app/src/main/java/com/shunzhi/parent/AppContext.java
@@ -105,7 +105,7 @@ public class AppContext extends GlobalApplication {
SharedPreferences sp = getSharedPreferences("info", Context.MODE_PRIVATE);
String account = sp.getString("account", "");
String token = sp.getString("token", "");
- Timber.i("---===account: %s token : %s",account,token);
+ Timber.i("---===account: %s token : %s", account, token);
if (account.length() > 0 && token.length() > 0) {
return new LoginInfo(account, token);
}
@@ -218,11 +218,12 @@ public class AppContext extends GlobalApplication {
intent.setAction(LOCATION_CITYNAME + "");
sendBroadcast(intent);
stopLocation();
+ AppConfig.getAppConfig(getContext()).set(AppConfig.DISTRICT, district);
} else {
cityName = "定位失败";
district = "定位失败";
-
-// Log.d("mlocation:","errorCode="+aMapLocation.getErrorCode()+"errorInfo="+aMapLocation.getErrorInfo());
+ if (null != AppConfig.getAppConfig(getContext()).get(AppConfig.DISTRICT))
+ district = AppConfig.getAppConfig(getContext()).get(AppConfig.DISTRICT);
}
}
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
index 0eb8e3a..03f1e84 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
@@ -72,6 +72,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
EditText et_search;
int pageIndex = 1;
+
boolean first = true;
NestedScrollView nesteScrollView;
diff --git a/build.gradle b/build.gradle
index 9f6e9cc..35f80c9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
mavenCentral() // add repository
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.0.1'
+ classpath 'com.android.tools.build:gradle:3.1.2'
classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2' // add plugin
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 39d0fb2..9af82a7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Feb 27 14:00:51 CST 2018
+#Sat Apr 28 08:11:59 CST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
--
libgit2 0.21.0