• R/O
  • HTTP
  • SSH
  • HTTPS

PKRemote: Commit

Pentax DSLR Remote Control app.


Commit MetaInfo

Revision2af999a7ed8f5831447bdf571a84065bcc3cb2db (tree)
Time2019-03-31 00:57:11
AuthorMRSa <mrsa@myad...>
CommiterMRSa

Log Message

他から呼ばれてもよいようにちょっと調整。

Change Summary

Incremental Difference

--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,6 +13,7 @@
1313
1414 <application
1515 android:allowBackup="true"
16+ android:fullBackupContent="true"
1617 android:icon="@mipmap/ic_launcher"
1718 android:label="@string/app_name"
1819 android:roundIcon="@mipmap/ic_launcher_round"
@@ -26,6 +27,10 @@
2627 <action android:name="android.intent.action.MAIN" />
2728 <category android:name="android.intent.category.LAUNCHER" />
2829 </intent-filter>
30+ <intent-filter>
31+ <action android:name="android.intent.action.VIEW" />
32+ <category android:name="android.intent.category.DEFAULT" />
33+ </intent-filter>
2934 </activity>
3035 <meta-data android:name="android.max_aspect" android:value="ratio_float"/>
3136 </application>
--- a/app/src/main/java/net/osdn/gokigen/pkremote/transfer/AutoTransferFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/transfer/AutoTransferFragment.java
@@ -33,7 +33,7 @@ public class AutoTransferFragment extends Fragment implements View.OnClickListen
3333 private final String TAG = this.toString();
3434
3535 private static final int SLEEP_MS = 300; // 動作チェック待ち時間
36- private static final int SLEEP_WAIT_MS = 3500; // 一覧確認の待機時間 (3.5秒おき)
36+ private static final int SLEEP_WAIT_MS = 4500; // 一覧確認の待機時間 (4.5秒おき)
3737
3838 private AppCompatActivity activity = null;
3939 private FileAutoTransferMain transferMain = null;
@@ -188,7 +188,7 @@ public class AutoTransferFragment extends Fragment implements View.OnClickListen
188188 @Override
189189 public void run()
190190 {
191- int count = 0;
191+ //int count = 0;
192192 if (transferMain != null)
193193 {
194194 // 前処理...
@@ -218,8 +218,8 @@ public class AutoTransferFragment extends Fragment implements View.OnClickListen
218218 Thread.sleep(SLEEP_WAIT_MS - checkTime);
219219 }
220220 }
221- count++;
222- Log.v(TAG, "TRANSFER LOOP : " + count);
221+ //count++;
222+ //Log.v(TAG, "TRANSFER LOOP : " + count);
223223 }
224224 catch (Exception e)
225225 {
--- a/app/src/main/java/net/osdn/gokigen/pkremote/transfer/FileAutoTransferMain.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/transfer/FileAutoTransferMain.java
@@ -213,11 +213,11 @@ class FileAutoTransferMain implements ICameraContentListCallback
213213 {
214214 firstContent = false;
215215
216- // 初期データを突っ込んでおく...
216+ // 初期データをHashMapに突っ込んでおく...
217217 for (ICameraContent content : baseContentList)
218218 {
219219 String key = (content.getContentPath() + "/" + content.getContentName()).toLowerCase();
220- Log.v(TAG, "FILE : " + key);
220+ //Log.v(TAG, "FILE : " + key);
221221 contentHashMap.put(key, content);
222222 }
223223 }
Show on old repository browser