bean.isRead = systemMsgObj.getBoolean("read"); 66 
+                                bean.url = JSONParseUtils.getJSONString(systemMsgObj.getString("url"));
67 
+                                bean.msgId =JSONParseUtils.getJSONString(systemMsgObj.getString("pk"));
68 
+                                bean.title = JSONParseUtils.getJSONString(systemMsgObj.getString("title"));
69 
+                                systemMsgList.add(bean);
70 
+                            }
71 
+                            bean.systemMsgList = systemMsgList;
72 
+                        }
73 
+                        JSONArray msgArray = msgObj.getJSONArray("orders");
74 
+                        if(msgArray!=null && msgArray.length()>0){
75 
+                            ArrayList<MessageBean> msgList = new ArrayList<>();
76 
+                            for(int count = 0; count<msgArray.length();count++){
77 
+                                JSONObject childMsg = msgArray.getJSONObject(count);
78 
+                                MessageBean childBean = new MessageBean();
79 
+                                childBean.createTime = JSONParseUtils.getJSONString(childMsg.getString("created_at"));
80 
+                                childBean.isRead = childMsg.getBoolean("read");
81 
+                                childBean.msgId = childMsg.getString("pk");
82 
+                                childBean.senderName = JSONParseUtils.getJSONString(childMsg.getString("from_nickname"));
83 
+                                childBean.senderAvatarUrl = JSONParseUtils.getJSONString(childMsg.getString("from_avatar"));
84 
+                                childBean.content = JSONParseUtils.getJSONString(childMsg.getString("msg_content"));
85 
+                                JSONObject photoObj = childMsg.getJSONObject("group_photo_info");
86 
+                                childBean.photoItem = GroupPhotoItem.parseFromJSON(photoObj);
87 
+                                msgList.add(childBean);
88 
+                            }
89 
+                            bean.msgList = msgList;
90 
+                        }
46 91 
                         return true;
47 92 
                     }else{
48 93 
                         message = json.getString("message");
@@ -65,7 +110,7 @@ public class BriefsInteractor implements BaseInteractor {
65 110 
                 listener.onInteractSuccess(bean);
66 111 
             }
67 112 
         };
68 
-        fetchInfoTask.executeOnExecutor(ThreadExecutor.getInstance().getExecutor(), UrlContainer.SESSION_IDS_CREATE);
113 
+        fetchInfoTask.executeOnExecutor(ThreadExecutor.getInstance().getExecutor(), UrlContainer.BRIEFS_URL);
69 114 
     }
70 115
71 116 
     @Override

+ 2 - 0
app/src/main/java/ai/pai/lensman/utils/UrlContainer.java
查看文件 

@@ -35,6 +35,8 @@ public class UrlContainer {
35 35 
      */
36 36 
     public static final String WX_LOGIN_URL = HOST_URL+"l/wx/authorize";
37 37
38 
+    public static final String BRIEFS_URL = HOST_URL+"l/brief";
39 
+
38 40
39 41
40 42 
 }

+ 14 - 1
app/src/main/res/layout/activity_settings.xml
查看文件 

@@ -34,7 +34,6 @@
34 34 
             android:gravity="center"
35 35 
             android:paddingLeft="10dp"
36 36 
             android:paddingRight="10dp"
37 
-            android:singleLine="true"
38 37 
             android:text="@string/settings"
39 38 
             android:textColor="@color/text_white"
40 39 
             android:textSize="@dimen/action_bar_title_medium_text_size" />
 
@@ -59,5 +58,19 @@
59 58
60 59 
     </LinearLayout>
61 60
61 
+    <ScrollView
62 
+        android:layout_below="@id/title_bar_with_back_btn"
63 
+        android:layout_width="match_parent"
64 
+        android:layout_height="match_parent">
65 
+
66 
+        <LinearLayout
67 
+            android:layout_width="match_parent"
68 
+            android:layout_height="wrap_content"
69 
+            android:orientation="vertical">
70 
+
71 
+
72 
+        </LinearLayout>
73 
+    </ScrollView>
74 
+
62 75
63 76 
 </RelativeLayout>

kodo - Gogs: Go Git Service
首页 探索 帮助
注册 登录
Kodo
/
kodo
关注 2
点赞 0
派生 0
工单管理 0 合并请求 0 提交历史 1193 版本发布 0

暂无描述

ZIP TAR.GZ

0025_auto_20161214_1659.py 2.2KB
文件历史 原始文件 

    # -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.db import models, migrations


class Migration(migrations.Migration):

    dependencies = [
        ('group', '0024_auto_20161214_1329'),
    ]

    operations = [
        migrations.AddField(
            model_name='groupinfo',
            name='name',
            field=models.CharField(help_text='\u5bfc\u6e38\u59d3\u540d', max_length=255, null=True, verbose_name='name', blank=True),
        ),
        migrations.AddField(
            model_name='groupinfo',
            name='phone',
            field=models.CharField(help_text='\u5bfc\u6e38\u7535\u8bdd', max_length=255, null=True, verbose_name='phone', blank=True),
        ),
        migrations.AlterField(
            model_name='groupinfo',
            name='ended_at',
            field=models.DateTimeField(help_text='\u65c5\u6e38\u56e2\u7ed3\u675f\u65f6\u95f4', null=True, verbose_name='ended_at', blank=True),
        ),
        migrations.AlterField(
            model_name='groupinfo',
            name='gather_at',
            field=models.DateTimeField(help_text='\u65c5\u6e38\u56e2\u96c6\u5408\u65f6\u95f4', null=True, verbose_name='gather_at', blank=True),
        ),
        migrations.AlterField(
            model_name='groupinfo',
            name='gather_lat',
            field=models.FloatField(help_text='\u65c5\u6e38\u56e2\u96c6\u5408\u7eac\u5ea6', null=True, verbose_name='gather_lat', blank=True),
        ),
        migrations.AlterField(
            model_name='groupinfo',
            name='gather_lon',
            field=models.FloatField(help_text='\u65c5\u6e38\u56e2\u96c6\u5408\u7ecf\u5ea6', null=True, verbose_name='gather_lon', blank=True),
        ),
        migrations.AlterField(
            model_name='groupinfo',
            name='group_closed',
            field=models.BooleanField(default=False, help_text='\u65c5\u6e38\u56e2\u5173\u95ed', verbose_name='group_closed'),
        ),
        migrations.AlterField(
            model_name='groupinfo',
            name='started_at',
            field=models.DateTimeField(help_text='\u65c5\u6e38\u56e2\u5f00\u59cb\u65f6\u95f4', null=True, verbose_name='started_at', blank=True),
        ),
    ]