Skip to content

Commit 0733ff5

Browse files
RokieGodFatherRokieGodFather
authored
Merge pull request #784 from RokieGodFather/master
更新部分layout资源
2 parents 1e3ddad + 761d0dc commit 0733ff5

File tree

4 files changed

+346
-1
lines changed

4 files changed

+346
-1
lines changed

‎android/src/main/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>

‎android/src/main/res/layout/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/v"
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.StatusBar.EventContent.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.StatusBar.EventContent.Time"
56+
android:id="@+id/push_notification_date"
57+
android:maxLines="1"
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.StatusBar.EventContent.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.StatusBar.EventContent.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.StatusBar.EventContent.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.StatusBar.EventContent.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>

‎android/src/main/res/values-zh/jpush_string.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="jg_channel_name_p_min">不重要</string>
4+
<string name="jg_channel_name_p_low">不重要</string>
5+
<string name="jg_channel_name_p_default">普通</string>
6+
<string name="jg_channel_name_p_high">重要</string>
7+
</resources>

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"types": "index.d.ts",
77
"license": "ISC",
88
"author": "wicked.tc130",
9-
"version": "2.8.0",
9+
"version": "2.8.1",
1010
"repository": {
1111
"type": "git",
1212
"url": "https://github.com/jpush/jpush-react-native"

0 commit comments

Comments
 (0)