react-native-mytatva-rn-sdk 1.2.32 → 1.2.33
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/android/build.gradle +144 -141
- package/android/src/main/AndroidManifest.xml +4 -1
- package/android/src/main/AndroidManifestNew.xml +141 -138
- package/android/src/main/java/com/mytatvarnsdk/CgmTrackyLibModule.kt +71 -71
- package/android/src/main/java/com/mytatvarnsdk/MainApplication.kt +4 -4
- package/android/src/main/java/com/mytatvarnsdk/activity/ConnectSensorActivity.kt +13 -2
- package/android/src/main/java/com/mytatvarnsdk/activity/PermissionActivity.kt +6 -0
- package/android/src/main/java/com/mytatvarnsdk/activity/PlaceSensorActivity.kt +82 -65
- package/android/src/main/java/com/mytatvarnsdk/activity/PlaceTransmitterActivity.kt +106 -89
- package/android/src/main/java/com/mytatvarnsdk/activity/SearchTransmitterActivity.kt +13 -7
- package/android/src/main/java/com/mytatvarnsdk/activity/SensorConnectSuccessActivity.kt +6 -0
- package/android/src/main/java/com/mytatvarnsdk/activity/StartCGMActivity.kt +63 -57
- package/android/src/main/java/com/mytatvarnsdk/activity/VideoActivity.kt +94 -0
- package/android/src/main/res/drawable/radio_button_background.xml +1 -1
- package/android/src/main/res/drawable/radio_checked.xml +1 -1
- package/android/src/main/res/layout/activity_connect_sensor.xml +497 -495
- package/android/src/main/res/layout/activity_place_sensor.xml +250 -238
- package/android/src/main/res/layout/activity_place_transmitter.xml +219 -207
- package/android/src/main/res/layout/activity_search_transmitter.xml +716 -714
- package/android/src/main/res/layout/activity_start_cgmactivity.xml +153 -153
- package/android/src/main/res/layout/activity_video.xml +32 -0
- package/android/src/main/res/values/styles.xml +1 -3
- package/ios/Database/KLTDatabaseHandler.m +8 -0
- package/package.json +1 -1
|
@@ -1,175 +1,175 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="utf-8"?>
|
|
2
2
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
3
|
+
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
4
|
+
android:id="@+id/main"
|
|
5
|
+
android:layout_width="match_parent"
|
|
6
|
+
android:layout_height="match_parent"
|
|
7
|
+
android:background="@android:color/white">
|
|
8
8
|
|
|
9
9
|
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
10
|
+
<include
|
|
11
|
+
android:id="@+id/toolbar"
|
|
12
|
+
layout="@layout/layout_toolbar" />
|
|
13
13
|
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
<!-- Title -->
|
|
22
|
-
<TextView
|
|
23
|
-
android:id="@+id/tvTitle"
|
|
24
|
-
android:layout_width="wrap_content"
|
|
25
|
-
android:layout_height="wrap_content"
|
|
26
|
-
android:layout_marginTop="16dp"
|
|
27
|
-
android:fontFamily="@font/playfairdisplay_bold"
|
|
28
|
-
android:text="Before You Start"
|
|
29
|
-
android:textColor="@android:color/black"
|
|
30
|
-
android:textSize="28sp"
|
|
31
|
-
android:textStyle="bold"
|
|
32
|
-
app:layout_constraintEnd_toEndOf="parent"
|
|
33
|
-
app:layout_constraintStart_toStartOf="parent"
|
|
34
|
-
app:layout_constraintTop_toBottomOf="@id/divider" />
|
|
35
|
-
|
|
36
|
-
<!-- Instructions Text -->
|
|
37
|
-
<TextView
|
|
38
|
-
android:id="@+id/tvInstructions"
|
|
39
|
-
android:layout_width="0dp"
|
|
40
|
-
android:layout_height="wrap_content"
|
|
41
|
-
android:layout_marginStart="24dp"
|
|
42
|
-
android:layout_marginTop="16dp"
|
|
43
|
-
android:layout_marginEnd="24dp"
|
|
44
|
-
android:fontFamily="@font/roboto_regular"
|
|
45
|
-
android:gravity="center"
|
|
46
|
-
android:text="Make sure your transmitter is fully charged. Put it in the charging pod until the blinking white light turns blue. This takes about 15 minutes"
|
|
47
|
-
android:textColor="#667085"
|
|
48
|
-
android:textSize="15sp"
|
|
49
|
-
app:layout_constraintEnd_toEndOf="parent"
|
|
50
|
-
app:layout_constraintStart_toStartOf="parent"
|
|
51
|
-
app:layout_constraintTop_toBottomOf="@id/tvTitle" />
|
|
52
|
-
|
|
53
|
-
<!-- Main Charging Pod Image -->
|
|
54
|
-
<ImageView
|
|
55
|
-
android:id="@+id/ivChargingPod"
|
|
56
|
-
android:layout_width="150dp"
|
|
57
|
-
android:layout_height="150dp"
|
|
58
|
-
android:layout_marginStart="20dp"
|
|
59
|
-
android:layout_marginTop="20dp"
|
|
60
|
-
android:layout_marginEnd="20dp"
|
|
61
|
-
android:scaleType="centerCrop"
|
|
62
|
-
android:src="@drawable/img_charging_pod_full"
|
|
63
|
-
app:layout_constraintEnd_toEndOf="parent"
|
|
64
|
-
app:layout_constraintStart_toStartOf="parent"
|
|
65
|
-
app:layout_constraintTop_toBottomOf="@id/tvInstructions" />
|
|
66
|
-
|
|
67
|
-
<!-- Charging Indicators Card -->
|
|
68
|
-
<androidx.cardview.widget.CardView
|
|
69
|
-
android:id="@+id/cardIndicators"
|
|
70
|
-
android:layout_width="0dp"
|
|
71
|
-
android:layout_height="wrap_content"
|
|
72
|
-
android:layout_marginStart="24dp"
|
|
73
|
-
android:layout_marginTop="24dp"
|
|
74
|
-
android:layout_marginEnd="24dp"
|
|
75
|
-
app:cardBackgroundColor="#F5F5F5"
|
|
76
|
-
app:cardCornerRadius="12dp"
|
|
77
|
-
app:cardElevation="0dp"
|
|
78
|
-
app:layout_constraintEnd_toEndOf="parent"
|
|
79
|
-
app:layout_constraintStart_toStartOf="parent"
|
|
80
|
-
app:layout_constraintTop_toBottomOf="@id/ivChargingPod">
|
|
81
|
-
|
|
82
|
-
<androidx.constraintlayout.widget.ConstraintLayout
|
|
83
|
-
android:layout_width="match_parent"
|
|
84
|
-
android:layout_height="wrap_content"
|
|
85
|
-
android:paddingVertical="15dp">
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
<!-- Charging Indicator -->
|
|
89
|
-
<ImageView
|
|
90
|
-
android:id="@+id/ivChargingIndicator"
|
|
91
|
-
android:layout_width="100dp"
|
|
92
|
-
android:layout_height="50dp"
|
|
93
|
-
android:src="@drawable/img_charging_indicator"
|
|
94
|
-
app:layout_constraintStart_toStartOf="parent"
|
|
95
|
-
app:layout_constraintTop_toTopOf="parent" />
|
|
14
|
+
<View
|
|
15
|
+
android:id="@+id/divider"
|
|
16
|
+
android:layout_width="match_parent"
|
|
17
|
+
android:layout_height="2dp"
|
|
18
|
+
android:background="#F2F4F7"
|
|
19
|
+
app:layout_constraintTop_toBottomOf="@+id/toolbar" />
|
|
96
20
|
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
android:
|
|
21
|
+
<!-- Title -->
|
|
22
|
+
<TextView
|
|
23
|
+
android:id="@+id/tvTitle"
|
|
24
|
+
android:layout_width="wrap_content"
|
|
100
25
|
android:layout_height="wrap_content"
|
|
101
|
-
android:
|
|
102
|
-
android:fontFamily="@font/
|
|
103
|
-
android:text="
|
|
104
|
-
android:textColor="
|
|
105
|
-
android:textSize="
|
|
106
|
-
|
|
26
|
+
android:layout_marginTop="16dp"
|
|
27
|
+
android:fontFamily="@font/playfairdisplay_bold"
|
|
28
|
+
android:text="Before You Start"
|
|
29
|
+
android:textColor="@android:color/black"
|
|
30
|
+
android:textSize="28sp"
|
|
31
|
+
android:textStyle="bold"
|
|
107
32
|
app:layout_constraintEnd_toEndOf="parent"
|
|
108
|
-
app:
|
|
109
|
-
app:
|
|
33
|
+
app:layout_constraintStart_toStartOf="parent"
|
|
34
|
+
app:layout_constraintTop_toBottomOf="@id/divider" />
|
|
110
35
|
|
|
111
|
-
|
|
112
|
-
|
|
36
|
+
<!-- Instructions Text -->
|
|
37
|
+
<TextView
|
|
38
|
+
android:id="@+id/tvInstructions"
|
|
113
39
|
android:layout_width="0dp"
|
|
114
40
|
android:layout_height="wrap_content"
|
|
115
|
-
android:layout_marginStart="
|
|
41
|
+
android:layout_marginStart="24dp"
|
|
42
|
+
android:layout_marginTop="16dp"
|
|
43
|
+
android:layout_marginEnd="24dp"
|
|
116
44
|
android:fontFamily="@font/roboto_regular"
|
|
117
|
-
android:
|
|
118
|
-
android:
|
|
119
|
-
android:
|
|
120
|
-
|
|
45
|
+
android:gravity="center"
|
|
46
|
+
android:text="Make sure your transmitter is fully charged. Put it in the charging pod until the blinking white light turns blue. This takes about 15 minutes"
|
|
47
|
+
android:textColor="#667085"
|
|
48
|
+
android:textSize="15sp"
|
|
49
|
+
app:layout_constraintEnd_toEndOf="parent"
|
|
50
|
+
app:layout_constraintStart_toStartOf="parent"
|
|
51
|
+
app:layout_constraintTop_toBottomOf="@id/tvTitle" />
|
|
52
|
+
|
|
53
|
+
<!-- Main Charging Pod Image -->
|
|
54
|
+
<ImageView
|
|
55
|
+
android:id="@+id/ivChargingPod"
|
|
56
|
+
android:layout_width="150dp"
|
|
57
|
+
android:layout_height="150dp"
|
|
58
|
+
android:layout_marginStart="20dp"
|
|
59
|
+
android:layout_marginTop="20dp"
|
|
60
|
+
android:layout_marginEnd="20dp"
|
|
61
|
+
android:scaleType="centerCrop"
|
|
62
|
+
android:src="@drawable/img_charging_pod_full"
|
|
121
63
|
app:layout_constraintEnd_toEndOf="parent"
|
|
122
|
-
app:layout_constraintStart_toEndOf="@id/ivChargingIndicator"
|
|
123
|
-
app:layout_constraintTop_toBottomOf="@id/tvChargingTitle" />
|
|
124
|
-
|
|
125
|
-
<!-- Fully Charged Indicator -->
|
|
126
|
-
<ImageView
|
|
127
|
-
android:id="@+id/ivFullyChargedIndicator"
|
|
128
|
-
android:layout_width="100dp"
|
|
129
|
-
android:layout_height="50dp"
|
|
130
|
-
android:layout_marginTop="24dp"
|
|
131
|
-
android:src="@drawable/img_charging_indicator"
|
|
132
64
|
app:layout_constraintStart_toStartOf="parent"
|
|
133
|
-
app:layout_constraintTop_toBottomOf="@id/
|
|
65
|
+
app:layout_constraintTop_toBottomOf="@id/tvInstructions" />
|
|
134
66
|
|
|
135
|
-
|
|
136
|
-
|
|
67
|
+
<!-- Charging Indicators Card -->
|
|
68
|
+
<androidx.cardview.widget.CardView
|
|
69
|
+
android:id="@+id/cardIndicators"
|
|
137
70
|
android:layout_width="0dp"
|
|
138
71
|
android:layout_height="wrap_content"
|
|
139
|
-
android:layout_marginStart="
|
|
140
|
-
android:
|
|
141
|
-
android:
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
app:
|
|
72
|
+
android:layout_marginStart="24dp"
|
|
73
|
+
android:layout_marginTop="24dp"
|
|
74
|
+
android:layout_marginEnd="24dp"
|
|
75
|
+
app:cardBackgroundColor="#F5F5F5"
|
|
76
|
+
app:cardCornerRadius="12dp"
|
|
77
|
+
app:cardElevation="0dp"
|
|
145
78
|
app:layout_constraintEnd_toEndOf="parent"
|
|
146
|
-
app:
|
|
147
|
-
app:
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
79
|
+
app:layout_constraintStart_toStartOf="parent"
|
|
80
|
+
app:layout_constraintTop_toBottomOf="@id/ivChargingPod">
|
|
81
|
+
|
|
82
|
+
<androidx.constraintlayout.widget.ConstraintLayout
|
|
83
|
+
android:layout_width="match_parent"
|
|
84
|
+
android:layout_height="wrap_content"
|
|
85
|
+
android:paddingVertical="15dp">
|
|
86
|
+
|
|
87
|
+
|
|
88
|
+
<!-- Charging Indicator -->
|
|
89
|
+
<ImageView
|
|
90
|
+
android:id="@+id/ivChargingIndicator"
|
|
91
|
+
android:layout_width="100dp"
|
|
92
|
+
android:layout_height="50dp"
|
|
93
|
+
android:src="@drawable/img_charging_indicator"
|
|
94
|
+
app:layout_constraintStart_toStartOf="parent"
|
|
95
|
+
app:layout_constraintTop_toTopOf="parent" />
|
|
96
|
+
|
|
97
|
+
<TextView
|
|
98
|
+
android:id="@+id/tvChargingTitle"
|
|
99
|
+
android:layout_width="0dp"
|
|
100
|
+
android:layout_height="wrap_content"
|
|
101
|
+
android:layout_marginStart="16dp"
|
|
102
|
+
android:fontFamily="@font/roboto_semibold"
|
|
103
|
+
android:text="Charging"
|
|
104
|
+
android:textColor="#101828"
|
|
105
|
+
android:textSize="16sp"
|
|
106
|
+
app:layout_constraintBottom_toTopOf="@+id/tvChargingDescription"
|
|
107
|
+
app:layout_constraintEnd_toEndOf="parent"
|
|
108
|
+
app:layout_constraintStart_toEndOf="@id/ivChargingIndicator"
|
|
109
|
+
app:layout_constraintTop_toTopOf="@id/ivChargingIndicator" />
|
|
110
|
+
|
|
111
|
+
<TextView
|
|
112
|
+
android:id="@+id/tvChargingDescription"
|
|
113
|
+
android:layout_width="0dp"
|
|
114
|
+
android:layout_height="wrap_content"
|
|
115
|
+
android:layout_marginStart="16dp"
|
|
116
|
+
android:fontFamily="@font/roboto_regular"
|
|
117
|
+
android:text="Flashing White Indicator"
|
|
118
|
+
android:textColor="#636363"
|
|
119
|
+
android:textSize="13sp"
|
|
120
|
+
app:layout_constraintBottom_toBottomOf="@+id/ivChargingIndicator"
|
|
121
|
+
app:layout_constraintEnd_toEndOf="parent"
|
|
122
|
+
app:layout_constraintStart_toEndOf="@id/ivChargingIndicator"
|
|
123
|
+
app:layout_constraintTop_toBottomOf="@id/tvChargingTitle" />
|
|
124
|
+
|
|
125
|
+
<!-- Fully Charged Indicator -->
|
|
126
|
+
<ImageView
|
|
127
|
+
android:id="@+id/ivFullyChargedIndicator"
|
|
128
|
+
android:layout_width="100dp"
|
|
129
|
+
android:layout_height="50dp"
|
|
130
|
+
android:layout_marginTop="24dp"
|
|
131
|
+
android:src="@drawable/img_charging_indicator"
|
|
132
|
+
app:layout_constraintStart_toStartOf="parent"
|
|
133
|
+
app:layout_constraintTop_toBottomOf="@id/ivChargingIndicator" />
|
|
134
|
+
|
|
135
|
+
<TextView
|
|
136
|
+
android:id="@+id/tvFullyChargedTitle"
|
|
137
|
+
android:layout_width="0dp"
|
|
138
|
+
android:layout_height="wrap_content"
|
|
139
|
+
android:layout_marginStart="16dp"
|
|
140
|
+
android:fontFamily="@font/roboto_semibold"
|
|
141
|
+
android:text="Fully Charged"
|
|
142
|
+
android:textColor="#101828"
|
|
143
|
+
android:textSize="16sp"
|
|
144
|
+
app:layout_constraintBottom_toTopOf="@+id/tvFullyChargedDescription"
|
|
145
|
+
app:layout_constraintEnd_toEndOf="parent"
|
|
146
|
+
app:layout_constraintStart_toEndOf="@id/ivFullyChargedIndicator"
|
|
147
|
+
app:layout_constraintTop_toTopOf="@id/ivFullyChargedIndicator" />
|
|
148
|
+
|
|
149
|
+
<TextView
|
|
150
|
+
android:id="@+id/tvFullyChargedDescription"
|
|
151
|
+
android:layout_width="0dp"
|
|
152
|
+
android:layout_height="wrap_content"
|
|
153
|
+
android:layout_marginStart="16dp"
|
|
154
|
+
android:fontFamily="@font/roboto_regular"
|
|
155
|
+
android:text="Blue Indicator"
|
|
156
|
+
android:textColor="#636363"
|
|
157
|
+
android:textSize="13sp"
|
|
158
|
+
app:layout_constraintBottom_toBottomOf="@+id/ivFullyChargedIndicator"
|
|
159
|
+
app:layout_constraintEnd_toEndOf="parent"
|
|
160
|
+
app:layout_constraintStart_toEndOf="@id/ivFullyChargedIndicator"
|
|
161
|
+
app:layout_constraintTop_toBottomOf="@id/tvFullyChargedTitle" />
|
|
162
|
+
|
|
163
|
+
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
164
|
+
</androidx.cardview.widget.CardView>
|
|
165
|
+
|
|
166
|
+
<include
|
|
167
|
+
android:id="@+id/commonButton"
|
|
168
|
+
layout="@layout/layout_button"
|
|
169
|
+
android:layout_width="match_parent"
|
|
152
170
|
android:layout_height="wrap_content"
|
|
153
|
-
|
|
154
|
-
android:fontFamily="@font/roboto_regular"
|
|
155
|
-
android:text="Blue Indicator"
|
|
156
|
-
android:textColor="#636363"
|
|
157
|
-
android:textSize="13sp"
|
|
158
|
-
app:layout_constraintBottom_toBottomOf="@+id/ivFullyChargedIndicator"
|
|
171
|
+
app:layout_constraintBottom_toBottomOf="parent"
|
|
159
172
|
app:layout_constraintEnd_toEndOf="parent"
|
|
160
|
-
app:
|
|
161
|
-
app:layout_constraintTop_toBottomOf="@id/tvFullyChargedTitle" />
|
|
162
|
-
|
|
163
|
-
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
164
|
-
</androidx.cardview.widget.CardView>
|
|
165
|
-
|
|
166
|
-
<include
|
|
167
|
-
android:id="@+id/commonButton"
|
|
168
|
-
layout="@layout/layout_button"
|
|
169
|
-
android:layout_width="match_parent"
|
|
170
|
-
android:layout_height="wrap_content"
|
|
171
|
-
app:layout_constraintBottom_toBottomOf="parent"
|
|
172
|
-
app:layout_constraintEnd_toEndOf="parent"
|
|
173
|
-
app:layout_constraintStart_toStartOf="parent" />
|
|
173
|
+
app:layout_constraintStart_toStartOf="parent" />
|
|
174
174
|
|
|
175
175
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="utf-8"?>
|
|
2
|
+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
3
|
+
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
4
|
+
xmlns:tools="http://schemas.android.com/tools"
|
|
5
|
+
android:id="@+id/main"
|
|
6
|
+
android:layout_width="match_parent"
|
|
7
|
+
android:layout_height="match_parent"
|
|
8
|
+
android:background="#E6000000"
|
|
9
|
+
tools:context=".activity.VideoActivity">
|
|
10
|
+
|
|
11
|
+
<com.pierfrancescosoffritti.androidyoutubeplayer.core.player.views.YouTubePlayerView
|
|
12
|
+
android:id="@+id/youtube_player_view"
|
|
13
|
+
android:layout_width="match_parent"
|
|
14
|
+
android:layout_height="wrap_content"
|
|
15
|
+
app:autoPlay="true"
|
|
16
|
+
app:layout_constraintBottom_toBottomOf="parent"
|
|
17
|
+
app:layout_constraintEnd_toEndOf="parent"
|
|
18
|
+
app:layout_constraintStart_toStartOf="parent"
|
|
19
|
+
app:layout_constraintTop_toTopOf="parent"
|
|
20
|
+
app:videoId="r5Zemc4R044" />
|
|
21
|
+
|
|
22
|
+
<FrameLayout
|
|
23
|
+
android:id="@+id/full_screen_view_container"
|
|
24
|
+
android:layout_width="match_parent"
|
|
25
|
+
android:layout_height="match_parent"
|
|
26
|
+
android:visibility="gone"
|
|
27
|
+
app:layout_constraintBottom_toBottomOf="parent"
|
|
28
|
+
app:layout_constraintEnd_toEndOf="parent"
|
|
29
|
+
app:layout_constraintStart_toStartOf="parent"
|
|
30
|
+
app:layout_constraintTop_toTopOf="parent" />
|
|
31
|
+
|
|
32
|
+
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
@@ -100,11 +100,9 @@
|
|
|
100
100
|
</style>
|
|
101
101
|
|
|
102
102
|
<style name="CustomRadioButton" parent="Widget.AppCompat.CompoundButton.RadioButton">
|
|
103
|
-
<item name="android:button">@
|
|
104
|
-
<item name="android:background">@drawable/radio_button_background</item>
|
|
103
|
+
<item name="android:button">@null</item>
|
|
105
104
|
<item name="android:padding">10dp</item>
|
|
106
105
|
<item name="android:fontFamily">@font/roboto_regular</item>
|
|
107
|
-
<item name="android:textColor">@color/radio_text_selector</item>
|
|
108
106
|
</style>
|
|
109
107
|
|
|
110
108
|
|
|
@@ -263,6 +263,10 @@
|
|
|
263
263
|
// 根据条件查询Receivedata表
|
|
264
264
|
|
|
265
265
|
- (NSArray *)queryReceiveDataWithDevice:(Device *)currentDevice needUserBG:(BOOL)needUserBG {
|
|
266
|
+
if (!self.context) {
|
|
267
|
+
NSLog(@"Core Data context is nil");
|
|
268
|
+
return @[];
|
|
269
|
+
}
|
|
266
270
|
NSEntityDescription *entity = [NSEntityDescription entityForName:@"ReceiveDataInfo" inManagedObjectContext:self.context];
|
|
267
271
|
NSFetchRequest *request = [[NSFetchRequest alloc] init];
|
|
268
272
|
NSPredicate *predicate;
|
|
@@ -273,6 +277,10 @@
|
|
|
273
277
|
}
|
|
274
278
|
request.entity = entity;
|
|
275
279
|
request.predicate = predicate;
|
|
280
|
+
if (!entity) {
|
|
281
|
+
NSLog(@"Entity 'ReceiveDataInfo' not found in Core Data model");
|
|
282
|
+
return @[];
|
|
283
|
+
}
|
|
276
284
|
NSArray *resendDatas = [self.context executeFetchRequest:request error:nil];
|
|
277
285
|
resendDatas = [resendDatas sortedArrayUsingDescriptors:@[[NSSortDescriptor sortDescriptorWithKey:@"receiveDateTime" ascending:YES]]];
|
|
278
286
|
return resendDatas;
|