b7cd0df0b77e456deR377">377
         }
377 378
     }
378 379
 
379
-    public void onEventObjectAdded(final int handle, final int format) {
380
+    public void onEventObjectAdded(final int handle) {
380 381
         handler.post(new Runnable() {
381 382
             @Override
382 383
             public void run() {
383 384
                 if (listener != null) {
384
-                    listener.onObjectAdded(handle, format);
385
+                    listener.onObjectAdded(handle);
385 386
                 }
386 387
             }
387 388
         });
@@ -883,5 +884,4 @@ public abstract class PtpCamera implements Camera {
883 884
     public void setCapturedPictureSampleSize(int sampleSize) {
884 885
         this.pictureSampleSize = sampleSize;
885 886
     }
886
-
887 887
 }

+ 7 - 2
app/src/main/java/com/remoteyourcam/usb/ptp/PtpConstants.java

@@ -119,6 +119,11 @@ public class PtpConstants {
119 119
         public static final int NikonGetObjectPropDesc = 0x9802;
120 120
         public static final int NikonGetObjectPropValue = 0x9803;
121 121
         public static final int NikonGetObjectPropList = 0x9805;
122
+        public static final int NikonGetVendorStorageIDs = 0x9209;
123
+        public static final int NIKONStartMovieRecInCard = 0x920a;
124
+        public static final int NIKONEndMovieRec = 0x920b;
125
+        public static final int NIKONTerminateCapture = 0x920c;
126
+        public static final int NIKONGetPartialObjectHiSpeed = 0x920b;
122 127
 
123 128
         // Canon EOS
124 129
         public static final int EosTakePicture = 0x910F;
@@ -156,9 +161,9 @@ public class PtpConstants {
156 161
         public static final int CaptureComplete = 0x400D;
157 162
 
158 163
         // Nikon
159
-        public static final int NikonObjectAddedInSdram = 0xC101;
164
+        public static final int NikonObjectAddedInSdram = 0xffffC101;
160 165
         public static final int NikonCaptureCompleteRecInSdram = 0xC102;
161
-        public static final int NikonPreviewImageAdded = 0xC104;
166
+        public static final int NikonPreviewImageAdded = 0xffffC104;
162 167
 
163 168
         // Canon EOS
164 169
         public static final int EosObjectAdded = 0xC181; // ? dir item request transfer or dir item created

+ 1 - 1
app/src/main/java/com/remoteyourcam/usb/ptp/commands/RetrieveAddedObjectInfoAction.java

@@ -42,7 +42,7 @@ public class RetrieveAddedObjectInfoAction implements PtpAction {
42 42
             return;
43 43
         }
44 44
 
45
-        camera.onEventObjectAdded(objectHandle, getInfo.getObjectInfo().objectFormat);
45
+        camera.onEventObjectAdded(objectHandle);
46 46
     }
47 47
 
48 48
     @Override

+ 5 - 0
app/src/main/java/com/remoteyourcam/usb/ptp/commands/nikon/NikonEventCheckCommand.java

@@ -70,6 +70,11 @@ public class NikonEventCheckCommand extends NikonCommand {
70 70
             case Event.CaptureComplete:
71 71
                 camera.onEventCaptureComplete();
72 72
                 break;
73
+            case Event.NikonObjectAddedInSdram:
74
+                //libgphoto2 相关处理
75
+                if (eventParam == 0) { eventParam = 0xffff001; }
76
+                camera.onEventObjectAdded(eventParam);
77
+                break;
73 78
             }
74 79
         }
75 80
     }

+ 14 - 4
app/src/main/res/layout/activity_my_test.xml

@@ -1,7 +1,10 @@
1 1
 <?xml version="1.0" encoding="utf-8"?>
2 2
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
+    xmlns:app="http://schemas.android.com/apk/res-auto"
4
+    xmlns:tools="http://schemas.android.com/tools"
3 5
     android:layout_width="match_parent"
4 6
     android:layout_height="match_parent"
7
+    android:background="#fff"
5 8
     android:orientation="vertical">
6 9
 
7 10
     <Button
@@ -53,15 +56,22 @@
53 56
             android:horizontalSpacing="4dp"
54 57
             android:listSelector="@android:color/transparent"
55 58
             android:numColumns="3"
56
-            android:verticalSpacing="4dp"
57
-            />
59
+            android:verticalSpacing="4dp" />
58 60
 
59 61
         <ImageView
60 62
             android:id="@+id/iv_latest_photo"
61 63
             android:layout_width="match_parent"
62 64
             android:layout_height="match_parent"
63
-            android:visibility="gone"
64
-            android:scaleType="fitCenter" />
65
+            android:scaleType="fitCenter"
66
+            android:visibility="gone" />
67
+
68
+        <ImageView
69
+            android:id="@+id/photo_detail"
70
+            android:layout_width="wrap_content"
71
+            android:layout_height="wrap_content"
72
+            android:visibility="invisible"
73
+            tools:src="@tools:sample/backgrounds/scenic" />
74
+
65 75
     </RelativeLayout>
66 76
 
67 77
 </LinearLayout>

kodo - Gogs: Go Git Service

Нет описания

joinus.html 2.6KB

    <!doctype html> <html> <head> <meta charset="UTF-8"> <title>拍爱 PAI.AI 加入拍爱</title> <meta name="keywords" content="摄影 图片 影像 分享 交流 社交 交友 摄影师 女性 孩子 亲子 旅行 旅游 约拍 iphone android app" /> <link href="css/layout.css" rel="stylesheet" type="text/css" /> <script type="text/javascript" src="js/jquery.min.js"></script> </head> <body> <div id="header"> <div class="content"> <a href="index.html" target="_self" class="logo"></a> <div class="navigation"> <a href="contactus.html" target="_self" >联系我们</a> <a href="joinus.html" target="_self" class="current" >加入拍爱</a> <a href="aboutus.html" target="_self" >关于我们</a> <a href="index.html" target="_self" >首页</a> </div> </div> </div> <div id="container" ><div class="content joinus"> <p> 在我们这里,你可以参与到一个火热的创业项目,未来很有可能看到自己作品满大街的人都在使用...如果您喜欢摄影...除了会有各种相机把玩,还会有同好可以畅聊...最重要的,你还会发现...... 你将成为——软件工程师中最懂摄影的人 来和我们一起做一份激动人心的事业吧 </p> <p> <strong>职位名称:iOS软件工程师</strong><br> <strong>岗位职责:</strong><br> 负责iOS平台下应用的开发<br> <strong>任职要求:</strong><br> 1、至少1年的iOS平台开发经验;<br> 2、具备扎实的数据结构、算法等技术功底;<br> 3、具备良好的编程风格与团队合作意识,可承担较大的工作压力;<br> 4、正直、优秀、有上进心,经验丰富的同时没有丧失开发NB产品的热情;<br> 5、年轻;<br> 6、期待您喜欢摄影,喜欢相机;<br> </p> <p> <strong>职位名称:专利工程师</strong><br> <strong>岗位职责:</strong><br> 1、撰写高质量的专利申请文件、答复审查意见;<br> 2、专利检索咨询、专利挖掘、以及撰写专利分析报告。<br> <strong>任职要求:</strong><br> 1、具有一年以上独立撰写专利文件经验,熟悉专利申请相关知识;<br> 2、理工科,大学本科以上毕业,物理、数学、电子、通讯、互联网等技术专业背景之一;<br> 3、有专利代理人资格证优先考虑;<br> 4、期待您喜欢摄影,喜欢相机; </p> </div></div> <div id="footer"> <div class="content foot"> <a href="aboutus.html" target="_self" >关于我们</a> <span>|</span> <a href="contactus.html" target="_self" >联系我们</a> ©2016 拍爱 PAI.AI 琼ICP备16000076号 </div> </div> </body> </html>