yutou/magic_box_2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2.3

Browse Source 
更新TBS服务sdk
更新广点通sdk
更新友盟sdk
更新glide框架
修复mod页面低栏在全面屏异常显示问题
修复Android10闪退问题
允许在没有权限的情况下使用盒子
将jianRMG文件夹移至私有目录中
This commit is contained in:
Yutousama
2019-11-18 16:01:01 +08:00
parent d20e3b04ae
commit 73274d6b8d
89 changed files with 558 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
harmony/src/androidTest/java/com/jianrmod/plugins/harmony/ExampleInstrumentedTest.java
View File

@@ -1,8 +1,8 @@
package com.jianrmod.plugins.harmony;
import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;

26
harmony/src/main/java/com/jianrmod/plugins/harmony/Activitys/MainActivity.java
View File

@@ -15,8 +15,11 @@ import android.widget.CompoundButton;
import android.widget.LinearLayout;
import android.widget.Switch;
import android.widget.TextView;
import android.widget.Toast;
import com.jianrmod.plugins.harmony.Tools.ClientUttls;
import com.jianrmod.plugins.harmony.Tools.HttpInterface;
import com.jianrmod.plugins.harmony.Tools.HttpTools;
import com.jianrmod.plugins.harmony.Tools.Utils;
import com.jianrmod.plugins.harmony.Tools.ZipUtils;
import com.kaopiz.kprogresshud.KProgressHUD;
@@ -32,6 +35,7 @@ public class MainActivity implements BaseActivityInterface {
private Context context;
private KProgressHUD hud;
private String httpData;
public MainActivity() {
}
@@ -101,7 +105,7 @@ public class MainActivity implements BaseActivityInterface {
Button button3=new Button(context);
final Switch siwtch = new Switch(context);
siwtch.setText("共存版");
text1.setText("更新说明：" +
text1.setText("更新说明(v3)：" +
"\n1、已支持覆盖版" +
"\n2、已安装压缩包时下次点击不再解压(如需覆盖解压请删除后缀.unzip)" +
"\n使用说明：请将proj.manifest、Cocos2dxPrefsFile.xml和压缩包放到jianRMG/harmony/文件夹中" +
@@ -154,6 +158,11 @@ public class MainActivity implements BaseActivityInterface {
button2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if(httpData==null){
Toast.makeText(context,"网络请求失败，1秒钟后再试试",Toast.LENGTH_LONG).show();
return;
}
System.out.println("httpData:"+httpData);
hud.show();
final File file = new File(Utils.getAppPath() + "/harmony/");
if(!file.exists()){
@@ -178,10 +187,10 @@ public class MainActivity implements BaseActivityInterface {
if (listFile.getName().endsWith(".zip")) {
File path;
if (siwtch.isChecked()) {
path = new File(Utils.getSDCardPath() + "/Android/data/com.huanmeng.zhanjian2/files/res_default/10/");
path = new File(Utils.getSDCardPath() + "/Android/data/com.huanmeng.zhanjian2/"+httpData);
System.out.println("操作对象：覆盖版");
} else {
path = new File(Utils.getSDCardPath() + "/Android/data/com.bigzhao.jianrmagicbox/files/res_default/10/");
path = new File(Utils.getSDCardPath() + "/Android/data/com.bigzhao.jianrmagicbox/"+httpData);
System.out.println("操作对象：共存版");
}
if (!path.exists()) {
@@ -221,6 +230,17 @@ public class MainActivity implements BaseActivityInterface {
context.startActivity(intent);
}
});
new HttpTools().httpGet("http://jianr.jianrmod.cn/admin/data.do?data=harmony", new HttpInterface() {
@Override
public void httpGetData(Object data, int state) {
httpData= (String) data;
}
@Override
public void httpError(Exception e) {
e.printStackTrace();
}
});
return linearLayout;
}

19
harmony/src/main/java/com/jianrmod/plugins/harmony/Tools/HttpInterface.java Normal file
View File

@@ -0,0 +1,19 @@
package com.jianrmod.plugins.harmony.Tools;
/**
* 协议接口
*/
public interface HttpInterface {
/**
* 请求成功
* @param data 请求参数
* @param state http状态
*/
void httpGetData(Object data, int state);
/**
* 请求异常
* @param e 异常
*/
void httpError(Exception e);
}

31
harmony/src/main/java/com/jianrmod/plugins/harmony/Tools/HttpTools.java Normal file
View File

@@ -0,0 +1,31 @@
package com.jianrmod.plugins.harmony.Tools;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
public class HttpTools {
public void httpGet(final String url, final HttpInterface networkInterface) {
new Thread(new Runnable() {
@Override
public void run() {
try {
HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
connection.connect();
String tmp, str = "";
while ((tmp = reader.readLine()) != null) {
str += tmp;
}
reader.close();
networkInterface.httpGetData(str, connection.getResponseCode());
} catch (Exception e) {
e.printStackTrace();
networkInterface.httpError(e);
}
}
}).start();
}
}

4
harmony/src/main/java/com/jianrmod/plugins/harmony/Tools/Utils.java
View File

@@ -65,12 +65,12 @@ public class Utils {
}
public static String getSDCardPath() {
String path = Environment.getExternalStorageDirectory().getPath() + "/";
String path = Application.application.getFilesDir() + "/";
return path;
}
public static String getAppPath() {
String path = Environment.getExternalStorageDirectory().getPath() + "/jianRMG";
String path = Application.application.getFilesDir() + "/jianRMG";
return path;
}

2
harmony/src/main/java/com/yutou/jianr_mg/plugins/Data.java
View File

@@ -8,5 +8,5 @@ public class Data {
public static String image="https://i.loli.net/2019/06/10/5cfe1f8f725b430506.png";
public static String mainFunction="com.jianrmod.plugins.harmony.Activitys.MainActivity#localActivity";
public static Integer permission=0;
public static String version="2.0";
public static String version="2.1";
}