diff --git a/.gradle/2.14.1/tasks/_qy_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/.gradle/2.14.1/tasks/_qy_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin deleted file mode 100644 index 2afb4b5..0000000 Binary files a/.gradle/2.14.1/tasks/_qy_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin and /dev/null differ diff --git a/.gradle/2.14.1/tasks/_qy_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin b/.gradle/2.14.1/tasks/_qy_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin deleted file mode 100644 index 7650d0c..0000000 Binary files a/.gradle/2.14.1/tasks/_qy_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin and /dev/null differ diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 78ec51a..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 03ab7bb..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/qy/build.gradle b/qy/build.gradle index 6af1d7f..e1cc59e 100644 --- a/qy/build.gradle +++ b/qy/build.gradle @@ -50,6 +50,7 @@ dependencies { compile files('libs/universal-image-loader-1.9.2.jar') compile files('libs/utdid4all-1.0.4.jar') compile 'com.google.code.gson:gson:2.8.0' + compile project(':PushSDK') } //tasks.withType(JavaCompile) { // options.encoding = "GBK" diff --git a/qy/src/main/AndroidManifest.xml b/qy/src/main/AndroidManifest.xml index 3dab19a..c0d0a62 100644 --- a/qy/src/main/AndroidManifest.xml +++ b/qy/src/main/AndroidManifest.xml @@ -1,12 +1,14 @@ + android:targetSdkVersion="22" + tools:overrideLibrary="com.umeng.message.lib"/> @@ -150,8 +152,18 @@ - - + + + + + + + + webObjcache; setPhoneId(); QLog.getLogger().d(dTAG, "mobileid is"+ getPhoneId()); getStaticsTracks(); + + initialPushSDK(); + } - + + void initialPushSDK(){ + PushAgent mPushAgent = PushAgent.getInstance(this); +//注册推送服务,每次调用register方法都会回调该接口 + mPushAgent.register(new IUmengRegisterCallback() { + + @Override + public void onSuccess(String deviceToken) { + //注册成功会返回device token + QLog.getLogger().d(dTAG, " deviceToken of push is "+ deviceToken); + } + + @Override + public void onFailure(String s, String s1) { + QLog.getLogger().d(dTAG, " push agent regist failed "); + } + }); + + } public Crypto crypto; public Entity entity; private void initCryto(){ diff --git a/qy/src/main/java/com/qiyou/mb/android/QiYouConstant.java b/qy/src/main/java/com/qiyou/mb/android/QiYouConstant.java index e938c20..ed2090d 100644 --- a/qy/src/main/java/com/qiyou/mb/android/QiYouConstant.java +++ b/qy/src/main/java/com/qiyou/mb/android/QiYouConstant.java @@ -15,7 +15,7 @@ public final static String BASE_MD_URL = BASE_URL;//+"upload/"; public final static String BASE_STATIC_URL = BASE_URL +"staticmap/"; public final static String TENCENT_APP_ID = "1104563148"; // TODO Turn off when deploying. -public static boolean DEVELOPER_MODE = false; +public static boolean DEVELOPER_MODE = true; public static boolean PLAYBACK_CAN_RECORD = false /*DEVELOPER_MODE*/ ; diff --git a/qy/src/main/java/com/qiyou/mb/android/ui/MainActivity.java b/qy/src/main/java/com/qiyou/mb/android/ui/MainActivity.java index 4230732..ac02729 100644 --- a/qy/src/main/java/com/qiyou/mb/android/ui/MainActivity.java +++ b/qy/src/main/java/com/qiyou/mb/android/ui/MainActivity.java @@ -112,7 +112,7 @@ import com.umeng.socialize.sso.UMQQSsoHandler; import com.umeng.socialize.weixin.controller.UMWXHandler; import com.umeng.socialize.weixin.media.CircleShareContent; import com.umeng.socialize.weixin.media.WeiXinShareContent; - +import com.umeng.message.PushAgent; import org.json.JSONException; import org.json.JSONObject; @@ -243,7 +243,9 @@ public class MainActivity extends Activity_qiyouBase { MobclickAgent. startWithConfigure(config); MobclickAgent.openActivityDurationTrack(false); } - + + PushAgent.getInstance(this).onAppStart(); //push start + mController.getConfig().removePlatform(SHARE_MEDIA.DOUBAN, SHARE_MEDIA.RENREN); //分享给QQ好友 UMQQSsoHandler qqSsoHandler = new UMQQSsoHandler(this, QiYouConstant.TENCENT_APP_ID, "bB5QKjxU4MpHoCq0"); diff --git a/settings.gradle b/settings.gradle index 08adfd5..18e8678 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ -include ':listviewlibrary' +include ':listviewlibrary', ':PushSDK' include ':qy'