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 @@ - + 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 @@ - - + + - + 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