Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
abook_check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_android
abook_check
Commits
0ecafb06
Commit
0ecafb06
authored
Jul 20, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
作業データのダウンロードが終われば作業を開けるように修正。
parent
e81ee568
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
16 deletions
+21
-16
ABVJE_Launcher_Android/assets/check
+1
-1
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVActivity.java
+5
-1
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
+13
-12
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/OperationListHelper.java
+2
-2
No files found.
check
@
77868961
Subproject commit
6000dac6d681be5f8f97d39419df8158777bfbaf
Subproject commit
77868961630429fffe6adafe3742bb79ceb30754
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVActivity.java
View file @
0ecafb06
...
...
@@ -104,7 +104,7 @@ public abstract class ABVActivity extends Activity {
public
static
final
String
URL
=
"url"
;
public
static
final
String
MESSAGE
=
"message"
;
public
static
final
String
PASSWORD
=
"password"
;
public
Runnable
mCallBack
;
protected
static
final
int
FP
=
android
.
view
.
ViewGroup
.
LayoutParams
.
MATCH_PARENT
;
protected
static
final
int
WC
=
android
.
view
.
ViewGroup
.
LayoutParams
.
WRAP_CONTENT
;
protected
static
final
int
R_FP
=
ViewGroup
.
LayoutParams
.
MATCH_PARENT
;
...
...
@@ -198,6 +198,10 @@ public abstract class ABVActivity extends Activity {
catch
(
Exception
e
)
{
Logger
.
e
(
TAG
,
"_closeProgressPopup error. progressDialogHorizontal error = "
+
e
.
toString
());
}
if
(
mCallBack
!=
null
)
{
mCallBack
.
run
();
mCallBack
=
null
;
}
}
}
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
View file @
0ecafb06
...
...
@@ -133,7 +133,6 @@ public class OperationListActivity extends ABVUIActivity {
private
Dialog
mSearchDialog
;
private
Date
mOperationLastEditDate
;
private
OperationDao
mOperationDao
=
AbstractDao
.
getDao
(
OperationDao
.
class
);
private
OperationContentDao
mOperationContentDao
=
AbstractDao
.
getDao
(
OperationContentDao
.
class
);
...
...
@@ -332,15 +331,16 @@ public class OperationListActivity extends ABVUIActivity {
}
final
OperationDto
tempOperationDto
=
mOperationDao
.
getOperationJoinContent
(
jsonParam
.
getInt
(
ABookKeys
.
OPERATION_ID
));
if
(
tempOperationDto
.
needSyncFlg
)
{
runOnUiThread
(
new
Runnable
()
{
@Override
public
void
run
()
{
startSyncOperation
(
tempOperationDto
,
new
Runnable
()
{
mCallBack
=
new
Runnable
()
{
@Override
public
void
run
()
{
openReportView
(
tempOperationDto
);
}
});
};
runOnUiThread
(
new
Runnable
()
{
@Override
public
void
run
()
{
startSyncOperation
(
tempOperationDto
);
}
});
}
else
{
...
...
@@ -355,15 +355,16 @@ public class OperationListActivity extends ABVUIActivity {
case
ABookKeys
.
CMD_KEY
.
GO_PANORAMA_EDIT
:
final
OperationDto
panoramaOperationDto
=
mOperationDao
.
getOperationJoinContent
(
jsonParam
.
getInt
(
ABookKeys
.
OPERATION_ID
));
if
(
panoramaOperationDto
.
needSyncFlg
)
{
runOnUiThread
(
new
Runnable
()
{
@Override
public
void
run
()
{
startSyncOperation
(
panoramaOperationDto
,
new
Runnable
()
{
mCallBack
=
new
Runnable
()
{
@Override
public
void
run
()
{
startTaskDirectionOrReportView
(
panoramaOperationDto
);
}
});
};
runOnUiThread
(
new
Runnable
()
{
@Override
public
void
run
()
{
startSyncOperation
(
panoramaOperationDto
);
}
});
}
else
{
...
...
@@ -1350,7 +1351,7 @@ public class OperationListActivity extends ABVUIActivity {
* 同期処理
* @param operationDto
*/
public
void
startSyncOperation
(
final
OperationDto
operationDto
,
final
Runnable
callback
)
{
public
void
startSyncOperation
(
final
OperationDto
operationDto
)
{
//ネットワークチェック
if
(!
ABVEnvironment
.
getInstance
().
networkAdapter
.
isNetworkConnected
())
{
ABVToastUtil
.
showMakeText
(
OperationListActivity
.
this
,
R
.
string
.
request_network_connection
,
Toast
.
LENGTH_SHORT
);
...
...
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/helper/OperationListHelper.java
View file @
0ecafb06
...
...
@@ -167,7 +167,7 @@ public abstract class OperationListHelper {
@Override
public
void
onSyncOperation
(
final
OperationDto
operationDto
)
{
// 同期処理
mAppActivity
.
startSyncOperation
(
operationDto
,
null
);
mAppActivity
.
startSyncOperation
(
operationDto
);
}
});
...
...
@@ -235,7 +235,7 @@ public abstract class OperationListHelper {
@Override
public
void
onSyncOperation
(
final
OperationDto
operationDto
)
{
// 同期処理
mAppActivity
.
startSyncOperation
(
operationDto
,
null
);
mAppActivity
.
startSyncOperation
(
operationDto
);
}
});
...
...
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