Commit 829048939415508590b39d2f4632a40bc8fea56f
1 parent
0a7ab48f
Exists in
yxb_dev
and in
2 other branches
no message
Showing
3 changed files
with
4 additions
and
5 deletions
Show diff stats
app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
| @@ -116,7 +116,7 @@ public class WebViewActivity extends BaseCompatActivity { | @@ -116,7 +116,7 @@ public class WebViewActivity extends BaseCompatActivity { | ||
| 116 | initWebView(); | 116 | initWebView(); |
| 117 | initWebSetting(nesteScrollWebView.getSettings()); | 117 | initWebSetting(nesteScrollWebView.getSettings()); |
| 118 | nesteScrollWebView.loadUrl(getIntent().getStringExtra("url")); | 118 | nesteScrollWebView.loadUrl(getIntent().getStringExtra("url")); |
| 119 | -// Log.d("66666","getIntent().getStringExtra(\"url\")="+getIntent().getStringExtra("url")); | 119 | + Log.d("66666","getIntent().getStringExtra(\"url\")="+getIntent().getStringExtra("url")); |
| 120 | } | 120 | } |
| 121 | 121 | ||
| 122 | @Override | 122 | @Override |
| @@ -179,7 +179,6 @@ public class WebViewActivity extends BaseCompatActivity { | @@ -179,7 +179,6 @@ public class WebViewActivity extends BaseCompatActivity { | ||
| 179 | nesteScrollWebView.setWebViewClient(new WebViewClient() { | 179 | nesteScrollWebView.setWebViewClient(new WebViewClient() { |
| 180 | @Override | 180 | @Override |
| 181 | public boolean shouldOverrideUrlLoading(WebView view, String url) { | 181 | public boolean shouldOverrideUrlLoading(WebView view, String url) { |
| 182 | - Log.d("666666", "url=" + url); | ||
| 183 | if (url.startsWith("http")) view.loadUrl(url); | 182 | if (url.startsWith("http")) view.loadUrl(url); |
| 184 | // if (url.contains("platformapi/startapp")) { | 183 | // if (url.contains("platformapi/startapp")) { |
| 185 | // startAlipayActivity(url); | 184 | // startAlipayActivity(url); |
app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java
| @@ -93,7 +93,7 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP | @@ -93,7 +93,7 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP | ||
| 93 | 93 | ||
| 94 | private void addTools() { | 94 | private void addTools() { |
| 95 | layout_control.measure(0, 0); | 95 | layout_control.measure(0, 0); |
| 96 | - mPresenter.getTools(layout_control, "余杭区"); | 96 | + mPresenter.getTools(layout_control, AppContext.getInstance().district); |
| 97 | 97 | ||
| 98 | } | 98 | } |
| 99 | 99 | ||
| @@ -102,7 +102,7 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP | @@ -102,7 +102,7 @@ public class CePingFragment extends BaseMVPCompatFragment<CepingContract.CePingP | ||
| 102 | super.onResume(); | 102 | super.onResume(); |
| 103 | // if (!tvLocalAddress.getText().toString().equals(AppContext.getInstance().cityName)){ | 103 | // if (!tvLocalAddress.getText().toString().equals(AppContext.getInstance().cityName)){ |
| 104 | tvLocalAddress.setText(AppContext.getInstance().district); | 104 | tvLocalAddress.setText(AppContext.getInstance().district); |
| 105 | - addTools(); | 105 | +// addTools(); |
| 106 | // } | 106 | // } |
| 107 | } | 107 | } |
| 108 | 108 |
app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
| @@ -140,7 +140,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu | @@ -140,7 +140,7 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu | ||
| 140 | xBanner.setOnItemClickListener(new XBanner.OnItemClickListener() { | 140 | xBanner.setOnItemClickListener(new XBanner.OnItemClickListener() { |
| 141 | @Override | 141 | @Override |
| 142 | public void onItemClick(XBanner banner, int position) { | 142 | public void onItemClick(XBanner banner, int position) { |
| 143 | - WebViewActivity.getInstance(getContext(), describeList.get(position), -1); | 143 | + WebViewActivity.getInstance(getContext(), imgesUrl.get(position), -1); |
| 144 | } | 144 | } |
| 145 | }); | 145 | }); |
| 146 | } | 146 | } |