CNLive Android Team / CNLiveApp · Commits

Commit f21829c80b9199136451226d72afb54dd924d085

Authored by 朱显松
1 parent fdceb690

合并后代码调整

Inline Side-by-side
Showing 6 changed files with 5 additions and 24 deletions
.idea/modules.xml
  View file @f21829c
... ... @@ -3,7 +3,6 @@
3 3 <component name="ProjectModuleManager">
4 4 <modules>
5 5 <module fileurl="file://$PROJECT_DIR$/CNLiveApp.iml" filepath="$PROJECT_DIR$/CNLiveApp.iml" />
6   - <module fileurl="file://$PROJECT_DIR$/CNLiveApp5.iml" filepath="$PROJECT_DIR$/CNLiveApp5.iml" />
7 6 <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
8 7 </modules>
9 8 </component>
... ...
app/build.gradle
  View file @f21829c
... ... @@ -30,10 +30,4 @@ dependencies {
30 30 compile 'com.android.support.constraint:constraint-layout:1.0.2'
31 31 compile 'com.github.bumptech.glide:glide:3.7.0'
32 32 compile 'org.greenrobot:eventbus:3.0.0'
33   - compile files('libs/libcnliveuser.jar')
34   - //Smack
35   - compile 'org.igniterealtime.smack:smack-android-extensions:4.1.4'
36   - compile 'org.igniterealtime.smack:smack-tcp:4.1.4'
37   - compile 'org.greenrobot:greendao-encryption:2.2.2'
38   - compile 'com.gyf.barlibrary:barlibrary:2.2.4'
39 33 }
... ...
app/src/main/AndroidManifest.xml
  View file @f21829c
... ... @@ -26,21 +26,10 @@
26 26 <uses-permission android:name="android.permission.READ_PHONE_STATE" />
27 27 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
28 28  
29   - <uses-permission android:name="android.permission.INTERNET" />
30   -
31 29 <!-- account start -->
32   - <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
33   - <uses-permission android:name="android.permission.GET_ACCOUNTS" />
34   - <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
35   - <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
36   - <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
37 30 <uses-permission
38 31 android:name="android.permission.ACCOUNT_MANAGER"
39 32 tools:ignore="ProtectedPermissions" />
40   - <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
41   - <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
42   - <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
43   - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
44 33  
45 34 <application
46 35 android:name=".main.application.CNLiveApplication"
... ...
app/src/main/java/com/cnlive/gundam/main/application/CNLiveApplication.java
  View file @f21829c
... ... @@ -13,6 +13,6 @@ public class CNLiveApplication extends Application {
13 13 @Override
14 14 public void onCreate() {
15 15 super.onCreate();
16   - Config.init(getApplicationContext(), "60_j4fc7dsm83", "4c8658abc5d66f270f9bf5dcd1ef11e3597fab4c4e0af9");
  16 + Config.init(getApplicationContext(), "60_j4fc7dsm83", "4c8658abc5d66f270f9bf5dcd1ef11e3597fab4c4e0af9",true);
17 17 }
18 18 }
... ...
app/src/main/java/com/cnlive/gundam/user/util/FileUtils.java
  View file @f21829c
... ... @@ -10,7 +10,6 @@ import android.text.format.Formatter;
10 10  
11 11 import com.cnlive.libs.util.SharedPreferencesHelper;
12 12  
13   -import org.jivesoftware.smack.util.StringUtils;
14 13  
15 14 import java.io.File;
16 15 import java.io.IOException;
... ... @@ -186,7 +185,7 @@ public class FileUtils {
186 185 }
187 186  
188 187 public static String getUrlFileExtensionName(String url) {
189   - if(StringUtils.isEmpty(url)) return "";
  188 + if(TextUtils.isEmpty(url)) return "";
190 189 int slashIndex = url.lastIndexOf('/');
191 190 String filenameWithoutExtension;
192 191 filenameWithoutExtension = url.substring(slashIndex + 1);
... ... @@ -206,7 +205,7 @@ public class FileUtils {
206 205 }
207 206  
208 207 public static String getUrlExtension(String url) {
209   - if (!StringUtils.isEmpty(url)) {
  208 + if (!TextUtils.isEmpty(url)) {
210 209 int i = url.lastIndexOf('.');
211 210 if (i > 0 && i < url.length() - 1) {
212 211 return url.substring(i + 1).toLowerCase(Locale.getDefault());
... ...
app/src/main/java/com/cnlive/gundam/user/util/ToastUtil.java
  View file @f21829c
1 1 package com.cnlive.gundam.user.util;
2 2  
3 3 import android.content.Context;
  4 +import android.text.TextUtils;
4 5 import android.view.LayoutInflater;
5 6 import android.view.View;
6 7 import android.widget.ImageView;
... ... @@ -9,7 +10,6 @@ import android.widget.Toast;
9 10  
10 11 import com.cnlive.gundam.R;
11 12  
12   -import org.jivesoftware.smack.util.StringUtils;
13 13  
14 14  
15 15 /**
... ... @@ -32,7 +32,7 @@ public class ToastUtil {
32 32 // if (!ShockwaveApplication.appOnline)
33 33 // return;
34 34 hide();
35   - if (null == context || StringUtils.isEmpty(msg))
  35 + if (null == context || TextUtils.isEmpty(msg))
36 36 return null;
37 37 if (back_pressed + 2000 < System.currentTimeMillis() || !show_msg.equals(msg)) {
38 38 hideToast();
... ...