diff --git a/.idea/misc.xml b/.idea/misc.xml index 75dac50..3963879 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,7 +24,7 @@ - + diff --git a/app/src/main/java/com/shunzhi/parent/AppConfig.java b/app/src/main/java/com/shunzhi/parent/AppConfig.java index 5a1e080..bd67d09 100644 --- a/app/src/main/java/com/shunzhi/parent/AppConfig.java +++ b/app/src/main/java/com/shunzhi/parent/AppConfig.java @@ -40,19 +40,18 @@ public class AppConfig { public static String APP_IS_START = "app_is_start"; //测试 - public static String BASE_URL="http://60.190.202.57:1000/"; - public static String BASE_URL_ORDER="http://60.190.202.57:8101/"; - public static String BASE_URL_FILE="http://60.190.202.57:8196"; - public static String BASE_URL_VOTE = "http://60.190.202.57:8812/"; +// public static String BASE_URL="http://60.190.202.57:1000/"; +// public static String BASE_URL_ORDER="http://60.190.202.57:8101/"; +// public static String BASE_URL_FILE="http://60.190.202.57:8196"; +// public static String BASE_URL_VOTE = "http://60.190.202.57:8812/"; //正式 -// 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 = "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_VOTE = "www.sxspy.net/"; -// public static String BASE_URL_VOTE = "http://www.sxspy.net/"; -// public static final String url_version = BASE_URL + "api/Common/AppVersion?appType=3"; + public static String BASE_URL_VOTE = "http://www.sxspy.net/"; //默认日志保存的路径 diff --git a/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java index 5d3a457..c7b9b27 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java @@ -1,5 +1,6 @@ package com.shunzhi.parent.presenter.consult; +import android.util.Log; import android.view.View; import android.widget.LinearLayout; 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 46c4385..bb9e505 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 @@ -98,11 +98,10 @@ public class WebViewActivity extends BaseCompatActivity { type = getIntent().getIntExtra("type", 0); token = getIntent().getStringExtra("token"); url = getIntent().getStringExtra("url"); - if (token != null && !"".equals(token) &&! TextUtils.isEmpty(token)) { + if (token != null && !"".equals(token) && !TextUtils.isEmpty(token)) { url = url + "&Token=" + token; } - - + Log.d("66666","url="+url); if (type == AppConfig.BINDING_SUCCESS_HEZUO) { binding_success.setVisibility(View.VISIBLE); binding_success2.setVisibility(View.GONE); @@ -135,7 +134,7 @@ public class WebViewActivity extends BaseCompatActivity { initWebView(); initWebSetting(nesteScrollWebView.getSettings()); - Log.e("aaaa",url); + Log.e("aaaa", url); nesteScrollWebView.loadUrl(url); } 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 d054da0..812c3d1 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 @@ -11,6 +11,7 @@ import android.support.annotation.Nullable; import android.support.annotation.RequiresApi; import android.support.v4.widget.NestedScrollView; import android.text.TextUtils; +import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.ImageView; @@ -231,7 +232,7 @@ public class ConsultFragment extends BaseMVPCompatFragment