合并后代码调整

朱显松
1 parent fdceb690
Showing 6 changed files with 5 additions and 24 deletions
.idea/modules.xml
app/build.gradle
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/gundam/main/application/CNLiveApplication.java
app/src/main/java/com/cnlive/gundam/user/util/FileUtils.java
app/src/main/java/com/cnlive/gundam/user/util/ToastUtil.java
@@ -3,7 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/CNLiveApp.iml" filepath="$PROJECT_DIR$/CNLiveApp.iml" />
-      <module fileurl="file://$PROJECT_DIR$/CNLiveApp5.iml" filepath="$PROJECT_DIR$/CNLiveApp5.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
@@ -30,10 +30,4 @@ dependencies {
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     compile 'com.github.bumptech.glide:glide:3.7.0'
     compile 'org.greenrobot:eventbus:3.0.0'
-    compile files('libs/libcnliveuser.jar')
-    //Smack
-    compile 'org.igniterealtime.smack:smack-android-extensions:4.1.4'
-    compile 'org.igniterealtime.smack:smack-tcp:4.1.4'
-    compile 'org.greenrobot:greendao-encryption:2.2.2'
-    compile 'com.gyf.barlibrary:barlibrary:2.2.4'
 }
@@ -26,21 +26,10 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.INTERNET" />
-
     <!-- account start -->
-    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission
         android:name="android.permission.ACCOUNT_MANAGER"
         tools:ignore="ProtectedPermissions" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <application
         android:name=".main.application.CNLiveApplication"
@@ -13,6 +13,6 @@ public class CNLiveApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-        Config.init(getApplicationContext(), "60_j4fc7dsm83", "4c8658abc5d66f270f9bf5dcd1ef11e3597fab4c4e0af9");
+        Config.init(getApplicationContext(), "60_j4fc7dsm83", "4c8658abc5d66f270f9bf5dcd1ef11e3597fab4c4e0af9",true);
     }
 }
@@ -10,7 +10,6 @@ import android.text.format.Formatter;
 import com.cnlive.libs.util.SharedPreferencesHelper;
-import org.jivesoftware.smack.util.StringUtils;
 import java.io.File;
 import java.io.IOException;
@@ -186,7 +185,7 @@ public class FileUtils {
     }
     public static String getUrlFileExtensionName(String url) {
-        if(StringUtils.isEmpty(url)) return "";
+        if(TextUtils.isEmpty(url)) return "";
         int slashIndex = url.lastIndexOf('/');
         String filenameWithoutExtension;
         filenameWithoutExtension = url.substring(slashIndex + 1);
@@ -206,7 +205,7 @@ public class FileUtils {
     }
     public static String getUrlExtension(String url) {
-        if (!StringUtils.isEmpty(url)) {
+        if (!TextUtils.isEmpty(url)) {
             int i = url.lastIndexOf('.');
             if (i > 0 && i < url.length() - 1) {
                 return url.substring(i + 1).toLowerCase(Locale.getDefault());
 package com.cnlive.gundam.user.util;
 import android.content.Context;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
@@ -9,7 +10,6 @@ import android.widget.Toast;
 import com.cnlive.gundam.R;
-import org.jivesoftware.smack.util.StringUtils;
 /**
@@ -32,7 +32,7 @@ public class ToastUtil {
 //        if (!ShockwaveApplication.appOnline)
 //            return;
         hide();
-        if (null == context || StringUtils.isEmpty(msg))
+        if (null == context || TextUtils.isEmpty(msg))
             return null;
         if (back_pressed + 2000 < System.currentTimeMillis() || !show_msg.equals(msg)) {
             hideToast();