Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Hevin committed Jun 22, 2016
2 parents 36d1fe2 + 490a39d commit be4f290
Show file tree
Hide file tree
Showing 25 changed files with 250 additions and 299 deletions.
Binary file removed .DS_Store
View file
Binary file not shown.
Binary file added JPushUnityPlugin_v2.1.3.unitypackage
View file
Binary file not shown.
Binary file removed Plugins/Android/.DS_Store
View file
Binary file not shown.
262 changes: 134 additions & 128 deletions Plugins/Android/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,129 +1,135 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.jpush.unity3dplugin"
android:versionCode="161"
android:versionName="1.6.1"
>
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="7" />
<permission
android:name="com.jpush.unity3dplugin.permission.JPUSH_MESSAGE"
android:protectionLevel="signature" />

<!-- Required 一些系统要求的权限，如访问网络等-->
<uses-permission android:name="com.jpush.unity3dplugin.permission.JPUSH_MESSAGE" />
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>



<!-- Optional for location -->
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />

<application
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@android:style/Theme.NoTitleBar">

<!-- For test only 测试的主程序-->
<activity
android:name="com.example.unity3d_jpush_demo.UnityPluginActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/app_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<!-- Required SDK核心功能-->
<activity
android:name="cn.jpush.android.ui.PushActivity"
android:theme="@android:style/Theme.Translucent.NoTitleBar"
android:configChanges="orientation|keyboardHidden" >
<intent-filter>
<action android:name="cn.jpush.android.ui.PushActivity" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="com.jpush.unity3dplugin" />
</intent-filter>
</activity>
<!-- Required SDK核心功能-->
<service
android:name="cn.jpush.android.service.DownloadService"
android:enabled="true"
android:exported="false" >
</service>

<!-- Required SDK 核心功能-->
<service
android:name="cn.jpush.android.service.PushService"
android:enabled="true"
android:exported="false">
<intent-filter>
<action android:name="cn.jpush.android.intent.REGISTER" />
<action android:name="cn.jpush.android.intent.REPORT" />
<action android:name="cn.jpush.android.intent.PushService" />
<action android:name="cn.jpush.android.intent.PUSH_TIME" />

</intent-filter>
</service>

<!-- Required SDK核心功能-->
<receiver
android:name="cn.jpush.android.service.PushReceiver"
android:enabled="true" >
<intent-filter android:priority="1000">
<action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" /> <!--Required 显示通知栏 -->
<category android:name="com.jpush.unity3dplugin" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.USER_PRESENT" />
<action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
</intent-filter>
<!-- Optional -->
<intent-filter>
<action android:name="android.intent.action.PACKAGE_ADDED" />
<action android:name="android.intent.action.PACKAGE_REMOVED" />
<data android:scheme="package" />
</intent-filter>

</receiver>

<!-- Required SDK核心功能-->
<receiver android:name="cn.jpush.android.service.AlarmReceiver" />

<!-- User defined. For test only 用户自定义的广播接收器-->
<receiver
android:name="com.example.unity3d_jpush_demo.MyReceiver"
android:enabled="true">
<intent-filter>
<action android:name="cn.jpush.android.intent.REGISTRATION" /> <!--Required 用户注册SDK的intent-->
<action android:name="cn.jpush.android.intent.UNREGISTRATION" />
<action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED" /> <!--Required 用户接收SDK消息的intent-->
<action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED" /> <!--Required 用户接收SDK通知栏信息的intent-->
<action android:name="cn.jpush.android.intent.NOTIFICATION_OPENED" /> <!--Required 用户打开自定义通知栏的intent-->
<action android:name="cn.jpush.android.intent.ACTION_RICHPUSH_CALLBACK" /> <!--Optional 用户接受Rich Push Javascript 回调函数的intent-->
<category android:name="com.jpush.unity3dplugin" />
</intent-filter>
</receiver>


<!-- Required . Enable it you can get statistics data with channel -->
<meta-data android:name="JPUSH_CHANNEL" android:value="developer-default"/>
<meta-data android:name="JPUSH_APPKEY" android:value="68a6a21369a9c99649d2a482" /> <!-- </>值来自开发者平台取得的AppKey-->

</application>
</manifest>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.jpush.unity3dplugin">

<permission
android:name="com.jpush.unity3dplugin.permission.JPUSH_MESSAGE"
android:protectionLevel="signature"/>

<!-- Required 一些系统要求的权限，如访问网络等-->
<uses-permission android:name="com.jpush.unity3dplugin.permission.JPUSH_MESSAGE"/>
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WRITE_SETTINGS"/>
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>


<!-- Optional for location -->
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>

<application
android:label="@string/app_name">

<!-- For test only. 测试的主程序 -->
<activity
android:name="com.example.unity3d_jpush_demo.UnityPluginActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>

<!-- Required. SDK 核心功能-->
<activity
android:name="cn.jpush.android.ui.PushActivity"
android:configChanges="orientation|keyboardHidden"
android:theme="@android:style/Theme.Translucent.NoTitleBar">
<intent-filter>
<action android:name="cn.jpush.android.ui.PushActivity"/>

<category android:name="android.intent.category.DEFAULT"/>
<category android:name="com.jpush.unity3dplugin"/>
</intent-filter>
</activity>
<!-- Required. SDK 核心功能 -->
<service
android:name="cn.jpush.android.service.DownloadService"
android:enabled="true"
android:exported="false">
</service>

<!-- Required. SDK 核心功能 -->
<service
android:name="cn.jpush.android.service.PushService"
android:enabled="true"
android:exported="false">
<intent-filter>
<action android:name="cn.jpush.android.intent.REGISTER"/>
<action android:name="cn.jpush.android.intent.REPORT"/>
<action android:name="cn.jpush.android.intent.PushService"/>
<action android:name="cn.jpush.android.intent.PUSH_TIME"/>

</intent-filter>
</service>

<!-- Required. SDK核心功能 -->
<receiver
android:name="cn.jpush.android.service.PushReceiver"
android:enabled="true">
<intent-filter android:priority="1000">
<!-- Required. 显示通知栏 -->
<action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY"/>
<category android:name="com.jpush.unity3dplugin"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.USER_PRESENT"/>
<action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
</intent-filter>
<!-- Optional -->
<intent-filter>
<action android:name="android.intent.action.PACKAGE_ADDED"/>
<action android:name="android.intent.action.PACKAGE_REMOVED"/>

<data android:scheme="package"/>
</intent-filter>

</receiver>

<!-- Required. SDK 核心功能 -->
<receiver android:name="cn.jpush.android.service.AlarmReceiver"/>

<!-- User defined. For test only 用户自定义的广播接收器 -->
<receiver
android:name="com.example.unity3d_jpush_demo.MyReceiver"
android:enabled="true">
<intent-filter>
<!-- Required. 用户注册 SDK 的 intent -->
<action android:name="cn.jpush.android.intent.REGISTRATION"/>
<action android:name="cn.jpush.android.intent.UNREGISTRATION"/>
<!-- Required. 用户接收 SDK 消息的 intent -->
<action android:name="cn.jpush.android.intent.MESSAGE_RECEIVED"/>
<!-- Required. 用户接收 SDK 通知栏信息的 intent -->
<action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED"/>
<!-- Required. 用户打开自定义通知栏的 intent -->
<action android:name="cn.jpush.android.intent.NOTIFICATION_OPENED"/>
<!-- Optional. 用户接受Rich Push Javascript 回调函数的 intent -->
<action android:name="cn.jpush.android.intent.ACTION_RICHPUSH_CALLBACK"/>
<category android:name="com.jpush.unity3dplugin"/>
</intent-filter>
</receiver>

<!-- Required. Enable it you can get statistics data with channel. -->
<meta-data
android:name="JPUSH_CHANNEL"
android:value="developer-default"/>
<!-- 值来自开发者平台取得的 AppKey-->
<meta-data
android:name="JPUSH_APPKEY"
android:value="68a6a21369a9c99649d2a482"/>

</application>
</manifest>
Binary file removed Plugins/Android/libs/.DS_Store
View file
Binary file not shown.
Binary file added Plugins/Android/libs/arm64-v8a/libjpush216.so
View file
Binary file not shown.
Binary file removed Plugins/Android/libs/armeabi-v7a/libjpush213.so
View file
Binary file not shown.
Binary file added Plugins/Android/libs/armeabi-v7a/libjpush216.so
View file
Binary file not shown.
Binary file removed Plugins/Android/libs/armeabi/libjpush213.so
View file
Binary file not shown.
Binary file added Plugins/Android/libs/armeabi/libjpush216.so
View file
Binary file not shown.
Binary file removed Plugins/Android/libs/jpush-android-2.1.3.jar
View file
Binary file not shown.
Binary file added Plugins/Android/libs/jpush-android-2.1.6.jar
View file
Binary file not shown.
Binary file added Plugins/Android/libs/mips/libjpush216.so
View file
Binary file not shown.
Binary file added Plugins/Android/libs/mips64/libjpush216.so
View file
Binary file not shown.
Binary file added Plugins/Android/libs/x86/libjpush216.so
View file
Binary file not shown.
Binary file added Plugins/Android/libs/x86_64/libjpush216.so
View file
Binary file not shown.
Binary file removed Plugins/Android/res/.DS_Store
View file
Binary file not shown.
Binary file removed Plugins/Android/res/drawable-hdpi/ic_launcher.png
View file
Binary file not shown.
Binary file removed Plugins/Android/res/drawable-ldpi/ic_launcher.png
View file
Binary file not shown.
Binary file removed Plugins/Android/res/drawable-mdpi/ic_launcher.png
View file
Binary file not shown.
Binary file removed Plugins/Android/res/drawable-xhdpi/ic_launcher.png
View file
Binary file not shown.
4 changes: 0 additions & 4 deletions Plugins/Android/res/values-zh/strings.xml
View file

This file was deleted.

4 changes: 0 additions & 4 deletions Plugins/Android/res/values/strings.xml
View file

This file was deleted.

Binary file removed Plugins/Android/run.png
View file
Binary file not shown.
Loading

0 comments on commit be4f290

Please sign in to comment.