OSDN -- Développer et télécharger des logiciels Open Source
Traduction statut du Français translation status for fr
  • R/O
  • SSH
  • HTTPS

gokigen: Commit


Commit MetaInfo

Révision446 (tree)
l'heure2019-03-09 17:56:40
Auteurmrsa

Message de Log

ファイル名を一括ダウンロードと同じとなるように合わせこんだ。

Change Summary

Modification

--- android/AirA01b/trunk/.idea/workspace.xml (revision 445)
+++ android/AirA01b/trunk/.idea/workspace.xml (revision 446)
@@ -25,11 +25,8 @@
2525 <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
2626 </component>
2727 <component name="ChangeListManager">
28- <list default="true" id="754c9e42-e168-4355-a96f-5b6d4290fd93" name="Default" comment="とりあえず動くものにした。">
28+ <list default="true" id="754c9e42-e168-4355-a96f-5b6d4290fd93" name="Default" comment="いきなりPlaybackモードが外れることがあったので、対策をうった。（一括ダウンロード時のみ）">
2929 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
30- <change beforePath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/logcat/LogCatFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/logcat/LogCatFragment.java" afterDir="false" />
31- <change beforePath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageDownloader.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageDownloader.java" afterDir="false" />
32- <change beforePath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java" afterDir="false" />
3330 <change beforePath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImagePagerViewFragment.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImagePagerViewFragment.java" afterDir="false" />
3431 </list>
3532 <ignored path="AirA01b.iws" />
@@ -97,8 +94,8 @@
9794 <usages-collector id="statistics.file.extensions.edit">
9895 <counts>
9996 <entry key="gradle" value="11" />
100- <entry key="java" value="9476" />
101- <entry key="txt" value="196" />
97+ <entry key="java" value="9551" />
98+ <entry key="txt" value="260" />
10299 <entry key="xml" value="1474" />
103100 </counts>
104101 </usages-collector>
@@ -105,8 +102,8 @@
105102 <usages-collector id="statistics.file.types.edit">
106103 <counts>
107104 <entry key="Groovy" value="11" />
108- <entry key="JAVA" value="9476" />
109- <entry key="PLAIN_TEXT" value="196" />
105+ <entry key="JAVA" value="9551" />
106+ <entry key="PLAIN_TEXT" value="260" />
110107 <entry key="XML" value="1474" />
111108 </counts>
112109 </usages-collector>
@@ -117,11 +114,11 @@
117114 </component>
118115 <component name="FileEditorManager">
119116 <leaf>
120- <file pinned="false" current-in-tab="false">
117+ <file pinned="false" current-in-tab="true">
121118 <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImagePagerViewFragment.java">
122119 <provider selected="true" editor-type-id="text-editor">
123- <state relative-caret-position="493">
124- <caret line="87" column="37" selection-start-line="87" selection-start-column="37" selection-end-line="87" selection-end-column="37" />
120+ <state relative-caret-position="425">
121+ <caret line="211" column="35" lean-forward="true" selection-start-line="211" selection-start-column="35" selection-end-line="211" selection-end-column="35" />
125122 <folding>
126123 <element signature="imports" expanded="true" />
127124 </folding>
@@ -129,18 +126,6 @@
129126 </provider>
130127 </entry>
131128 </file>
132- <file pinned="false" current-in-tab="true">
133- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java">
134- <provider selected="true" editor-type-id="text-editor">
135- <state relative-caret-position="1734">
136- <caret line="102" lean-forward="true" selection-start-line="102" selection-end-line="102" />
137- <folding>
138- <element signature="imports" expanded="true" />
139- </folding>
140- </state>
141- </provider>
142- </entry>
143- </file>
144129 </leaf>
145130 </component>
146131 <component name="FileTemplateManagerImpl">
@@ -3259,8 +3244,8 @@
32593244 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/OlyCameraContentListHolder.java" />
32603245 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageDownloader.java" />
32613246 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/logcat/LogCatFragment.java" />
3247+ <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java" />
32623248 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImagePagerViewFragment.java" />
3263- <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java" />
32643249 </list>
32653250 </option>
32663251 </component>
@@ -3838,13 +3823,6 @@
38383823 <option name="presentableId" value="Default" />
38393824 <updated>1469871562549</updated>
38403825 </task>
3841- <task id="LOCAL-00143" summary="1.6.1リリース版。&#10;">
3842- <created>1497540835522</created>
3843- <option name="number" value="00143" />
3844- <option name="presentableId" value="LOCAL-00143" />
3845- <option name="project" value="LOCAL" />
3846- <updated>1497540835522</updated>
3847- </task>
38483826 <task id="LOCAL-00144" summary="次バージョンの開発準備。">
38493827 <created>1497541116020</created>
38503828 <option name="number" value="00144" />
@@ -4181,7 +4159,14 @@
41814159 <option name="project" value="LOCAL" />
41824160 <updated>1552113927843</updated>
41834161 </task>
4184- <option name="localTasksCounter" value="192" />
4162+ <task id="LOCAL-00192" summary="いきなりPlaybackモードが外れることがあったので、対策をうった。（一括ダウンロード時のみ）">
4163+ <created>1552119664579</created>
4164+ <option name="number" value="00192" />
4165+ <option name="presentableId" value="LOCAL-00192" />
4166+ <option name="project" value="LOCAL" />
4167+ <updated>1552119664580</updated>
4168+ </task>
4169+ <option name="localTasksCounter" value="193" />
41854170 <servers />
41864171 </component>
41874172 <component name="TodoView">
@@ -4195,15 +4180,16 @@
41954180 </component>
41964181 <component name="ToolWindowManager">
41974182 <frame x="63" y="-8" width="2505" height="1456" extended-state="6" />
4183+ <editor active="true" />
41984184 <layout>
41994185 <window_info id="Image Layers" order="0" />
42004186 <window_info id="Nl-Palette" order="1" />
4201- <window_info active="true" id="Project" order="2" sideWeight="0.4959631" visible="true" weight="0.21384679" />
4187+ <window_info id="Project" order="2" sideWeight="0.49527186" visible="true" weight="0.21384679" />
42024188 <window_info id="Structure" order="3" weight="0.24979983" />
42034189 <window_info id="Captures" order="4" sideWeight="0.5040369" side_tool="true" weight="0.21384679" />
42044190 <window_info id="Build Variants" order="5" sideWeight="0.5040369" side_tool="true" weight="0.21384679" />
42054191 <window_info id="Capture Tool" order="6" />
4206- <window_info id="Favorites" order="7" sideWeight="0.5040369" side_tool="true" visible="true" weight="0.21384679" />
4192+ <window_info id="Favorites" order="7" sideWeight="0.50472814" side_tool="true" visible="true" weight="0.21384679" />
42074193 <window_info id="Palette&#9;" order="8" />
42084194 <window_info anchor="bottom" id="Message" order="0" />
42094195 <window_info anchor="bottom" id="Find" order="1" weight="0.33101314" />
@@ -4212,9 +4198,9 @@
42124198 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
42134199 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
42144200 <window_info anchor="bottom" id="TODO" order="6" weight="0.32903227" />
4215- <window_info anchor="bottom" id="Android Profiler" order="7" visible="true" weight="0.32946634" />
4201+ <window_info anchor="bottom" id="Android Profiler" order="7" weight="0.32946634" />
42164202 <window_info anchor="bottom" id="Event Log" order="8" sideWeight="0.51249486" side_tool="true" weight="0.45839873" />
4217- <window_info anchor="bottom" id="Logcat" order="9" weight="0.34570765" />
4203+ <window_info active="true" anchor="bottom" id="Logcat" order="9" visible="true" weight="0.34570765" />
42184204 <window_info anchor="bottom" id="Android Monitor" order="10" sideWeight="0.4747798" weight="0.46310833" />
42194205 <window_info anchor="bottom" id="Version Control" order="11" weight="0.3265306" />
42204206 <window_info anchor="bottom" id="Terminal" order="12" weight="0.32903227" />
@@ -4247,7 +4233,6 @@
42474233 <option name="myLimit" value="2678400000" />
42484234 </component>
42494235 <component name="VcsManagerConfiguration">
4250- <MESSAGE value="ライブビュー画像についても共有できるようにする。" />
42514236 <MESSAGE value="ライブビュー保存時の画像、縦横サイズをギャラリーに渡す。" />
42524237 <MESSAGE value="次バージョン準備。" />
42534238 <MESSAGE value="プロパティの設定を、現在設定と違うものだけ設定するようにした。" />
@@ -4272,7 +4257,8 @@
42724257 <MESSAGE value="一括ダウンロードの大枠だけ..." />
42734258 <MESSAGE value="一括ダウンロードを作りこみ。" />
42744259 <MESSAGE value="とりあえず動くものにした。" />
4275- <option name="LAST_COMMIT_MESSAGE" value="とりあえず動くものにした。" />
4260+ <MESSAGE value="いきなりPlaybackモードが外れることがあったので、対策をうった。（一括ダウンロード時のみ）" />
4261+ <option name="LAST_COMMIT_MESSAGE" value="いきなりPlaybackモードが外れることがあったので、対策をうった。（一括ダウンロード時のみ）" />
42764262 </component>
42774263 <component name="editorHistoryManager">
42784264 <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/CameraDateTimeSynchronizer.java">
@@ -4641,10 +4627,10 @@
46414627 </state>
46424628 </provider>
46434629 </entry>
4644- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImagePagerViewFragment.java">
4630+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java">
46454631 <provider selected="true" editor-type-id="text-editor">
4646- <state relative-caret-position="493">
4647- <caret line="87" column="37" selection-start-line="87" selection-start-column="37" selection-end-line="87" selection-end-column="37" />
4632+ <state relative-caret-position="1734">
4633+ <caret line="102" lean-forward="true" selection-start-line="102" selection-end-line="102" />
46484634 <folding>
46494635 <element signature="imports" expanded="true" />
46504636 </folding>
@@ -4651,10 +4637,10 @@
46514637 </state>
46524638 </provider>
46534639 </entry>
4654- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImageGridViewFragment.java">
4640+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImagePagerViewFragment.java">
46554641 <provider selected="true" editor-type-id="text-editor">
4656- <state relative-caret-position="1734">
4657- <caret line="102" lean-forward="true" selection-start-line="102" selection-end-line="102" />
4642+ <state relative-caret-position="425">
4643+ <caret line="211" column="35" lean-forward="true" selection-start-line="211" selection-start-column="35" selection-end-line="211" selection-end-column="35" />
46584644 <folding>
46594645 <element signature="imports" expanded="true" />
46604646 </folding>
--- android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImagePagerViewFragment.java (revision 445)
+++ android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/playback/ImagePagerViewFragment.java (revision 446)
@@ -208,10 +208,11 @@
208208 String lowerCasePath = path.toLowerCase();
209209 String suffix = (specialSuffix == null) ? lowerCasePath.substring(lowerCasePath.lastIndexOf(".")) : specialSuffix;
210210 Calendar calendar = Calendar.getInstance();
211- String filename = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(calendar.getTime()) + suffix;
211+ String targetFileName = file.getFilename();
212+ String filename = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(calendar.getTime()) + "_" + targetFileName.substring(0, targetFileName.indexOf(".")) + suffix;
212213
213214 // ダイアログを表示して保存する
214- saveImageWithDialog(filename, downloadSize, getInformation);
215+ saveImageWithDialog(filename.toLowerCase(), downloadSize, getInformation);
215216 /* --------------------------------------------------------
216217 // Layoutの Fragment が ImagePagerViewFragment を 継承していた時にはイメージを保存する
217218 Fragment fragment = getFragmentManager().findFragmentById(R.id.fragment1);
Afficher sur ancien navigateur de dépôt.