diff --git a/app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java
index a5f0f3c..4f7e675 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java
@@ -83,27 +83,5 @@ public class CePingPresenter extends CepingContract.CePingPresenter {
}
}));
- /*List<ToolBean> toolBeanList=new ArrayList<>();
- toolBeanList.add(new ToolBean(R.drawable.gxzt+"","高校直通"));
- toolBeanList.add(new ToolBean(R.drawable.zycx+"","专业查询"));
- toolBeanList.add(new ToolBean(R.drawable.cmyk+"","传媒艺考"));
- toolBeanList.add(new ToolBean(R.drawable.phb+"","排行榜"));
- for (int i = 0; i < toolBeanList.size(); i++) {
- TextAndImgShowView textAndImgShowView=new TextAndImgShowView(mIView.getBindActivity());
- textAndImgShowView.setTextColor(R.color.textColor);
- textAndImgShowView.setText(toolBeanList.get(i).toolName);
- textAndImgShowView.setImgs(R.drawable.play, Integer.parseInt(toolBeanList.get(i).toolImage));
- textAndImgShowView.setSelect(true);
- textAndImgShowView.setWidth(mIView.getBindActivity(),layout_control);
- textAndImgShowView.setBackground(AttrsUtils.getAttrs(mIView.getBindActivity()).getDrawable(0));
- textAndImgShowView.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View view) {
-
- }
- });
- layout_control.addView(textAndImgShowView);
- }*/
-// mIView.showTools(toolBeanList);
}
}
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
index 6dbb602..8d9dec9 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
@@ -50,7 +50,6 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
mRxManager.register(mIModel.getLoginResult(loginName, loginPwd).subscribe(new Consumer<JsonObject>() {
@Override
public void accept(JsonObject jsonObject) throws Exception {
- Timber.i("---=== loginResult :%s", jsonObject);
try {
if (jsonObject != null && !TextUtils.isEmpty(jsonObject.get("access_token").getAsString())) {
AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.ACCESS_TOKEN, jsonObject.get("access_token").getAsString());
@@ -69,19 +68,19 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
}, new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
- Response response = ((HttpException)throwable).response();
- if (response==null)return;
+ Response response = ((HttpException) throwable).response();
+ if (response == null) return;
ResponseBody responseBody = response.errorBody();
- if (responseBody==null)return;
+ if (responseBody == null) return;
try {
JSONObject json = new JSONObject(responseBody.string());
// ToastUtils.showToast(json.optString("message")+"json="+json);
- if(TextUtils.isEmpty(json.optString("error"))){
+ if (TextUtils.isEmpty(json.optString("error"))) {
mIView.showerror(json.optString("message"));
return;
}
mIView.showerror(json.optString("error"));
- } catch (Exception e1) {
+ } catch (Exception e1) {
e1.printStackTrace();
}
}
@@ -112,15 +111,15 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
}, new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
- Response response = ((HttpException)throwable).response();
- if (response==null)return;
+ Response response = ((HttpException) throwable).response();
+ if (response == null) return;
ResponseBody responseBody = response.errorBody();
- if (responseBody==null)return;
+ if (responseBody == null) return;
try {
JSONObject json = new JSONObject(responseBody.string());
// ToastUtils.showToast(json.optString("message")+"json="+json);
mIView.showerror(json.optString("message"));
- } catch (Exception e1) {
+ } catch (Exception e1) {
e1.printStackTrace();
}
}
@@ -158,7 +157,6 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
mRxManager.register(mIModel.getUserInfo(mobile, school_id, captcha).subscribe(new Consumer<UserInfo>() {
@Override
public void accept(UserInfo userInfo) throws Exception {
-// Log.d("6666", "userInfo=" + userInfo.toString());
if (userInfo != null) {
CurrentBean currentBean = userInfo.getData();
AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, currentBean.getMobile());
@@ -186,15 +184,15 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre
}, new Consumer<Throwable>() {
@Override
public void accept(Throwable throwable) throws Exception {
- Response response = ((HttpException)throwable).response();
- if (response==null)return;
+ Response response = ((HttpException) throwable).response();
+ if (response == null) return;
ResponseBody responseBody = response.errorBody();
- if (responseBody==null)return;
+ if (responseBody == null) return;
try {
JSONObject json = new JSONObject(responseBody.string());
// ToastUtils.showToast(json.optString("message")+"json="+json);
mIView.showerror(json.optString("message"));
- } catch (Exception e1) {
+ } catch (Exception e1) {
e1.printStackTrace();
}
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/mine/PersonInfoPrasenter.java b/app/src/main/java/com/shunzhi/parent/presenter/mine/PersonInfoPrasenter.java
index 5b15f41..2e00c5b 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/mine/PersonInfoPrasenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/mine/PersonInfoPrasenter.java
@@ -34,7 +34,7 @@ public class PersonInfoPrasenter extends PersonInfoContract.PersonInfoPresenter
public void accept(JsonObject jsonObject) throws Exception {
try {
if(jsonObject!=null&&jsonObject.get("data").getAsBoolean()) {
- ToastUtils.showToast(jsonObject.toString());
+// ToastUtils.showToast(jsonObject.toString());
AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_NAME, parentName);
AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.USER_SEX, String.valueOf(sex));
mIView.updateInfo();
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 6e7847a..9d0f0df 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
@@ -87,7 +87,6 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu
videoplayer.replayTextView.setVisibility(View.GONE);
videoplayer.backButton.setVisibility(View.GONE);
-// mPresenter.getTools(layout_control);
mPresenter.getBanners("2", AppContext.getInstance().district);
initBroadCast();
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
index db513c3..dc15b4e 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
@@ -77,12 +77,9 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
private void setPersonInfo() {
if (AppConfig.ISLOGIN) {
String url = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.USER_IMAGE);
- ToastUtils.showToast(url);
if (!TextUtils.isEmpty(url)) {
GlideUtils.showImg(getContext(),user_photo,url);
-// Glide.with(getActivity()).load(url).asBitmap().error(R.drawable.test).centerCrop().into(user_photo);
} else {
-// Glide.with(getActivity()).load(R.drawable.test).centerCrop().into(user_photo);
GlideUtils.showImg(getContext(),user_photo,url);
user_photo.setCornerRadius(20);
}
@@ -165,6 +162,8 @@ public class MineFragment extends BaseMVPCompatFragment<LoginAndRegisterContract
AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, "");
AppConfig.ISLOGIN=false;
setPersonInfo();
+ startNewActivity(LoginAndRegistActivity.class);
+ getActivity().finish();
}
@Override
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
index e363d35..0b3040c 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java
@@ -7,6 +7,7 @@ import android.support.annotation.Nullable;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
+import android.util.Log;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@@ -181,7 +182,7 @@ public class LoginAndRegistFragment extends BaseMVPCompatFragment<LoginAndRegist
@Override
public void showerror(String error) {
progressDialog.dismiss();
- ToastUtils.showToast(error);
+// ToastUtils.showToast(error);
}
@Override
diff --git a/app/src/main/res/layout/fragment_report.xml b/app/src/main/res/layout/fragment_report.xml
index d7b196b..5ae7459 100644
--- a/app/src/main/res/layout/fragment_report.xml
+++ b/app/src/main/res/layout/fragment_report.xml
@@ -15,12 +15,13 @@
android:padding="10dp">
<TextView
+ android:id="@+id/tvName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:drawablePadding="10dp"
android:drawableRight="@drawable/pull"
- android:text="马铂骞"
+ android:text=""
android:textColor="@color/textColor"
android:textSize="@dimen/textSize16" />
--
libgit2 0.21.0