diff --git a/app/build.gradle b/app/build.gradle index 6c68539..9b1e880 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ android { minSdkVersion 26 targetSdkVersion 29 - versionCode 13 - versionName "1.2.1" + versionCode 23 + versionName "1.3.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -87,6 +87,15 @@ android { v1SigningEnabled true v2SigningEnabled false } + + //iPlay50 mini,iPlay50 android13 共用签名 + iPlay50mini { + storeFile file("keystore/iPlay50Mini.keystore") + storePassword "android" + keyAlias "platform" + keyPassword "android" + v2SigningEnabled false + } } buildTypes { @@ -132,6 +141,34 @@ android { signingConfig signingConfigs.iPlay50SE } + iPlay50miniDebug.initWith(debug) + iPlay50miniDebug { + buildConfigField "String", "platform", '"T811"' + versionNameSuffix "-debug" + debuggable true + signingConfig signingConfigs.iPlay50mini + } + + iPlay50miniRelease.initWith(release) + iPlay50miniRelease { + buildConfigField "String", "platform", '"T811"' + signingConfig signingConfigs.iPlay50mini + } + + iPlay5013Debug.initWith(debug) + iPlay5013Debug { + buildConfigField "String", "platform", '"iplay5013"' + versionNameSuffix "-debug" + debuggable true + signingConfig signingConfigs.iPlay50mini + } + + iPlay5013Release.initWith(release) + iPlay5013Release { + buildConfigField "String", "platform", '"iplay5013"' + signingConfig signingConfigs.iPlay50mini + } + zhanRuiDebug.initWith(debug) zhanRuiDebug { debuggable true @@ -184,6 +221,24 @@ android { } } } + + sourceSets { + Cube8183Debug { manifest.srcFile 'src/debug/AndroidManifest.xml' } + Teclast8183Debug { manifest.srcFile 'src/debug/AndroidManifest.xml' } + iPlay50SEDebug { manifest.srcFile 'src/debug/AndroidManifest.xml' } + iPlay50miniDebug { manifest.srcFile 'src/debug/AndroidManifest.xml' } + iPlay5013Debug { manifest.srcFile 'src/debug/AndroidManifest.xml' } + zhanRuiDebug { manifest.srcFile 'src/debug/AndroidManifest.xml' } + debug { manifest.srcFile 'src/debug/AndroidManifest.xml' } + + Cube8183Release { manifest.srcFile 'src/main/AndroidManifest.xml' } + Teclast8183Release { manifest.srcFile 'src/main/AndroidManifest.xml' } + iPlay50SERelease { manifest.srcFile 'src/main/AndroidManifest.xml' } + iPlay50miniRelease { manifest.srcFile 'src/main/AndroidManifest.xml' } + iPlay5013Release { manifest.srcFile 'src/main/AndroidManifest.xml' } + zhanRuiRelease { manifest.srcFile 'src/main/AndroidManifest.xml' } + release { manifest.srcFile 'src/main/AndroidManifest.xml' } + } } dependencies { diff --git a/app/keystore/iPlay50Mini.keystore b/app/keystore/iPlay50Mini.keystore new file mode 100644 index 0000000..fa4d77f Binary files /dev/null and b/app/keystore/iPlay50Mini.keystore differ diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..41f6d6d --- /dev/null +++ b/app/src/debug/AndroidManifest.xml @@ -0,0 +1,328 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/uiui/zyappstore/activity/ClassAppActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/ClassAppActivity.java index 357cdeb..115ca90 100644 --- a/app/src/main/java/com/uiui/zyappstore/activity/ClassAppActivity.java +++ b/app/src/main/java/com/uiui/zyappstore/activity/ClassAppActivity.java @@ -17,6 +17,7 @@ import com.uiui.zyappstore.bean.AppInfo; import com.uiui.zyappstore.bean.BaseResponse; import com.uiui.zyappstore.common.CommonDatas; import com.uiui.zyappstore.network.NetInterfaceManager; +import com.uiui.zyappstore.utils.ToastUtil; import java.util.List; @@ -36,6 +37,8 @@ public class ClassAppActivity extends BaseActivity { RecyclerView mRecyclerView; @BindView(R.id.iv_nodata) ImageView iv_nodata; + @BindView(R.id.iv_search) + ImageView iv_search; private AppAdapter mAppAdapter; @@ -60,6 +63,12 @@ public class ClassAppActivity extends BaseActivity { if (!TextUtils.isEmpty(className)) { mMoreappTvTitle.setText(className); } + iv_search.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + ToastUtil.show("功能暂未开放"); + } + }); int classId = intent.getIntExtra(CommonDatas.APP_CLASS_ID, 0); mAppAdapter = new AppAdapter(this); GridLayoutManager gridLayoutManager = new GridLayoutManager(this, 2); diff --git a/app/src/main/java/com/uiui/zyappstore/activity/MoreAppActivity.java b/app/src/main/java/com/uiui/zyappstore/activity/MoreAppActivity.java index 695e744..cea4e91 100644 --- a/app/src/main/java/com/uiui/zyappstore/activity/MoreAppActivity.java +++ b/app/src/main/java/com/uiui/zyappstore/activity/MoreAppActivity.java @@ -18,6 +18,7 @@ import com.uiui.zyappstore.bean.BaseResponse; import com.uiui.zyappstore.common.CommonDatas; import com.uiui.zyappstore.fragment.FeaturedFragment; import com.uiui.zyappstore.network.NetInterfaceManager; +import com.uiui.zyappstore.utils.ToastUtil; import java.util.Comparator; import java.util.List; @@ -37,6 +38,8 @@ public class MoreAppActivity extends BaseActivity { RecyclerView mRecyclerView; @BindView(R.id.iv_nodata) ImageView iv_nodata; + @BindView(R.id.iv_search) + ImageView iv_search; private AppAdapter mAppAdapter; @@ -62,6 +65,12 @@ public class MoreAppActivity extends BaseActivity { } else if (FeaturedFragment.POPULAR_APP.equals(extra)) { getAdminApp(); } + iv_search.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + ToastUtil.show("功能暂未开放"); + } + }); mAppAdapter = new AppAdapter(this); GridLayoutManager gridLayoutManager = new GridLayoutManager(this, 2); mRecyclerView.setLayoutManager(gridLayoutManager); diff --git a/app/src/main/java/com/uiui/zyappstore/network/NetInterfaceManager.java b/app/src/main/java/com/uiui/zyappstore/network/NetInterfaceManager.java index 953c2b6..b2f9933 100644 --- a/app/src/main/java/com/uiui/zyappstore/network/NetInterfaceManager.java +++ b/app/src/main/java/com/uiui/zyappstore/network/NetInterfaceManager.java @@ -210,10 +210,14 @@ public class NetInterfaceManager { set.add(JGYUtils.UZY12Tag); } else if (platform == JGYUtils.Cube8183Platform) { set.add(JGYUtils.Cube8183Tag); - }else if (platform == JGYUtils.Teclast8183Platform) { + } else if (platform == JGYUtils.Teclast8183Platform) { set.add(JGYUtils.TeclastMTK12Tag); - }else if (platform == JGYUtils.ipaly50SEPlatform) { + } else if (platform == JGYUtils.ipaly50SEPlatform) { set.add(JGYUtils.ipaly50SETag); + } else if (platform == JGYUtils.iPlayMiniPlatform) { + set.add(JGYUtils.iPlayMiniTag); + } else if (platform == JGYUtils.iPlay5013Platform) { + set.add(JGYUtils.iPlay5013Tag); } }); setpushTag(set); @@ -237,12 +241,12 @@ public class NetInterfaceManager { pushService.bindTag(CloudPushService.DEVICE_TARGET, tag, null, new CommonCallback() { @Override public void onSuccess(String s) { - Log.e("bindTag","bind tag " + Arrays.toString(tag) + " success\n"); + Log.e("bindTag", "bind tag " + Arrays.toString(tag) + " success\n"); } @Override public void onFailed(String errorCode, String errorMsg) { - Log.e("bindTag","bind tag " + Arrays.toString(tag) + " failed." + + Log.e("bindTag", "bind tag " + Arrays.toString(tag) + " failed." + "errorCode: " + errorCode + ", errorMsg:" + errorMsg + "\n"); } }); diff --git a/app/src/main/java/com/uiui/zyappstore/utils/JGYUtils.java b/app/src/main/java/com/uiui/zyappstore/utils/JGYUtils.java index bbcb6ce..18bcca1 100644 --- a/app/src/main/java/com/uiui/zyappstore/utils/JGYUtils.java +++ b/app/src/main/java/com/uiui/zyappstore/utils/JGYUtils.java @@ -59,6 +59,8 @@ public class JGYUtils { public static final int Cube8183Platform = 8; public static final int Teclast8183Platform = 9; public static final int ipaly50SEPlatform = 10; + public static final int iPlayMiniPlatform = 13; + public static final int iPlay5013Platform = 14; public static final int UnknowPlatform = 0; public static final String MTKTag = "MTK"; @@ -69,6 +71,8 @@ public class JGYUtils { public static final String Cube8183Tag = "cube8183"; public static final String TeclastMTK12Tag = "teclast8183"; public static final String ipaly50SETag = "ipaly50SE"; + public static final String iPlayMiniTag = "T811"; + public static final String iPlay5013Tag = "iplay5013"; private JGYUtils(Context context) { @@ -333,19 +337,26 @@ public class JGYUtils { } else if (UZY12Tag.equalsIgnoreCase(platform)) { Log.i(TAG, "checkAppPlatform: " + "UZY12"); return UZY12Platform; - }else if (Cube8183Tag.equalsIgnoreCase(platform)) { + } else if (Cube8183Tag.equalsIgnoreCase(platform)) { Log.i(TAG, "checkAppPlatform: " + "cube8183"); return Cube8183Platform; } else if (TeclastMTK12Tag.equalsIgnoreCase(platform)) { Log.i(TAG, "checkAppPlatform: " + "teclast8183"); return Teclast8183Platform; - }else if (ipaly50SETag.equalsIgnoreCase(platform)) { + } else if (ipaly50SETag.equalsIgnoreCase(platform)) { Log.i(TAG, "checkAppPlatform: " + "ipaly50SE"); return ipaly50SEPlatform; + } else if (iPlayMiniTag.equalsIgnoreCase(platform)) { + Log.i(TAG, "checkAppPlatform: " + "ipaly50 mini"); + return iPlayMiniPlatform; + } else if (iPlay5013Tag.equalsIgnoreCase(platform)) { + Log.i(TAG, "checkAppPlatform: " + "ipaly50 13"); + return iPlay5013Platform; } else { Log.i(TAG, "checkAppPlatform: " + "没有数据"); return UnknowPlatform; } + } public boolean isSamePlatform(String platform) { @@ -379,6 +390,10 @@ public class JGYUtils { getAppPlatformCallback.AppPlatform(Cube8183Platform); } else if (ipaly50SETag.equalsIgnoreCase(platform)) { getAppPlatformCallback.AppPlatform(ipaly50SEPlatform); + } else if (iPlayMiniTag.equalsIgnoreCase(platform)) { + getAppPlatformCallback.AppPlatform(iPlayMiniPlatform); + } else if (iPlay5013Tag.equalsIgnoreCase(platform)) { + getAppPlatformCallback.AppPlatform(iPlay5013Platform); } else { getAppPlatformCallback.AppPlatform(UnknowPlatform); } @@ -412,7 +427,7 @@ public class JGYUtils { mContext.sendBroadcast(bootIntent); } - public String getIMEI() { + public String getIMEI() { String IMEI = "unknow"; String IMEI1, IMEI2, IMEI3; //获取手机设备号 @@ -494,7 +509,7 @@ public class JGYUtils { Log.e(TAG, "subscribe: " + apkPath); String pkg = ApkUtils.getPackageName(mContext, apkPath); // if (externalPkg.contains(pkg)) { - packageListMap.put(pkg, apkPath); + packageListMap.put(pkg, apkPath); // } else { // Log.e(TAG, "checkLocalAppInstall: skip: " + pkg + " fileName: " + fileName); // } diff --git a/app/src/main/res/layout/activity_class_app.xml b/app/src/main/res/layout/activity_class_app.xml index 0a4f707..435de46 100644 --- a/app/src/main/res/layout/activity_class_app.xml +++ b/app/src/main/res/layout/activity_class_app.xml @@ -42,6 +42,7 @@ app:layout_constraintStart_toEndOf="@+id/moreapp_iv_back" />