陶汉栋 / ParentWork

Download as
Browse Code »

Commit 5054d902f2708b5c073c2c43dee830783a9cae8c

Authored by 姚旭斌
2 parents 1812a131 69679356
Exists in yxb_dev and in 2 other branches developer, wwx

Merge branch 'developer' into yxb_dev

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
  Diff comments   View file @5054d90
@@ -114,7 +114,7 @@ public class WebViewActivity extends BaseCompatActivity { @@ -114,7 +114,7 @@ public class WebViewActivity extends BaseCompatActivity {
114 initWebView(); 114 initWebView();
115 initWebSetting(nesteScrollWebView.getSettings()); 115 initWebSetting(nesteScrollWebView.getSettings());
116 nesteScrollWebView.loadUrl(getIntent().getStringExtra("url")); 116 nesteScrollWebView.loadUrl(getIntent().getStringExtra("url"));
117 -// Log.d("66666","getIntent().getStringExtra(\"url\")="+getIntent().getStringExtra("url")); 117 + Log.d("66666","getIntent().getStringExtra(\"url\")="+getIntent().getStringExtra("url"));
118 } 118 }
119 119
120 @Override 120 @Override
@@ -177,7 +177,6 @@ public class WebViewActivity extends BaseCompatActivity { @@ -177,7 +177,6 @@ public class WebViewActivity extends BaseCompatActivity {
177 nesteScrollWebView.setWebViewClient(new WebViewClient() { 177 nesteScrollWebView.setWebViewClient(new WebViewClient() {
178 @Override 178 @Override
179 public boolean shouldOverrideUrlLoading(WebView view, String url) { 179 public boolean shouldOverrideUrlLoading(WebView view, String url) {
180 - Log.d("666666", "url=" + url);  
181 if (url.startsWith("http")) view.loadUrl(url); 180 if (url.startsWith("http")) view.loadUrl(url);
182 // if (url.contains("platformapi/startapp")) { 181 // if (url.contains("platformapi/startapp")) {
183 // startAlipayActivity(url); 182 // startAlipayActivity(url);
app/src/main/java/com/shunzhi/parent/ui/fragment/CePingFragment.java
  Diff comments   View file @5054d90
@@ -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
  Diff comments   View file @5054d90
@@ -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(), guanggaoList.get(position).url, -1); 143 + WebViewActivity.getInstance(getContext(), imgesUrl.get(position), -1);
144 } 144 }
145 }); 145 });
146 } 146 }