Commit 0f4158c7d0c3cc94ed5273324bd945b2e5415622
1 parent
f9d17f1b
Exists in
yxb_dev
and in
2 other branches
no message
Showing
2 changed files
with
2 additions
and
4 deletions
Show diff stats
app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
| 1 | package com.shunzhi.parent.presenter.loginandregister; | 1 | package com.shunzhi.parent.presenter.loginandregister; |
| 2 | 2 | ||
| 3 | import android.text.TextUtils; | 3 | import android.text.TextUtils; |
| 4 | -import android.util.Log; | ||
| 5 | 4 | ||
| 6 | import com.google.gson.JsonObject; | 5 | import com.google.gson.JsonObject; |
| 7 | import com.share.mvpsdk.helper.RetrofitCreateHelper; | 6 | import com.share.mvpsdk.helper.RetrofitCreateHelper; |
| @@ -26,7 +25,6 @@ import io.reactivex.functions.Consumer; | @@ -26,7 +25,6 @@ import io.reactivex.functions.Consumer; | ||
| 26 | import okhttp3.ResponseBody; | 25 | import okhttp3.ResponseBody; |
| 27 | import retrofit2.HttpException; | 26 | import retrofit2.HttpException; |
| 28 | import retrofit2.Response; | 27 | import retrofit2.Response; |
| 29 | -import timber.log.Timber; | ||
| 30 | 28 | ||
| 31 | /** | 29 | /** |
| 32 | * Created by Administrator on 2018/3/6 0006. | 30 | * Created by Administrator on 2018/3/6 0006. |
| @@ -174,7 +172,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre | @@ -174,7 +172,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre | ||
| 174 | String token = Utils.MD5(account); | 172 | String token = Utils.MD5(account); |
| 175 | nimLogin(account, token); | 173 | nimLogin(account, token); |
| 176 | 174 | ||
| 177 | - mIView.getUserInfo(0); | 175 | +// mIView.getUserInfo(0); |
| 178 | 176 | ||
| 179 | } else { | 177 | } else { |
| 180 | LoginAndRegistFragment.progressDialog.dismiss(); | 178 | LoginAndRegistFragment.progressDialog.dismiss(); |
app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java
| @@ -169,7 +169,7 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP | @@ -169,7 +169,7 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP | ||
| 169 | @Override | 169 | @Override |
| 170 | public void onReceive(Context context, Intent intent) { | 170 | public void onReceive(Context context, Intent intent) { |
| 171 | if (intent.getAction().equals(AppContext.LOCATION_CITYNAME + "")) { | 171 | if (intent.getAction().equals(AppContext.LOCATION_CITYNAME + "")) { |
| 172 | - tvLocalAddress.setText(AppContext.getInstance().cityName); | 172 | + tvLocalAddress.setText(AppContext.getInstance().district); |
| 173 | } | 173 | } |
| 174 | } | 174 | } |
| 175 | }; | 175 | }; |