From 85477cb5784fa7064f68800e9cbdd6631d838f82 Mon Sep 17 00:00:00 2001 From: 陶汉栋 <2821744554@qq.com> Date: Sat, 24 Mar 2018 17:04:57 +0800 Subject: [PATCH] no message --- app/src/main/java/com/shunzhi/parent/AppConfig.java | 2 +- app/src/main/java/com/shunzhi/parent/presenter/ceping/CePingPresenter.java | 3 --- app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java | 1 + app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java | 2 -- app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java | 1 + app/src/main/res/layout/activity_personinfo.xml | 6 +++--- app/src/main/res/layout/fragment_ce_ping.xml | 3 +++ app/src/main/res/layout/fragment_mine.xml | 4 ++-- mvpsdk/src/main/java/com/share/mvpsdk/helper/okhttp/CacheInterceptor.java | 9 ++------- 9 files changed, 13 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/shunzhi/parent/AppConfig.java b/app/src/main/java/com/shunzhi/parent/AppConfig.java index c11981e..0289df7 100644 --- a/app/src/main/java/com/shunzhi/parent/AppConfig.java +++ b/app/src/main/java/com/shunzhi/parent/AppConfig.java @@ -45,7 +45,7 @@ public class AppConfig { //正式 public static String BASE_URL="http://campus.myjxt.com/"; public static String BASE_URL_ORDER="http://parent.myjxt.com/"; - public static String BASE_URL_FILE="http://manage.myjxt.com "; + public static String BASE_URL_FILE="http://manage.myjxt.com"; //默认日志保存的路径 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 4f7e675..8ceea5b 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 @@ -1,6 +1,5 @@ package com.shunzhi.parent.presenter.ceping; -import android.util.Log; import android.view.View; import android.widget.LinearLayout; @@ -19,7 +18,6 @@ import java.util.ArrayList; import java.util.List; import io.reactivex.functions.Consumer; -import timber.log.Timber; /** * Created by ToaHanDong on 2018/3/14. @@ -43,7 +41,6 @@ public class CePingPresenter extends CepingContract.CePingPresenter { mRxManager.register(mIModel.getTools(areaName).subscribe(new Consumer() { @Override public void accept(JsonObject jsonObject) throws Exception { - if (jsonObject.get("status").getAsString().equals("1")){ JsonArray jsonArray=jsonObject.getAsJsonArray("data"); layout_control.removeAllViews(); 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 1f40538..4ee4dc6 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,6 +50,7 @@ public class LoginAndRegisterPresenter extends LoginAndRegisterContract.LoginPre @Override public void accept(JsonObject jsonObject) throws Exception { try { +// Log.d("66666","jsonObject="+jsonObject); if (jsonObject != null && !TextUtils.isEmpty(jsonObject.get("access_token").getAsString())) { AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.ACCESS_TOKEN, jsonObject.get("access_token").getAsString()); AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.LOGIN_NAME, loginName); diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java index b92dec9..1eeb7e8 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java @@ -119,7 +119,6 @@ public class WebViewActivity extends BaseCompatActivity { initWebView(); initWebSetting(nesteScrollWebView.getSettings()); nesteScrollWebView.loadUrl(getIntent().getStringExtra("url")); -// Log.d("66666","getIntent().getStringExtra(\"url\")="+getIntent().getStringExtra("url")); } @Override @@ -183,7 +182,6 @@ public class WebViewActivity extends BaseCompatActivity { @Override public boolean shouldOverrideUrlLoading(WebView view, String url) { -// Log.d("66666","shouldOverrideUrlLoading="+url); if (url.startsWith("http")) view.loadUrl(url); // if (url.contains("platformapi/startapp")) { // startAlipayActivity(url); diff --git a/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java b/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java index 174268f..d6978bb 100644 --- a/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java +++ b/app/src/main/java/com/shunzhi/parent/views/TextAndImgShowView.java @@ -5,6 +5,7 @@ import android.content.Context; import android.support.annotation.DrawableRes; import android.support.annotation.Nullable; import android.util.AttributeSet; +import android.util.Log; import android.view.View; import android.widget.FrameLayout; import android.widget.ImageView; diff --git a/app/src/main/res/layout/activity_personinfo.xml b/app/src/main/res/layout/activity_personinfo.xml index 8f3db3c..7a13cc8 100644 --- a/app/src/main/res/layout/activity_personinfo.xml +++ b/app/src/main/res/layout/activity_personinfo.xml @@ -27,14 +27,14 @@ android:layout_height="180dp" android:background="@drawable/backgroud_top" android:orientation="vertical" - android:paddingTop="20dp"> - + > diff --git a/app/src/main/res/layout/fragment_ce_ping.xml b/app/src/main/res/layout/fragment_ce_ping.xml index ed61f77..da10553 100644 --- a/app/src/main/res/layout/fragment_ce_ping.xml +++ b/app/src/main/res/layout/fragment_ce_ping.xml @@ -174,6 +174,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:scaleType="fitXY" + android:src="@drawable/activite1" android:id="@+id/ivCourse1" /> +