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
5ffd63b8
Commit
5ffd63b8
authored
Jun 22, 2020
by
Kim Jinsung
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
THETAプレビュー画面から転送後、THETAライブラリ画面に戻ると「転送済み」文字列非表示問題対応
parent
8b08286c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
3 deletions
+23
-3
ABVJE_BL/src/jp/agentec/abook/abv/bl/common/constant/ABookKeys.java
+1
-0
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/theta/ThetaImageListActivity.java
+12
-1
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/theta/ThetaImagePreviewActivity.java
+10
-2
No files found.
ABVJE_BL/src/jp/agentec/abook/abv/bl/common/constant/ABookKeys.java
View file @
5ffd63b8
...
...
@@ -134,4 +134,5 @@ public class ABookKeys {
public
static
final
String
THETA_FILE_ID
=
"OBJECT_ID"
;
public
static
final
String
THETA_THUMBNAIL
=
"THUMBNAIL"
;
public
static
final
String
THETA_OLD_VERSION_FLG
=
"thetaOldVersionFlg"
;
//true:API2.0利用、false:API2.1利用
public
static
final
String
THETA_LIST_ACTIVITY_FLG
=
"thetaListActivityFlg"
;
}
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/theta/ThetaImageListActivity.java
View file @
5ffd63b8
...
...
@@ -33,6 +33,7 @@ import jp.agentec.abook.abv.ui.viewer.activity.theta.task.LoadPhotoTask;
*/
public
class
ThetaImageListActivity
extends
ThetaActivity
{
private
static
final
String
TAG
=
"ThetaImageListActivity"
;
private
static
int
THETA_PREVIEW_BACK_ACTIVITY
=
1000
;
private
ListView
mImageListView
;
private
List
<
ImageRow
>
mImageRows
;
private
int
mSelectedPosition
;
...
...
@@ -113,8 +114,9 @@ public class ThetaImageListActivity extends ThetaActivity {
if
(
selectedItem
.
isPhoto
())
{
Intent
intent
=
new
Intent
();
intent
.
putExtra
(
ABookKeys
.
THETA_FILE_ID
,
selectedItem
.
getFileId
());
intent
.
putExtra
(
ABookKeys
.
THETA_LIST_ACTIVITY_FLG
,
true
);
intent
.
setClassName
(
getPackageName
(),
ThetaImagePreviewActivity
.
class
.
getName
());
startActivity
(
intent
);
startActivity
ForResult
(
intent
,
THETA_PREVIEW_BACK_ACTIVITY
);
}
else
{
Logger
.
e
(
TAG
,
"is not Photo"
);
}
...
...
@@ -191,4 +193,13 @@ public class ThetaImageListActivity extends ThetaActivity {
}
}
@Override
protected
void
onActivityResult
(
int
requestCode
,
int
resultCode
,
Intent
intent
)
{
//THETAプレビュー画面から転送したあと、戻ったとき再描画を行う。
if
(
requestCode
==
THETA_PREVIEW_BACK_ACTIVITY
&&
resultCode
==
RESULT_OK
)
{
showProgressPopup
();
new
ImageListTask
(
this
).
execute
();
}
}
}
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/theta/ThetaImagePreviewActivity.java
View file @
5ffd63b8
...
...
@@ -34,18 +34,23 @@ public class ThetaImagePreviewActivity extends ThetaActivity {
private
GLPhotoView
mGLPhotoView
;
private
Photo
mTexture
;
private
String
mFileId
;
private
boolean
isSavedSuccess
;
private
boolean
isThetaListActivityBack
;
@Override
public
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
Logger
.
d
(
TAG
,
"onCreate"
);
setContentView
(
R
.
layout
.
ac_theta_image_preview
);
isSavedSuccess
=
false
;
// 戻るボタン
Button
backBtn
=
findViewById
(
R
.
id
.
btn_back
);
backBtn
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
//転送後にTHETAライブラリ再描画のため
if
(
isThetaListActivityBack
&&
isSavedSuccess
)
{
setResult
(
RESULT_OK
);
}
finish
();
}
});
...
...
@@ -62,6 +67,7 @@ public class ThetaImagePreviewActivity extends ThetaActivity {
showProgressPopup
();
if
(
mThetaHelper
.
thetaImageLocalSave
(
mTexture
.
getPhoto
(),
mFileId
))
{
showSimpleAlertDialog
(
R
.
string
.
app_name
,
R
.
string
.
msg_theta_image_send_success
);
isSavedSuccess
=
true
;
}
else
{
showSimpleAlertDialog
(
R
.
string
.
app_name
,
R
.
string
.
msg_theta_image_send_fail
);
}
...
...
@@ -73,6 +79,8 @@ public class ThetaImagePreviewActivity extends ThetaActivity {
Intent
intent
=
getIntent
();
this
.
mFileId
=
intent
.
getStringExtra
(
ABookKeys
.
THETA_FILE_ID
);
this
.
isThetaListActivityBack
=
intent
.
getBooleanExtra
(
ABookKeys
.
THETA_LIST_ACTIVITY_FLG
,
false
);
mGLPhotoView
=
findViewById
(
R
.
id
.
photo_image
);
mGLPhotoView
.
setmRotateInertia
(
mRotateInertia
);
...
...
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