Merge branch 'feature/1.0.1_leej' into 'feature/1.0.1'

Feature/1.0.1 leej

See merge request !1

ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/ProjectLogic.java

@@ -316,7 +316,7 @@ public class ProjectLogic extends AbstractLogic {
                 if (!newValue.equals(taskDirectionsItemsDto.inputValue)) {
                     // 値が異なる場合のみ、更新する
                     taskDirectionsItemsDto.inputValue = newValue;
-                    if (taskDirectionsItemsDto.inputValue.startsWith("q_1_")) {
+                    if (taskDirectionsItemsDto.itemKey.startsWith("q_1_")) {
                         // 値が異なるため、作業コードの入力値を変更する
                         taskDto.taskCode = taskDirectionsItemsDto.inputValue;
                     }

ABVJE_UI_Android/res/layout/scale_zoom_toolbar.xml

@@ -7,6 +7,16 @@
     android:background="@color/transparent">
 
     <ImageButton
+        android:id="@+id/btn_pin_toggle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="2px"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:background="@drawable/ic_hidden_show_directions_button"
+        android:visibility="visible"/>
+
+    <ImageButton
         android:id="@+id/btn_hide_task_direct"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/activity/ABVContentViewActivity.java

@@ -155,14 +155,14 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
 
         if (!isLinkedContent) {
 			projectDto = AbstractLogic.getLogic(ProjectLogic.class).getProject(mProjectId);
-            mXWalkOpenType = intent.getIntExtra(Constant.ABookCheck.XWALK_OPEN_TYPE, -1);
+            mXWalkOpenType = intent.getIntExtra(Constant.ABookCheck.XWALK_OPEN_TYPE, Constant.XWalkOpenType.DEFAULT);
             if (mXWalkOpenType == Constant.XWalkOpenType.TASK_REPORT || mXWalkOpenType == Constant.XWalkOpenType.TASK_DERECTION || mXWalkOpenType == Constant.XWalkOpenType.PANO_EDIT) {
                 if (mXWalkOpenType == Constant.XWalkOpenType.TASK_REPORT || mXWalkOpenType == Constant.XWalkOpenType.TASK_DERECTION) {
-                    if (isNormalSize()) {
+                    mProjectType = projectDto.projectType;
+                    if (mProjectType != ProjectType.PDF && isNormalSize()) {
                         // 縦画面固定
                         setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
                     }
-                    mProjectType = projectDto.projectType;
 
                     new Thread(new Runnable() {
                         @Override
@@ -693,7 +693,7 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
 
         if (mXWalkOpenType == Constant.XWalkOpenType.TASK_REPORT || mXWalkOpenType == Constant.XWalkOpenType.TASK_DERECTION || mXWalkOpenType == Constant.XWalkOpenType.PANO_EDIT) {
             if (mXWalkOpenType == Constant.XWalkOpenType.TASK_REPORT || mXWalkOpenType == Constant.XWalkOpenType.TASK_DERECTION) {
-                if (isNormalSize()) {
+                if (mProjectType != ProjectType.PDF && isNormalSize()) {
                     // 縦画面固定
                     setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
                 }
@@ -775,11 +775,6 @@ public abstract class ABVContentViewActivity extends ABVAuthenticatedActivity {
      */
     protected void onActionProjectPdfWebView(Map<String, String> checkParam, ProjectTaskDto projectTaskDto) {}
 
-    /**
-     * Be override
-     */
-    public Point convertToAuthoringPoint(float x, float y) { return new Point((int)x, (int)y); }
-
     public void onClickShowHelpView(View v) {
         int helpViewType = 0;
         switch (mStatusCode) {

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/ActionProjectTaskCode.java

@@ -10,7 +10,10 @@ import android.view.animation.Animation;
 import android.view.animation.LinearInterpolator;
 import android.widget.TextView;
 
+import jp.agentec.abook.abv.bl.dto.ProjectTaskDto;
+import jp.agentec.abook.abv.cl.util.PreferenceUtil;
 import jp.agentec.abook.abv.launcher.android.R;
+import jp.agentec.abook.abv.ui.common.appinfo.AppDefType;
 
 /**
  * Created by seo-y on 2018/11/15.
@@ -20,20 +23,22 @@ public class ActionProjectTaskCode extends TextView {
     public String taskKey;
     private boolean isAnimated = false;
     private Animation animation;
+    private Context mContext;
+    public ProjectTaskDto mProjectTaskDto;
 
-    public ActionProjectTaskCode(final Context context, final String text, boolean isFinished) {
+    public ActionProjectTaskCode(Context context, ProjectTaskDto dto) {
         super(context);
-
+        mContext = context;
+        mProjectTaskDto = dto;
         setSingleLine(true);
         setEllipsize(TextUtils.TruncateAt.END);
-        setText(text);
+        setText(dto.taskCode);
         setTextColor(Color.WHITE);
         setTypeface(null, Typeface.BOLD);
         setTextSize(TypedValue.COMPLEX_UNIT_SP, 14);
-        setBackgroundResource(R.drawable.shape_hotspot);
         setPadding(15,5,15,5);
-
-        if (isFinished) {
+        setBackgroundResource(R.drawable.shape_hotspot);
+        if (dto.isFinished) {
             setBackgroundColor(ProjectTaskLayout.COLOR_BLUE);
         } else {
             setBackgroundColor(ProjectTaskLayout.COLOR_ORANGE);

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/ActionProjectTaskPin.java

+package jp.agentec.abook.abv.ui.viewer.view;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.text.TextUtils;
+import android.util.TypedValue;
+import android.view.animation.AlphaAnimation;
+import android.view.animation.Animation;
+import android.view.animation.LinearInterpolator;
+import android.widget.ImageView;
+
+import jp.agentec.abook.abv.bl.dto.ProjectTaskDto;
+import jp.agentec.abook.abv.launcher.android.R;
+
+/**
+ * Created by leej on 2019/02/25.
+ */
+
+
+public class ActionProjectTaskPin extends ImageView {
+    public String taskKey;
+    private boolean isAnimated = false;
+    private Context mContext;
+    private Animation animation;
+
+    public ProjectTaskDto mProjectTaskDto;
+
+
+    public ActionProjectTaskPin(final Context context, final ProjectTaskDto dto) {
+        super(context);
+        mContext = context;
+        mProjectTaskDto = dto;
+        if (mProjectTaskDto.isFinished) {
+            setImageResource(R.drawable.s_pin2);
+        } else {
+            setImageResource(R.drawable.s_pin1);
+        }
+        setBackgroundColor(Color.TRANSPARENT);
+    }
+
+    public void stopAnimation() {
+        if (this.isAnimated) {
+            this.clearAnimation();
+            this.isAnimated = false;
+        }
+    }
+
+    public void startBlinkAnimation() {
+        if (animation == null) {
+            animation = new AlphaAnimation(1, 0);
+            animation.setDuration(1000);
+            animation.setInterpolator(new LinearInterpolator());
+            animation.setRepeatCount(Animation.INFINITE);
+            animation.setRepeatMode(Animation.REVERSE);
+        }
+
+        this.startAnimation(animation);
+        this.isAnimated = true;
+    }
+}