|
@@ -13,7 +13,6 @@ import android.view.KeyEvent; |
|
@@ -13,7 +13,6 @@ import android.view.KeyEvent; |
|
13
|
import android.view.View;
|
13
|
import android.view.View;
|
|
14
|
import android.view.Window;
|
14
|
import android.view.Window;
|
|
15
|
import android.view.WindowManager;
|
15
|
import android.view.WindowManager;
|
|
16
|
-import android.webkit.JavascriptInterface;
|
|
|
|
17
|
import android.webkit.WebSettings;
|
16
|
import android.webkit.WebSettings;
|
|
18
|
import android.webkit.WebView;
|
17
|
import android.webkit.WebView;
|
|
19
|
|
18
|
|
|
@@ -66,8 +65,7 @@ public class AggH5MainActivity extends Activity { |
|
@@ -66,8 +65,7 @@ public class AggH5MainActivity extends Activity { |
|
66
|
h5game = gameUrl;
|
65
|
h5game = gameUrl;
|
|
67
|
}
|
66
|
}
|
|
68
|
h5game = String.format(h5game, STSSConstants.sdkParams.getGame_id(), STSSConstants.sdkParams.getCurrChannel());
|
67
|
h5game = String.format(h5game, STSSConstants.sdkParams.getGame_id(), STSSConstants.sdkParams.getCurrChannel());
|
|
69
|
- String newH5Url = h5game + "?" + ParamsTools.getParams(mContext, currToken);
|
|
|
|
70
|
- webView.loadUrl(newH5Url);
|
68
|
+ loadH5Game();
|
|
71
|
}
|
69
|
}
|
|
72
|
|
70
|
|
|
73
|
private void initView() {
|
71
|
private void initView() {
|
|
@@ -150,9 +148,7 @@ public class AggH5MainActivity extends Activity { |
|
@@ -150,9 +148,7 @@ public class AggH5MainActivity extends Activity { |
|
150
|
runOnUiThread(new Runnable() {
|
148
|
runOnUiThread(new Runnable() {
|
|
151
|
@Override
|
149
|
@Override
|
|
152
|
public void run() {
|
150
|
public void run() {
|
|
153
|
- String newH5Url = h5game + "?" + ParamsTools.getParams(mContext, currToken);
|
|
|
|
154
|
- AggH5Log.d(TAG, newH5Url);
|
|
|
|
155
|
- webView.loadUrl(newH5Url);
|
151
|
+ loadH5Game();
|
|
156
|
}
|
152
|
}
|
|
157
|
});
|
153
|
});
|
|
158
|
} else {
|
154
|
} else {
|
|
@@ -176,10 +172,9 @@ public class AggH5MainActivity extends Activity { |
|
@@ -176,10 +172,9 @@ public class AggH5MainActivity extends Activity { |
|
176
|
AggH5MainActivity.this.runOnUiThread(new Runnable() {
|
172
|
AggH5MainActivity.this.runOnUiThread(new Runnable() {
|
|
177
|
@Override
|
173
|
@Override
|
|
178
|
public void run() {
|
174
|
public void run() {
|
|
179
|
- //showToast("个人中心退出帐号成功");
|
|
|
|
180
|
currToken = null;
|
175
|
currToken = null;
|
|
|
|
176
|
+ loadH5Game();
|
|
181
|
login();
|
177
|
login();
|
|
182
|
- AggH5Log.d(TAG, "实现游戏的切换或注销帐号的流程,比如回到登陆界面");
|
|
|
|
183
|
}
|
178
|
}
|
|
184
|
});
|
179
|
});
|
|
185
|
}
|
180
|
}
|
|
@@ -210,14 +205,10 @@ public class AggH5MainActivity extends Activity { |
|
@@ -210,14 +205,10 @@ public class AggH5MainActivity extends Activity { |
|
210
|
}, 1000);
|
205
|
}, 1000);
|
|
211
|
}
|
206
|
}
|
|
212
|
|
207
|
|
|
213
|
- @JavascriptInterface
|
|
|
|
214
|
- public void logout() {
|
|
|
|
215
|
- STSSAggGame.logout();
|
|
|
|
216
|
- }
|
|
|
|
217
|
-
|
|
|
|
218
|
- @JavascriptInterface
|
|
|
|
219
|
- public void exit() {
|
|
|
|
220
|
- STSSAggGame.exit();
|
208
|
+ private void loadH5Game() {
|
|
|
|
209
|
+ String newH5Url = h5game + "?" + ParamsTools.getParams(mContext, currToken);
|
|
|
|
210
|
+ AggH5Log.d(TAG, newH5Url);
|
|
|
|
211
|
+ webView.loadUrl(newH5Url);
|
|
221
|
}
|
212
|
}
|
|
222
|
|
213
|
|
|
223
|
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|
214
|
public void onActivityResult(int requestCode, int resultCode, Intent data) {
|