l-9 ol-9"> 143 143
         SessionBean sessionBean = sessionList.get(position);
144 144
         ArrayList<PhotoBean> photoList = sessionBean.sessionPhotos;
145 145
         if(photoList==null || photoList.size()==0){

BIN
app/src/main/res/drawable-xhdpi/progress_bg.png


BIN
app/src/main/res/drawable-xhdpi/progress_drawable.png


BIN
app/src/main/res/drawable-xhdpi/progress_fail_drawable.png


+ 26 - 0
app/src/main/res/drawable/progress_upload_bg.xml

@@ -0,0 +1,26 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3
+    <item android:id="@android:id/background">
4
+        <shape>
5
+            <corners android:radius="1px" />
6
+            <solid android:color="@color/dark_grey" />
7
+        </shape>
8
+    </item>
9
+    <item android:id="@android:id/secondaryProgress">
10
+        <clip>
11
+            <shape>
12
+                <corners android:radius="1px" />
13
+                <solid android:color="@color/light_blue" />
14
+            </shape>
15
+        </clip>
16
+    </item>
17
+    <item android:id="@android:id/progress">
18
+        <clip>
19
+            <shape>
20
+                <corners android:radius="1px" />
21
+                <solid android:color="@color/light_blue" />
22
+            </shape>
23
+        </clip>
24
+    </item>
25
+
26
+</layer-list>

+ 26 - 0
app/src/main/res/drawable/progress_upload_fail_bg.xml

@@ -0,0 +1,26 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
3
+    <item android:id="@android:id/background">
4
+        <shape>
5
+            <corners android:radius="1px" />
6
+            <solid android:color="@color/dark_grey" />
7
+        </shape>
8
+    </item>
9
+    <item android:id="@android:id/secondaryProgress">
10
+        <clip>
11
+            <shape>
12
+                <corners android:radius="1px" />
13
+                <solid android:color="@color/red" />
14
+            </shape>
15
+        </clip>
16
+    </item>
17
+    <item android:id="@android:id/progress">
18
+        <clip>
19
+            <shape>
20
+                <corners android:radius="1px" />
21
+                <solid android:color="@color/red" />
22
+            </shape>
23
+        </clip>
24
+    </item>
25
+
26
+</layer-list>

+ 1 - 0
app/src/main/res/layout/activity_upload.xml

@@ -47,6 +47,7 @@
47 47
         android:id="@+id/recycler_view_sessions"
48 48
         android:layout_width="match_parent"
49 49
         android:layout_height="match_parent"
50
+        android:layout_marginBottom="50dp"
50 51
         android:layout_below="@id/title_layout"/>
51 52
 
52 53
 

+ 1 - 2
app/src/main/res/layout/session_item.xml

@@ -39,9 +39,8 @@
39 39
             android:id="@+id/pb_session_upload"
40 40
             android:layout_width="match_parent"
41 41
             android:layout_height="4dp"
42
-            android:progressDrawable="@drawable/progress_drawable"
42
+            android:progressDrawable="@drawable/progress_upload_bg"
43 43
             style="?android:attr/progressBarStyleHorizontal"
44
-            android:background="@drawable/progress_bg"
45 44
             android:layout_marginLeft="10dp"
46 45
             android:layout_marginRight="10dp"
47 46
             android:layout_marginBottom="8dp"

+ 2 - 0
app/src/main/res/values/colors.xml

@@ -4,10 +4,12 @@
4 4
     <color name="colorPrimaryDark">#2E78E5</color>
5 5
     <color name="colorAccent">#0BBE06</color>
6 6
 
7
+    <color name="light_blue">#1E90FF</color>
7 8
     <color name="white">#ffffffff</color>
8 9
     <color name="transparent">#00000000</color>
9 10
     <color name="black">#000000</color>
10 11
     <color name="grey">#999999</color>
12
+    <color name="red">#FF0000</color>
11 13
     <color name="text_white">#FFFFFF</color>
12 14
     <color name="background_white">#FFFFFF</color>
13 15
     <color name="background_light_grey_color">#F0F0F0</color>

kodo - Gogs: Go Git Service

暂无描述

admin_utils.py 793B

    # -*- coding: utf-8 -*- from TimeConvert import TimeConvert as tc from group.models import GroupInfo, GroupUserInfo def is_group_admin(group_id, admin_id): return GroupUserInfo.objects.filter(group_id=group_id, user_id=admin_id, admin=True, admin_status=True, status=True).exists() def is_group_subadmin(group_id, admin_id): return GroupUserInfo.objects.filter(group_id=group_id, user_id=admin_id, subadmin=True, admin_status=True, status=True).exists() def have_active_group(user_id): groups = GroupUserInfo.objects.filter(user_id=user_id, subadmin=True, admin_status=True, status=True) groupids = [group.group_id for group in groups] return GroupInfo.objects.filter(group_id__in=groupids, group_closed=False, status=True, ended_at__gt=tc.utc_datetime()).exists()