- 去掉EPG本地存储权限相关

app/src/main/java/com/github/tvbox/osc/event/RefreshEvent.java

@@ -15,8 +15,8 @@ public class RefreshEvent {
     public static final int TYPE_SEARCH_RESULT = 6;
     public static final int TYPE_QUICK_SEARCH_RESULT = 7;
     public static final int TYPE_API_URL_CHANGE = 8;
-    public static final int TYPE_EPG_URL_CHANGE = 8;
     public static final int TYPE_PUSH_URL = 9;
+    public static final int TYPE_EPG_URL_CHANGE = 10;
     public int type;
     public Object obj;
 

app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java

@@ -6,7 +6,6 @@ import android.animation.AnimatorSet;
 import android.animation.IntEvaluator;
 import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
@@ -51,9 +50,6 @@ import com.github.tvbox.osc.util.DefaultConfig;
 import com.github.tvbox.osc.util.HawkConfig;
 import com.github.tvbox.osc.util.LOG;
 import com.github.tvbox.osc.viewmodel.SourceViewModel;
-import com.hjq.permissions.OnPermissionCallback;
-import com.hjq.permissions.Permission;
-import com.hjq.permissions.XXPermissions;
 import com.orhanobut.hawk.Hawk;
 import com.owen.tvrecyclerview.widget.TvRecyclerView;
 import com.owen.tvrecyclerview.widget.V7LinearLayoutManager;
@@ -120,30 +116,6 @@ public class HomeActivity extends BaseActivity {
             Bundle bundle = intent.getExtras();
             useCacheConfig = bundle.getBoolean("useCache", false);
         }
-        if (XXPermissions.isGranted(HomeActivity.this, Permission.Group.STORAGE)) {
-//            Toast.makeText(HomeActivity.this, "已获得存储权限", Toast.LENGTH_SHORT).show();
-        } else {
-            XXPermissions.with(HomeActivity.this)
-                    .permission(Permission.Group.STORAGE)
-                    .request(new OnPermissionCallback() {
-                        @Override
-                        public void onGranted(List<String> permissions, boolean all) {
-                            if (all) {
-                                //  Toast.makeText(HomeActivity.this, "已获得存储权限", Toast.LENGTH_SHORT).show();
-                            }
-                        }
-
-                        @Override
-                        public void onDenied(List<String> permissions, boolean never) {
-                            if (never) {
-                                Toast.makeText(HomeActivity.this, "获取存储权限失败,请在系统设置中开启", Toast.LENGTH_SHORT).show();
-                                XXPermissions.startPermissionActivity((Activity) HomeActivity.this, permissions);
-                            } else {
-                                Toast.makeText(HomeActivity.this, "获取存储权限失败", Toast.LENGTH_SHORT).show();
-                            }
-                        }
-                    });
-        }
         initData();
     }
 

app/src/main/java/com/github/tvbox/osc/util/EpgNameFuzzyMatch.java

@@ -1,38 +1,22 @@
 package com.github.tvbox.osc.util;
 
-import android.app.Activity;
 import android.content.res.AssetManager;
-import android.os.Environment;
-import android.widget.Toast;
-
 import com.github.tvbox.osc.base.App;
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.hjq.permissions.OnPermissionCallback;
-import com.hjq.permissions.Permission;
-import com.hjq.permissions.XXPermissions;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.callback.AbsCallback;
 import com.lzy.okgo.model.Response;
 import com.lzy.okgo.request.GetRequest;
 
-import org.json.JSONArray;
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.BufferedReader;
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.lang.reflect.Type;
 import java.util.Hashtable;
-import java.util.List;
-
-import kotlin.reflect.KType;
 
 public class EpgNameFuzzyMatch {
 
@@ -43,26 +27,6 @@ public class EpgNameFuzzyMatch {
         if(epgNameDoc != null)
             return;
 
-        String root = Environment.getExternalStorageDirectory().getAbsolutePath();
-        try { //  读取本地tvbox_tv文件夹  Roinlong_Epg.json 文件中的内容
-            File file = new File(root + "/tvbox_tv/");
-            if (!file.exists()){
-                file.mkdirs();
-            }else{
-                String epgnameFile = root + "/tvbox_tv/Roinlong_Epg.json";
-                    String content = FileUtils.readFileToString(epgnameFile,"UTF-8");
-                    if(!content.isEmpty()){
-                        JsonObject  jsonObj =  new Gson().fromJson(content,  JsonObject.class);
-                        epgNameDoc =jsonObj;
-                        hasAddData(epgNameDoc);
-                        return;
-                    }
-            }
-        } catch (Exception e) {
-
-            e.printStackTrace();
-        }
-
         try {
             AssetManager assetManager = App.getInstance().getAssets(); //获得assets资源管理器（assets中的文件无法直接访问，可以使用AssetManager访问）
             InputStreamReader inputStreamReader = new InputStreamReader(assetManager.open("Roinlong_Epg.json"),"UTF-8"); //使用IO流读取json文件内容