166 
     public void showEmptyView() {
151 
-        qrcodeScanBtn.setVisibility(View.VISIBLE);
152 
-        photosRecyclerView.setVisibility(View.GONE);
153 
-        noPhotoLayout.setVisibility(View.VISIBLE);
167 
+        photosRecyclerView.post(new Runnable() {
168 
+            @Override
169 
+            public void run() {
170 
+                qrcodeScanBtn.setVisibility(View.VISIBLE);
171 
+                photosRecyclerView.setVisibility(View.GONE);
172 
+                noPhotoLayout.setVisibility(View.VISIBLE);
173 
+            }
174 
+        });
175 
+
154 176 
     }
155 177
156 178 
     @Override

+ 4 - 4
app/src/main/java/ai/pai/lensman/session/SessionInteractor.java
Просмотреть файл 

@@ -64,7 +64,7 @@ public class SessionInteractor implements Callback{
64 64 
                 + File.separator + ai.pai.lensman.utils.Constants.ORIGIN_DIR_NAME;
65 65 
        new File(sessionWorkingDirPath).mkdirs();
66 66
67 
-        int result = CameraJNIInterface.getInstance().mygpcamerainit();
67 
+        int result = CameraJNIInterface.getInstance().java_mygpcamerainit();
68 68 
         if(result>=0){
69 69 
             listener.onSessionStartSuccess(sessionBean.sessionId);
70 70 
             isWorking = true;
 
@@ -106,7 +106,7 @@ public class SessionInteractor implements Callback{
106 106 
         }
107 107
108 108 
         isLastQueryReturned = false;
109 
-        String photoName = CameraJNIInterface.getInstance().mygpcamerawaitforevent(sessionWorkingDirPath);
109 
+        String photoName = CameraJNIInterface.getInstance().java_mygpcamerawaitforevent(sessionWorkingDirPath);
110 110 
         if(photoName!=null && photoName.length()>0){
111 111 
             String sub = photoName.substring(0,1);
112 112 
             if(TextUtils.isDigitsOnly(sub)){
 
@@ -122,7 +122,7 @@ public class SessionInteractor implements Callback{
122 122 
                 bean.sessionSeq = sessionBean.sessionSeq;
123 123 
                 bean.sessionDate = sessionBean.sessionDate;
124 124 
                 bean.sessionCreateTime = sessionBean.createTime;
125 
-                bean.photoPath = Constants.APP_IMAGE_DIR+File.separator+photoName;
125 
+                bean.photoPath = sessionWorkingDirPath+File.separator+photoName;
126 126 
                 listener.onSessionPhotoCaptured(bean);
127 127 
             }
128 128 
         }
 
@@ -138,7 +138,7 @@ public class SessionInteractor implements Callback{
138 138 
             photoCaptureTimer.cancel();
139 139 
             photoCaptureTimer = null;
140 140 
         }
141 
-        CameraJNIInterface.getInstance().mygpcameraexit();
141 
+        CameraJNIInterface.getInstance().java_mygpcameraexit();
142 142 
         listener.onSessionEnd(sessionBean.sessionId);
143 143 
         if(cameraInitHandler!=null){
144 144 
             cameraInitHandler.removeCallbacksAndMessages(null);

Update openid · a415dd967f - Gogs: Go Git Service
Home Explore Help
Register Sign In
Kodo
/
kodo
Watch 2
Star 0
Fork 0

Browse Source
Update openid

Kimi.Huang 7 years ago
parent
fcb693083e
commit
a415dd967f
2 changed files with 9 additions and 2 deletions
Show Diff Stats
  1. 2 2
      commands/management/commands/subscribe.py
  2. 7 0
      miniapp/views.py

+ 2 - 2
commands/management/commands/subscribe.py
View File 

@@ -57,7 +57,7 @@ class Command(CompatibilityBaseCommand):
57 57 
             with transaction.atomic():
58 58 
                 subscribe, unionid, openid = userinfo.get('subscribe', ''), userinfo.get('unionid', ''), userinfo.get('openid', '')
59 59 
                 if subscribe:
60 
-                    SubscribeUserInfo.objects.update_or_create(openid=openid, defaults={
60 
+                    SubscribeUserInfo.objects.update_or_create(extraid=brand_id, openid=openid, defaults={
61 61 
                         'unionid': unionid,
62 62 
                         'nickname': userinfo.get('nickname', ''),
63 63 
                         'sex': userinfo.get('sex', ''),
 
@@ -77,6 +77,6 @@ class Command(CompatibilityBaseCommand):
77 77 
                     })
78 78 
                     UserInfo.objects.filter(unionid=unionid).update(openid=openid)
79 79 
                 else:
80 
-                    SubscribeUserInfo.objects.filter(openid=openid).update(subscribe=subscribe)
80 
+                    SubscribeUserInfo.objects.filter(extraid=brand_id, openid=openid).update(subscribe=subscribe)
81 81
82 82 
             close_old_connections()

+ 7 - 0
miniapp/views.py
View File 

@@ -5,6 +5,7 @@ from django.db import transaction
5 5 
 from django_curtail_uuid import CurtailUUID
6 6 
 from django_logit import logit
7 7 
 from django_response import response
8 
+from django_we.models import SubscribeUserInfo
8 9 
 from ipaddr import client_ip
9 10 
 from pywe_membercard import get_miniapp_extraData
10 11 
 from pywe_miniapp import get_session_info, get_session_key, get_userinfo, store_session_key
 
@@ -141,6 +142,12 @@ def mini_login_api(request):
141 142 
     user.user_from = UserInfo.MINIAPP_USER
142 143 
     if unionid:
143 144 
         user.unionid = unionid
145 
+        try:
146 
+            subuser = SubscribeUserInfo.objects.get(brand_id=brand_id, unionid=unionid)
147 
+        except SubscribeUserInfo.DoesNotExist:
148 
+            subuser = None
149 
+        if subuser:
150 
+            user.openid = subuser.openid
144 151 
     user.user_status = UserInfo.ACTIVATED
145 152 
     user.signup_ip = client_ip(request)
146 153 
     user.signup_at = tc.utc_datetime()