Commit Graph

197 Commits

Author SHA1 Message Date
minggo b25b2121d6 merge v3.1 2021-04-20 19:15:18 +08:00
OnlyKoei abc11ba7b3 Update CocosActivity.java (#3326)
After the restoration of virtual Home button click to hide App, App Home key to re-open not hidden.
2021-03-19 16:06:28 +08:00
Knox 0981eb7cbd improve video player seekTo in android (#3291)
* improve video player seekTo in android
2021-03-01 09:41:59 +08:00
kenshin fd94f6c1fd Handle touch event in SurfaceView, fix inconsistent touch area between Activity and View. (#3252) 2021-01-27 15:22:39 +08:00
Knox b28f95602e fix: pause video then switch to the background and return, there will be playback error (#3227) 2021-01-19 09:54:06 +08:00
Knox 8a95b8c2d6 Fix the dialog box that can't play this video when stoped video (#3209) 2021-01-12 15:48:47 +08:00
Knox c8bc5e9f21 Fix the dialog box that can't play this video when playing video (#3186) 2021-01-09 18:26:25 +08:00
minggo 82061f4b01 modify for sdk service (#3175) 2020-12-31 15:50:42 +08:00
Knox d05857f68e fix video player resume invalid (#3138) 2020-12-22 17:31:17 +08:00
minggo b78d759b6a get video properties in gl thread to avoid dead lock (#3137)
ui thread may wait for gl thread to enter pause state, if the same time gl thread get video properties in ui thread and wait for it, then dead lock happens
2020-12-22 14:34:53 +08:00
吴智明 7d55ad729a 3d gfx add orientation change event (#3135) 2020-12-22 10:59:18 +08:00
minggo e9463d9be2 Fix todo (#3097)
* remove close window function

* remove unneeded codes

* fix todo
2020-12-07 11:07:37 +08:00
吴智明 2d1a52e597 add immisive mode (#3092)
* hide navigation bar and use immersive mode as default

* remove empty line
2020-12-03 13:37:57 +08:00
Knox edc85f1f4c add getSafeArea for android and iOS (#3067) 2020-11-25 16:58:46 +08:00
cary 835b0bbb07 Fix the text baseline on native platform. (#3043) 2020-11-19 13:47:12 +08:00
吴智明 4dc6a9f67c change android package name (#3006) 2020-11-11 10:55:10 +08:00
minggo 3fc5d1d76d 3d gfx use java activity (#2990)
* use java activity

* simplify codes

* initialize app

* first version of touch handler

* fix touch event's bug

* add keycode event support for android

* add sensor adapt

* add copyright header

* add webview support

* support video player

* add missing property

* add editor box support

* handle crash if come from background on Android

* update external version

Co-authored-by: wuzhiming <wuzhiming.chukong@gmail.com>
2020-11-07 17:38:33 +08:00
Knox 8299383ae8 add web view (#2863)
* add web view

* refine code
2020-09-30 17:58:38 +08:00
Knox 24bb96f7ef add video player (#2860) 2020-09-30 13:58:07 +08:00
江战 21b16d6246 Rename package okhttp3 to org.cocos2dx.okhttp3 #1961 (#2843) 2020-09-28 10:39:36 +08:00
江战 fab25711ec bug: fix crash when launch from icon after launch from installer #2169 (#2840) 2020-09-28 09:50:58 +08:00
zhefeng.zhang fda166d954 sync #1919 (#2711) 2020-08-24 11:54:15 +08:00
江战 7423ccef65 Impl runOnGameThread on Android (#2577) 2020-06-24 15:31:25 +08:00
minggo 7997a44f18 Remove webview (#2543) 2020-06-10 16:04:07 +08:00
minggo 96cbe1e971 Android adapt (#2410)
* simplify get obb file path

* not get package name throung jni

* not get sdk version from android

* remove unneeded codes

* remove convertEncoding

* remove unneeded codes'

* remove unneeded codes

* simpify codes

* simplify codes

* remove unneeded codes
2020-04-27 17:14:06 +08:00
minggo 2d3010f546 Editbox (#2294)
* mac support editbox

* fix compiling/runtime issue for iOS/Android

* prevent handling touch event if it is prevented

* make editbox work

* fix effect of editbox on android
2020-03-19 13:46:31 +08:00
minggo 7ac05e123f remove unneed codes (#2180) 2020-02-25 16:04:18 +08:00
minggo dda8760df0 remove unneed codes (#2176)
* remove unneed codes

* remove unneed codes
2020-02-25 11:04:50 +08:00
minggo e693d0a237 get audio output sample rate and output frame count in C++ (#2175) 2020-02-24 18:14:00 +08:00
minggo bd68b01b4d Android native dpi (#2173)
* fix compiling error

* android get dpi in C++
2020-02-24 16:09:13 +08:00
minggo 20edb6a63e implement sensor events in C++ (#2171) 2020-02-24 15:42:58 +08:00
minggo adb387ada5 remove unneeded codes and fix jni implementation (#2154) 2020-02-20 12:03:14 +08:00
Yun Hsiao Wu 5c797d64c1 fix text positioning (#2031)
* fix android text positioning

* fix windows text positioning

* fix Mac/iOS text positioning
2019-12-30 17:48:09 +08:00
Cocos Robot 682a8ed3d7 Sync branch v2.1.3-release to v2.2.0-release 2019-09-17 19:52:38 +08:00
Knox c53a28c957 Fixed that video could not play when stopped (#1846)
* Fixed that video could not play when stopped

* refine code
2019-09-16 18:34:41 +08:00
Jare Guo 2fe69db75c Merge v2.1.3 into v2.2.0-release 2019-08-30 20:05:02 +08:00
minggo f21dbcba3c Video player android (#1811)
* fix some video issues on Android

* revert some error commit
2019-08-29 11:34:48 +08:00
Cocos Robot 99bec00fd5 Sync branch v2.2.0 to develop 2019-08-02 18:17:55 +08:00
unace ca5c7fd25b [Android] fix an audio bug (#1788)
*  fix external player muting. add audio focus flag

Add ability to not stop sound & music on game start in android
This comes from https://github.com/cocos2d/cocos2d-x/pull/18640.

* [Android] fix an audio bug

fix an audio bug that audios are not paused when locking screen while notification drawer is showing.
2019-08-02 09:25:11 +08:00
unace 919d036a95 fix external player muting. add audio focus flag (#1785)
Add ability to not stop sound & music on game start in android
This comes from https://github.com/cocos2d/cocos2d-x/pull/18640.
2019-07-31 15:06:11 +08:00
PP 575c15bbed set default text color for editText (#1778) 2019-07-31 15:05:37 +08:00
knox 7f68a97cda improve getCurrentLanguage to android 2019-07-26 16:45:31 +08:00
Cocos Robot 25b7911e92 Sync branch v2.3.0 to develop 2019-07-05 14:44:31 +08:00
minggo 875acde984 native returns unpremultiplied data (#1765)
* unpremultiply alpha on ios/mac

* unpremultiply alpha on Android and windows
2019-07-02 15:00:15 +08:00
Jare Guo 9eb2af918f improve convert draw y point calculate for 2d-tasks/issues/1378 (#1739) (#1764)
* improve convert draw y point calculate for 2d-tasks/issues/1378

* update comment

* improve convert draw y point calculate for android

* improve convert draw y point calculate for win32
2019-07-01 15:11:44 +08:00
Arnold 029a94612d add okio-1.15.0.jar (#1750) 2019-05-28 01:42:43 -07:00
Arnold 7e6d0598e1 fix bad suggestion (#1747) 2019-05-27 01:59:20 -07:00
Wenhai Lin 7e2031296a Replace Android HttpClient with OkHttp (#1731)
* Remove the code of http client

* Replace Android HttpClient with OkHttp
2019-05-21 18:49:39 -07:00
Cocos Robot 7afbeed3ac Sync branch v2.3.0 to develop 2019-05-15 22:10:37 +08:00
Yehsam23 06310ca1a8 WebView add background transparent (#1727)
* WebView add background transparent

* Android WebView remove reflection
2019-05-15 15:17:55 +08:00