@@ -7,7 +7,7 @@ | |||||
<option name="testRunner" value="GRADLE" /> | <option name="testRunner" value="GRADLE" /> | ||||
<option name="distributionType" value="DEFAULT_WRAPPED" /> | <option name="distributionType" value="DEFAULT_WRAPPED" /> | ||||
<option name="externalProjectPath" value="$PROJECT_DIR$" /> | <option name="externalProjectPath" value="$PROJECT_DIR$" /> | ||||
<option name="gradleJvm" value="11" /> | |||||
<option name="gradleJvm" value="11 (2)" /> | |||||
<option name="modules"> | <option name="modules"> | ||||
<set> | <set> | ||||
<option value="$PROJECT_DIR$" /> | <option value="$PROJECT_DIR$" /> | ||||
@@ -8,6 +8,7 @@ android { | |||||
namespace 'cn.org.bjca.trust.pushdemo' | namespace 'cn.org.bjca.trust.pushdemo' | ||||
compileSdk 33 | compileSdk 33 | ||||
buildFeatures.dataBinding = true | |||||
defaultConfig { | defaultConfig { | ||||
applicationId "cn.org.bjca.trust.pushdemo" | applicationId "cn.org.bjca.trust.pushdemo" | ||||
minSdk 24 | minSdk 24 | ||||
@@ -63,6 +64,7 @@ dependencies { | |||||
androidTestImplementation 'androidx.test.ext:junit:1.1.3' | androidTestImplementation 'androidx.test.ext:junit:1.1.3' | ||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' | androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' | ||||
implementation 'com.xuqm.android:base:0.0.2' | |||||
// implementation 'cn.org.bjca.trus:push:0.0.1.011' | // implementation 'cn.org.bjca.trus:push:0.0.1.011' | ||||
implementation project(path: ':push') | implementation project(path: ':push') | ||||
} | } |
@@ -1,11 +1,13 @@ | |||||
package cn.org.bjca.trust | package cn.org.bjca.trust | ||||
import android.app.Application | |||||
import cn.org.bjca.trust.push.common.LogHelper | import cn.org.bjca.trust.push.common.LogHelper | ||||
import com.xuqm.base.App | |||||
import com.xuqm.base.di.manager.HttpManager | |||||
class Myapplication : Application() { | |||||
class Myapplication : App() { | |||||
override fun onCreate() { | override fun onCreate() { | ||||
super.onCreate() | super.onCreate() | ||||
LogHelper.e("+++++++++++++++Application") | LogHelper.e("+++++++++++++++Application") | ||||
appComponent = HttpManager.getAppComponent(""); | |||||
} | } | ||||
} | } |
@@ -1,23 +1,25 @@ | |||||
package cn.org.bjca.trust.pushdemo | package cn.org.bjca.trust.pushdemo | ||||
import android.os.Bundle | import android.os.Bundle | ||||
import android.widget.TextView | |||||
import androidx.appcompat.app.AppCompatActivity | |||||
import androidx.lifecycle.lifecycleScope | import androidx.lifecycle.lifecycleScope | ||||
import cn.org.bjca.trust.push.PushSdk | import cn.org.bjca.trust.push.PushSdk | ||||
import cn.org.bjca.trust.push.api.PushService | import cn.org.bjca.trust.push.api.PushService | ||||
import cn.org.bjca.trust.push.common.LogHelper | import cn.org.bjca.trust.push.common.LogHelper | ||||
import cn.org.bjca.trust.push.common.SendMessageHelper | import cn.org.bjca.trust.push.common.SendMessageHelper | ||||
import cn.org.bjca.trust.push.di.manager.HttpManager | import cn.org.bjca.trust.push.di.manager.HttpManager | ||||
import cn.org.bjca.trust.pushdemo.databinding.ActivityMainBinding | |||||
import com.xuqm.base.extensions.http | import com.xuqm.base.extensions.http | ||||
import com.xuqm.base.ui.BaseActivity | |||||
class MainActivity : AppCompatActivity() { | |||||
override fun onCreate(savedInstanceState: Bundle?) { | |||||
super.onCreate(savedInstanceState) | |||||
setContentView(R.layout.activity_main) | |||||
class MainActivity : BaseActivity<ActivityMainBinding>() { | |||||
override fun getLayoutId(): Int = R.layout.activity_main | |||||
override fun initView(savedInstanceState: Bundle?) { | |||||
super.initView(savedInstanceState) | |||||
PushSdk.instance.register("xuqinmin") | PushSdk.instance.register("xuqinmin") | ||||
findViewById<TextView>(R.id.register).setOnClickListener { | |||||
binding.register.setOnClickListener { | |||||
lifecycleScope.http( | lifecycleScope.http( | ||||
request = { | request = { | ||||
HttpManager.getApi( | HttpManager.getApi( | ||||
@@ -29,7 +31,7 @@ class MainActivity : AppCompatActivity() { | |||||
resp = { LogHelper.d(it) } | resp = { LogHelper.d(it) } | ||||
) | ) | ||||
} | } | ||||
findViewById<TextView>(R.id.send).setOnClickListener { | |||||
binding.send.setOnClickListener { | |||||
SendMessageHelper.sendTextMessage("xuqinmin", "你好啊${System.currentTimeMillis()}") | SendMessageHelper.sendTextMessage("xuqinmin", "你好啊${System.currentTimeMillis()}") | ||||
} | } | ||||
@@ -1,31 +1,34 @@ | |||||
<?xml version="1.0" encoding="utf-8"?> | <?xml version="1.0" encoding="utf-8"?> | ||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | |||||
xmlns:app="http://schemas.android.com/apk/res-auto" | |||||
xmlns:tools="http://schemas.android.com/tools" | |||||
android:layout_width="match_parent" | |||||
android:layout_height="match_parent" | |||||
tools:context=".MainActivity"> | |||||
<layout> | |||||
<TextView | |||||
android:id="@+id/register" | |||||
android:layout_width="wrap_content" | |||||
android:layout_height="wrap_content" | |||||
android:text="注册im服务" | |||||
app:layout_constraintBottom_toBottomOf="parent" | |||||
app:layout_constraintEnd_toEndOf="parent" | |||||
app:layout_constraintStart_toStartOf="parent" | |||||
app:layout_constraintTop_toTopOf="parent" | |||||
app:layout_constraintVertical_bias="0.08" /> | |||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | |||||
xmlns:app="http://schemas.android.com/apk/res-auto" | |||||
xmlns:tools="http://schemas.android.com/tools" | |||||
android:layout_width="match_parent" | |||||
android:layout_height="match_parent" | |||||
tools:context=".MainActivity"> | |||||
<TextView | |||||
android:id="@+id/send" | |||||
android:layout_width="wrap_content" | |||||
android:layout_height="wrap_content" | |||||
android:text="发送消息" | |||||
app:layout_constraintBottom_toBottomOf="parent" | |||||
app:layout_constraintEnd_toEndOf="parent" | |||||
app:layout_constraintStart_toStartOf="parent" | |||||
app:layout_constraintTop_toTopOf="parent" | |||||
app:layout_constraintVertical_bias="0.188" /> | |||||
<TextView | |||||
android:id="@+id/register" | |||||
android:layout_width="wrap_content" | |||||
android:layout_height="wrap_content" | |||||
android:text="注册im服务" | |||||
app:layout_constraintBottom_toBottomOf="parent" | |||||
app:layout_constraintEnd_toEndOf="parent" | |||||
app:layout_constraintStart_toStartOf="parent" | |||||
app:layout_constraintTop_toTopOf="parent" | |||||
app:layout_constraintVertical_bias="0.08" /> | |||||
</androidx.constraintlayout.widget.ConstraintLayout> | |||||
<TextView | |||||
android:id="@+id/send" | |||||
android:layout_width="wrap_content" | |||||
android:layout_height="wrap_content" | |||||
android:text="发送消息" | |||||
app:layout_constraintBottom_toBottomOf="parent" | |||||
app:layout_constraintEnd_toEndOf="parent" | |||||
app:layout_constraintStart_toStartOf="parent" | |||||
app:layout_constraintTop_toTopOf="parent" | |||||
app:layout_constraintVertical_bias="0.188" /> | |||||
</androidx.constraintlayout.widget.ConstraintLayout> | |||||
</layout> |
@@ -26,7 +26,7 @@ systemProp.sonar.projectKey=PushDemo | |||||
systemProp.sonar.sources=src/main | systemProp.sonar.sources=src/main | ||||
systemProp.sonar.host.url=http://127.0.0.1:9999 | systemProp.sonar.host.url=http://127.0.0.1:9999 | ||||
systemProp.sonar.login=sqp_bb426073c10683012f6d73afe52cc9c3b134e496 | systemProp.sonar.login=sqp_bb426073c10683012f6d73afe52cc9c3b134e496 | ||||
systemProp.sonar.projectVersion=1.0.0.003 | |||||
systemProp.sonar.projectVersion=1.0.0.004 | |||||
sonar.pdf.password=xuqinmin1022 | sonar.pdf.password=xuqinmin1022 | ||||
sonar.pdf.username=xuqinmin12 | sonar.pdf.username=xuqinmin12 | ||||
#sonar.androidLint.reportPaths=./build/slf/lint-results.xml | #sonar.androidLint.reportPaths=./build/slf/lint-results.xml | ||||
@@ -2,17 +2,13 @@ package cn.org.bjca.trust.push.manager | |||||
import android.content.Context | import android.content.Context | ||||
import cn.org.bjca.trust.push.BuildConfig | import cn.org.bjca.trust.push.BuildConfig | ||||
import cn.org.bjca.trust.push.api.PushService | |||||
import cn.org.bjca.trust.push.common.DeviceHelper | import cn.org.bjca.trust.push.common.DeviceHelper | ||||
import cn.org.bjca.trust.push.common.LogHelper | |||||
import cn.org.bjca.trust.push.di.manager.HttpManager | |||||
import cn.org.bjca.trust.push.enums.OsType | import cn.org.bjca.trust.push.enums.OsType | ||||
import cn.org.bjca.trust.push.kit.SdkInterface | import cn.org.bjca.trust.push.kit.SdkInterface | ||||
import cn.org.bjca.trust.push.message.ImCallback | import cn.org.bjca.trust.push.message.ImCallback | ||||
import cn.org.bjca.trust.push.message.ImManager | import cn.org.bjca.trust.push.message.ImManager | ||||
import cn.org.bjca.trust.push.message.callback.CallbackListener | import cn.org.bjca.trust.push.message.callback.CallbackListener | ||||
import cn.org.bjca.trust.push.message.client.ImConnectOptions | import cn.org.bjca.trust.push.message.client.ImConnectOptions | ||||
import kotlinx.coroutines.runBlocking | |||||
class PushSdkManager : SdkInterface { | class PushSdkManager : SdkInterface { | ||||
@@ -26,15 +22,15 @@ class PushSdkManager : SdkInterface { | |||||
private fun registerPush(userId: String) {} | private fun registerPush(userId: String) {} | ||||
private fun registerIm(userId: String) { | private fun registerIm(userId: String) { | ||||
runBlocking { | |||||
HttpManager.getApi( | |||||
HttpManager.getAppComponent("http://192.168.115.173:8080"), | |||||
PushService::class.java | |||||
) | |||||
.getArticle(42) | |||||
}.also { | |||||
LogHelper.e(it, "初始化登录") | |||||
} | |||||
// runBlocking { | |||||
// HttpManager.getApi( | |||||
// HttpManager.getAppComponent("http://192.168.115.173:8080"), | |||||
// PushService::class.java | |||||
// ) | |||||
// .getArticle(42) | |||||
// }.also { | |||||
// LogHelper.e(it, "初始化登录") | |||||
// } | |||||
//先关闭已有连接 | //先关闭已有连接 | ||||
if (ImManager.instance.isConnect() || ImManager.instance.isConnecting()) { | if (ImManager.instance.isConnect() || ImManager.instance.isConnecting()) { | ||||