mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 16:12:40 +08:00
Merge the code of v3.3.1 platform adaptation layer into the development branch (#3958)
* 1、Merge platform adaptation layer code into the development branch 2、It passed the test in windows and ohos system * 1、Merge platform adaptation layer code into the development branch 2、It passed the test in windows and ohos system * 1、Fix github compile windows error * 1、Fix github compile windows error * 1. Adjust the code format; 2. Fix js automatic generation binding 3. Adjust github CI compilation * 1. Adjust the code format; 2. Fix js automatic generation binding 3. Adjust github CI compilation * Solve mac and ios compilation failure * Fix the problem of compilation of Windows-side simulator * 1. Adapt the simulator to a new adaptation layer; 2. Fix the compilation warning of ios, and the implicit conversion failed; 3. Fix the mac compilation error, due to the problem of adding the link identification -all_load; * 1.Add the isDisplayStats and setDisplayStats method to the screen interface * Fix clang-tidy compilation warning * Fix clang-tidy compilation warning * Repair the emulator, compatible with mac and win * 1、Repair detailed errors, including name modification and calling method modification 2、Delete redundant files in the template directory 3、Change the vibrate interface to vibrator 4、Fix word spelling errors * Rename interfaces to modules * Replace CC_ASSERT with CCASSERT * Replace CC_ASSERT with CCASSERT Co-authored-by: qiuguohua <>
This commit is contained in:
@@ -29,8 +29,7 @@
|
||||
#include "network/Downloader.h"
|
||||
#include "platform/java/jni/JniHelper.h"
|
||||
#include "platform/java/jni/JniImp.h"
|
||||
|
||||
#include <platform/Application.h>
|
||||
#include "application/ApplicationManager.h"
|
||||
#include <mutex>
|
||||
|
||||
#ifndef JCLS_DOWNLOADER
|
||||
@@ -252,7 +251,7 @@ JNIEXPORT void JNICALL JNI_DOWNLOADER(nativeOnProgress)(JNIEnv * /*env*/, jclass
|
||||
}
|
||||
downloader->onProcessImpl((int)taskId, (int64_t)dl, (int64_t)dlnow, (int64_t)dltotal);
|
||||
};
|
||||
cc::Application::getInstance()->getScheduler()->performFunctionInCocosThread(func);
|
||||
CC_CURRENT_ENGINE()->getScheduler()->performFunctionInCocosThread(func);
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL JNI_DOWNLOADER(nativeOnFinish)(JNIEnv *env, jclass /*clazz*/, jint id, jint taskId, jint errCode, jstring errStr, jbyteArray data) {
|
||||
@@ -286,7 +285,7 @@ JNIEXPORT void JNICALL JNI_DOWNLOADER(nativeOnFinish)(JNIEnv *env, jclass /*claz
|
||||
// success
|
||||
downloader->onFinishImpl((int)taskId, (int)errCode, nullptr, dataTmp);
|
||||
};
|
||||
cc::Application::getInstance()->getScheduler()->performFunctionInCocosThread(func);
|
||||
CC_CURRENT_ENGINE()->getScheduler()->performFunctionInCocosThread(func);
|
||||
}
|
||||
|
||||
} // extern "C" {
|
||||
|
||||
Reference in New Issue
Block a user