Commit d25fb468296b09646bc8059a1515cfa36bef9d0b
1 parent
9ffdddb3
Exists in
yxb_dev
and in
1 other branch
no message
Showing
5 changed files
with
15 additions
and
15 deletions
Show diff stats
.idea/misc.xml
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 | </value> |
| 25 | 25 | </option> |
| 26 | 26 | </component> |
| 27 | - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> | |
| 27 | + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK"> | |
| 28 | 28 | <output url="file://$PROJECT_DIR$/build/classes" /> |
| 29 | 29 | </component> |
| 30 | 30 | <component name="ProjectType"> | ... | ... |
app/src/main/java/com/shunzhi/parent/AppConfig.java
| ... | ... | @@ -40,19 +40,18 @@ public class AppConfig { |
| 40 | 40 | public static String APP_IS_START = "app_is_start"; |
| 41 | 41 | |
| 42 | 42 | //测试 |
| 43 | - public static String BASE_URL="http://60.190.202.57:1000/"; | |
| 44 | - public static String BASE_URL_ORDER="http://60.190.202.57:8101/"; | |
| 45 | - public static String BASE_URL_FILE="http://60.190.202.57:8196"; | |
| 46 | - public static String BASE_URL_VOTE = "http://60.190.202.57:8812/"; | |
| 43 | +// public static String BASE_URL="http://60.190.202.57:1000/"; | |
| 44 | +// public static String BASE_URL_ORDER="http://60.190.202.57:8101/"; | |
| 45 | +// public static String BASE_URL_FILE="http://60.190.202.57:8196"; | |
| 46 | +// public static String BASE_URL_VOTE = "http://60.190.202.57:8812/"; | |
| 47 | 47 | |
| 48 | 48 | |
| 49 | 49 | //正式 |
| 50 | -// public static String BASE_URL = "http://campus.myjxt.com/"; | |
| 51 | -// public static String BASE_URL_ORDER = "http://parent.myjxt.com/"; | |
| 52 | -// public static String BASE_URL_FILE = "http://manage.myjxt.com"; | |
| 50 | + public static String BASE_URL = "http://campus.myjxt.com/"; | |
| 51 | + public static String BASE_URL_ORDER = "http://parent.myjxt.com/"; | |
| 52 | + public static String BASE_URL_FILE = "http://manage.myjxt.com"; | |
| 53 | 53 | // public static String BASE_URL_VOTE = "www.sxspy.net/"; |
| 54 | -// public static String BASE_URL_VOTE = "http://www.sxspy.net/"; | |
| 55 | -// public static final String url_version = BASE_URL + "api/Common/AppVersion?appType=3"; | |
| 54 | + public static String BASE_URL_VOTE = "http://www.sxspy.net/"; | |
| 56 | 55 | |
| 57 | 56 | |
| 58 | 57 | //默认日志保存的路径 | ... | ... |
app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java
app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
| ... | ... | @@ -98,11 +98,10 @@ public class WebViewActivity extends BaseCompatActivity { |
| 98 | 98 | type = getIntent().getIntExtra("type", 0); |
| 99 | 99 | token = getIntent().getStringExtra("token"); |
| 100 | 100 | url = getIntent().getStringExtra("url"); |
| 101 | - if (token != null && !"".equals(token) &&! TextUtils.isEmpty(token)) { | |
| 101 | + if (token != null && !"".equals(token) && !TextUtils.isEmpty(token)) { | |
| 102 | 102 | url = url + "&Token=" + token; |
| 103 | 103 | } |
| 104 | - | |
| 105 | - | |
| 104 | + Log.d("66666","url="+url); | |
| 106 | 105 | if (type == AppConfig.BINDING_SUCCESS_HEZUO) { |
| 107 | 106 | binding_success.setVisibility(View.VISIBLE); |
| 108 | 107 | binding_success2.setVisibility(View.GONE); |
| ... | ... | @@ -135,7 +134,7 @@ public class WebViewActivity extends BaseCompatActivity { |
| 135 | 134 | |
| 136 | 135 | initWebView(); |
| 137 | 136 | initWebSetting(nesteScrollWebView.getSettings()); |
| 138 | - Log.e("aaaa",url); | |
| 137 | + Log.e("aaaa", url); | |
| 139 | 138 | nesteScrollWebView.loadUrl(url); |
| 140 | 139 | } |
| 141 | 140 | ... | ... |
app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
| ... | ... | @@ -11,6 +11,7 @@ import android.support.annotation.Nullable; |
| 11 | 11 | import android.support.annotation.RequiresApi; |
| 12 | 12 | import android.support.v4.widget.NestedScrollView; |
| 13 | 13 | import android.text.TextUtils; |
| 14 | +import android.util.Log; | |
| 14 | 15 | import android.view.View; |
| 15 | 16 | import android.widget.EditText; |
| 16 | 17 | import android.widget.ImageView; |
| ... | ... | @@ -231,7 +232,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu |
| 231 | 232 | |
| 232 | 233 | @Override |
| 233 | 234 | public void showVote(int position,String token) { |
| 234 | - if(imgWebUrl.get(position).startsWith(AppConfig.BASE_URL_VOTE)) { | |
| 235 | + if(imgWebUrl.get(position).contains(AppConfig.BASE_URL_VOTE)) { | |
| 235 | 236 | WebViewActivity.getInstance(getContext(), imgWebUrl.get(position), -1, token); |
| 236 | 237 | }else{ |
| 237 | 238 | WebViewActivity.getInstance(getContext(), imgWebUrl.get(position), -1); | ... | ... |