Commit 1c1190fa4bed554dad8c67e0da763c330dedda14
1 parent
03248c7f
Exists in
yxb_dev
and in
1 other branch
no message
Showing
6 changed files
with
34 additions
and
11 deletions
Show diff stats
app/libs/processor.jar
No preview for this file type
app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.java
@@ -46,7 +46,7 @@ public interface ConsultContract { | @@ -46,7 +46,7 @@ public interface ConsultContract { | ||
46 | } | 46 | } |
47 | 47 | ||
48 | interface IConsultView extends IBaseFragment { | 48 | interface IConsultView extends IBaseFragment { |
49 | - void showVote(int position); | 49 | + void showVote(int position,String token); |
50 | 50 | ||
51 | void showBanners(List<GuangGaoBean> guangGaoBeanList); | 51 | void showBanners(List<GuangGaoBean> guangGaoBeanList); |
52 | 52 |
app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java
@@ -137,14 +137,14 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter { | @@ -137,14 +137,14 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter { | ||
137 | mRxManager.register(mIModel.loginVote(phoneNum, password).subscribe(new Consumer<String>() { | 137 | mRxManager.register(mIModel.loginVote(phoneNum, password).subscribe(new Consumer<String>() { |
138 | @Override | 138 | @Override |
139 | public void accept(String str) throws Exception { | 139 | public void accept(String str) throws Exception { |
140 | - Log.e("111111",str.toString()); | ||
141 | - mIView.showVote(position); | 140 | + Log.e("111111",str); |
141 | + mIView.showVote(position,str); | ||
142 | } | 142 | } |
143 | }, new Consumer<Throwable>() { | 143 | }, new Consumer<Throwable>() { |
144 | @Override | 144 | @Override |
145 | public void accept(Throwable throwable) throws Exception { | 145 | public void accept(Throwable throwable) throws Exception { |
146 | Log.e("111111",throwable.getMessage()); | 146 | Log.e("111111",throwable.getMessage()); |
147 | - mIView.showVote(position); | 147 | + mIView.showVote(position,""); |
148 | } | 148 | } |
149 | })); | 149 | })); |
150 | } | 150 | } |
app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
@@ -4,6 +4,7 @@ import android.content.Context; | @@ -4,6 +4,7 @@ import android.content.Context; | ||
4 | import android.content.Intent; | 4 | import android.content.Intent; |
5 | import android.graphics.Bitmap; | 5 | import android.graphics.Bitmap; |
6 | import android.os.Bundle; | 6 | import android.os.Bundle; |
7 | +import android.text.TextUtils; | ||
7 | import android.view.View; | 8 | import android.view.View; |
8 | import android.webkit.JavascriptInterface; | 9 | import android.webkit.JavascriptInterface; |
9 | import android.webkit.WebChromeClient; | 10 | import android.webkit.WebChromeClient; |
@@ -27,12 +28,21 @@ public class WebViewActivity extends BaseCompatActivity { | @@ -27,12 +28,21 @@ public class WebViewActivity extends BaseCompatActivity { | ||
27 | 28 | ||
28 | NestedScrollWebView nesteScrollWebView; | 29 | NestedScrollWebView nesteScrollWebView; |
29 | LinearLayout binding_success, binding_success2; | 30 | LinearLayout binding_success, binding_success2; |
30 | - ImageView close_btn,close_btn_right; | 31 | + ImageView close_btn, close_btn_right; |
31 | TextView tv_info, zuoye, title_web; | 32 | TextView tv_info, zuoye, title_web; |
32 | 33 | ||
33 | int type; | 34 | int type; |
34 | 35 | ||
35 | private ProgressBar pvWeb; | 36 | private ProgressBar pvWeb; |
37 | + private String token, url; | ||
38 | + | ||
39 | + public static void getInstance(Context context, String url, int type, String token) { | ||
40 | + Intent intent = new Intent(context, WebViewActivity.class); | ||
41 | + intent.putExtra("url", url); | ||
42 | + intent.putExtra("type", type); | ||
43 | + intent.putExtra("token", token); | ||
44 | + context.startActivity(intent); | ||
45 | + } | ||
36 | 46 | ||
37 | public static void getInstance(Context context, String url, int type) { | 47 | public static void getInstance(Context context, String url, int type) { |
38 | Intent intent = new Intent(context, WebViewActivity.class); | 48 | Intent intent = new Intent(context, WebViewActivity.class); |
@@ -66,9 +76,9 @@ public class WebViewActivity extends BaseCompatActivity { | @@ -66,9 +76,9 @@ public class WebViewActivity extends BaseCompatActivity { | ||
66 | close_btn_right.setOnClickListener(new View.OnClickListener() { | 76 | close_btn_right.setOnClickListener(new View.OnClickListener() { |
67 | @Override | 77 | @Override |
68 | public void onClick(View v) { | 78 | public void onClick(View v) { |
69 | - if(type!=-1&&type!= AppConfig.ORDER_CENTER) { | 79 | + if (type != -1 && type != AppConfig.ORDER_CENTER) { |
70 | startActivity(new Intent().setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP).setClass(WebViewActivity.this, MainActivity.class)); | 80 | startActivity(new Intent().setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP).setClass(WebViewActivity.this, MainActivity.class)); |
71 | - }else{ | 81 | + } else { |
72 | finish(); | 82 | finish(); |
73 | } | 83 | } |
74 | } | 84 | } |
@@ -85,6 +95,13 @@ public class WebViewActivity extends BaseCompatActivity { | @@ -85,6 +95,13 @@ public class WebViewActivity extends BaseCompatActivity { | ||
85 | 95 | ||
86 | pvWeb = findViewById(R.id.pb_web); | 96 | pvWeb = findViewById(R.id.pb_web); |
87 | type = getIntent().getIntExtra("type", 0); | 97 | type = getIntent().getIntExtra("type", 0); |
98 | + token = getIntent().getStringExtra("token"); | ||
99 | + url = getIntent().getStringExtra("url"); | ||
100 | + if (token != null && !"".equals(token) &&! TextUtils.isEmpty(token)) { | ||
101 | + url = url + "&Token=" + token; | ||
102 | + } | ||
103 | + | ||
104 | + | ||
88 | if (type == AppConfig.BINDING_SUCCESS_HEZUO) { | 105 | if (type == AppConfig.BINDING_SUCCESS_HEZUO) { |
89 | binding_success.setVisibility(View.VISIBLE); | 106 | binding_success.setVisibility(View.VISIBLE); |
90 | binding_success2.setVisibility(View.GONE); | 107 | binding_success2.setVisibility(View.GONE); |
@@ -117,7 +134,7 @@ public class WebViewActivity extends BaseCompatActivity { | @@ -117,7 +134,7 @@ public class WebViewActivity extends BaseCompatActivity { | ||
117 | 134 | ||
118 | initWebView(); | 135 | initWebView(); |
119 | initWebSetting(nesteScrollWebView.getSettings()); | 136 | initWebSetting(nesteScrollWebView.getSettings()); |
120 | - nesteScrollWebView.loadUrl(getIntent().getStringExtra("url")); | 137 | + nesteScrollWebView.loadUrl(url); |
121 | } | 138 | } |
122 | 139 | ||
123 | @Override | 140 | @Override |
app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java
@@ -230,8 +230,13 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu | @@ -230,8 +230,13 @@ public class ConsultFragment extends BaseMVPCompatFragment<ConsultContract.Consu | ||
230 | } | 230 | } |
231 | 231 | ||
232 | @Override | 232 | @Override |
233 | - public void showVote(int position) { | ||
234 | - WebViewActivity.getInstance(getContext(), imgWebUrl.get(position), -1); | 233 | + public void showVote(int position,String token) { |
234 | + Log.e("000000",imgWebUrl.get(position).toString()); | ||
235 | + if(imgWebUrl.get(position).startsWith(AppConfig.BASE_URL_VOTE)) { | ||
236 | + WebViewActivity.getInstance(getContext(), imgWebUrl.get(position), -1, token); | ||
237 | + }else{ | ||
238 | + WebViewActivity.getInstance(getContext(), imgWebUrl.get(position), -1); | ||
239 | + } | ||
235 | } | 240 | } |
236 | 241 | ||
237 | @Override | 242 | @Override |
app/src/main/java/com/shunzhi/parent/ui/fragment/StartFragment.java
@@ -98,8 +98,9 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult | @@ -98,8 +98,9 @@ public class StartFragment extends BaseMVPCompatFragment<ConsultContract.Consult | ||
98 | } | 98 | } |
99 | 99 | ||
100 | 100 | ||
101 | + | ||
101 | @Override | 102 | @Override |
102 | - public void showVote(int position) { | 103 | + public void showVote(int position, String token) { |
103 | 104 | ||
104 | } | 105 | } |
105 | 106 |