diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 14bf141..0000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 049a366..cdb83f9 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -11,6 +11,7 @@ diff --git a/app/build.gradle b/app/build.gradle index e59c662..70b88ff 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -50,11 +50,12 @@ android { } } dependencies { -// implementation fileTree(include: ['*.jar','*.aar'], dir: 'libs') + implementation fileTree(include: ['*.jar','*.aar'], dir: 'libs') api project(path: ':SzyxImSdk') + api project(path: ':SzyxPushSdk') implementation 'androidx.appcompat:appcompat:1.4.2' implementation 'com.google.android.material:material:1.5.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.3' diff --git a/app/libs/SzyxImSdk-release.aar b/app/libs/SzyxImSdk-release.aar deleted file mode 100644 index 8e08a31..0000000 Binary files a/app/libs/SzyxImSdk-release.aar and /dev/null differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a10c7ee..80fbb86 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,8 +20,7 @@ android:exported="false" /> + android:exported="true"> @@ -37,6 +36,13 @@ + + + \ No newline at end of file diff --git a/app/src/main/java/cn/org/bjca/trust/android/imdemo/ui/MainActivity.java b/app/src/main/java/cn/org/bjca/trust/android/imdemo/ui/MainActivity.java index 94b3d2d..d3c3e63 100644 --- a/app/src/main/java/cn/org/bjca/trust/android/imdemo/ui/MainActivity.java +++ b/app/src/main/java/cn/org/bjca/trust/android/imdemo/ui/MainActivity.java @@ -10,12 +10,14 @@ import com.xuqm.base.adapter.CommonPagedAdapter; import com.xuqm.base.adapter.ViewHolder; import com.xuqm.base.ui.BaseListFormLayoutActivity; +import cn.org.bjca.trust.android.imdemo.MyApplication; import cn.org.bjca.trust.android.imdemo.R; import cn.org.bjca.trust.android.imdemo.data.item.MainItem; import cn.org.bjca.trust.android.imdemo.databinding.ActivityMainBinding; import cn.org.bjca.trust.android.imdemo.vm.MainVM; import cn.org.bjca.trust.android.lib.im.SZYXImSdk; import cn.org.bjca.trust.android.lib.im.kit.IMSDKCallback; +import cn.org.bjca.trust.android.lib.push.SZYXPushSdk; public class MainActivity extends BaseListFormLayoutActivity { @@ -29,6 +31,7 @@ public class MainActivity extends BaseListFormLayoutActivity SZYXImSdk.getInstance().logout(new IMSDKCallback() { @Override public void success() { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5993878..a571cf9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - ImAndroid + 推送demo LoginActivity Phone Password diff --git a/settings.gradle b/settings.gradle index 392490a..848c21d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -27,3 +27,4 @@ dependencyResolutionManagement { rootProject.name = "ImAndroid" include ':app' include ':SzyxImSdk' +include ':SzyxPushSdk' diff --git a/szyxpushsdk/.gitignore b/szyxpushsdk/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/szyxpushsdk/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/szyxpushsdk/build.gradle b/szyxpushsdk/build.gradle new file mode 100644 index 0000000..4f3e57c --- /dev/null +++ b/szyxpushsdk/build.gradle @@ -0,0 +1,37 @@ +plugins { + id 'com.android.library' +} + +android { + namespace 'cn.org.bjca.trust.android.lib.push' + compileSdk 33 + + defaultConfig { + minSdk 24 + targetSdk 33 + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles "consumer-rules.pro" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +dependencies { + implementation fileTree(include: ['*.jar','*.aar'], dir: 'libs') + implementation 'androidx.appcompat:appcompat:1.4.2' + implementation 'com.google.android.material:material:1.5.0' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + +} \ No newline at end of file diff --git a/szyxpushsdk/consumer-rules.pro b/szyxpushsdk/consumer-rules.pro new file mode 100644 index 0000000..e69de29 diff --git a/szyxpushsdk/libs/vivo_pushSDK_v3.0.0.4_484.aar b/szyxpushsdk/libs/vivo_pushSDK_v3.0.0.4_484.aar new file mode 100644 index 0000000..f278999 Binary files /dev/null and b/szyxpushsdk/libs/vivo_pushSDK_v3.0.0.4_484.aar differ diff --git a/szyxpushsdk/proguard-rules.pro b/szyxpushsdk/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/szyxpushsdk/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/szyxpushsdk/src/androidTest/java/cn/org/bjca/trust/android/lib/push/ExampleInstrumentedTest.java b/szyxpushsdk/src/androidTest/java/cn/org/bjca/trust/android/lib/push/ExampleInstrumentedTest.java new file mode 100644 index 0000000..4490a4c --- /dev/null +++ b/szyxpushsdk/src/androidTest/java/cn/org/bjca/trust/android/lib/push/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package cn.org.bjca.trust.android.lib.push; + +import android.content.Context; + +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); + assertEquals("cn.org.bjca.trust.android.lib.push.test", appContext.getPackageName()); + } +} \ No newline at end of file diff --git a/szyxpushsdk/src/main/AndroidManifest.xml b/szyxpushsdk/src/main/AndroidManifest.xml new file mode 100644 index 0000000..51213e8 --- /dev/null +++ b/szyxpushsdk/src/main/AndroidManifest.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/szyxpushsdk/src/main/java/cn/org/bjca/trust/android/lib/push/SZYXPushSdk.java b/szyxpushsdk/src/main/java/cn/org/bjca/trust/android/lib/push/SZYXPushSdk.java new file mode 100644 index 0000000..1fc0d94 --- /dev/null +++ b/szyxpushsdk/src/main/java/cn/org/bjca/trust/android/lib/push/SZYXPushSdk.java @@ -0,0 +1,14 @@ +package cn.org.bjca.trust.android.lib.push; + +import cn.org.bjca.trust.android.lib.push.kit.PushInterface; +import cn.org.bjca.trust.android.lib.push.push.SZYXPushManager; + +public class SZYXPushSdk { + private static final class PushHolder { + static final PushInterface instance = new SZYXPushManager(); + } + + public static PushInterface getInstance() { + return PushHolder.instance; + } +} diff --git a/szyxpushsdk/src/main/java/cn/org/bjca/trust/android/lib/push/kit/PushInterface.java b/szyxpushsdk/src/main/java/cn/org/bjca/trust/android/lib/push/kit/PushInterface.java new file mode 100644 index 0000000..84ad304 --- /dev/null +++ b/szyxpushsdk/src/main/java/cn/org/bjca/trust/android/lib/push/kit/PushInterface.java @@ -0,0 +1,7 @@ +package cn.org.bjca.trust.android.lib.push.kit; + +import android.content.Context; + +public interface PushInterface { + void init(Context mContext); +} diff --git a/szyxpushsdk/src/main/java/cn/org/bjca/trust/android/lib/push/push/PushMessageReceiverImpl.java b/szyxpushsdk/src/main/java/cn/org/bjca/trust/android/lib/push/push/PushMessageReceiverImpl.java new file mode 100644 index 0000000..ccfd0f7 --- /dev/null +++ b/szyxpushsdk/src/main/java/cn/org/bjca/trust/android/lib/push/push/PushMessageReceiverImpl.java @@ -0,0 +1,6 @@ +package cn.org.bjca.trust.android.lib.push.push; + +import com.vivo.push.sdk.OpenClientPushMessageReceiver; + +public class PushMessageReceiverImpl extends OpenClientPushMessageReceiver { +} diff --git a/szyxpushsdk/src/main/java/cn/org/bjca/trust/android/lib/push/push/SZYXPushManager.java b/szyxpushsdk/src/main/java/cn/org/bjca/trust/android/lib/push/push/SZYXPushManager.java new file mode 100644 index 0000000..eb7ae5b --- /dev/null +++ b/szyxpushsdk/src/main/java/cn/org/bjca/trust/android/lib/push/push/SZYXPushManager.java @@ -0,0 +1,27 @@ +package cn.org.bjca.trust.android.lib.push.push; + +import android.content.Context; +import android.util.Log; + +import com.vivo.push.PushClient; +import com.vivo.push.util.VivoPushException; + +import cn.org.bjca.trust.android.lib.push.kit.PushInterface; + +public class SZYXPushManager implements PushInterface { + @Override + public void init(Context mContext) { + //初始化push + try { + PushClient.getInstance(mContext).initialize(); + } catch (VivoPushException e) { + Log.e("=====>0", e.getMessage()); + } + + // 打开push开关, 关闭为turnOffPush，详见api接入文档 + PushClient.getInstance(mContext).turnOnPush(state -> { + Log.e("=====>1", state + ""); + Log.e("=====>2", PushClient.getInstance(mContext).getRegId()); + }); + } +} diff --git a/szyxpushsdk/src/test/java/cn/org/bjca/trust/android/lib/push/ExampleUnitTest.java b/szyxpushsdk/src/test/java/cn/org/bjca/trust/android/lib/push/ExampleUnitTest.java new file mode 100644 index 0000000..096f65c --- /dev/null +++ b/szyxpushsdk/src/test/java/cn/org/bjca/trust/android/lib/push/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package cn.org.bjca.trust.android.lib.push; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file