陶汉栋 / ParentWork

Download as
Browse Code »

Commit 0a7ab48fa28a4563f8244a28f81e133c07e58ba7

Authored by 陶汉栋
2 parents cc9bfb52 0f4158c7
Exists in yxb_dev and in 2 other branches developer, wwx

Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer

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