+        int uploadQuality = 90;
262 
+        LogHelper.d("czy","upload default width = "+uploadWidth+"uploadQuality="+uploadQuality);
263 
+        Bitmap bmp = ImageUtils.decodeBitmapWithSize(f.getAbsolutePath(), uploadWidth,uploadHeight);
264 
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
265 
+        bmp.compress(Bitmap.CompressFormat.JPEG, uploadQuality, baos);
266 
+        return baos.toByteArray();
267 
+    }
268 
+
269 
+    //把文件转换成字节数组
217 270 
     private byte[] getBytes(File f) throws Exception {
218 271 
         FileInputStream in = new FileInputStream(f);
219 272 
         ByteArrayOutputStream out = new ByteArrayOutputStream();

+ 5 - 2
app/src/main/java/ai/pai/lensman/service/UploadTask.java
查看文件 

@@ -15,7 +15,7 @@ import ai.pai.lensman.utils.UrlContainer;
15 15
16 16 
 public class UploadTask extends AsyncTask<Void, Integer, Boolean> {
17 17
18 
-    private static final String TAG = "UploadTask";
18 
+    private static final String TAG = "czy";
19 19 
     private PhotoBean bean;
20 20 
     private OnPhotoUploadListener listener;
21 21 
 
@@ -41,13 +41,16 @@ public class UploadTask extends AsyncTask<Void, Integer, Boolean> {
41 41 
                     photoUploadUtils.addTextParameter("photo_id", String.valueOf(bean.photoId));
42 42 
                     photoUploadUtils.addTextParameter("nickname",Preferences.getInstance().getUserName());
43 43 
                     photoUploadUtils.addTextParameter("lensman_type",bean.lensmanType);
44 
-                    String result = new String(photoUploadUtils.send(), "UTF-8");
44 
+                    String result = new String(bean.priority == 1 ? photoUploadUtils.sendThumb():photoUploadUtils.send(), "UTF-8");
45 45 
                     JSONObject resultObj = new JSONObject(result);
46 46 
                     if (resultObj.getInt("status") == 200) {
47 47 
                         LogHelper.d(TAG, "上传 UploadTask upload result ok ");
48 48 
                         return true;
49 
+                    }else {
50 
+                        LogHelper.d(TAG, "上传 UploadTask status not 200  "+result);
49 51 
                     }
50 52 
                 } else {
53 
+                    LogHelper.d(TAG, "上传 UploadTask本地文件不存在 ");
51 54 
                     return false;
52 55 
                 }
53 56

+ 1 - 1
app/src/main/java/ai/pai/lensman/session/PhotoRecyclerAdapter.java
查看文件 

@@ -100,7 +100,7 @@ public class PhotoRecyclerAdapter extends RecyclerView.Adapter<PhotoRecyclerAdap
100 100 
         holder.photo.setLayoutParams(lp);
101 101 
         long timeLeft = delay - (System.currentTimeMillis() - item.captureTime) / 1000;
102 102
103 
-        if (timeLeft < 0) {
103 
+        if (timeLeft < 0 || item.uploadStatus!=PhotoBean.UploadStatus.STATUS_NO_BEGIN) {
104 104 
             item.canDelete = false;
105 105 
             if (item.uploadStatus == PhotoBean.UploadStatus.STATUS_ERROR) {
106 106 
                 holder.uploadStatusText.setText(context.getString(R.string.upload_error) + "，" + context.getString(R.string.click_to_retry));

+ 3 - 0
app/src/main/java/ai/pai/lensman/session/SessionPresenter.java
查看文件 

@@ -109,6 +109,9 @@ public class SessionPresenter implements SessionContract.Presenter, SessionInter
109 109 
         }
110 110 
         LogHelper.d(TAG,"onSessionPhotoCaptured "+bean);
111 111 
         bean.groupId = groupId;
112 
+        if(photoList.size()==0){
113 
+            bean.priority = 1;
114 
+        }
112 115 
         DBService.getInstance().addPhotoBean(bean);
113 116 
         sessionView.showPhotoRecyclerView();
114 117 
         sessionView.addNewPhoto(bean);

move errno_utils.py／response_utils.py into error file · 7d85bed0b0 - Gogs: Go Git Service
首页 探索 帮助
注册 登录
Pai2
/
pai2
关注 2
点赞 0
派生 0

浏览代码
move errno_utils.py／response_utils.py into error file

Brightcells 10 年之前
父节点
11c6982627
当前提交
7d85bed0b0
共有 8 个文件被更改，包括 17 次插入 和 12 次删除
显示文件统计
  1. 3 2
      account/views.py
  2. 3 2
      group/views.py
  3. 3 2
      message/views.py
  4. 2 2
      pay/views.py
  5. 3 2
      photo/views.py
  6. 0 0
      utils/error/__init__.py
  7. 0 0
      utils/error/errno_utils.py
  8. 3 2
      utils/response_utils.py

+ 3 - 2
account/views.py
查看文件 

@@ -9,9 +9,10 @@ from rest_framework import viewsets
9 9 
 from account.models import LensmanInfo, UserInfo, UserLoginLogInfo
10 10 
 from account.serializers import UserSerializer, GroupSerializer, LensmanInfoSerializer, UserInfoSerializer
11 11
12 
-from utils.errno_utils import UserStatusCode
13 12 
 from utils.ip_utils import ip_addr
14 
-from utils.response_utils import response
13 
+
14 
+from utils.error.errno_utils import UserStatusCode
15 
+from utils.error.response_utils import response
15 16
16 17 
 from curtail_uuid import CurtailUUID
17 18 
 from TimeConvert import TimeConvert as tc

+ 3 - 2
group/views.py
查看文件 

@@ -13,10 +13,11 @@ from message.models import UserMessageInfo
13 13
14 14 
 from group.serializers import GroupInfoSerializer, GroupUserInfoSerializer, GroupPhotoInfoSerializer
15 15
16 
-from utils.errno_utils import UserStatusCode, GroupStatusCode, GroupPhotoStatusCode
17 
-from utils.response_utils import response
18 16 
 from utils.thumbnail_utils import make_thumb
19 17
18 
+from utils.error.errno_utils import UserStatusCode, GroupStatusCode, GroupPhotoStatusCode
19 
+from utils.error.response_utils import response
20 
+
20 21 
 from curtail_uuid import CurtailUUID
21 22
22 23 
 from TimeConvert import TimeConvert as tc

+ 3 - 2
message/views.py
查看文件 

@@ -5,10 +5,11 @@ from django.http import JsonResponse
5 5
6 6 
 from message.models import UserMessageInfo
7 7
8 
-from utils.errno_utils import MessageStatusCode
9 
-from utils.response_utils import response
10 8 
 from utils.page_utils import pagination
11 9
10 
+from utils.error.errno_utils import MessageStatusCode
11 
+from utils.error.response_utils import response
12 
+
12 13
13 14 
 def message_list_api(request):
14 15 
     user_id = request.POST.get('user_id', '') or request.GET.get('user_id', '')

+ 2 - 2
pay/views.py
查看文件 

@@ -7,8 +7,8 @@ from django.shortcuts import HttpResponse
7 7
8 8 
 from pay.models import OrderInfo
9 9
10 
-from utils.errno_utils import OrderStatusCode
11 
-from utils.response_utils import response
10 
+from utils.error.errno_utils import OrderStatusCode
11 
+from utils.error.response_utils import response
12 12
13 13 
 from TimeConvert import TimeConvert as tc
14 14 
 from wechatpy import WeChatPay, WeChatPayException

+ 3 - 2
photo/views.py
查看文件 

@@ -13,11 +13,12 @@ from group.models import GroupInfo, GroupUserInfo, GroupPhotoInfo
13 13 
 from photo.models import UUIDInfo, PhotosInfo
14 14 
 from photo.serializers import PhotosInfoSerializer
15 15
16 
-from utils.errno_utils import PhotoStatusCode
17 16 
 from utils.ip_utils import ip_addr
18 
-from utils.response_utils import response
19 17 
 from utils.watermark_utils import watermark_wrap
20 18
19 
+from utils.error.errno_utils import PhotoStatusCode
20 
+from utils.error.response_utils import response
21 
+
21 22 
 from curtail_uuid import CurtailUUID
22 23
23 24 
 from TimeConvert import TimeConvert as tc

+ 0 - 0
utils/error/__init__.py
查看文件


utils/errno_utils.py → utils/error/errno_utils.py
查看文件


+ 3 - 2
utils/response_utils.py
查看文件 

@@ -3,8 +3,9 @@
3 3 
 from django.http import JsonResponse
4 4
5 5
6 
-def response(status_code):
6 
+def response(status_code, data={}):
7 7 
     return JsonResponse({
8 8 
         'status': status_code,
9 
-        'message': status_code.description
9 
+        'message': status_code.description,
10 
+        'data': data,
10 11 
     })