陶汉栋 / ParentWork

Download as
Browse Code »

Commit a41e62a69ece4c96137cc3c358513861309bc574

Authored by 陶汉栋
1 parent 1c1190fa
Exists in yxb_dev and in 1 other branch developer

no message

Showing 9 changed files with 13 additions and 10 deletions   Show diff stats
.idea/misc.xml
  Diff comments   View file @a41e62a
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 </value> 24 </value>
25 </option> 25 </option>
26 </component> 26 </component>
27 - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK"> 27 + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
28 <output url="file://$PROJECT_DIR$/build/classes" /> 28 <output url="file://$PROJECT_DIR$/build/classes" />
29 </component> 29 </component>
30 <component name="ProjectType"> 30 <component name="ProjectType">
.idea/modules.xml
  Diff comments   View file @a41e62a
@@ -4,10 +4,10 @@ @@ -4,10 +4,10 @@
4 <modules> 4 <modules>
5 <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> 5 <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
6 <module fileurl="file://$PROJECT_DIR$/mvpsdk/mvpsdk.iml" filepath="$PROJECT_DIR$/mvpsdk/mvpsdk.iml" /> 6 <module fileurl="file://$PROJECT_DIR$/mvpsdk/mvpsdk.iml" filepath="$PROJECT_DIR$/mvpsdk/mvpsdk.iml" />
7 - <module fileurl="file://E:\parentwork\parentWorkHolper.iml" filepath="E:\parentwork\parentWorkHolper.iml" />  
8 - <module fileurl="file://F:\parentwork\parentWorkHolper.iml" filepath="F:\parentwork\parentWorkHolper.iml" /> 7 + <module fileurl="file://F:/parentwork/parentWorkHolper.iml" filepath="F:/parentwork/parentWorkHolper.iml" />
  8 + <module fileurl="file://$PROJECT_DIR$/parentWorkHolper.iml" filepath="$PROJECT_DIR$/parentWorkHolper.iml" />
9 <module fileurl="file://$PROJECT_DIR$/parentwork.iml" filepath="$PROJECT_DIR$/parentwork.iml" /> 9 <module fileurl="file://$PROJECT_DIR$/parentwork.iml" filepath="$PROJECT_DIR$/parentwork.iml" />
10 - <module fileurl="file://F:\parentWorkHolper\parentwork.iml" filepath="F:\parentWorkHolper\parentwork.iml" /> 10 + <module fileurl="file://F:/parentWorkHolper/parentwork.iml" filepath="F:/parentWorkHolper/parentwork.iml" />
11 <module fileurl="file://$PROJECT_DIR$/processor/processor.iml" filepath="$PROJECT_DIR$/processor/processor.iml" /> 11 <module fileurl="file://$PROJECT_DIR$/processor/processor.iml" filepath="$PROJECT_DIR$/processor/processor.iml" />
12 <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" /> 12 <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" />
13 </modules> 13 </modules>
app/libs/processor.jar
View file @a41e62a
No preview for this file type
app/sql.txt 0 → 100644
  Diff comments   View file @a41e62a
app/src/main/java/com/shunzhi/parent/AppConfig.java
  Diff comments   View file @a41e62a
@@ -26,6 +26,7 @@ public class AppConfig { @@ -26,6 +26,7 @@ public class AppConfig {
26 public static String NIM_CONFIG_SOUND = "nim_config_sound";//收到通知响铃 26 public static String NIM_CONFIG_SOUND = "nim_config_sound";//收到通知响铃
27 public static String ISBINDING = "isbinding"; 27 public static String ISBINDING = "isbinding";
28 public static String CURRCHILDJSONSTR = ""; 28 public static String CURRCHILDJSONSTR = "";
  29 + public static String DISTRICT="district";
29 30
30 31
31 public static boolean ISLOGIN = false; 32 public static boolean ISLOGIN = false;
app/src/main/java/com/shunzhi/parent/AppContext.java
  Diff comments   View file @a41e62a
@@ -105,7 +105,7 @@ public class AppContext extends GlobalApplication { @@ -105,7 +105,7 @@ public class AppContext extends GlobalApplication {
105 SharedPreferences sp = getSharedPreferences("info", Context.MODE_PRIVATE); 105 SharedPreferences sp = getSharedPreferences("info", Context.MODE_PRIVATE);
106 String account = sp.getString("account", ""); 106 String account = sp.getString("account", "");
107 String token = sp.getString("token", ""); 107 String token = sp.getString("token", "");
108 - Timber.i("---===account: %s token : %s",account,token); 108 + Timber.i("---===account: %s token : %s", account, token);
109 if (account.length() > 0 && token.length() > 0) { 109 if (account.length() > 0 && token.length() > 0) {
110 return new LoginInfo(account, token); 110 return new LoginInfo(account, token);
111 } 111 }
@@ -218,11 +218,12 @@ public class AppContext extends GlobalApplication { @@ -218,11 +218,12 @@ public class AppContext extends GlobalApplication {
218 intent.setAction(LOCATION_CITYNAME + ""); 218 intent.setAction(LOCATION_CITYNAME + "");
219 sendBroadcast(intent); 219 sendBroadcast(intent);
220 stopLocation(); 220 stopLocation();
  221 + AppConfig.getAppConfig(getContext()).set(AppConfig.DISTRICT, district);
221 } else { 222 } else {
222 cityName = "定位失败"; 223 cityName = "定位失败";
223 district = "定位失败"; 224 district = "定位失败";
224 -  
225 -// Log.d("mlocation:","errorCode="+aMapLocation.getErrorCode()+"errorInfo="+aMapLocation.getErrorInfo()); 225 + if (null != AppConfig.getAppConfig(getContext()).get(AppConfig.DISTRICT))
  226 + district = AppConfig.getAppConfig(getContext()).get(AppConfig.DISTRICT);
226 } 227 }
227 228
228 } 229 }
app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
  Diff comments   View file @a41e62a
@@ -72,6 +72,7 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu @@ -72,6 +72,7 @@ public class ConsultFragment extends BaseMVPCompatFragment&lt;ConsultContract.Consu
72 EditText et_search; 72 EditText et_search;
73 73
74 int pageIndex = 1; 74 int pageIndex = 1;
  75 +
75 boolean first = true; 76 boolean first = true;
76 77
77 NestedScrollView nesteScrollView; 78 NestedScrollView nesteScrollView;
@@ -8,7 +8,7 @@ buildscript { @@ -8,7 +8,7 @@ buildscript {
8 mavenCentral() // add repository 8 mavenCentral() // add repository
9 } 9 }
10 dependencies { 10 dependencies {
11 - classpath 'com.android.tools.build:gradle:3.0.1' 11 + classpath 'com.android.tools.build:gradle:3.1.2'
12 classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2' // add plugin 12 classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2' // add plugin
13 13
14 14
gradle/wrapper/gradle-wrapper.properties
  Diff comments   View file @a41e62a
1 -#Tue Feb 27 14:00:51 CST 2018 1 +#Sat Apr 28 08:11:59 CST 2018
2 distributionBase=GRADLE_USER_HOME 2 distributionBase=GRADLE_USER_HOME
3 distributionPath=wrapper/dists 3 distributionPath=wrapper/dists
4 zipStoreBase=GRADLE_USER_HOME 4 zipStoreBase=GRADLE_USER_HOME
5 zipStorePath=wrapper/dists 5 zipStorePath=wrapper/dists
6 -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip 6 +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip