fix android compiling error

Author: minggo

cocos/2d/CCActionInterval.cpp

@@ -2535,15 +2535,7 @@ Animate* Animate::create(Animation *animation)
 }
 
 Animate::Animate()
-: _splitTimes(new std::vector<float>)
-, _nextFrame(0)
-, _origFrame(nullptr)
-, _executedLoops(0)
-, _animation(nullptr)
-, _frameDisplayedEvent(nullptr)
-, _currFrameIndex(0)
 {
-
 }
 
 Animate::~Animate()

cocos/2d/CCActionInterval.h

@@ -1561,14 +1561,14 @@ class CC_DLL Animate : public ActionInterval
     bool initWithAnimation(Animation *animation);
 
 protected:
-    std::vector<float>* _splitTimes;
-    int             _nextFrame;
-    SpriteFrame*    _origFrame;
-    int _currFrameIndex;
-    unsigned int    _executedLoops;
-    Animation*      _animation;
-
-    EventCustom*    _frameDisplayedEvent;
+    std::vector<float>* _splitTimes = new std::vector<float>;
+    int             _nextFrame = 0;
+    SpriteFrame*    _origFrame = nullptr;
+    int _currFrameIndex = 0;
+    unsigned int    _executedLoops = 0;
+    Animation*      _animation = nullptr;
+
+    EventCustom*    _frameDisplayedEvent = nullptr;
     AnimationFrame::DisplayedEventInfo _frameDisplayedEventInfo;
 private:
     CC_DISALLOW_COPY_AND_ASSIGN(Animate);

cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxEngineDataManager.cpp

@@ -173,7 +173,6 @@ float _levelDecreaseThreshold = 0.2f;
 float _cpuFpsFactor = 1.0f;
 float _gpuFpsFactor = 1.0f;
 bool _isFpsChanged = false;
-float _oldRealFps = 60.0f;
 
 uint32_t _lowFpsCheckMode = 0; // 0: Continuous mode, 1: Average mode
 float _lowRealFpsThreshold = 0.5f; // Unit: percentage (0 ~ 1)

cocos/platform/android/jni/TouchesJni.cpp

@@ -101,9 +101,7 @@ extern "C" {
 
     };
 
-    JNIEXPORT jboolean JNICALL Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeKeyEvent(JNIEnv * env, jobject thiz, jint keyCode, jboolean isPressed) {
-        Director* pDirector = Director::getInstance();
-        
+    JNIEXPORT jboolean JNICALL Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeKeyEvent(JNIEnv * env, jobject thiz, jint keyCode, jboolean isPressed) {        
         auto iterKeyCode = g_keyCodeMap.find(keyCode);
         if (iterKeyCode == g_keyCodeMap.end()) {
             return JNI_FALSE;

cocos/renderer/backend/BindGroup.cpp

@@ -36,14 +36,31 @@ BindGroup::UniformInfo& BindGroup::UniformInfo::operator=(UniformInfo&& rhs)
     {
         name = rhs.name;
         size = rhs.size;
-        
+
+        if (data) free(data);
         data = rhs.data;
         rhs.data = nullptr;
     }
 
     return *this;
 }
 
+BindGroup::UniformInfo& BindGroup::UniformInfo::operator=(const UniformInfo& rhs)
+{
+    if (this != &rhs)
+    {
+        name = rhs.name;
+        size = rhs.size;
+
+        if (data) free(data);
+        data = malloc(size);
+        if (data)
+            memcpy(data, rhs.data, size);
+    }
+
+    return *this;
+}
+
 BindGroup::TextureInfo::TextureInfo(const std::string& _name, const std::vector<uint32_t>& _indices, const std::vector<Texture*> _textures)
 : name(_name)
 , indices(_indices)
@@ -78,6 +95,21 @@ BindGroup::TextureInfo& BindGroup::TextureInfo::operator=(TextureInfo&& rhs)
     return *this;
 }
 
+BindGroup::TextureInfo& BindGroup::TextureInfo::operator=(const TextureInfo& rhs)
+{
+    if (this != &rhs)
+    {
+        name = rhs.name;
+        indices = rhs.indices;
+
+        releaseTextures();
+        textures = rhs.textures;
+        retainTextures();
+    }
+
+    return *this;
+}
+
 void BindGroup::TextureInfo::retainTextures()
 {
     for (auto& texture : textures)

cocos/renderer/backend/BindGroup.h

@@ -22,6 +22,7 @@ class BindGroup : public cocos2d::Ref
         UniformInfo(const UniformInfo&);
         ~UniformInfo();
         UniformInfo& operator =(UniformInfo&& rhs);
+        UniformInfo& operator =(const UniformInfo& rhs);
 
         std::string name;
         uint32_t size = 0;
@@ -35,6 +36,7 @@ class BindGroup : public cocos2d::Ref
         TextureInfo(const TextureInfo&);
         ~TextureInfo();
         TextureInfo& operator =(TextureInfo&& rhs);
+        TextureInfo& operator =(const TextureInfo& rhs);
 
         void retainTextures();
         void releaseTextures();