diff --git a/app/libs/processor.jar b/app/libs/processor.jar index ceefe7e..46b1996 100644 Binary files a/app/libs/processor.jar and b/app/libs/processor.jar differ diff --git a/app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.java b/app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.java index 07af53a..f9f6e0e 100644 --- a/app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.java +++ b/app/src/main/java/com/shunzhi/parent/contract/consult/ConsultContract.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 guangGaoBeanList); diff --git a/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java index 0c84578..fb45594 100644 --- a/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java +++ b/app/src/main/java/com/shunzhi/parent/presenter/consult/ConsultPresenter.java @@ -137,14 +137,14 @@ public class ConsultPresenter extends ConsultContract.ConsultPresenter { mRxManager.register(mIModel.loginVote(phoneNum, password).subscribe(new Consumer() { @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() { @Override public void accept(Throwable throwable) throws Exception { Log.e("111111",throwable.getMessage()); - mIView.showVote(position); + mIView.showVote(position,""); } })); } diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java index 3a1b5ec..45ed56f 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java +++ b/app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java @@ -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 diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java index 2ea80aa..0eb8e3a 100644 --- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java +++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ConsultFragment.java @@ -230,8 +230,13 @@ public class ConsultFragment extends BaseMVPCompatFragment