ホーム エスクプローラ ヘルプ
登録 サインイン
chengzhenyu
/
lensman
Watch 1
Star 0
Fork 0

ソースを参照
购买照片流程

chengzhenyu 8 年 前
親
f0c720729f
コミット
a37141a4dd
共有1 個のファイルを変更した、31 個の追加 と 15 個の削除を含む
差分情報を表示
  1. 31 15
      app/src/main/java/ai/pai/lensman/service/OrderDealService.java

+ 31 - 15
app/src/main/java/ai/pai/lensman/service/OrderDealService.java
ファイルの表示 

@@ -23,6 +23,7 @@ import java.net.URL;
23 23 
 import java.util.ArrayList;
24 24 
 import java.util.HashMap;
25 25
26 
+import ai.pai.lensman.BuildConfig;
26 27 
 import ai.pai.lensman.bean.OrderBean;
27 28 
 import ai.pai.lensman.bean.PhotoBean;
28 29 
 import ai.pai.lensman.db.Preferences;
 
@@ -37,8 +38,6 @@ public class OrderDealService extends Service implements Handler.Callback{
37 38 
     private Handler handler;
38 39 
     private static final int MSG_QUERY_ORDER = 2001;
39 40
40 
-    private static final String TAG = "czy";
41 
-
42 41 
     @Override
43 42 
     public void onCreate() {
44 43 
         super.onCreate();
 
@@ -66,7 +65,7 @@ public class OrderDealService extends Service implements Handler.Callback{
66 65
67 66 
             @Override
68 67 
             protected boolean parseResponse(String response) {
69 
-                LogHelper.d(TAG, "startQuery order list = " + response);
68 
+                LogHelper.d("OrderDealService", "startQuery order list = " + response);
70 69 
                 try {
71 70 
                     JSONObject json = new JSONObject(response);
72 71 
                     int status = json.getInt("status");
 
@@ -122,15 +121,32 @@ public class OrderDealService extends Service implements Handler.Callback{
122 121 
     }
123 122
124 123 
     private void fetchOriginFromBox(final OrderBean orderBean) {
124 
+        LogHelper.d("OrderDealService", "fetchOriginFromBox ");
125 125 
         HashMap<String, String> params = new HashMap<>();
126 126 
         params.put("lensman", Preferences.getInstance().getLensManId());
127 127 
         params.put("session", orderBean.sessionId);
128 128 
         params.put("id", orderBean.photoId);
129 
+
130 
+        //TODO for test
131 
+        if(BuildConfig.isTestMode){
132 
+            PhotoBean bean = new PhotoBean();
133 
+            bean.photoId = Long.parseLong(orderBean.photoId);
134 
+            bean.photoName = bean.photoId+".jpg";
135 
+            bean.photoPath = "http://img.pconline.com.cn/images/upload/upc/tx/wallpaper/1402/12/c1/31189058_1392186616852.jpg";
136 
+            bean.captureTime = bean.photoId;
137 
+            bean.isRawPhoto = false;
138 
+            bean.uploadStatus =  PhotoBean.UploadStatus.STATUS_NO_BEGIN;
139 
+            bean.sessionId = orderBean.sessionId;
140 
+            bean.lensmanId = Preferences.getInstance().getLensManId();
141 
+            orderBean.photoBean = bean;
142 
+            new SavePhotoTask(orderBean).executeOnExecutor(ThreadExecutor.getInstance().getExecutor(), orderBean);
143 
+            return;
144 
+        }
129 145 
         new HttpPostTask(params) {
130 146
131 147 
             @Override
132 148 
             protected boolean parseResponse(String response) {
133 
-                LogHelper.d(TAG, "fetchOriginFromBox get response string = " + response);
149 
+                LogHelper.d("OrderDealService", "fetchOriginFromBox get response string = " + response);
134 150 
                 try {
135 151 
                     JSONObject json = new JSONObject(response);
136 152 
                     int status = json.getInt("status");
 
@@ -211,7 +227,10 @@ public class OrderDealService extends Service implements Handler.Callback{
211 227 
         protected Boolean doInBackground(OrderBean... params) {
212 228
213 229 
             String path = BoxUrlContainer.PHOTO_PATH_PREFIX_URL + orderBean.photoBean.photoPath;
214 
-            LogHelper.d(TAG, "保存照片到本地，图片链接地址为" + path);
230 
+            if(BuildConfig.isTestMode){
231 
+                path = "http://img.pconline.com.cn/images/upload/upc/tx/wallpaper/1402/12/c1/31189058_1392186616852.jpg";
232 
+            }
233 
+            LogHelper.d("OrderDealService", "保存照片到本地，图片链接地址为" + path);
215 234 
             FileOutputStream fOut = null;
216 235 
             HttpURLConnection conn = null;
217 236 
             InputStream inStream = null;
 
@@ -234,7 +253,7 @@ public class OrderDealService extends Service implements Handler.Callback{
234 253 
                         fOut.flush();
235 254 
                     }
236 255 
                     fOut.flush();
237 
-                    LogHelper.d(TAG, "保存照片到本地，图片保存至" + file.getAbsolutePath() + "图片大小为" + file.length() + "字节\n\n");
256 
+                    LogHelper.d("OrderDealService", "保存照片到本地，图片保存至" + file.getAbsolutePath() + "图片大小为" + file.length() + "字节\n\n");
238 257 
                 }
239 258 
                 return true;
240 259 
             } catch (Exception e) {
 
@@ -272,7 +291,7 @@ public class OrderDealService extends Service implements Handler.Callback{
272 291
273 292 
             @Override
274 293 
             protected boolean parseResponse(String response) {
275 
-                LogHelper.d(TAG, "reportOriginPhotoDeleted get response string = " + response);
294 
+                LogHelper.d("OrderDealService", "reportOriginPhotoDeleted get response string = " + response);
276 295 
                 try {
277 296 
                     JSONObject json = new JSONObject(response);
278 297 
                     int status = json.getInt("status");
 
@@ -303,7 +322,6 @@ public class OrderDealService extends Service implements Handler.Callback{
303 322 
     }
304 323 
     public class UploadTask extends AsyncTask<Void, Integer, Boolean> {
305 324
306 
-        private static final String TAG = "czy";
307 325 
         private OrderBean bean;
308 326
309 327 
         public UploadTask(OrderBean bean) {
 
@@ -319,7 +337,7 @@ public class OrderDealService extends Service implements Handler.Callback{
319 337 
                     File dir = new File(dirPath);
320 338 
                     dir.mkdirs();
321 339 
                     File photo = new File(dir, bean.photoBean.photoName);
322 
-                    LogHelper.d(TAG, "上传照片 第" + k + "次尝试" + bean);
340 
+                    LogHelper.d("OrderDealService", "上传照片 第" + k + "次尝试" + bean);
323 341 
                     if (photo.exists() && photo.isFile()) {
324 342 
                         PhotoUploadUtils photoUploadUtils = new PhotoUploadUtils(UrlContainer.ORIGIN_PHOTO_UPLOAD_URL + "?timestamp=" + System.currentTimeMillis());
325 343 
                         photoUploadUtils.addTextParameter("deleted", String.valueOf(0));
 
@@ -331,7 +349,7 @@ public class OrderDealService extends Service implements Handler.Callback{
331 349 
                         String result = new String(photoUploadUtils.send(), "UTF-8");
332 350 
                         JSONObject resultObj = new JSONObject(result);
333 351 
                         if (resultObj.getInt("status") == 200) {
334 
-                            LogHelper.d(TAG, "上传 UploadTask upload result ok ");
352 
+                            LogHelper.d("OrderDealService", "上传 UploadTask upload result ok ");
335 353 
                             return true;
336 354 
                         }
337 355 
                     } else {
 
@@ -339,7 +357,7 @@ public class OrderDealService extends Service implements Handler.Callback{
339 357 
                     }
340 358
341 359 
                 } catch (Exception e) {
342 
-                    LogHelper.d(TAG, "上传发生异常 UploadTask :" + bean + " error:" + e);
360 
+                    LogHelper.d("OrderDealService", "上传发生异常 UploadTask :" + bean + " error:" + e);
343 361 
                 }
344 362 
             }
345 363 
             return false;
 
@@ -348,15 +366,13 @@ public class OrderDealService extends Service implements Handler.Callback{
348 366 
         @Override
349 367 
         protected void onPostExecute(Boolean result) {
350 368 
             if (result) {
351 
-                LogHelper.d(TAG, "上传 UploadTask " + bean + "  success ");
369 
+                LogHelper.d("OrderDealService", "上传 UploadTask " + bean + "  success ");
352 370 
                 orderList.remove(bean);
353 371 
                 dealOrder();
354 372 
             } else {
355 
-                LogHelper.d(TAG, "上传 UploadTask " + bean + "  fail ");
373 
+                LogHelper.d("OrderDealService", "上传 UploadTask " + bean + "  fail ");
356 374 
             }
357 375 
         }
358 376 
     }
359 377
360 
-
361 
-
362 378 
 }