Accueil Explorer Aide
Inscription Connexion
chengzhenyu
/
client
Suivre 1
Voter 0
Embranchement 0

Parcourir la Source
升级至1021

chengzhenyu 8 ans auparavant
Parent
a8e9f111f9
Commettre
76b303e45b
5 fichiers modifiés avec 93 ajouts et 101 suppressions
Afficher les stats Diff
  1. 2 2
      app/build.gradle
  2. 64 72
      app/src/main/AndroidManifest.xml
  3. 24 24
      app/src/main/java/ai/pai/client/services/GroupService.java
  4. 1 1
      build.gradle
  5. 2 2
      gradle/wrapper/gradle-wrapper.properties

+ 2 - 2
app/build.gradle
Voir le fichier 

@@ -13,8 +13,8 @@ android {
13 13 
         applicationId "ai.pai.client"
14 14 
         minSdkVersion 14
15 15 
         targetSdkVersion 22
16 
-        versionCode 1020
17 
-        versionName "1.0.20"
16 
+        versionCode 1021
17 
+        versionName "1.0.21"
18 18 
         buildConfigField "boolean","isDevMode","true"
19 19 
         manifestPlaceholders = [CHANNEL_NAME: "guanwang"]
20 20

+ 64 - 72
app/src/main/AndroidManifest.xml
Voir le fichier 

@@ -15,9 +15,9 @@
15 15 
     <uses-permission android:name="android.permission.VIBRATE" />
16 16 
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
17 17
18 
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
19 
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
20 
-    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>
18 
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
19 
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
20 
+    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
21 21
22 22 
     <uses-feature android:name="android.hardware.camera" />
23 23 
     <uses-feature android:name="android.hardware.camera.autofocus" />
 
@@ -27,34 +27,30 @@
27 27 
         android:icon="@mipmap/ic_launcher"
28 28 
         android:label="@string/app_name"
29 29 
         android:largeHeap="true"
30 
-        android:theme="@style/AppTheme.NoActionBar"
31 
-        >
30 
+        android:theme="@style/AppTheme.NoActionBar">
32 31
33 32 
         <meta-data
34 33 
             android:name="UMENG_CHANNEL"
35 
-            android:value="${CHANNEL_NAME}"/>
34 
+            android:value="${CHANNEL_NAME}" />
36 35
37 36 
         <meta-data
38 37 
             android:name="UMENG_APPKEY"
39 
-            android:value="5682490467e58e717e00290d" >
40 
-        </meta-data>
38 
+            android:value="5682490467e58e717e00290d"></meta-data>
41 39
42 40 
         <meta-data
43 41 
             android:name="com.amap.api.v2.apikey"
44 
-            android:value="aa78182204ca5666e723137321bb99b5">
45 
-        </meta-data>
42 
+            android:value="aa78182204ca5666e723137321bb99b5"></meta-data>
46 43
47 44 
         <!-- 定位需要的服务 -->
48 
-        <service android:name="com.amap.api.location.APSService"/>
45 
+        <service android:name="com.amap.api.location.APSService" />
49 46
50 
-        <service android:name=".services.MyLocationService"/>
47 
+        <service android:name=".services.MyLocationService" />
51 48
52 49 
         <activity
53 50 
             android:name=".activity.WelcomeActivity"
54 
-            android:label="@string/app_name"
55 
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
56 51 
             android:configChanges="keyboardHidden|orientation|screenSize"
57 
-            >
52 
+            android:label="@string/app_name"
53 
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
58 54 
             <intent-filter>
59 55 
                 <action android:name="android.intent.action.MAIN" />
60 56 
 
@@ -64,152 +60,149 @@
64 60
65 61 
         <activity
66 62 
             android:name=".activity.MainActivity"
67 
-            android:label="@string/app_name"
68 63 
             android:configChanges="keyboardHidden|orientation|screenSize"
69 
-            >
70 
-        </activity>
64 
+            android:label="@string/app_name"
65 
+            android:screenOrientation="portrait"></activity>
71 66
72 67 
         <activity
73 68 
             android:name=".activity.GuideActivity"
74 
-            android:label="@string/app_name"
75 69 
             android:configChanges="keyboardHidden|orientation|screenSize"
76 
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
77 
-            >
78 
-        </activity>
70 
+            android:label="@string/app_name"
71 
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></activity>
79 72
80 73 
         <activity
81 74 
             android:name=".activity.QRCaptureActivity"
82 
-            android:label="@string/app_name"
83 75 
             android:configChanges="keyboardHidden|orientation|screenSize"
84 
-            />
76 
+            android:label="@string/app_name"
77 
+            android:screenOrientation="portrait" />
85 78
86 79 
         <activity
87 80 
             android:name=".activity.AboutUsActivity"
88 
-            android:label="@string/app_name"
89 81 
             android:configChanges="keyboardHidden|orientation|screenSize"
90 
-            />
82 
+            android:label="@string/app_name"
83 
+            android:screenOrientation="portrait" />
91 84
92 85 
         <activity
93 
-        android:name=".activity.FeedbackActivity"
94 
-        android:label="@string/app_name"
95 
-        android:configChanges="keyboardHidden|orientation|screenSize"
96 
-        />
86 
+            android:name=".activity.FeedbackActivity"
87 
+            android:configChanges="keyboardHidden|orientation|screenSize"
88 
+            android:label="@string/app_name"
89 
+            android:screenOrientation="portrait" />
97 90
98 91 
         <activity
99 92 
             android:name=".activity.PhotoGalleryActivity"
100 
-            android:label="@string/app_name"
101 93 
             android:configChanges="keyboardHidden|orientation|screenSize"
102 
-            />
94 
+            android:label="@string/app_name"
95 
+            android:screenOrientation="portrait" />
103 96
104 97
105 98 
         <activity
106 99 
             android:name=".activity.GroupDeleteMemberActivity"
107 
-            android:label="@string/app_name"
108 100 
             android:configChanges="keyboardHidden|orientation|screenSize"
109 
-            />
101 
+            android:label="@string/app_name"
102 
+            android:screenOrientation="portrait" />
110 103
111 104 
         <activity
112 105 
             android:name=".activity.GroupRenameActivity"
113 
-            android:label="@string/app_name"
114 106 
             android:configChanges="keyboardHidden|orientation|screenSize"
115 
-            />
107 
+            android:label="@string/app_name"
108 
+            android:screenOrientation="portrait" />
116 109
117 110 
         <activity
118 111 
             android:name=".activity.GroupSettingActivity"
119 
-            android:label="@string/app_name"
120 112 
             android:configChanges="keyboardHidden|orientation|screenSize"
121 
-            />
113 
+            android:label="@string/app_name"
114 
+            android:screenOrientation="portrait" />
122 115
123 116 
         <activity
124 117 
             android:name=".activity.MessageActivity"
125 
-            android:label="@string/app_name"
126 118 
             android:configChanges="keyboardHidden|orientation|screenSize"
127 
-            />
119 
+            android:label="@string/app_name"
120 
+            android:screenOrientation="portrait" />
128 121
129 122 
         <activity
130 123 
             android:name=".activity.SystemMessageActivity"
131 
-            android:label="@string/app_name"
132 124 
             android:configChanges="keyboardHidden|orientation|screenSize"
133 
-            />
125 
+            android:label="@string/app_name"
126 
+            android:screenOrientation="portrait" />
134 127
135 128 
         <activity
136 129 
             android:name=".activity.OrderListActivity"
137 
-            android:label="@string/app_name"
138 130 
             android:configChanges="keyboardHidden|orientation|screenSize"
139 
-            />
131 
+            android:label="@string/app_name"
132 
+            android:screenOrientation="portrait" />
140 133
141 134 
         <activity
142 135 
             android:name=".activity.PhotoDetailsActivity"
143 
-            android:label="@string/app_name"
144 136 
             android:configChanges="keyboardHidden|orientation|screenSize"
145 
-            />
137 
+            android:label="@string/app_name"
138 
+            android:screenOrientation="portrait" />
146 139
147 140 
         <activity
148 141 
             android:name=".activity.PhotoUploadActivity"
149 
-            android:label="@string/app_name"
150 142 
             android:configChanges="keyboardHidden|orientation|screenSize"
151 
-            />
143 
+            android:label="@string/app_name"
144 
+            android:screenOrientation="portrait" />
152 145
153 146 
         <activity
154 147 
             android:name=".activity.PhotoFullScreenActivity"
155 
-            android:label="@string/app_name"
156 
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
157 148 
             android:configChanges="keyboardHidden|orientation|screenSize"
158 
-            />
149 
+            android:label="@string/app_name"
150 
+            android:screenOrientation="portrait"
151 
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
159 152
160 153 
         <activity
161 154 
             android:name=".activity.SettingsActivity"
162 
-            android:label="@string/app_name"
163 155 
             android:configChanges="keyboardHidden|orientation|screenSize"
164 
-            />
156 
+            android:label="@string/app_name"
157 
+            android:screenOrientation="portrait" />
165 158
166 159 
         <activity
167 160 
             android:name=".activity.WebViewActivity"
168 
-            android:label="@string/app_name"
169 161 
             android:configChanges="keyboardHidden|orientation|screenSize"
170 
-            />
162 
+            android:label="@string/app_name" />
171 163
172 164 
         <activity
173 165 
             android:name=".activity.GroupListActivity"
174 
-            android:label="@string/app_name"
175 166 
             android:configChanges="keyboardHidden|orientation|screenSize"
176 
-            />
167 
+            android:label="@string/app_name"
168 
+            android:screenOrientation="portrait" />
177 169
178 170 
         <activity
179 171 
             android:name=".activity.PaidPhotoActivity"
180 
-            android:label="@string/app_name"
181 
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
182 172 
             android:configChanges="keyboardHidden|orientation|screenSize"
183 
-            />
173 
+            android:label="@string/app_name"
174 
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
184 175
185 176 
         <activity
186 177 
             android:name=".activity.GroupActivity"
187 
-            android:label="@string/app_name"
188 178 
             android:configChanges="keyboardHidden|orientation|screenSize"
189 
-            />
179 
+            android:label="@string/app_name"
180 
+            android:screenOrientation="portrait" />
190 181
191 182 
         <activity
192 183 
             android:name=".wxapi.WXEntryActivity"
193 
-            android:theme="@android:style/Theme.Translucent.NoTitleBar"
194 184 
             android:configChanges="keyboardHidden|orientation|screenSize"
195 185 
             android:exported="true"
196 
-            android:screenOrientation="portrait" />
186 
+            android:screenOrientation="portrait"
187 
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
197 188
198 189 
         <activity
199 190 
             android:name=".wxapi.WXPayEntryActivity"
200 
-            android:theme="@android:style/Theme.Translucent.NoTitleBar"
201 191 
             android:configChanges="keyboardHidden|orientation|screenSize"
202 192 
             android:exported="true"
203 
-            android:screenOrientation="portrait" />
193 
+            android:screenOrientation="portrait"
194 
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
204 195
205 196 
         <activity
206 197 
             android:name="com.tencent.tauth.AuthActivity"
207 
-            android:noHistory="true"
208 
-            android:launchMode="singleTask">
198 
+            android:launchMode="singleTask"
199 
+            android:noHistory="true">
209 200 
             <intent-filter>
210 201 
                 <action android:name="android.intent.action.VIEW" />
202 
+
211 203 
                 <category android:name="android.intent.category.DEFAULT" />
212 204 
                 <category android:name="android.intent.category.BROWSABLE" />
205 
+
213 206 
                 <data android:scheme="tencent1105111674" />
214 207 
             </intent-filter>
215 208 
         </activity>
 
@@ -217,7 +210,7 @@
217 210 
         <activity
218 211 
             android:name=".activity.WBShareActivity"
219 212 
             android:configChanges="keyboardHidden|orientation"
220 
-            android:screenOrientation="portrait" >
213 
+            android:screenOrientation="portrait">
221 214 
             <intent-filter>
222 215 
                 <action android:name="com.sina.weibo.sdk.action.ACTION_SDK_REQ_ACTIVITY" />
223 216 
                 <category android:name="android.intent.category.DEFAULT" />
 
@@ -226,9 +219,8 @@
226 219 
         <activity
227 220 
             android:name="com.sina.weibo.sdk.component.WeiboSdkBrowser"
228 221 
             android:configChanges="keyboardHidden|orientation"
229 
-            android:windowSoftInputMode="adjustResize"
230 
-            android:exported="false" >
231 
-        </activity>
222 
+            android:exported="false"
223 
+            android:windowSoftInputMode="adjustResize"></activity>
232 224
233 225 
         <activity
234 226 
             android:name="com.tencent.connect.common.AssistActivity"

+ 24 - 24
app/src/main/java/ai/pai/client/services/GroupService.java
Voir le fichier 

@@ -269,30 +269,30 @@ public class GroupService extends Service implements UploadTask.OnPhotoUploadLis
269 269 
                         groupInfo.groupName = group.getString("group_name");
270 270 
                         groupInfo.createTime = group.getString("created_at");
271 271 
                         groupInfo.groupFrom = group.getInt("group_from");
272 
-                        if(data.has("photos")){
273 
-                            JSONArray sessionArray = data.getJSONArray("photos");
274 
-                            if(sessionArray!=null && sessionArray.length()>0) {
275 
-                                photoList = new ArrayList<>();
276 
-                                for(int k = 0; k<sessionArray.length();k++){
277 
-                                    JSONObject sessionObj = sessionArray.getJSONObject(k);
278 
-                                    String sessionId = sessionObj.getString("session_id");
279 
-                                    JSONArray photoArray = sessionObj.getJSONArray("photos");
280 
-                                    if(photoArray!=null && photoArray.length()>0){
281 
-                                        for(int m = 0; m<photoArray.length();m++){
282 
-                                            JSONObject photoObj = photoArray.getJSONObject(m);
283 
-                                            GroupPhotoItem groupPhotoItem = GroupPhotoItem.parseFromJSON(photoObj);
284 
-                                            groupPhotoItem.sessionId = sessionId;
285 
-                                            photoList.add(groupPhotoItem);
286 
-                                        }
287 
-                                    }
288 
-                                }
289 
-                                LogHelper.d(TAG,"group service doJoinGroupTask  get new photos ,count="+photoList.size());
290 
-                                DBService.getInstance(context).addGroupPhotoList(photoList);
291 
-                            }
292 
-
293 
-                            int currentId = data.getInt("current_id");
294 
-                            DBService.getInstance(context).updateCurrentIdByGroupId(groupInfo.groupId,String.valueOf(currentId));
295 
-                        }
272 
+//                        if(data.has("photos")){
273 
+//                            JSONArray sessionArray = data.getJSONArray("photos");
274 
+//                            if(sessionArray!=null && sessionArray.length()>0) {
275 
+//                                photoList = new ArrayList<>();
276 
+//                                for(int k = 0; k<sessionArray.length();k++){
277 
+//                                    JSONObject sessionObj = sessionArray.getJSONObject(k);
278 
+//                                    String sessionId = sessionObj.getString("session_id");
279 
+//                                    JSONArray photoArray = sessionObj.getJSONArray("photos");
280 
+//                                    if(photoArray!=null && photoArray.length()>0){
281 
+//                                        for(int m = 0; m<photoArray.length();m++){
282 
+//                                            JSONObject photoObj = photoArray.getJSONObject(m);
283 
+//                                            GroupPhotoItem groupPhotoItem = GroupPhotoItem.parseFromJSON(photoObj);
284 
+//                                            groupPhotoItem.sessionId = sessionId;
285 
+//                                            photoList.add(groupPhotoItem);
286 
+//                                        }
287 
+//                                    }
288 
+//                                }
289 
+//                                LogHelper.d(TAG,"group service doJoinGroupTask  get new photos ,count="+photoList.size());
290 
+//                                DBService.getInstance(context).addGroupPhotoList(photoList);
291 
+//                            }
292 
+//
293 
+//                            int currentId = data.getInt("current_id");
294 
+//                            DBService.getInstance(context).updateCurrentIdByGroupId(groupInfo.groupId,String.valueOf(currentId));
295 
+//                        }
296 296 
                         return  true;
297 297 
                     }
298 298 
                 }catch (Exception e){

+ 1 - 1
build.gradle
Voir le fichier 

@@ -4,7 +4,7 @@ buildscript {
4 4 
         jcenter()
5 5 
     }
6 6 
     dependencies {
7 
-        classpath 'com.android.tools.build:gradle:2.2.2'
7 
+        classpath 'com.android.tools.build:gradle:2.2.3'
8 8
9 9 
         // NOTE: Do not place your application dependencies here; they belong
10 10 
         // in the individual module build.gradle files

+ 2 - 2
gradle/wrapper/gradle-wrapper.properties
Voir le fichier 

@@ -1,6 +1,6 @@
1 
-#Mon Dec 28 10:00:20 PST 2015
1 
+#Thu Feb 09 21:51:20 CST 2017
2 2 
 distributionBase=GRADLE_USER_HOME
3 3 
 distributionPath=wrapper/dists
4 4 
 zipStoreBase=GRADLE_USER_HOME
5 5 
 zipStorePath=wrapper/dists
6 
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
6 
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip