diff --git a/Classes/C2DXMobLink/Android/C2DXAndroidActionListener.cpp b/Classes/C2DXMobLink/Android/C2DXAndroidActionListener.cpp index eba9748..cee1080 100755 --- a/Classes/C2DXMobLink/Android/C2DXAndroidActionListener.cpp +++ b/Classes/C2DXMobLink/Android/C2DXAndroidActionListener.cpp @@ -1,9 +1,4 @@ -// -// Created by litl on 2017/5/18. -// - #include "C2DXAndroidActionListener.h" -#include "JSON/CCJSONConverter.h" C2DXAndroidActionListener::C2DXAndroidActionListener() { @@ -17,19 +12,19 @@ void C2DXAndroidActionListener::setGetModIdCallBack(C2DXGetMobIdResultEvent cb) void C2DXAndroidActionListener::onResult(const char* result) { - CCJSONConverter* json = CCJSONConverter::sharedConverter(); - C2DXDictionary* dic = json->dictionaryFrom(result); - CCString* modId = (CCString*) dic->objectForKey("mobID"); C2DXGetMobIdResultEvent prt = getModIdCallBack; if (prt) { - prt(modId->getCString()); + prt(result); } - dic->release(); } void C2DXAndroidActionListener::onError(const char* error) { - // do nothing + // 临时解决mobid失败时, 传空字符串(与ios保持一致) + C2DXGetMobIdResultEvent prt = getModIdCallBack; + if (prt) { + prt(""); + } } C2DXAndroidActionListener::~C2DXAndroidActionListener() diff --git a/Classes/C2DXMobLink/Android/C2DXAndroidActionListener.h b/Classes/C2DXMobLink/Android/C2DXAndroidActionListener.h index c35ac70..2fec101 100755 --- a/Classes/C2DXMobLink/Android/C2DXAndroidActionListener.h +++ b/Classes/C2DXMobLink/Android/C2DXAndroidActionListener.h @@ -1,7 +1,3 @@ -// -// Created by litl on 2017/5/18. -// - #ifndef __C2DXMobLinkSample__C2DXAndroidActionListener__ #define __C2DXMobLinkSample__C2DXAndroidActionListener__ diff --git a/Classes/C2DXMobLink/Android/C2DXAndroidMobLink.cpp b/Classes/C2DXMobLink/Android/C2DXAndroidMobLink.cpp index 9aaddd3..f7bafc1 100755 --- a/Classes/C2DXMobLink/Android/C2DXAndroidMobLink.cpp +++ b/Classes/C2DXMobLink/Android/C2DXAndroidMobLink.cpp @@ -1,16 +1,7 @@ -// -// C2DXAndroidMobLink.m -// Cocos2DXForMobLink -// -// Created by 李同垒 on 2017/5/18. -// -// - - - #include "C2DXAndroidMobLink.h" #include "JSON/CCJSONConverter.h" #include "C2DXAndroidRestoreSceneListener.h" +#include "string.h" USING_NS_CC; using namespace mob::moblink; @@ -18,27 +9,17 @@ using namespace mob::moblink; void C2DXAndroidMobLink::getMobId(mob::moblink::C2DXMobLinkScene *scene, C2DXGetMobIdResultEvent callback) { JNIEnv* env = JniHelper::getEnv(); - jstring jPath = env->NewStringUTF(scene->path.c_str()); - jstring jSource = env->NewStringUTF(scene->source.c_str()); - - jobject jParam; - { - // 大括号, 隐藏不必要的变量 - C2DXDictionary* dict = scene->getCustomParams(); - CCJSONConverter* json = CCJSONConverter::sharedConverter(); - const char* ccContent = json->strFrom(dict); - jParam = jsonString2HashMap(env, ccContent); - } + jobject jScene = cxxScene2JavaScene(scene, env); JniMethodInfo mi; JniHelper::getStaticMethodInfo(mi, "com/mob/moblink/MobLink" - , "getMobID", "(Ljava/util/HashMap;Ljava/lang/String;Ljava/lang/String;Lcom/mob/moblink/ActionListener;)V"); + , "getMobID", "(Lcom/mob/moblink/Scene;Lcom/mob/moblink/ActionListener;)V"); jobject jListener = newActionListener(env); C2DXAndroidActionListener* cxxListener = (C2DXAndroidActionListener*)getCxxObject(env, jListener); cxxListener->setGetModIdCallBack(callback); - env->CallStaticVoidMethod(mi.classID, mi.methodID, jParam, jPath, jSource, jListener); + env->CallStaticVoidMethod(mi.classID, mi.methodID, jScene, jListener); } void C2DXAndroidMobLink::setRestoreCallBack(C2DXRestoreSceneResultEvent callback) @@ -65,16 +46,49 @@ jobject C2DXAndroidMobLink::getAndroidContext(JNIEnv* env) return env->CallStaticObjectMethod(methodInfo.classID, methodInfo.methodID); } -jobject C2DXAndroidMobLink::jsonString2HashMap(JNIEnv* env, const char* json) +jobject C2DXAndroidMobLink::cxxScene2JavaScene(C2DXMobLinkScene* scene, JNIEnv* env) { - JniMethodInfo mi; - JniHelper::getMethodInfo(mi, "com/mob/tools/utils/Hashon", "", "()V"); - jobject jthiz = env->NewObject(mi.classID, mi.methodID); + jclass jclazz = env->FindClass("com/mob/moblink/Scene"); + jmethodID jmethod = env->GetMethodID(jclazz, "", "()V"); + jobject jScene = env->NewObject(jclazz, jmethod); + + jobject jTemp = env->NewStringUTF(scene->path.c_str()); + jfieldID jField = env->GetFieldID(jclazz, "path", "Ljava/lang/String;"); + env->SetObjectField(jScene, jField, jTemp); + + jTemp = env->NewStringUTF(scene->source.c_str()); + jField = env->GetFieldID(jclazz, "path", "Ljava/lang/String;"); + env->SetObjectField(jScene, jField, jTemp); + + jTemp = NULL; + C2DXDictionary* dict = scene->getCustomParams(); + if (NULL != dict) { + jTemp = dict2HashMap(dict, env); + } + jField = env->GetFieldID(jclazz, "params", "Ljava/util/HashMap;"); + env->SetObjectField(jScene, jField, jTemp); - jmethodID jmethod = env->GetMethodID(mi.classID, "fromJson", "(Ljava/lang/String;)Ljava/util/HashMap;"); - jstring jJson = env->NewStringUTF(json); - jobject result = env->CallObjectMethod(jthiz, jmethod, jJson); - return result; + return jScene; +} + +jobject C2DXAndroidMobLink::dict2HashMap(C2DXDictionary* dict, JNIEnv* env) +{ + jclass jclazz = env->FindClass("java/util/HashMap"); + jmethodID jMethod = env->GetMethodID(jclazz, "", "()V"); + jobject jHashMap = env->NewObject(jclazz, jMethod); + jMethod = env->GetMethodID(jclazz, "put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;"); + + C2DXArray* keys = dict->allKeys(); + int size = NULL != keys ? keys->count() : 0; + for (int i = 0; i < size; ++i) { + CCString* key = dynamic_cast(keys->objectAtIndex(i)); + + jobject jKey = env->NewStringUTF(key->getCString()); + jobject jValue = env->NewStringUTF(dict->valueForKey(key->getCString())->getCString()); + + env->CallObjectMethod(jHashMap, jMethod, jKey, jValue); + } + return jHashMap; } jobject C2DXAndroidMobLink::newActionListener(JNIEnv* env) diff --git a/Classes/C2DXMobLink/Android/C2DXAndroidMobLink.h b/Classes/C2DXMobLink/Android/C2DXAndroidMobLink.h index bd620c1..1d4bfae 100755 --- a/Classes/C2DXMobLink/Android/C2DXAndroidMobLink.h +++ b/Classes/C2DXMobLink/Android/C2DXAndroidMobLink.h @@ -34,7 +34,8 @@ namespace mob private: static jobject getAndroidContext(JNIEnv* env); - static jobject jsonString2HashMap(JNIEnv* env, const char* json); + static jobject cxxScene2JavaScene(C2DXMobLinkScene* scene, JNIEnv* env); + static jobject dict2HashMap(C2DXDictionary* dict, JNIEnv* env); static jobject newActionListener(JNIEnv* env); }; diff --git a/Classes/C2DXMobLink/Android/C2DXAndroidRestoreSceneListener.cpp b/Classes/C2DXMobLink/Android/C2DXAndroidRestoreSceneListener.cpp index bbb11f2..9093e53 100755 --- a/Classes/C2DXMobLink/Android/C2DXAndroidRestoreSceneListener.cpp +++ b/Classes/C2DXMobLink/Android/C2DXAndroidRestoreSceneListener.cpp @@ -1,9 +1,4 @@ -// -// Created by litl on 2017/5/18. -// - #include "C2DXAndroidRestoreSceneListener.h" -#include "JSON/CCJSONConverter.h" extern mob::moblink::C2DXRestoreSceneResultEvent restoreSceneCallBack; @@ -17,37 +12,72 @@ void C2DXAndroidRestoreSceneListener::setRestoreSceneCallBack(C2DXRestoreSceneRe restoreSceneCallBack = cb; } -void C2DXAndroidRestoreSceneListener::onReturnSceneData(const char* result) +void C2DXAndroidRestoreSceneListener::onReturnSceneData(JNIEnv* env, jobject jScene) { - CCJSONConverter *json = CCJSONConverter::sharedConverter(); - C2DXDictionary *dic = json->dictionaryFrom(result); - __String* path = (__String*)dic->objectForKey("path"); - __String* source = (__String*)dic->objectForKey("source"); - C2DXDictionary* params = (C2DXDictionary*)dic->objectForKey("params"); - C2DXMobLinkScene* scene = new C2DXMobLinkScene(); - if (path) - { - scene->path = path->getCString(); + jclass jclazz = env->GetObjectClass(jScene); + + jfieldID jField = env->GetFieldID(jclazz, "path", "Ljava/lang/String;"); + jobject jTemp = env->GetObjectField(jScene, jField); + const char* cvalue = env->GetStringUTFChars((jstring)jTemp, NULL); + if (NULL != cvalue) { + scene->path = cvalue; + env->ReleaseStringUTFChars((jstring )jTemp, cvalue); } - if (source) - { - scene->source = source->getCString(); + jField = env->GetFieldID(jclazz, "source", "Ljava/lang/String;"); + jTemp = env->GetObjectField(jScene, jField); + cvalue = env->GetStringUTFChars((jstring)jTemp, NULL); + if (NULL != cvalue) { + scene->source = cvalue; + env->ReleaseStringUTFChars((jstring )jTemp, cvalue); } - if (params) - { - scene->setCustomParams(params); + // TODO + jField = env->GetFieldID(jclazz, "params", "Ljava/util/HashMap;"); + jTemp = env->GetObjectField(jScene, jField); + C2DXDictionary* dict = hashMap2Dict(env, jTemp); + if (NULL != dict) { + scene->setCustomParams(dict); + dict->release(); } C2DXRestoreSceneResultEvent prt = restoreSceneCallBack; - if (prt) - { + if (prt) { prt(scene); } +} - dic->release(); +C2DXDictionary* C2DXAndroidRestoreSceneListener::hashMap2Dict(JNIEnv* env, jobject jHashMap) +{ + C2DXDictionary* dict = C2DXDictionary::create(); + + jclass jclazz = env->FindClass("com/mob/moblink/cocos2dx/MapUtil"); + jmethodID jMethod = env->GetStaticMethodID(jclazz, "keySet", "(Ljava/util/Map;)[Ljava/lang/Object;"); + jobject jKeys = env->CallStaticObjectMethod(jclazz, jMethod, jHashMap); + jsize count = env->GetArrayLength((jarray)jKeys); + + + jclazz = env->GetObjectClass(jHashMap); + jMethod = env->GetMethodID(jclazz, "get", "(Ljava/lang/Object;)Ljava/lang/Object;"); + for (int i = 0; i < count; ++i) { + jobject jKey = env->GetObjectArrayElement((jobjectArray)jKeys, i); + jobject jValue = env->CallObjectMethod(jHashMap, jMethod, jKey); + const char * cKey = env->GetStringUTFChars((jstring)jKey, NULL); + const char * cValue = env->GetStringUTFChars((jstring)jValue, NULL); + if (NULL != cKey && NULL != cValue) { + dict->setObject(C2DXString::create(cValue), cKey); + } + if (NULL != cKey) { + env->ReleaseStringUTFChars((jstring)jKey, cKey); + } + if (NULL != cValue) { + env->ReleaseStringUTFChars((jstring)jValue, cValue); + } + env->DeleteLocalRef(jKey); + env->DeleteLocalRef(jValue); + } + return dict; } C2DXRestoreSceneResultEvent C2DXAndroidRestoreSceneListener::getRestoreSceneCallBack() diff --git a/Classes/C2DXMobLink/Android/C2DXAndroidRestoreSceneListener.h b/Classes/C2DXMobLink/Android/C2DXAndroidRestoreSceneListener.h index e5481c8..13a545f 100755 --- a/Classes/C2DXMobLink/Android/C2DXAndroidRestoreSceneListener.h +++ b/Classes/C2DXMobLink/Android/C2DXAndroidRestoreSceneListener.h @@ -24,7 +24,7 @@ class C2DXAndroidRestoreSceneListener { * 当时有场景还原时回调 * @param result json字符串 */ - void onReturnSceneData(const char* result); + void onReturnSceneData(JNIEnv* env, jobject scene); /** * 设置场景还原的回调函数 @@ -38,6 +38,9 @@ class C2DXAndroidRestoreSceneListener { */ C2DXRestoreSceneResultEvent getRestoreSceneCallBack(); +private: + static C2DXDictionary* hashMap2Dict(JNIEnv* env, jobject jHashMap); + }; #endif diff --git a/Classes/C2DXMobLink/Android/com_mob_moblink_cocos2dx_ActionListener.cpp b/Classes/C2DXMobLink/Android/com_mob_moblink_cocos2dx_ActionListener.cpp index 18aa709..4e65b02 100755 --- a/Classes/C2DXMobLink/Android/com_mob_moblink_cocos2dx_ActionListener.cpp +++ b/Classes/C2DXMobLink/Android/com_mob_moblink_cocos2dx_ActionListener.cpp @@ -30,6 +30,7 @@ JNIEXPORT jint JNICALL Java_com_mob_moblink_cocos2dx_ActionListener_nativeOnResu const char* cresult = env->GetStringUTFChars(jresult, JNI_FALSE); listener->onResult(cresult); env->ReleaseStringUTFChars(jresult, cresult); + return 0; } /* @@ -44,7 +45,7 @@ JNIEXPORT jint JNICALL Java_com_mob_moblink_cocos2dx_ActionListener_nativeOnErro const char* cresult = env->GetStringUTFChars(jerror, JNI_FALSE); listener->onError(cresult); env->ReleaseStringUTFChars(jerror, cresult); - + return 0; } /* @@ -57,4 +58,5 @@ JNIEXPORT jint JNICALL Java_com_mob_moblink_cocos2dx_ActionListener_nativeOnDest { C2DXAndroidActionListener* listener = (C2DXAndroidActionListener*)getCxxObject(env, jthiz); delete listener; + return 0; } diff --git a/Classes/C2DXMobLink/Android/com_mob_moblink_cocos2dx_RestoreSceneListener.cpp b/Classes/C2DXMobLink/Android/com_mob_moblink_cocos2dx_RestoreSceneListener.cpp index 0088461..f33a07f 100755 --- a/Classes/C2DXMobLink/Android/com_mob_moblink_cocos2dx_RestoreSceneListener.cpp +++ b/Classes/C2DXMobLink/Android/com_mob_moblink_cocos2dx_RestoreSceneListener.cpp @@ -20,15 +20,14 @@ JNIEXPORT jint JNICALL Java_com_mob_moblink_cocos2dx_RestoreSceneListener_native /* * Class: com_mob_moblink_cocos2dx_RestoreSceneListener * Method: nativeOnReturnSceneData - * Signature: (Landroid/app/Activity;Ljava/lang/String;)I + * Signature: (Landroid/app/Activity;Lcom/mob/moblink/Scene;)I */ JNIEXPORT jint JNICALL Java_com_mob_moblink_cocos2dx_RestoreSceneListener_nativeOnReturnSceneData - (JNIEnv *env, jobject jthiz, jobject jactivity, jstring jvalue) + (JNIEnv *env, jobject jthiz, jobject jactivity, jobject jvalue) { C2DXAndroidRestoreSceneListener* listener = (C2DXAndroidRestoreSceneListener*)getCxxObject(env, jthiz); - const char* cvalue = env->GetStringUTFChars(jvalue, JNI_FALSE); - listener->onReturnSceneData(cvalue); - env->ReleaseStringUTFChars(jvalue, cvalue); + listener->onReturnSceneData(env, jvalue); + return 0; } /* diff --git a/Classes/C2DXMobLink/Android/com_mob_moblink_cocos2dx_RestoreSceneListener.h b/Classes/C2DXMobLink/Android/com_mob_moblink_cocos2dx_RestoreSceneListener.h index 3dedfd7..36463cb 100755 --- a/Classes/C2DXMobLink/Android/com_mob_moblink_cocos2dx_RestoreSceneListener.h +++ b/Classes/C2DXMobLink/Android/com_mob_moblink_cocos2dx_RestoreSceneListener.h @@ -18,10 +18,10 @@ JNIEXPORT jint JNICALL Java_com_mob_moblink_cocos2dx_RestoreSceneListener_native /* * Class: com_mob_moblink_cocos2dx_RestoreSceneListener * Method: nativeOnReturnSceneData - * Signature: (Landroid/app/Activity;Ljava/lang/String;)I + * Signature: (Landroid/app/Activity;Lcom/mob/moblink/Scene;)I */ JNIEXPORT jint JNICALL Java_com_mob_moblink_cocos2dx_RestoreSceneListener_nativeOnReturnSceneData - (JNIEnv *, jobject, jobject, jstring); + (JNIEnv *, jobject, jobject, jobject); /* * Class: com_mob_moblink_cocos2dx_RestoreSceneListener diff --git a/proj.android-studio/Cocos2dxBridge/build.gradle b/proj.android-studio/Cocos2dxBridge/build.gradle index 6715358..f7dfb97 100755 --- a/proj.android-studio/Cocos2dxBridge/build.gradle +++ b/proj.android-studio/Cocos2dxBridge/build.gradle @@ -1,8 +1,6 @@ -import org.apache.tools.ant.taskdefs.condition.Os - apply plugin: 'com.android.library' -apply from: '../MobLink/build-mix.gradle' - +apply from: './build-mix.gradle' +apply plugin: 'com.mob.sdk' android { @@ -56,5 +54,10 @@ android { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') - compile project(':MobLink') +} + +MobSDK { + MobCommons {} + MobTools {} + MobLink {version = "2.0.5"} } diff --git a/proj.android-studio/Cocos2dxBridge/jni/Android.mk b/proj.android-studio/Cocos2dxBridge/jni/Android.mk index 4ab40b9..a18ab42 100755 --- a/proj.android-studio/Cocos2dxBridge/jni/Android.mk +++ b/proj.android-studio/Cocos2dxBridge/jni/Android.mk @@ -18,9 +18,7 @@ LOCAL_SRC_FILES := ../../../Classes/C2DXMobLink/C2DXMobLink.cpp \ ../../../Classes/C2DXMobLink/Android/C2DXAndroidActionListener.cpp \ ../../../Classes/C2DXMobLink/Android/com_mob_moblink_cocos2dx_ActionListener.cpp \ ../../../Classes/C2DXMobLink/Android/C2DXAndroidRestoreSceneListener.cpp \ - ../../../Classes/C2DXMobLink/Android/com_mob_moblink_cocos2dx_RestoreSceneListener.cpp \ - ../../../Classes/C2DXMobLink/Android/JSON/CCJSONConverter.cpp \ - ../../../Classes/C2DXMobLink/Android/JSON/cJSON/cJSON.c + ../../../Classes/C2DXMobLink/Android/com_mob_moblink_cocos2dx_RestoreSceneListener.cpp LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(COCOS2D_ROOT)/cocos \ diff --git a/proj.android-studio/Cocos2dxBridge/src/com/mob/moblink/cocos2dx/ActionListener.java b/proj.android-studio/Cocos2dxBridge/src/com/mob/moblink/cocos2dx/ActionListener.java index 7ca2870..1ab36a6 100755 --- a/proj.android-studio/Cocos2dxBridge/src/com/mob/moblink/cocos2dx/ActionListener.java +++ b/proj.android-studio/Cocos2dxBridge/src/com/mob/moblink/cocos2dx/ActionListener.java @@ -1,9 +1,5 @@ package com.mob.moblink.cocos2dx; -import org.json.JSONObject; - -import java.util.HashMap; - /** * ActionListener for cocos2dx.
* 使用demo, step by step: @@ -16,9 +12,7 @@ * * */ -public class ActionListener extends Object implements com.mob.moblink.ActionListener { - - +public class ActionListener extends Object implements com.mob.moblink.ActionListener { private int cxxObject; public ActionListener() { @@ -27,16 +21,13 @@ public ActionListener() { } @Override - public void onResult(HashMap params) { - JSONObject json = new JSONObject(params); - String value = json.toString(); - nativeOnResult(value); + public void onResult(String mid) { + nativeOnResult(mid); } @Override public void onError(Throwable t) { - JSONObject json = new JSONObject(); - String value = json.toString(); + String value = t.toString(); nativeOnError(value); } diff --git a/proj.android-studio/Cocos2dxBridge/src/com/mob/moblink/cocos2dx/MapUtil.java b/proj.android-studio/Cocos2dxBridge/src/com/mob/moblink/cocos2dx/MapUtil.java new file mode 100755 index 0000000..e4ccc99 --- /dev/null +++ b/proj.android-studio/Cocos2dxBridge/src/com/mob/moblink/cocos2dx/MapUtil.java @@ -0,0 +1,15 @@ +package com.mob.moblink.cocos2dx; + +import java.util.Map; + +/** + * Created by litl on 2018/2/7. + */ + +public class MapUtil { + + + private static Object[] keySet(Map map) { + return map.keySet().toArray(); + } +} 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 index 7722fc1..6174651 100755 --- a/proj.android-studio/Cocos2dxBridge/src/com/mob/moblink/cocos2dx/RestoreSceneListener.java +++ b/proj.android-studio/Cocos2dxBridge/src/com/mob/moblink/cocos2dx/RestoreSceneListener.java @@ -1,12 +1,11 @@ package com.mob.moblink.cocos2dx; import android.app.Activity; +import android.content.Intent; -import org.json.JSONObject; +import com.mob.moblink.Scene; -import java.util.HashMap; - -public class RestoreSceneListener extends com.mob.moblink.AbstractRestoreSceneListener { +public class RestoreSceneListener extends Object implements com.mob.moblink.RestoreSceneListener { private int cxxObject; @@ -16,10 +15,23 @@ public RestoreSceneListener() { } @Override - public void onReturnSceneData(Activity activity, HashMap result) { - JSONObject jsonObject = new JSONObject(result); - String value = jsonObject.toString(); - nativeOnReturnSceneData(activity, value); + public void onBeginCheckScene() { + // do nothing + } + + @Override + public void onFinishCheckScene() { + // do nothing + } + + @Override + public boolean onReturnSceneIntent(String var1, Intent var2) { + return false; + } + + @Override + public void onReturnSceneData(Activity activity, Scene result) { + nativeOnReturnSceneData(activity, result); } @Override @@ -29,7 +41,7 @@ protected void finalize() throws Throwable { } private native int nativeOnCreateCxxObject(); - private native int nativeOnReturnSceneData(Activity activity, String string); + private native int nativeOnReturnSceneData(Activity activity, Scene string); private native int nativeOnDestoryCxxObject(); public int getCxxObject() { diff --git a/proj.android-studio/app/AndroidManifest.xml b/proj.android-studio/app/AndroidManifest.xml index 83a9767..4bad25e 100755 --- a/proj.android-studio/app/AndroidManifest.xml +++ b/proj.android-studio/app/AndroidManifest.xml @@ -1,8 +1,8 @@ diff --git a/proj.android-studio/build.gradle b/proj.android-studio/build.gradle old mode 100644 new mode 100755 index c6f2f50..3703c44 --- a/proj.android-studio/build.gradle +++ b/proj.android-studio/build.gradle @@ -1,19 +1,29 @@ // 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.0' - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + dependencies { + classpath 'com.android.tools.build:gradle:2.3.2' + classpath 'com.mob.sdk:MobSDK:+' } } allprojects { repositories { jcenter() + maven { + url mavenMobUrl + } } } diff --git a/proj.android-studio/settings.gradle b/proj.android-studio/settings.gradle index b3db5dc..9336e82 100755 --- a/proj.android-studio/settings.gradle +++ b/proj.android-studio/settings.gradle @@ -1,4 +1,4 @@ -include ':libcocos2dx', ':MobLink', ":Cocos2dxBridge" +include ':libcocos2dx', ":Cocos2dxBridge" project(':libcocos2dx').projectDir = new File(settingsDir, '../cocos2d/cocos/platform/android/libcocos2dx') include ':Cocos2DXForMobLink' project(':Cocos2DXForMobLink').projectDir = new File(settingsDir, 'app')