From 1e92eff67b997263ecefa255c63eb6641c47b57f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 14 六月 2019 10:22:33 +0800
Subject: [PATCH] 设备消息BUG解决,品牌

---
 fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java |   50 ++++++++++++++++++++++++++++++--------------------
 1 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java b/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
index ec8106b..fa0a438 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
@@ -1,6 +1,7 @@
 package com.yeshi.fanli.controller;
 
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.Date;
@@ -100,7 +101,7 @@
 				nickName = URLDecoder.decode(nickName, "UTF-8");
 			} catch (Exception e) {
 			}
-			final String name=nickName;
+			final String name = nickName;
 			// LogHelper.test("uid:" + uid + "\n accessToken:" + accessToken);
 
 			// 鑾峰彇娓犻亾ID涓庝細鍛業D
@@ -115,9 +116,9 @@
 					LogHelper.test(e.getMsg());
 					errCode = 5;
 				}
-				//寮傛鐢宠浼氬憳ID
-                ThreadUtil.run(new Runnable() {
-					
+				// 寮傛鐢宠浼氬憳ID
+				ThreadUtil.run(new Runnable() {
+
 					@Override
 					public void run() {
 						String specialId = TaoKeApiUtil.getSpecialId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
@@ -132,7 +133,7 @@
 						}
 					}
 				});
-				
+
 			} else if ("zigou".equalsIgnoreCase(source)) {
 				String specialId = TaoKeApiUtil.getSpecialId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
 						TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
@@ -145,11 +146,10 @@
 					LogHelper.test(e.getMsg());
 					errCode = 5;
 				}
-				
-				
-				//寮傛鐢宠娓犻亾ID
-                ThreadUtil.run(new Runnable() {
-					
+
+				// 寮傛鐢宠娓犻亾ID
+				ThreadUtil.run(new Runnable() {
+
 					@Override
 					public void run() {
 						String relationId = TaoKeApiUtil.getRelationId(accessToken, TaoBaoConstant.TAOBAO_AUTH_APPKEY,
@@ -163,7 +163,7 @@
 						}
 					}
 				});
-				
+
 			} else if ("bind".equalsIgnoreCase(source)) {
 
 				boolean bindInfo = true;
@@ -215,20 +215,18 @@
 
 		} catch (Exception e) {
 			errCode = 4;
-			try {
-				LogHelper.errorDetailInfo(e);
-			} catch (Exception e1) {
-				e1.printStackTrace();
-			}
+			LogHelper.errorDetailInfo(e);
 		}
 
 		try {
 			if (errCode == 0)// 鎴愬姛
 			{
 				if ("share".equalsIgnoreCase(source)) {
-					response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_bonusState.html?code=0");
+					// response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_bonusState.html?code=0");
+					closeWebPage(response.getWriter());
 				} else if ("zigou".equalsIgnoreCase(source)) {
-					response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_rebateState.html?code=0");
+					// response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_rebateState.html?code=0");
+					closeWebPage(response.getWriter());
 				} else if ("bind".equalsIgnoreCase(source)) {
 					String script = String.format(
 							"<script>if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {window.location.href = 'yestv://toast#%s';setTimeout(function(){window.location.href = 'yestv://finishPage';},100);} else {yestv.toast(\"鎭枩浣狅紝娣樺疂缁戝畾鎴愬姛\");yestv.finishPage();}</script>",
@@ -237,9 +235,11 @@
 				}
 			} else {// 澶辫触
 				if ("share".equalsIgnoreCase(source)) {
-					response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_bonusState.html?code=1");
+					// response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_bonusState.html?code=1");
+					closeWebPage(response.getWriter());
 				} else if ("zigou".equalsIgnoreCase(source)) {
-					response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_rebateState.html?code=1");
+					// response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_rebateState.html?code=1");
+					closeWebPage(response.getWriter());
 				} else if ("bind".equalsIgnoreCase(source)) {
 					String script = String.format(
 							"<script>if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {window.location.href = 'yestv://toast#%s';setTimeout(function(){window.location.href = 'yestv://finishPage';},100);} else {yestv.toast(\"鎶辨瓑锛屾窐瀹濈粦瀹氬け璐");yestv.finishPage();}</script>",
@@ -253,4 +253,14 @@
 
 	}
 
+	private void closeWebPage(PrintWriter out) {
+		String script = "<script>if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {setTimeout(function(){window.location.href = 'yestv://finishPage';},100);} else {yestv.finishPage();}</script>";
+		out.print(script);
+	}
+
+	@RequestMapping(value = "pinduoduo")
+	public void pinDuoDuo(HttpServletResponse response) {
+
+	}
+
 }

--
Gitblit v1.8.0