Skip to content

apk_product / ForFun

Go to a project
Toggle navigation
Toggle navigation pinning
Commit a6be91c5 a6be91c55b61208cb412fb1678e60af2cc7b2337 by 金学艇
Options

1.解决透明度问题

1 parent b994d0fb
Inline Side-by-side
Showing 7 changed files with 68 additions and 27 deletions
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
207 "array": [ 207 "array": [
208 0, 208 0,
209 0, 209 0,
210 271.0659484863281, 210 265.0037841796875,
211 0, 211 0,
212 0, 212 0,
213 0, 213 0,
...@@ -2653,8 +2653,8 @@ ...@@ -2653,8 +2653,8 @@
2653 } 2653 }
2654 ], 2654 ],
2655 "_useOriginalSize": false, 2655 "_useOriginalSize": false,
2656 "_string": "应用信息", 2656 "_string": "精彩图片",
2657 "_N$string": "应用信息", 2657 "_N$string": "精彩图片",
2658 "_fontSize": 32, 2658 "_fontSize": 32,
2659 "_lineHeight": 45, 2659 "_lineHeight": 45,
2660 "_enableWrapText": true, 2660 "_enableWrapText": true,
...@@ -3800,12 +3800,6 @@ ...@@ -3800,12 +3800,6 @@
3800 "PFB_RECOMMEN_CATEGORY": { 3800 "PFB_RECOMMEN_CATEGORY": {
3801 "__uuid__": "3555d4d3-0ee6-47bb-9039-3bb44aab89a2" 3801 "__uuid__": "3555d4d3-0ee6-47bb-9039-3bb44aab89a2"
3802 }, 3802 },
3803 "test_detail_type_json": {
3804 "__uuid__": "11cd5783-c449-45e7-8f89-78d931485c00"
3805 },
3806 "test_detail_json": {
3807 "__uuid__": "769f72d2-5dbf-4a57-852a-b416a22d17f8"
3808 },
3809 "_id": "e7L+WJBsFHUK29Fs5R70+b" 3803 "_id": "e7L+WJBsFHUK29Fs5R70+b"
3810 } 3804 }
3811 ] 3805 ]
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
192 "array": [ 192 "array": [
193 0, 193 0,
194 0, 194 0,
195 271.0659484863281, 195 265.0037841796875,
196 0, 196 0,
197 0, 197 0,
198 0, 198 0,
...@@ -5631,7 +5631,7 @@ ...@@ -5631,7 +5631,7 @@
5631 }, 5631 },
5632 { 5632 {
5633 "__type__": "cc.Node", 5633 "__type__": "cc.Node",
5634 "_name": "New Label", 5634 "_name": "Version",
5635 "_objFlags": 0, 5635 "_objFlags": 0,
5636 "_parent": { 5636 "_parent": {
5637 "__id__": 2 5637 "__id__": 2
...@@ -5657,7 +5657,7 @@ ...@@ -5657,7 +5657,7 @@
5657 }, 5657 },
5658 "_contentSize": { 5658 "_contentSize": {
5659 "__type__": "cc.Size", 5659 "__type__": "cc.Size",
5660 "width": 201.96, 5660 "width": 205.52,
5661 "height": 30.24 5661 "height": 30.24
5662 }, 5662 },
5663 "_anchorPoint": { 5663 "_anchorPoint": {
...@@ -5708,8 +5708,8 @@ ...@@ -5708,8 +5708,8 @@
5708 } 5708 }
5709 ], 5709 ],
5710 "_useOriginalSize": false, 5710 "_useOriginalSize": false,
5711 "_string": "v0.9.0.2020031117", 5711 "_string": "v0.9.0.2020031217",
5712 "_N$string": "v0.9.0.2020031117", 5712 "_N$string": "v0.9.0.2020031217",
5713 "_fontSize": 24, 5713 "_fontSize": 24,
5714 "_lineHeight": 24, 5714 "_lineHeight": 24,
5715 "_enableWrapText": true, 5715 "_enableWrapText": true,
...@@ -5736,7 +5736,7 @@ ...@@ -5736,7 +5736,7 @@
5736 "_target": null, 5736 "_target": null,
5737 "_alignFlags": 36, 5737 "_alignFlags": 36,
5738 "_left": 0, 5738 "_left": 0,
5739 "_right": 10, 5739 "_right": 8.219999999999999,
5740 "_top": 0, 5740 "_top": 0,
5741 "_bottom": 10, 5741 "_bottom": 10,
5742 "_verticalCenter": 0, 5742 "_verticalCenter": 0,
......
...@@ -232,10 +232,10 @@ cc.Class({ ...@@ -232,10 +232,10 @@ cc.Class({
232 cc.log("向下滑动：" + fiFocusTarget.node.name); 232 cc.log("向下滑动：" + fiFocusTarget.node.name);
233 this._cFocus.flyFocus(this._fiCurrentFocus, fiFocusTarget, Common.MOVE_DIRECTION_DOWN, 1.0, oScrollParameter); 233 this._cFocus.flyFocus(this._fiCurrentFocus, fiFocusTarget, Common.MOVE_DIRECTION_DOWN, 1.0, oScrollParameter);
234 } 234 }
235 if (this._fiCurrentFocus.node.name == "Play" && this._bShowProgress) { 235 // if (this._fiCurrentFocus.node.name == "Play" && this._bShowProgress) { //暂时隐藏选集框，否则点击单曲循环会出现问题
236 this.showSelectGatherArea(); 236 // this.showSelectGatherArea();
237 return; 237 // return;
238 } 238 // }
239 } 239 }
240 if (event.keyCode == cc.macro.KEY.left || event.keyCode == Common.ANDROID_KEY.left) { 240 if (event.keyCode == cc.macro.KEY.left || event.keyCode == Common.ANDROID_KEY.left) {
241 if (this._fiCurrentFocus.node.name == "Nothing") { 241 if (this._fiCurrentFocus.node.name == "Nothing") {
......
...@@ -71,6 +71,7 @@ cc.Class({ ...@@ -71,6 +71,7 @@ cc.Class({
71 this._bAbleHotUpdate = false; 71 this._bAbleHotUpdate = false;
72 this._bIsDataListMoving = false; 72 this._bIsDataListMoving = false;
73 this._bIsScrollViewMoving = false; 73 this._bIsScrollViewMoving = false;
74 this._bInitCategoryListSuccess = true;
74 this._scrollview = this.node.getComponent(cc.ScrollView); 75 this._scrollview = this.node.getComponent(cc.ScrollView);
75 this._oSceneContext.focusPath = "scrollContent/TopNavi/topNavi1"; 76 this._oSceneContext.focusPath = "scrollContent/TopNavi/topNavi1";
76 this._oSceneContext._iPageIndex = 1; 77 this._oSceneContext._iPageIndex = 1;
...@@ -590,8 +591,6 @@ cc.Class({ ...@@ -590,8 +591,6 @@ cc.Class({
590 // cc.log("子节点："+nodeLayout.childrenCount); 591 // cc.log("子节点："+nodeLayout.childrenCount);
591 } 592 }
592 593
593 if (this._oSceneContext._iPageIndex != 1)
594 this.recoverFocusPath(); //有必要的话去恢复焦点记忆
595 // this.node.getChildByName("scrollContent").height = 2300; //这里暂且写死，scrollView有bug 594 // this.node.getChildByName("scrollContent").height = 2300; //这里暂且写死，scrollView有bug
596 // this._scrollview.scrollToTop(); 595 // this._scrollview.scrollToTop();
597 } catch (error) { 596 } catch (error) {
...@@ -605,6 +604,13 @@ cc.Class({ ...@@ -605,6 +604,13 @@ cc.Class({
605 604
606 recoverFocusPath: function () { 605 recoverFocusPath: function () {
607 if (this._oSceneContext._iCurrentLeftIndex == 1) { 606 if (this._oSceneContext._iCurrentLeftIndex == 1) {
607 if (this._oSceneContext._iPageIndex == 1) {
608 this.scheduleOnce(()=>{
609 let fiFocusTarget = cc.find(this._oSceneContext.focusPath, this.node).getComponent(FocusInfo);
610 this._cFocus.flyFocus(this._fiCurrentFocus, fiFocusTarget, Common.MOVE_DIRECTION_DOWN, null, null);
611 return;
612 },0)
613 }
608 let height = this._aBgHeight[this._oSceneContext._iPageIndex - 1] || 0; //-1,打补丁：解决回退回来页面对不上的bug 614 let height = this._aBgHeight[this._oSceneContext._iPageIndex - 1] || 0; //-1,打补丁：解决回退回来页面对不上的bug
609 this.onScrollViewScrollStart(); 615 this.onScrollViewScrollStart();
610 this._scrollview.scrollToOffset(cc.v2(0, height), 0.5); 616 this._scrollview.scrollToOffset(cc.v2(0, height), 0.5);
...@@ -761,8 +767,11 @@ cc.Class({ ...@@ -761,8 +767,11 @@ cc.Class({
761 ); 767 );
762 // lvCategoryList.loadData( 768 // lvCategoryList.loadData(
763 // function (strResponse) { 769 // function (strResponse) {
764 // cc.log("列表：" + JSON.stringify(this._aJsonList[this._oSceneContext._iCurrentLeftIndex])); 770 // cc.log("列表：" + this._oInit[this._oSceneContext._iCurrentLeftIndex]);
765 let strResponse = this._oInit[this._oSceneContext._iCurrentLeftIndex]; //这里采用列表 771 let strResponse = this._oInit[this._oSceneContext._iCurrentLeftIndex]; //这里采用列表
772 if (strResponse && strResponse != "undefined") { //防止焦点未初始化完成就去跳转，导致报错
773 this._bInitCategoryListSuccess = false;
774 }
766 lvCategoryList.renderInitData(strResponse, function () { 775 lvCategoryList.renderInitData(strResponse, function () {
767 cc.log("InitCategoryList-------------------->"); 776 cc.log("InitCategoryList-------------------->");
768 var oJSONResult = JSON.parse(strResponse); 777 var oJSONResult = JSON.parse(strResponse);
...@@ -816,7 +825,7 @@ cc.Class({ ...@@ -816,7 +825,7 @@ cc.Class({
816 var nodeInitFocus; 825 var nodeInitFocus;
817 if (this._oSceneContext._iCurrentLeftIndex == 1) { //只对导航1瀑布流做光标记忆，其他暂不做，以后考虑会做 826 if (this._oSceneContext._iCurrentLeftIndex == 1) { //只对导航1瀑布流做光标记忆，其他暂不做，以后考虑会做
818 nodeInitFocus = cc.find(this._oSceneContext.focusPath, this.node); 827 nodeInitFocus = cc.find(this._oSceneContext.focusPath, this.node);
819 }else{ 828 } else {
820 nodeInitFocus = cc.find("scrollContent/TopNavi/topNavi" + this._oSceneContext._iCurrentLeftIndex, this.node); 829 nodeInitFocus = cc.find("scrollContent/TopNavi/topNavi" + this._oSceneContext._iCurrentLeftIndex, this.node);
821 } 830 }
822 831
...@@ -829,11 +838,15 @@ cc.Class({ ...@@ -829,11 +838,15 @@ cc.Class({
829 Common.SCREEN_WIDTH, Common.SCREEN_HEIGHT, 10, 6, 1.1, true); 838 Common.SCREEN_WIDTH, Common.SCREEN_HEIGHT, 10, 6, 1.1, true);
830 this._cFocus.hide(); 839 this._cFocus.hide();
831 840
841 if (this._oSceneContext.focusPath != "scrollContent/TopNavi/topNavi1")
842 this.recoverFocusPath(); //有必要的话去恢复焦点记忆
843
832 if (this._oSceneContext._iCurrentLeftIndex > 1) { //不是第一个焦点框就跳过去，恢复记忆 844 if (this._oSceneContext._iCurrentLeftIndex > 1) { //不是第一个焦点框就跳过去，恢复记忆
833 this.scheduleOnce(function () { 845 this.scheduleOnce(function () {
834 this._cFocus.flyFocus(this._fiCurrentFocus, nodeInitFocus.getComponent(FocusInfo), Common.MOVE_DIRECTION_RIGHT, null, null); 846 this._cFocus.flyFocus(this._fiCurrentFocus, nodeInitFocus.getComponent(FocusInfo), Common.MOVE_DIRECTION_RIGHT, null, null);
835 }, 0); 847 }, 0);
836 } 848 }
849
837 if (!Common._bIsHotUpdate) { 850 if (!Common._bIsHotUpdate) {
838 Common._bIsHotUpdate = true; 851 Common._bIsHotUpdate = true;
839 this.checkUpdate(); //热更新 852 this.checkUpdate(); //热更新
...@@ -874,6 +887,10 @@ cc.Class({ ...@@ -874,6 +887,10 @@ cc.Class({
874 // cc.log("目标节点名称：" + fiFocusTarget.node.name); 887 // cc.log("目标节点名称：" + fiFocusTarget.node.name);
875 var leftNavLayout = this.targetAry[0].target; 888 var leftNavLayout = this.targetAry[0].target;
876 889
890 if (!this._bInitCategoryListSuccess) {
891 return [null, oScrollParameter];
892 }
893
877 if (fiFocusTarget && 0 == fiFocusTarget.node.name.indexOf("topNavi") || 0 == fiFocusTarget.node.name.indexOf("topCell")) { 894 if (fiFocusTarget && 0 == fiFocusTarget.node.name.indexOf("topNavi") || 0 == fiFocusTarget.node.name.indexOf("topCell")) {
878 if (0 != this._fiCurrentFocus.node.name.indexOf("topNavi") && 0 != this._fiCurrentFocus.node.name.indexOf("topCell")) {//如果不是TypeList之间跳转，则哪里来回哪里去 895 if (0 != this._fiCurrentFocus.node.name.indexOf("topNavi") && 0 != this._fiCurrentFocus.node.name.indexOf("topCell")) {//如果不是TypeList之间跳转，则哪里来回哪里去
879 fiFocusTarget = cc.find("topNavi" + this._oSceneContext._iCurrentLeftIndex, leftNavLayout).getComponent(FocusInfo); 896 fiFocusTarget = cc.find("topNavi" + this._oSceneContext._iCurrentLeftIndex, leftNavLayout).getComponent(FocusInfo);
...@@ -1256,6 +1273,8 @@ cc.Class({ ...@@ -1256,6 +1273,8 @@ cc.Class({
1256 ); 1273 );
1257 } 1274 }
1258 1275
1276 if (0 == fiFrom.node.getName().indexOf('topNavi')) {//如果不是导航之间切换，不必要重新刷新数据
1277
1259 this._oSceneContext._iCurrentLeftIndex = iIndex; 1278 this._oSceneContext._iCurrentLeftIndex = iIndex;
1260 this.scheduleOnce(function () { 1279 this.scheduleOnce(function () {
1261 // this.requestMediaList(1); //重新渲染CategoryList 1280 // this.requestMediaList(1); //重新渲染CategoryList
...@@ -1284,6 +1303,7 @@ cc.Class({ ...@@ -1284,6 +1303,7 @@ cc.Class({
1284 rightNodeLayout.children[i].active = false; 1303 rightNodeLayout.children[i].active = false;
1285 } 1304 }
1286 } 1305 }
1306 }
1287 1307
1288 } 1308 }
1289 1309
......
1 <?xml version="1.0" encoding="utf-8"?>
2 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 android:id="@+id/ll_single"
4 android:layout_width="match_parent"
5 android:layout_height="match_parent"
6 android:visibility="gone">
7
8 <ImageView
9 android:id="@+id/iv"
10 android:layout_width="match_parent"
11 android:layout_height="match_parent"
12 android:src="@mipmap/icon_white"/>
13
14 </RelativeLayout>
...\ No newline at end of file ...\ No newline at end of file
...@@ -40,8 +40,10 @@ import android.util.Log; ...@@ -40,8 +40,10 @@ import android.util.Log;
40 import android.view.LayoutInflater; 40 import android.view.LayoutInflater;
41 import android.view.View; 41 import android.view.View;
42 import android.view.WindowManager; 42 import android.view.WindowManager;
43 import android.webkit.WebView;
43 import android.widget.FrameLayout; 44 import android.widget.FrameLayout;
44 import android.widget.ImageView; 45 import android.widget.ImageView;
46 import android.widget.LinearLayout;
45 import android.widget.RelativeLayout; 47 import android.widget.RelativeLayout;
46 48
47 import com.topdraw.component.CocosMediaPlayer; 49 import com.topdraw.component.CocosMediaPlayer;
...@@ -54,13 +56,21 @@ public class AppActivity extends Cocos2dxActivity { ...@@ -54,13 +56,21 @@ public class AppActivity extends Cocos2dxActivity {
54 protected static Handler mUIHandler; 56 protected static Handler mUIHandler;
55 private BroadcastReceiver receiver = null; 57 private BroadcastReceiver receiver = null;
56 private View view; 58 private View view;
59 private View singleView;
60 private RelativeLayout relativeLayout;
61 private RelativeLayout mRLSingleColor;
57 62
58 @Override 63 @Override
59 protected void onCreate(Bundle savedInstanceState) { 64 protected void onCreate(Bundle savedInstanceState) {
60 super.onCreate(savedInstanceState); 65 super.onCreate(savedInstanceState);
66 //----解决游戏页按返回退出时，背景图透明度过高,onPause和onResume中控制显示还是隐藏
67 singleView = LayoutInflater.from(this).inflate(R.layout.activity_main_single_color, null);
68 mRLSingleColor = singleView.findViewById(R.id.ll_single);
69 mFrameLayout.addView(singleView);
70 //---- end
61 //添加加载小游戏进度条(暂时将Cocos2dxActivity中的this.mGLSurfaceView.setZOrderOnTop(true);注释，否则显示不出来) 71 //添加加载小游戏进度条(暂时将Cocos2dxActivity中的this.mGLSurfaceView.setZOrderOnTop(true);注释，否则显示不出来)
62 view = LayoutInflater.from(this).inflate(R.layout.activity_main, null); 72 view = LayoutInflater.from(this).inflate(R.layout.activity_main, null);
63 final RelativeLayout relativeLayout = view.findViewById(R.id.rl_img); 73 relativeLayout = view.findViewById(R.id.rl_img);
64 mFrameLayout.addView(view); 74 mFrameLayout.addView(view);
65 receiver = new BroadcastReceiver() { 75 receiver = new BroadcastReceiver() {
66 @Override 76 @Override
...@@ -103,9 +113,6 @@ public class AppActivity extends Cocos2dxActivity { ...@@ -103,9 +113,6 @@ public class AppActivity extends Cocos2dxActivity {
103 113
104 // DO OTHER INITIALIZATION BELOW 114 // DO OTHER INITIALIZATION BELOW
105 SDKWrapper.getInstance().init(this); 115 SDKWrapper.getInstance().init(this);
106
107 //测试下载奥比中光
108 // TopdrawSDKWrapper.startOBiGame("com.topdraw.xhx.bird","");
109 } 116 }
110 117
111 //修改回默认主题，防止部分挖洞窗口有阴影 118 //修改回默认主题，防止部分挖洞窗口有阴影
...@@ -129,15 +136,20 @@ public class AppActivity extends Cocos2dxActivity { ...@@ -129,15 +136,20 @@ public class AppActivity extends Cocos2dxActivity {
129 136
130 @Override 137 @Override
131 protected void onResume() { 138 protected void onResume() {
139 Log.d("AppActivity", "onResume()....");
132 super.onResume(); 140 super.onResume();
133 SDKWrapper.getInstance().onResume(); 141 SDKWrapper.getInstance().onResume();
142 mRLSingleColor.setVisibility(View.GONE);
134 } 143 }
135 144
136 @Override 145 @Override
137 protected void onPause() { 146 protected void onPause() {
138 Log.d("AppActivity", "onPause()...."); 147 Log.d("AppActivity", "onPause()....");
148 mRLSingleColor.setVisibility(View.VISIBLE);
149 // setTheme(android.R.style.Theme_NoDisplay);
139 super.onPause(); 150 super.onPause();
140 SDKWrapper.getInstance().onPause(); 151 SDKWrapper.getInstance().onPause();
152
141 } 153 }
142 154
143 @Override 155 @Override
...@@ -198,6 +210,7 @@ public class AppActivity extends Cocos2dxActivity { ...@@ -198,6 +210,7 @@ public class AppActivity extends Cocos2dxActivity {
198 210
199 @Override 211 @Override
200 protected void onStart() { 212 protected void onStart() {
213 Log.d("AppActivity", "onStart()....");
201 SDKWrapper.getInstance().onStart(); 214 SDKWrapper.getInstance().onStart();
202 super.onStart(); 215 super.onStart();
203 } 216 }
......