@@ -3,8 +3,9 @@ |
||
3 | 3 |
<component name="GradleSettings"> |
4 | 4 |
<option name="linkedExternalProjectsSettings"> |
5 | 5 |
<GradleProjectSettings> |
6 |
- <option name="distributionType" value="DEFAULT_WRAPPED" /> |
|
6 |
+ <option name="distributionType" value="LOCAL" /> |
|
7 | 7 |
<option name="externalProjectPath" value="$PROJECT_DIR$" /> |
8 |
+ <option name="gradleHome" value="C:\Android\Studio\gradle\gradle-2.14.1" /> |
|
8 | 9 |
<option name="modules"> |
9 | 10 |
<set> |
10 | 11 |
<option value="$PROJECT_DIR$" /> |
@@ -2,7 +2,6 @@ |
||
2 | 2 |
<project version="4"> |
3 | 3 |
<component name="ProjectModuleManager"> |
4 | 4 |
<modules> |
5 |
- <module fileurl="file://$PROJECT_DIR$/Lensman.iml" filepath="$PROJECT_DIR$/Lensman.iml" /> |
|
6 | 5 |
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> |
7 | 6 |
<module fileurl="file://$PROJECT_DIR$/common/common.iml" filepath="$PROJECT_DIR$/common/common.iml" /> |
8 | 7 |
<module fileurl="file://$PROJECT_DIR$/lensman_ssh.iml" filepath="$PROJECT_DIR$/lensman_ssh.iml" /> |
@@ -161,6 +161,7 @@ public class DBService { |
||
161 | 161 |
sessionBean.sessionDate = photoBean.sessionDate; |
162 | 162 |
sessionBean.sessionSeq = photoBean.sessionSeq; |
163 | 163 |
sessionBean.sessionId = photoBean.sessionId; |
164 |
+ sessionBean.lensmanId = photoBean.lensmanId; |
|
164 | 165 |
ArrayList<PhotoBean> photoList = new ArrayList<>(); |
165 | 166 |
sessionBean.sessionPhotos = photoList; |
166 | 167 |
sessionBeanArrayList.add(sessionBean); |
@@ -111,7 +111,7 @@ public class PhotoUploadUtils { |
||
111 | 111 |
LogHelper.d("czy","upload final file length="+bmp.length); |
112 | 112 |
LogHelper.d("czy","Upload bitmap size:"+bmp.length); |
113 | 113 |
ds.writeBytes("\r\n"); |
114 |
- saveUploadFile(value,bmp); |
|
114 |
+// saveUploadFile(value,bmp); |
|
115 | 115 |
} |
116 | 116 |
} |
117 | 117 |
//获取文件的上传类型,图片格式为image/png,image/jpg等。非图片为application/octet-stream |
@@ -5,7 +5,7 @@ buildscript { |
||
5 | 5 |
jcenter() |
6 | 6 |
} |
7 | 7 |
dependencies { |
8 |
- classpath 'com.android.tools.build:gradle:2.1.2' |
|
8 |
+ classpath 'com.android.tools.build:gradle:2.1.3' |
|
9 | 9 |
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' |
10 | 10 |
// NOTE: Do not place your application dependencies here; they belong |
11 | 11 |
// in the individual module build.gradle files |
@@ -1,6 +1,6 @@ |
||
1 |
-#Mon Dec 28 10:00:20 PST 2015 |
|
1 |
+#Thu Aug 18 08:08:09 CST 2016 |
|
2 | 2 |
distributionBase=GRADLE_USER_HOME |
3 | 3 |
distributionPath=wrapper/dists |
4 | 4 |
zipStoreBase=GRADLE_USER_HOME |
5 | 5 |
zipStorePath=wrapper/dists |
6 |
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip |
|
6 |
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip |