no message

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