Skip to content

Commit e56a05c

Browse files
JoshLipanJoshLipan
committed
Update SDK to Android v3.6.6 iOS v3.3.3
1 parent a50bafc commit e56a05c

File tree

8 files changed

+223
-55
lines changed

8 files changed

+223
-55
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jpush-phonegap-plugin",
3-
"version": "3.7.5",
3+
"version": "3.7.6",
44
"description": "JPush for cordova plugin",
55
"cordova": {
66
"id": "jpush-phonegap-plugin",

‎plugin.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
id="jpush-phonegap-plugin"
5-
version="3.7.5">
5+
version="3.7.6">
66

77
<name>JPush</name>
88
<description>JPush for cordova plugin</description>
@@ -49,7 +49,7 @@
4949
<source-file src="src/ios/Plugins/AppDelegate+JPush.m" />
5050

5151
<header-file src="src/ios/lib/JPUSHService.h" />
52-
<source-file src="src/ios/lib/jpush-ios-3.2.6.a" framework="true" />
52+
<source-file src="src/ios/lib/jpush-ios-3.3.3.a" framework="true" />
5353
<resource-file src="src/ios/JPushConfig.plist" />
5454

5555
<framework src="CFNetwork.framework" weak="true" />
@@ -255,7 +255,7 @@
255255

256256
</config-file>
257257

258-
<lib-file src="src/android/libs/jpush-android-3.5.8.jar" />
258+
<lib-file src="src/android/libs/jpush-android-3.6.6.jar" />
259259

260260
<source-file src="src/android/PushService.java" target-dir="src/cn/jiguang/cordova/push" />
261261
<source-file src="src/android/JPushPlugin.java" target-dir="src/cn/jiguang/cordova/push" />
@@ -278,6 +278,8 @@
278278
target="res/layout/jpush_webview_layout.xml" />
279279
<resource-file src="src/android/res/layout/push_notification.xml"
280280
target="res/layout/push_notification.xml" />
281+
<resource-file src="src/android/res/layout-v21/push_notification.xml"
282+
target="res/layout-v21/push_notification.xml" />
281283

282284
<resource-file src="src/android/res/values/jpush_style.xml"
283285
target="res/values/jpush_style.xml" />

‎src/android/libs/jpush-android-3.5.8.jar‎

-267 KB
Binary file not shown.

‎src/android/libs/jpush-android-3.6.6.jar‎

279 KB
Binary file not shown.

‎src/android/res/layout-v21/push_notification.xml‎

Lines changed: 169 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout
3+
android:id="@+id/push_root_view"
4+
xmlns:android="http://schemas.android.com/apk/res/android"
5+
android:layout_width="match_parent"
6+
android:layout_height="wrap_content"
7+
android:paddingTop="2dp"
8+
android:paddingRight="8dp"
9+
android:paddingLeft="8dp"
10+
android:paddingBottom="4dp">
11+
12+
<FrameLayout
13+
android:id="@+id/v21"
14+
android:layout_width="0dp"
15+
android:layout_height="0dp" />
16+
17+
<RelativeLayout
18+
android:id="@+id/push_notification_style_default"
19+
android:layout_width="match_parent"
20+
android:layout_height="wrap_content">
21+
<LinearLayout
22+
android:id="@+id/push_notification_layout_lefttop"
23+
android:layout_width="wrap_content"
24+
android:layout_height="wrap_content"
25+
android:layout_alignParentTop="true"
26+
android:layout_alignParentLeft="true"
27+
android:layout_toLeftOf="@+id/push_notification_big_icon"
28+
android:gravity="center_vertical"
29+
android:orientation="horizontal">
30+
<ImageView
31+
android:id="@+id/push_notification_small_icon"
32+
android:layout_width="18dp"
33+
android:layout_height="18dp"
34+
android:layout_marginLeft="6dp"
35+
android:scaleType="centerInside" />
36+
<TextView
37+
style="@android:style/TextAppearance.Material.Notification.Title"
38+
android:id="@+id/push_notification_title"
39+
android:layout_width="wrap_content"
40+
android:layout_height="wrap_content"
41+
android:layout_marginLeft="4dp"
42+
android:maxLines="1"
43+
android:maxWidth="200dp"
44+
android:maxLength="24"
45+
android:textSize="12sp" />
46+
<TextView
47+
style="@android:style/TextAppearance.Material.Notification.Info"
48+
android:id="@+id/push_notification_dot"
49+
android:layout_width="wrap_content"
50+
android:layout_height="wrap_content"
51+
android:layout_marginLeft="4dp"
52+
android:text="· "
53+
android:textSize="20sp" />
54+
<TextView
55+
style="@android:style/TextAppearance.Material.Notification.Time"
56+
android:maxLines="1"
57+
android:id="@+id/push_notification_date"
58+
android:layout_width="wrap_content"
59+
android:layout_height="wrap_content"
60+
android:textSize="12sp" />
61+
</LinearLayout>
62+
63+
<ImageView
64+
android:id="@+id/push_notification_big_icon"
65+
android:layout_width="48dp"
66+
android:layout_height="48dp"
67+
android:layout_alignParentRight="true"
68+
android:layout_centerVertical="true"
69+
android:layout_marginRight="8dp"
70+
android:scaleType="centerInside" />
71+
72+
<TextView
73+
style="@android:style/TextAppearance.Material.Notification.Title"
74+
android:id="@+id/push_notification_sub_title"
75+
android:layout_width="match_parent"
76+
android:layout_height="wrap_content"
77+
android:layout_marginTop="1dp"
78+
android:layout_below="@id/push_notification_layout_lefttop"
79+
android:layout_toLeftOf="@+id/push_notification_big_icon"
80+
android:layout_marginLeft="6dp"
81+
android:layout_marginRight="4dp"
82+
android:maxLines="1"
83+
android:textSize="13sp"
84+
android:visibility="gone" />
85+
86+
<TextView
87+
style="@android:style/TextAppearance.Material.Notification.Info"
88+
android:id="@+id/push_notification_content"
89+
android:layout_width="match_parent"
90+
android:layout_height="wrap_content"
91+
android:layout_marginRight="4dp"
92+
android:layout_below="@id/push_notification_sub_title"
93+
android:layout_toLeftOf="@+id/push_notification_big_icon"
94+
android:layout_marginLeft="6dp"
95+
android:ellipsize="end"
96+
android:layout_marginTop="1dp"
97+
android:maxLines="2"
98+
android:textSize="13sp" />
99+
<TextView
100+
style="@android:style/TextAppearance.Material.Notification.Info"
101+
android:id="@+id/push_notification_content_one_line"
102+
android:layout_width="match_parent"
103+
android:layout_height="wrap_content"
104+
android:layout_marginRight="4dp"
105+
android:layout_toLeftOf="@+id/push_notification_big_icon"
106+
android:layout_below="@id/push_notification_sub_title"
107+
android:ellipsize="end"
108+
android:layout_marginLeft="6dp"
109+
android:layout_marginTop="1dp"
110+
android:textSize="13sp"
111+
android:maxLines="1"
112+
android:visibility="gone" />
113+
</RelativeLayout>
114+
115+
<RelativeLayout
116+
android:id="@+id/push_notification_style_1"
117+
android:layout_height="wrap_content"
118+
android:layout_width="match_parent"
119+
android:visibility="gone">
120+
<ImageView
121+
android:id="@+id/push_notification_style_1_big_icon"
122+
android:layout_width="50dp"
123+
android:layout_height="50dp"
124+
android:layout_alignParentLeft="true"
125+
android:layout_centerVertical="true"
126+
android:scaleType="centerInside" />
127+
<LinearLayout
128+
android:layout_marginLeft="6dp"
129+
android:layout_toRightOf="@+id/push_notification_style_1_big_icon"
130+
android:layout_width="match_parent"
131+
android:layout_height="wrap_content"
132+
android:layout_centerVertical="true"
133+
android:orientation="vertical">
134+
<RelativeLayout
135+
android:layout_width="match_parent"
136+
android:layout_height="wrap_content">
137+
<TextView
138+
style="@android:style/TextAppearance.Material.Notification.Time"
139+
android:id="@+id/push_notification_style_1_date"
140+
android:layout_height="wrap_content"
141+
android:layout_alignParentRight="true"
142+
android:layout_width="wrap_content"
143+
android:textSize="12sp" />
144+
<TextView
145+
style="@android:style/TextAppearance.Material.Notification.Title"
146+
android:id="@+id/push_notification_style_1_title"
147+
android:layout_alignParentLeft="true"
148+
android:layout_width="match_parent"
149+
android:layout_height="wrap_content"
150+
android:layout_toLeftOf="@+id/push_notification_style_1_date"
151+
android:maxLines="1"
152+
android:layout_marginRight="8dp"
153+
android:textSize="12sp"
154+
android:textStyle="bold" />
155+
</RelativeLayout>
156+
<TextView
157+
style="@android:style/TextAppearance.Material.Notification.Info"
158+
android:id="@+id/push_notification_style_1_content"
159+
android:layout_width="wrap_content"
160+
android:layout_height="wrap_content"
161+
android:layout_marginRight="4dp"
162+
android:ellipsize="end"
163+
android:layout_marginTop="1dp"
164+
android:maxLines="2"
165+
android:textSize="13sp" />
166+
</LinearLayout>
167+
</RelativeLayout>
168+
169+
</RelativeLayout>

0 commit comments

Comments
 (0)