适配v2.2.1版本

MobClub · May 21, 2018 · 15a7dd9 · 15a7dd9
1 parent 73ae7c2
commit 15a7dd9
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 37 deletions.
diff --git a/proj.android-studio/.gitignore b/proj.android-studio/.gitignore
@@ -1,4 +1,5 @@
 .gradle
+/gradle
 /local.properties
 /.idea/workspace.xml
 /.idea/libraries

diff --git a/proj.android-studio/Cocos2dxBridge/AndroidManifest.xml b/proj.android-studio/Cocos2dxBridge/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.mob.moblink.cocos2dx"
-    android:versionCode="200"
-    android:versionName="2.0.0" >
+    android:versionCode="20201"
+    android:versionName="2.2.1" >
 
     <uses-sdk
         android:minSdkVersion="8"

diff --git a/proj.android-studio/Cocos2dxBridge/build.gradle b/proj.android-studio/Cocos2dxBridge/build.gradle
@@ -57,7 +57,7 @@ dependencies {
 }
 
 MobSDK {
-    MobCommons {}
-    MobTools {}
-    MobLink {version = "2.0.5"}
+//    MobCommons {}
+//    MobTools {}
+    MobLink {version = "2.2.1"}
 }
diff --git a/proj.android-studio/Cocos2dxBridge/src/com/mob/moblink/cocos2dx/RestoreSceneListener.java b/proj.android-studio/Cocos2dxBridge/src/com/mob/moblink/cocos2dx/RestoreSceneListener.java
@@ -14,16 +14,6 @@ public RestoreSceneListener() {
 		cxxObject = nativeOnCreateCxxObject();
 	}
 
-	@Override
-	public void onBeginCheckScene() {
-		// do nothing
-	}
-
-	@Override
-	public void onFinishCheckScene() {
-		// do nothing
-	}
-
 	@Override
 	public boolean onReturnSceneIntent(String var1, Intent var2) {
 		return false;

diff --git a/proj.android-studio/app/AndroidManifest.xml b/proj.android-studio/app/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.mob.moblink.demo"
-    android:versionName="2.0.5"
-    android:versionCode="20005"
+    android:versionName="2.2.1"
+    android:versionCode="20201"
     android:installLocation="auto">
 
     <uses-feature android:glEsVersion="0x00020000" />

diff --git a/proj.android-studio/app/build.gradle b/proj.android-studio/app/build.gradle
@@ -1,6 +1,7 @@
 import org.apache.tools.ant.taskdefs.condition.Os
 
 apply plugin: 'com.android.application'
+apply plugin: 'com.mob.sdk'
 
 android {
     compileSdkVersion 22
@@ -10,8 +11,8 @@ android {
         applicationId "com.mob.moblink.demo"
         minSdkVersion 10
         targetSdkVersion 16
-        versionCode 200
-        versionName "2.0.0"
+        versionCode 20201
+        versionName "2.2.1"
 
         externalNativeBuild {
             ndkBuild {

diff --git a/proj.android-studio/build.gradle b/proj.android-studio/build.gradle
@@ -1,29 +1,18 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext {
-        mavenMobUrl = "http://mvn.mob.com/android"
-//        mavenMobUrl = "http://10.18.97.47:8080/jenkins/job/iMaven/ws/android"
-    }
-
     repositories {
         jcenter()
-        maven {
-            url mavenMobUrl
-        }
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:3.1.2'
         classpath 'com.mob.sdk:MobSDK:+'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
-        maven {
-            url mavenMobUrl
-        }
     }
 }
diff --git a/proj.android-studio/gradle/wrapper/gradle-wrapper.properties b/proj.android-studio/gradle/wrapper/gradle-wrapper.properties
diff --git a/proj.android-studio/settings.gradle b/proj.android-studio/settings.gradle
@@ -1,4 +1,5 @@
 include ':libcocos2dx', ":Cocos2dxBridge"
 project(':libcocos2dx').projectDir = new File(settingsDir, '../cocos2d/cocos/platform/android/libcocos2dx')
+
 include ':Cocos2DXForMobLink'
 project(':Cocos2DXForMobLink').projectDir = new File(settingsDir, 'app')