Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
IOTClient
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lola
IOTClient
Commits
d41108d9
Commit
d41108d9
authored
Jun 03, 2019
by
DESKTOP-NFGF3PG\zxa01
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove date error
parent
dcb4a669
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
app/src/main/java/com/example/zxa01/iotclient/common/tools/DownloadFile.java
...om/example/zxa01/iotclient/common/tools/DownloadFile.java
+0
-2
app/src/main/java/com/example/zxa01/iotclient/component/home/record/RecordViewModel.java
...xa01/iotclient/component/home/record/RecordViewModel.java
+2
-1
No files found.
app/src/main/java/com/example/zxa01/iotclient/common/tools/DownloadFile.java
View file @
d41108d9
...
...
@@ -55,7 +55,6 @@ public class DownloadFile {
private
class
DownloadingTask
extends
AsyncTask
<
Void
,
Void
,
Void
>
{
File
apkStorage
=
null
;
File
outputFile
=
null
;
@Override
...
...
@@ -111,7 +110,6 @@ public class DownloadFile {
outputFile
.
setWritable
(
true
);
Log
.
e
(
TAG
,
"File Created"
);
}
// output handle
FileOutputStream
fos
=
new
FileOutputStream
(
outputFile
);
...
...
app/src/main/java/com/example/zxa01/iotclient/component/home/record/RecordViewModel.java
View file @
d41108d9
...
...
@@ -13,6 +13,7 @@ import com.example.zxa01.iotclient.component.privacy.PrivacyActivity;
import
java.text.ParseException
;
import
java.text.SimpleDateFormat
;
import
java.util.List
;
import
java.util.TimeZone
;
import
java.util.stream.Collectors
;
public
class
RecordViewModel
extends
ViewModel
{
...
...
@@ -79,7 +80,7 @@ public class RecordViewModel extends ViewModel {
}
private
String
convertDateTime
(
String
dateTime
)
{
SimpleDateFormat
preConvert
=
new
SimpleDateFormat
(
"yyyy-MM-dd'T'HH:mm:ss.
mmm
"
);
SimpleDateFormat
preConvert
=
new
SimpleDateFormat
(
"yyyy-MM-dd'T'HH:mm:ss.
SSS
"
);
SimpleDateFormat
postConvert
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm"
);
String
convertDateTime
=
""
;
try
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment