Skip to content

Commit eecb768

Browse files
weiruiyangweiruiyang
authored
Merge pull request #55 from weiruiyang/master
更新sdk android 3.7.0 ios 3.3.4
2 parents 361d8a9 + 54d760f commit eecb768

33 files changed

+1964
-35
lines changed

‎PLuginsAndroidAARCode/jpush-unity-plugin/build.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ android {
3535
sourceCompatibility JavaVersion.VERSION_1_6
3636
targetCompatibility JavaVersion.VERSION_1_6
3737
}
38+
lintOptions {
39+
abortOnError false
40+
}
3841
}
3942

4043
dependencies {

‎PLuginsAndroidAARCode/jpush-unity-plugin/libs/jcore-android-2.2.4.jar

-439 KB
Binary file not shown.

‎PLuginsAndroidAARCode/jpush-unity-plugin/libs/jcore-android-2.4.2.jar

539 KB
Binary file not shown.

‎PLuginsAndroidAARCode/jpush-unity-plugin/libs/jpush-android-3.5.4.jar

-227 KB
Binary file not shown.

‎PLuginsAndroidAARCode/jpush-unity-plugin/libs/jpush-android-3.7.0.jar

362 KB
Binary file not shown.

‎PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/arm64-v8a/libjcore224.so ‎PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/arm64-v8a/libjcore242.so

5.7 KB
Binary file not shown.

‎PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/armeabi-v7a/libjcore224.so ‎PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/armeabi-v7a/libjcore242.so

13.5 KB
Binary file not shown.

‎PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/armeabi/libjcore224.so ‎PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/armeabi/libjcore242.so

17.5 KB
Binary file not shown.

‎PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/mips/libjcore224.so

-5.59 KB
Binary file not shown.

‎PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/mips/libjcore242.so

5.55 KB
Binary file not shown.

‎PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/mips64/libjcore224.so

-6.25 KB
Binary file not shown.

‎PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/mips64/libjcore242.so

6.2 KB
Binary file not shown.

‎PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/x86/libjcore224.so ‎PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/x86/libjcore242.so

5.36 KB
Binary file not shown.

‎PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/x86_64/libjcore224.so ‎PLuginsAndroidAARCode/jpush-unity-plugin/src/main/jniLibs/x86_64/libjcore242.so

5.97 KB
Binary file not shown.

‎PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/drawable-hdpi/jpush_ic_action_cancle.png

551 Bytes
Loading

‎PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/drawable-hdpi/jpush_ic_action_close.png

591 Bytes
Loading

‎PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/drawable-hdpi/jpush_ic_action_close2.png

759 Bytes
Loading

‎PLuginsAndroidAARCode/jpush-unity-plugin/src/main/res/layout-v21/push_notification.xml

+296
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,296 @@
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+
8+
<FrameLayout
9+
android:id="@+id/v21"
10+
android:layout_width="match_parent"
11+
android:layout_height="match_parent" />
12+
<FrameLayout
13+
android:id="@+id/layout_version_2"
14+
android:layout_width="0dp"
15+
android:layout_height="0dp" />
16+
<RelativeLayout
17+
android:id="@+id/push_notification_style_default"
18+
android:layout_width="match_parent"
19+
android:layout_height="wrap_content"
20+
android:visibility="gone">
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:scaleType="centerInside" />
35+
<TextView
36+
style="@android:style/TextAppearance.Material.Notification.Title"
37+
android:id="@+id/push_notification_title"
38+
android:layout_width="wrap_content"
39+
android:layout_height="wrap_content"
40+
android:layout_marginLeft="4dp"
41+
android:maxLines="1"
42+
android:maxWidth="200dp"
43+
android:maxLength="24"
44+
android:textSize="12sp" />
45+
<TextView
46+
style="@android:style/TextAppearance.Material.Notification.Info"
47+
android:id="@+id/push_notification_dot"
48+
android:layout_width="wrap_content"
49+
android:layout_height="wrap_content"
50+
android:layout_marginLeft="4dp"
51+
android:textStyle="bold"
52+
android:text="·"
53+
android:textSize="16sp" />
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+
<FrameLayout
63+
android:id="@+id/push_notification_for_bottom_margin"
64+
android:layout_width="match_parent"
65+
android:layout_alignParentBottom="true"
66+
android:layout_height="0dp"/>
67+
<ImageView
68+
android:id="@+id/push_notification_banner_icon"
69+
android:layout_width="match_parent"
70+
android:layout_height="96dp"
71+
android:layout_above="@+id/push_notification_for_bottom_margin"
72+
android:layout_marginBottom="8dp"
73+
android:visibility="gone"
74+
android:scaleType="centerCrop" />
75+
<LinearLayout
76+
android:id="@+id/push_notification_main_layout"
77+
android:orientation="vertical"
78+
android:layout_width="match_parent"
79+
android:layout_height="match_parent"
80+
android:layout_above="@+id/push_notification_banner_icon"
81+
android:gravity="center_vertical"
82+
android:layout_marginRight="4dp"
83+
android:layout_marginBottom="5dp"
84+
android:layout_toLeftOf="@+id/push_notification_big_icon"
85+
android:layout_below="@id/push_notification_layout_lefttop">
86+
<TextView
87+
style="@android:style/TextAppearance.Material.Notification.Title"
88+
android:id="@+id/push_notification_sub_title"
89+
android:layout_width="match_parent"
90+
android:layout_height="wrap_content"
91+
android:layout_marginTop="1dp"
92+
android:maxLines="1"
93+
android:ellipsize="end"
94+
android:textSize="13sp"
95+
android:visibility="gone" />
96+
97+
<TextView
98+
style="@android:style/TextAppearance.Material.Notification.Info"
99+
android:id="@+id/push_notification_content"
100+
android:layout_width="match_parent"
101+
android:layout_height="wrap_content"
102+
android:ellipsize="end"
103+
android:layout_marginTop="1dp"
104+
android:maxLines="2"
105+
android:textSize="13sp" />
106+
<TextView
107+
style="@android:style/TextAppearance.Material.Notification.Info"
108+
android:id="@+id/push_notification_content_one_line"
109+
android:layout_width="match_parent"
110+
android:layout_height="wrap_content"
111+
android:ellipsize="end"
112+
android:layout_marginTop="1dp"
113+
android:textSize="13sp"
114+
android:maxLines="1"
115+
android:visibility="gone" />
116+
</LinearLayout>
117+
<ImageView
118+
android:id="@+id/push_notification_big_icon"
119+
android:layout_width="48dp"
120+
android:layout_height="48dp"
121+
android:layout_alignParentRight="true"
122+
android:layout_alignTop="@+id/push_notification_main_layout"
123+
android:layout_alignBottom="@+id/push_notification_main_layout"
124+
android:scaleType="centerInside" />
125+
</RelativeLayout>
126+
127+
<RelativeLayout
128+
android:id="@+id/push_notification_style_1"
129+
android:layout_height="wrap_content"
130+
android:layout_width="match_parent"
131+
android:visibility="gone">
132+
<ImageView
133+
android:id="@+id/push_notification_style_1_big_icon"
134+
android:layout_width="50dp"
135+
android:layout_height="50dp"
136+
android:layout_alignParentLeft="true"
137+
android:layout_centerVertical="true"
138+
android:scaleType="centerInside" />
139+
<LinearLayout
140+
android:id="@+id/push_notification_style_1_main_layout"
141+
android:layout_toRightOf="@+id/push_notification_style_1_big_icon"
142+
android:layout_width="match_parent"
143+
android:layout_height="wrap_content"
144+
android:layout_centerVertical="true"
145+
android:orientation="vertical">
146+
<LinearLayout
147+
android:layout_width="match_parent"
148+
android:layout_height="wrap_content"
149+
android:id="@+id/push_notification_layout_time"
150+
android:gravity="center_vertical"
151+
android:weightSum="1"
152+
android:orientation="horizontal">
153+
<TextView
154+
style="@android:style/TextAppearance.Material.Notification.Title"
155+
android:id="@+id/push_notification_style_1_title"
156+
android:layout_width="wrap_content"
157+
android:layout_height="wrap_content"
158+
android:maxLines="1"
159+
android:layout_marginRight="8dp"
160+
android:textSize="12sp"
161+
android:textStyle="bold" />
162+
<TextView
163+
style="@android:style/TextAppearance.Material.Notification.Time"
164+
android:id="@+id/push_notification_style_1_date"
165+
android:layout_height="wrap_content"
166+
android:layout_width="0dp"
167+
android:layout_weight="1"
168+
android:gravity="right"
169+
android:textSize="12sp" />
170+
<TextView android:id="@+id/push_notification_null"
171+
android:layout_width="24dp"
172+
android:visibility="gone"
173+
android:layout_height="20dp"/>
174+
</LinearLayout>
175+
176+
<TextView
177+
style="@android:style/TextAppearance.Material.Notification.Info"
178+
android:id="@+id/push_notification_style_1_content"
179+
android:layout_width="wrap_content"
180+
android:layout_height="wrap_content"
181+
android:ellipsize="end"
182+
android:layout_marginTop="1dp"
183+
android:maxLines="1"
184+
android:textSize="13sp" />
185+
</LinearLayout>
186+
<ImageView
187+
android:id="@+id/push_notification_style_1_banner_icon"
188+
android:layout_width="match_parent"
189+
android:layout_height="96dp"
190+
android:layout_alignParentBottom="true"
191+
android:visibility="gone"
192+
android:layout_below="@id/push_notification_style_1_main_layout"
193+
android:scaleType="centerInside" />
194+
</RelativeLayout>
195+
<FrameLayout
196+
android:id="@+id/push_notification_banner_layout"
197+
android:layout_width="match_parent"
198+
android:layout_height="match_parent">
199+
<ImageView
200+
android:id="@+id/push_notification_banner_img"
201+
android:layout_width="match_parent"
202+
android:layout_height="match_parent"
203+
android:scaleType="centerCrop"
204+
android:visibility="gone" />
205+
</FrameLayout>
206+
207+
<RelativeLayout
208+
android:id="@+id/push_notification_header_neg_fb"
209+
android:layout_width="wrap_content"
210+
android:layout_height="wrap_content"
211+
android:layout_alignParentRight="true"
212+
android:layout_alignParentTop="true"
213+
android:visibility="gone">
214+
<ImageView android:id="@+id/push_notification_header_expand"
215+
android:layout_marginRight="2dp"
216+
android:layout_marginTop="2dp"
217+
android:layout_width="14dp"
218+
android:layout_height="14dp"
219+
android:layout_alignParentRight="true"
220+
android:layout_alignParentTop="true"
221+
android:scaleType="centerInside"
222+
android:background="#08000000"
223+
android:src="@drawable/jpush_ic_action_close"
224+
android:visibility="visible"/>
225+
<LinearLayout
226+
android:id="@+id/push_notification_fb_content"
227+
android:layout_width="match_parent"
228+
android:layout_height="wrap_content"
229+
android:paddingTop="8dp"
230+
android:layout_below="@id/push_notification_header_expand"
231+
android:orientation="horizontal"
232+
android:visibility="invisible"
233+
android:gravity="center">
234+
<TextView
235+
style="@android:style/TextAppearance.Material.Notification.Title"
236+
android:id="@+id/push_notification_fb_content_no_like1"
237+
android:layout_width="wrap_content"
238+
android:layout_height="wrap_content"
239+
android:background="#0f000000"
240+
android:paddingTop="5dp"
241+
android:paddingBottom="5dp"
242+
android:paddingLeft="6dp"
243+
android:paddingRight="6dp"
244+
android:textSize="14sp"
245+
android:gravity="center"
246+
android:maxLines="1"
247+
android:layout_margin="5dp"
248+
android:text="不感兴趣"/>
249+
<TextView
250+
style="@android:style/TextAppearance.Material.Notification.Title"
251+
android:id="@+id/push_notification_fb_content_no_like2"
252+
android:layout_width="wrap_content"
253+
android:layout_height="wrap_content"
254+
android:background="#0f000000"
255+
android:paddingTop="5dp"
256+
android:paddingBottom="5dp"
257+
android:paddingLeft="6dp"
258+
android:paddingRight="6dp"
259+
android:textSize="14sp"
260+
android:gravity="center"
261+
android:maxLines="1"
262+
android:layout_margin="5dp"
263+
android:text="重复收到"/>
264+
<TextView
265+
style="@android:style/TextAppearance.Material.Notification.Title"
266+
android:id="@+id/push_notification_fb_content_no_like3"
267+
android:layout_width="wrap_content"
268+
android:layout_height="wrap_content"
269+
android:background="#0f000000"
270+
android:paddingTop="5dp"
271+
android:paddingBottom="5dp"
272+
android:paddingLeft="6dp"
273+
android:paddingRight="6dp"
274+
android:textSize="14sp"
275+
android:gravity="center"
276+
android:maxLines="1"
277+
android:layout_margin="5dp"
278+
android:text="内容低质"/>
279+
<TextView
280+
style="@android:style/TextAppearance.Material.Notification.Title"
281+
android:id="@+id/push_notification_fb_content_no_like4"
282+
android:layout_width="wrap_content"
283+
android:layout_height="wrap_content"
284+
android:background="#0f000000"
285+
android:paddingTop="5dp"
286+
android:paddingBottom="5dp"
287+
android:paddingLeft="6dp"
288+
android:paddingRight="6dp"
289+
android:textSize="14sp"
290+
android:gravity="center"
291+
android:maxLines="1"
292+
android:layout_margin="5dp"
293+
android:text="内容不宜"/>
294+
</LinearLayout>
295+
</RelativeLayout>
296+
</RelativeLayout>

0 commit comments

Comments
 (0)