1.升级gradle版本

.idea/gradle.xml

@@ -14,8 +14,6 @@
             <option value="$PROJECT_DIR$/../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/platform/android/libcocos2dx" />
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/game" />
-            <option value="$PROJECT_DIR$/instantapp" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />

.idea/modules.xml

@@ -4,8 +4,6 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/.idea/proj.android-studio.iml" filepath="$PROJECT_DIR$/.idea/proj.android-studio.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/proj.android-studio.efunbox-ott-launcher.iml" filepath="$PROJECT_DIR$/.idea/modules/app/proj.android-studio.efunbox-ott-launcher.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/game/proj.android-studio.game.iml" filepath="$PROJECT_DIR$/.idea/modules/game/proj.android-studio.game.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/instantapp/proj.android-studio.instantapp.iml" filepath="$PROJECT_DIR$/.idea/modules/instantapp/proj.android-studio.instantapp.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/-1880156357/proj.android-studio.libcocos2dx.iml" filepath="$PROJECT_DIR$/.idea/modules/-1880156357/proj.android-studio.libcocos2dx.iml" />
     </modules>
   </component>

.idea/modules/game/proj.android-studio.game.iml

@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":game" external.linked.project.path="$MODULE_DIR$/../../../game" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="proj.android-studio" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":game" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.2.0" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="3.2.0" />
-      </configuration>
-    </facet>
-    <facet type="native-android-gradle" name="Native-Android-Gradle">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="release-armeabi-v7a" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="release" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleRelease" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileReleaseSources" />
-        <afterSyncTasks>
-          <task>generateReleaseSources</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../game/src/main/res;file://$MODULE_DIR$/../../../res;file://$MODULE_DIR$/../../../game/res;file://$MODULE_DIR$/../../../game/src/release/res;file://$MODULE_DIR$/../../../game/build/generated/res/rs/release;file://$MODULE_DIR$/../../../game/build/generated/res/resValues/release" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../game/src/androidTest/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="PROJECT_TYPE" value="5" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
-    <output url="file://$MODULE_DIR$/../../../game/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes" />
-    <output-test url="file://$MODULE_DIR$/../../../game/build/intermediates/javac/releaseUnitTest/compileReleaseUnitTestJavaWithJavac/classes" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../../../../../../../AndroidStudio/sdk/ndk-bundle/sources/android/cpufeatures">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../AndroidStudio/sdk/ndk-bundle/sources/android/cpufeatures" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/2d">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/2d" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/audio">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/audio" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/audio/android">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/audio/android" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/audio/android/audio_utils">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/audio/android/audio_utils" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/audio/android/utils">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/audio/android/utils" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/base">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/base" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support/dragonbones-creator-support">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support/dragonbones-creator-support" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support/dragonbones/animation">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support/dragonbones/animation" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support/dragonbones/armature">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support/dragonbones/armature" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support/dragonbones/core">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support/dragonbones/core" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support/dragonbones/event">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support/dragonbones/event" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support/dragonbones/factory">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support/dragonbones/factory" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support/dragonbones/geom">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support/dragonbones/geom" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support/dragonbones/model">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support/dragonbones/model" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support/dragonbones/parser">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support/dragonbones/parser" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support/particle">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support/particle" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support/spine">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support/spine" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support/spine-creator-support">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/editor-support/spine-creator-support" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/math">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/math" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/network">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/network" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/platform">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/platform" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/platform/android">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/platform/android" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/platform/android/jni">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/platform/android/jni" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/renderer">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/renderer" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/renderer/gfx">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/renderer/gfx" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/renderer/renderer">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/renderer/renderer" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/renderer/scene">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/renderer/scene" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/renderer/scene/assembler">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/renderer/scene/assembler" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/scripting/js-bindings/auto">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/scripting/js-bindings/auto" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/scripting/js-bindings/event">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/scripting/js-bindings/event" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/scripting/js-bindings/jswrapper/v8/debugger" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/scripting/js-bindings/manual">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/scripting/js-bindings/manual" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/storage/local-storage">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/storage/local-storage" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/ui/edit-box">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/ui/edit-box" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/ui/videoplayer">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/ui/videoplayer" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/ui/webview">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/ui/webview" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/extensions/assets-manager">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/extensions/assets-manager" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/external/sources/ConvertUTF">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/external/sources/ConvertUTF" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/external/sources/edtaa3func">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/external/sources/edtaa3func" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/external/sources/pvmp3dec/src">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/external/sources/pvmp3dec/src" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/external/sources/pvmp3dec/src/asm">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/external/sources/pvmp3dec/src/asm" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/external/sources/tinyxml2">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/external/sources/tinyxml2" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/external/sources/tremolo/Tremolo">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/external/sources/tremolo/Tremolo" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/external/sources/unzip">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/external/sources/unzip" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/external/sources/xxtea">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/external/sources/xxtea" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../../Classes">
-      <sourceFolder url="file://$MODULE_DIR$/../../../../Classes" isTestSource="false" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../game">
-      <sourceFolder url="file://$MODULE_DIR$/../../../game/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../game/build/generated/res/resValues/release" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../game/build/generated/res/rs/release" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../game/build/generated/source/apt/release" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../game/build/generated/source/buildConfig/release" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../game/build/generated/source/rs/release" isTestSource="false" generated="true" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../game/.cxx" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../game/.externalNativeBuild" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../game/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../game/build" />
-    </content>
-    <content url="file://$MODULE_DIR$/../../../jni/hellojavascript">
-      <sourceFolder url="file://$MODULE_DIR$/../../../jni/hellojavascript" isTestSource="false" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: ./libs/alipaySdk-20180601.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./libs/dom4j-1.6.1.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/platform/android/java/libs/com.android.vending.expansion.zipfile.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/platform/android/java/libs/okhttp-3.12.7.jar" level="project" />
-    <orderEntry type="library" name="Gradle: ./../../../../../../CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/platform/android/java/libs/okio-1.15.0.jar" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-android:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: org.slf4j:slf4j-api:1.7.21" level="project" />
-    <orderEntry type="library" name="Gradle: ./libs/auth_number_product-2.12.3-log-online-standard-release.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./libs/crashshield-2.1.2-release.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./libs/logger-2.1.2-release.aar" level="project" />
-    <orderEntry type="library" name="Gradle: ./libs/main-2.1.2-release.aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.instantapps:instantapps:1.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.danikula:videocache:2.7.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: tv.danmaku.ijk.media:ijkplayer-java:0.8.8@aar" level="project" />
-    <orderEntry type="module" module-name="proj.android-studio.libcocos2dx" />
-  </component>
-</module>

.idea/modules/instantapp/proj.android-studio.instantapp.iml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":instantapp" external.linked.project.path="$MODULE_DIR$/../../../instantapp" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="proj.android-studio" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":instantapp" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.2.0" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="3.2.0" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="release" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleRelease" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="dummyRelease" />
-        <afterSyncTasks>
-          <task>dummyRelease</task>
-        </afterSyncTasks>
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../instantapp/src/main/res;file://$MODULE_DIR$/../../../instantapp/src/release/res" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="PROJECT_TYPE" value="4" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6">
-    <output url="file://$MODULE_DIR$/../../.." />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../instantapp">
-      <excludeFolder url="file://$MODULE_DIR$/../../../instantapp/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/../../../instantapp/build" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

app/AndroidManifest.xml

@@ -144,6 +144,7 @@
                 <action android:name="com.meizu.flyme.push.intent.UNREGISTER.FEEDBACK" />
                 <action android:name="com.meizu.c2dm.intent.REGISTRATION" />
                 <action android:name="com.meizu.c2dm.intent.RECEIVE" />
+
                 <category android:name="com.edufound.mobile" />
             </intent-filter>
         </receiver>
@@ -152,10 +153,10 @@
         <!-- 友盟厂商VIVO-->
         <meta-data
                 android:name="com.vivo.push.api_key"
-                android:value="xxx" />
+                android:value="6cf08542-16fa-48b5-9d26-8ebbb35432e4" />
         <meta-data
                 android:name="com.vivo.push.app_id"
-                android:value="xxx" />
+                android:value="18875" />
         <!-- 友盟厂商VIVOend-->
         <!--友盟start-->
         <meta-data

app/build.gradle

@@ -230,29 +230,36 @@ android {
         flavor -> flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: manifestPlaceholders.appCode, icon: manifestPlaceholders.appIcon]
     }
 
-
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 android.applicationVariants.all { variant ->
     // delete previous files first
     delete "${buildDir}/intermediates/merged_assets/${variant.dirName}"
 
-    variant.mergeAssets.doLast {
+    //修改 报警错误 API 'variant.getMergeAssets()' is obsolete and has been replaced with 'variant.getMergeAssetsProvider()'.It will be removed at the end of 2019.
+//  variant.mergeAssets.doLast {
+    variant.mergeAssetsProvider.get().doLast {
         def sourceDir = "${buildDir}/../../../../.."
-
         copy {
             from "${sourceDir}/assets"
             into "${outputDir}/assets"
+            into outputDir.dir("assets")
         }
 
         copy {
             from "${sourceDir}/src"
             into "${outputDir}/src"
+            into outputDir.dir("src")
         }
 
         copy {
             from "${sourceDir}/jsb-adapter"
             into "${outputDir}/jsb-adapter"
+            into outputDir.dir("jsb-adapter")
         }
 
         copy {
@@ -300,4 +307,5 @@ dependencies {
     //友盟厂商(ViVo)
     api 'com.umeng.umsdk:vivo-umengaccs:1.1.5'
     implementation 'com.umeng.umsdk:vivo-push:3.0.0.3'
+
 }

build.gradle

@@ -9,7 +9,7 @@ buildscript {
         maven { url 'https://developer.huawei.com/repo/' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.6.3'
         classpath 'com.huawei.agconnect:agcp:1.4.2.300'
 
 
@@ -27,7 +27,6 @@ allprojects {
         }
         maven { url 'https://repo1.maven.org/maven2/' }
         maven { url 'https://developer.huawei.com/repo/' }
-        maven { url 'https://repo1.maven.org/maven2/' }
     }
 }
 

gradle.properties

@@ -32,4 +32,5 @@ RELEASE_KEY_ALIAS=edufound_key
 RELEASE_KEY_PASSWORD=edufound321
 android.injected.testOnly=false
 android.useAndroidX=true
-android.enableJetifier=false
+android.enableJetifier=false
+android.enableAdapter=true

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+

jni/CocosAndroid.mk

@@ -2,7 +2,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := cocos2djs_shared
+LOCAL_MODULE := cocos2djs
 
 LOCAL_MODULE_FILENAME := libcocos2djs
 
@@ -20,4 +20,4 @@ LOCAL_STATIC_LIBRARIES := cocos2dx_static
 
 include $(BUILD_SHARED_LIBRARY)
 
-$(call import-module, cocos)
+$(call import-module, cocos)

settings.gradle

@@ -1,4 +1,4 @@
-include ':libcocos2dx',':game', ':instantapp'
+include ':libcocos2dx'
 project(':libcocos2dx').projectDir = new File('G:/CocosCreator/cocoscreator_ide/CocosCreator_v2.4.0_20200622_win/resources/cocos2d-x/cocos/platform/android/libcocos2dx')
 include ':efunbox-ott-launcher'
 project(':efunbox-ott-launcher').projectDir = new File(settingsDir, 'app')

src/org/cocos2dx/javascript/AppActivity.java

@@ -43,6 +43,7 @@ import com.umeng.commonsdk.UMConfigure;
 import org.cocos2dx.javascript.presenter.MainPresenter;
 import org.cocos2dx.javascript.util.Consts;
 import org.cocos2dx.javascript.util.Logger;
+import org.cocos2dx.javascript.util.NotificationUtil;
 import org.cocos2dx.lib.Cocos2dxActivity;
 import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
 
@@ -91,6 +92,8 @@ public class AppActivity extends Cocos2dxActivity {
     }
 
     public void removeSplashImage() {
+        Logger.e("removeSplashImage-removeSplashImage");
+        NotificationUtil.choseNotification(this);
         mSplashImage.setVisibility(View.GONE);
     }
 

src/org/cocos2dx/javascript/presenter/MainPresenter.java

@@ -220,14 +220,14 @@ public class MainPresenter {
     TokenResultListener mTokenResultListener = new TokenResultListener() {
         @Override
         public void onTokenSuccess(String json) {
-            try {
-                JSONObject object = new JSONObject(json);
-                String code = object.getString("code");
-                autoLogin = true;
-                loginToken = object.getString("token");
-            } catch (JSONException e) {
-                e.printStackTrace();
-            }
+//            try {
+//                JSONObject object = new JSONObject(json);
+//                String code = object.getString("code");
+//                autoLogin = true;
+//                loginToken = object.getString("token");
+//            } catch (JSONException e) {
+//                e.printStackTrace();
+//            }
         }
 
         @Override

src/org/cocos2dx/javascript/util/NotificationUtil.java

@@ -0,0 +1,138 @@
+package org.cocos2dx.javascript.util;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.AppOpsManager;
+import android.app.NotificationManager;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.net.Uri;
+import android.os.Build;
+import android.support.annotation.RequiresApi;
+import android.support.v4.app.NotificationManagerCompat;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+public class NotificationUtil {
+
+
+    public static void choseNotification(Activity activity) {
+        //如果是新应用，查询权限并且询问
+        if (SPutil.getPrefInt(activity, SPutil.notificationType, 0) == 0) {
+            if (org.cocos2dx.javascript.util.NotificationUtil.areNotificationsEnabled(activity)) {
+                //有权限
+                SPutil.setPrefInt(activity, SPutil.notificationType, SPutil.NOTIFICATION_OPEN);
+            } else {
+                //没权限
+                SPutil.setPrefInt(activity, SPutil.notificationType, SPutil.NOTIFICATION_CLOSE);
+                org.cocos2dx.javascript.util.NotificationUtil.showDialog(activity);
+            }
+        } else {
+            //不是第一次新应用，如果设置了有权限，就设置系统默认的权限，不提示
+            if (org.cocos2dx.javascript.util.NotificationUtil.areNotificationsEnabled(activity)) {
+                //有权限
+                SPutil.setPrefInt(activity, SPutil.notificationType, SPutil.NOTIFICATION_OPEN);
+            } else {
+                //没权限
+                SPutil.setPrefInt(activity, SPutil.notificationType, SPutil.NOTIFICATION_CLOSE);
+            }
+        }
+    }
+
+
+    private static boolean areNotificationsEnabled(Context context) {
+        NotificationManagerCompat.from(context).areNotificationsEnabled();
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
+            return true;
+        }
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            return isEnableV19(context);
+        } else {
+            return isEnableV26(context);
+        }
+    }
+
+
+    @RequiresApi(api = Build.VERSION_CODES.KITKAT)
+    private static boolean isEnableV19(Context context) {
+        final String CHECK_OP_NO_THROW = "checkOpNoThrow";
+        final String OP_POST_NOTIFICATION = "OP_POST_NOTIFICATION";
+        AppOpsManager mAppOps = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+        ApplicationInfo appInfo = context.getApplicationInfo();
+        String pkg = context.getApplicationContext().getPackageName();
+        int uid = appInfo.uid;
+        Class appOpsClass = null; /* Context.APP_OPS_MANAGER */
+        try {
+            appOpsClass = Class.forName(AppOpsManager.class.getName());
+            Method checkOpNoThrowMethod = appOpsClass.getMethod(CHECK_OP_NO_THROW, Integer.TYPE, Integer.TYPE, String.class);
+            Field opPostNotificationValue = appOpsClass.getDeclaredField(OP_POST_NOTIFICATION);
+            int value = (int) opPostNotificationValue.get(Integer.class);
+            return ((int) checkOpNoThrowMethod.invoke(mAppOps, value, uid, pkg) == AppOpsManager.MODE_ALLOWED);
+        } catch (ClassNotFoundException e) {
+        } catch (NoSuchMethodException e) {
+        } catch (NoSuchFieldException e) {
+        } catch (InvocationTargetException e) {
+        } catch (IllegalAccessException e) {
+        } catch (Exception e) {
+        }
+        return false;
+    }
+
+
+    private static boolean isEnableV26(Context context) {
+        ApplicationInfo appInfo = context.getApplicationInfo();
+        String pkg = context.getApplicationContext().getPackageName();
+        int uid = appInfo.uid;
+        try {
+            NotificationManager notificationManager = (NotificationManager)
+                    context.getSystemService(Context.NOTIFICATION_SERVICE);
+            Method sServiceField = notificationManager.getClass().getDeclaredMethod("getService");
+            sServiceField.setAccessible(true);
+            Object sService = sServiceField.invoke(notificationManager);
+
+            Method method = sService.getClass().getDeclaredMethod("areNotificationsEnabledForPackage"
+                    , String.class, Integer.TYPE);
+            method.setAccessible(true);
+            return (boolean) method.invoke(sService, pkg, uid);
+        } catch (Exception e) {
+            return true;
+        }
+    }
+
+
+    private static void showDialog(final Activity act) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(act)
+//                .setIcon(R.mipmap.ic_launcher)
+                .setTitle("提示")
+                .setMessage("检测到您没有打开通知权限，是否去打开")
+                .setPositiveButton("确定", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+                        dialogInterface.cancel();
+                        Intent localIntent = new Intent();
+                        localIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                        if (Build.VERSION.SDK_INT >= 9) {
+                            localIntent.setAction("android.settings.APPLICATION_DETAILS_SETTINGS");
+                            localIntent.setData(Uri.fromParts("package", act.getPackageName(), null));
+                        } else if (Build.VERSION.SDK_INT <= 8) {
+                            localIntent.setAction(Intent.ACTION_VIEW);
+                            localIntent.setClassName("com.android.settings",
+                                    "com.android.settings.InstalledAppDetails");
+                            localIntent.putExtra("com.android.settings.ApplicationPkgName",
+                                    act.getPackageName());
+                        }
+                        act.startActivity(localIntent);
+                    }
+                }).setNegativeButton("取消", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int i) {
+                        dialog.cancel();
+                    }
+                });
+        builder.create().show();
+    }
+}

src/org/cocos2dx/javascript/util/SPutil.java

@@ -15,8 +15,10 @@ import java.util.List;
 public class SPutil {
 
     private static final String spName = "efunbox_mobile";
-
+    public static final String notificationType = "notification_type";
     private static int model = Context.MODE_MULTI_PROCESS;
+    public static final int NOTIFICATION_OPEN = 1;
+    public static final int NOTIFICATION_CLOSE = 2;
 
     public static String getPrefString(Context context, String key, final String defaultValue) {
         SharedPreferences sp = context.getSharedPreferences(spName, model);