Skip to content

Commit c88e3c3

Browse files
SundoggyNewSundoggyNew
committed
sdk合规检测，使用腾讯连连做demo，去掉tpns的依赖。
Change-Id: I515e9c60027eb0c9686c7aa39632d9cacb2444dd
1 parent 8db030f commit c88e3c3

File tree

5 files changed

+2
-282
lines changed

5 files changed

+2
-282
lines changed

‎app/build.gradle‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,7 @@ dependencies {
137137
implementation 'com.youth.banner:banner:1.4.10'
138138
//左滑删除
139139
implementation 'com.github.mcxtzhang:SwipeDelMenuLayout:V1.2.1'
140-
//信鸽推送
141-
implementation 'com.tencent.jg:jg:1.1'
142-
implementation 'com.tencent.tpns:tpns:1.3.4.3-release'
140+
143141
implementation 'androidx.cardview:cardview:1.0.0'
144142
api 'com.android.support:recyclerview-v7:29.0.0'
145143
//kotlin协程

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,6 @@
3636
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
3737
<uses-permission android:name="android.permission.READ_PHONE_STATE" tools:node="remove"/>
3838

39-
<!-- 移动推送TPNS自定义权限，用于发送接收广播权限校验（必选）-->
40-
<permission
41-
android:name="${applicationId}.permission.XGPUSH_RECEIVE"
42-
android:protectionLevel="signature" />
43-
<uses-permission android:name="${applicationId}.permission.XGPUSH_RECEIVE" />
44-
45-
<!-- 移动推送TPNS 网络权限 （必选）-->
46-
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
47-
4839
<application
4940
android:name=".App"
5041
android:allowBackup="false"
@@ -57,39 +48,6 @@
5748
android:usesCleartextTraffic="true"
5849
tools:replace="android:allowBackup">
5950

60-
<!-- 请您务必确保终端用户首次安装启动应用时，配置不自动启动推送服务,以确保应用首次安装启动时不会自启推送服务，直到调用了推送服务注册接口 XGPushManager.registerPush() 才会开启 -->
61-
<meta-data
62-
android:name="XG_SERVICE_PULL_UP_OFF"
63-
android:value="true" />
64-
<!-- 手动集成时该receiver的intent-filter只保留下面3个action -->
65-
<receiver
66-
android:name="com.tencent.android.tpush.XGPushReceiver"
67-
android:exported="false"
68-
android:process=":xg_vip_service" >
69-
<intent-filter android:priority="0x7fffffff" tools:node="replace" >
70-
<!-- 【必须】 信鸽SDK的内部广播 -->
71-
<action android:name="com.tencent.android.xg.vip.action.SDK" />
72-
<action android:name="com.tencent.android.xg.vip.action.INTERNAL_PUSH_MESSAGE" />
73-
<action android:name="com.tencent.android.xg.vip.action.ACTION_SDK_KEEPALIVE" />
74-
</intent-filter>
75-
</receiver>
76-
77-
<!-- 在自身应用的AndroidManifest.xml文件中添加如下结点 -->
78-
<!-- 关闭与 移动推送TPNS 应用的联合保活功能，请配置 -->
79-
<provider
80-
android:name="com.tencent.android.tpush.XGPushProvider"
81-
tools:replace="android:authorities"
82-
android:authorities="${applicationId}.link.XGVIP_PUSH_AUTH"
83-
android:enabled="false"
84-
android:exported="false" />
85-
<!-- 关闭与 移动推送TPNS 应用的联合保活功能，请配置 -->
86-
<provider
87-
android:name="com.tencent.android.tpush.XGVipPushKAProvider"
88-
tools:replace="android:authorities"
89-
android:authorities="${applicationId}.AUTH_XGPUSH_KEEPALIVE"
90-
android:enabled="false"
91-
android:exported="false" />
92-
9351
<activity
9452
android:name=".kitlink.activity.BleOTADownloadActivity"
9553
android:exported="false" />
@@ -234,13 +192,7 @@
234192
<activity android:name=".kitlink.activity.SoftApStepActivity" /> <!-- picture end -->
235193
<activity android:name=".kitlink.activity.EditNameActivity" />
236194
<activity android:name=".kitlink.activity.videoui.RecordVideoActivity" />
237-
<activity android:name=".kitlink.activity.videoui.ParamSettingActivity" />
238-
<receiver android:name=".MessageReceiver">
239-
<intent-filter>
240-
<action android:name="com.tencent.android.xg.vip.action.PUSH_MESSAGE" />
241-
<action android:name="com.tencent.android.xg.vip.action.FEEDBACK" />
242-
</intent-filter>
243-
</receiver> <!-- 腾讯地地图 meta-data -->
195+
<activity android:name=".kitlink.activity.videoui.ParamSettingActivity" /><!-- 腾讯地地图 meta-data -->
244196
<meta-data
245197
android:name="TencentMapSDK"
246198
android:value="${MAP_SDK_VALUE}" />

‎app/src/main/java/com/tencent/iot/explorer/link/App.kt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import android.widget.Toast
1010
import androidx.multidex.MultiDex
1111
import com.alibaba.fastjson.JSON
1212
import com.alibaba.fastjson.JSONObject
13-
import com.tencent.android.tpush.XGPushConfig
1413
import com.tencent.iot.explorer.link.core.auth.IoTAuth
1514
import com.tencent.iot.explorer.link.core.auth.callback.MyCallback
1615
import com.tencent.iot.explorer.link.core.auth.entity.DeviceEntity
@@ -161,9 +160,6 @@ class App : Application(), Application.ActivityLifecycleCallbacks, PayloadMessag
161160
L.isLog = DEBUG_VERSION
162161
//日志等级
163162
L.LOG_LEVEL = L.LEVEL_DEBUG
164-
//信鸽推送日志开关
165-
XGPushConfig.enableDebug(applicationContext, DEBUG_VERSION)
166-
XGPushConfig.enablePullUpOtherApp(applicationContext, PULL_OTHER)
167163
language = SharePreferenceUtil.getString(this, CONFIG, "language")
168164
data.readLocalUser(this)
169165
data.appLifeCircleId = UUID.randomUUID().toString()

‎app/src/main/java/com/tencent/iot/explorer/link/MessageReceiver.java‎

Lines changed: 0 additions & 188 deletions
This file was deleted.

‎app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/MainActivity.kt‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ import androidx.fragment.app.Fragment
1616
import com.alibaba.fastjson.JSON
1717
import com.alibaba.fastjson.JSONObject
1818
import com.example.qrcode.Constant
19-
import com.tencent.android.tpush.XGIOperateCallback
20-
import com.tencent.android.tpush.XGPushConfig
21-
import com.tencent.android.tpush.XGPushManager
2219
import com.tencent.iot.explorer.link.App
2320
import com.tencent.iot.explorer.link.BuildConfig
2421
import com.tencent.iot.explorer.link.R
@@ -54,7 +51,6 @@ import com.tencent.iot.explorer.link.kitlink.util.HttpRequest
5451
import com.tencent.iot.explorer.link.kitlink.util.LogcatHelper
5552
import com.tencent.iot.explorer.link.kitlink.util.RequestCode
5653
import com.tencent.iot.explorer.link.mvp.IPresenter
57-
import com.tencent.tpns.baseapi.XGApiConfig
5854
import kotlinx.android.synthetic.main.activity_main.*
5955
import java.util.*
6056
import kotlin.system.exitProcess
@@ -140,7 +136,6 @@ class MainActivity : PActivity(), MyCallback {
140136
}
141137

142138
override fun initView() {
143-
openXGPush()
144139
home_bottom_view.addUnclickAbleItem(2) // 限定2号位置不可选中
145140
// LogcatHelper.getInstance(this).start()
146141
home_bottom_view.addMenu(
@@ -311,39 +306,6 @@ class MainActivity : PActivity(), MyCallback {
311306
}
312307
}
313308

314-
private fun openXGPush() {
315-
XGPushConfig.init(applicationContext)
316-
if (App.data.regionId == "1") {// 中国大陆
317-
XGPushConfig.setAccessId(applicationContext,
318-
if (BuildConfig.XgAccessId.toLongOrNull() == null) 0 else BuildConfig.XgAccessId.toLong())
319-
XGPushConfig.setAccessKey(applicationContext, BuildConfig.XgAccessKey)
320-
XGApiConfig.setServerSuffix(applicationContext, CommonField.XG_ACCESS_POINT_CHINA)
321-
} else if (App.data.regionId == "22") {// 美国
322-
XGPushConfig.setAccessId(applicationContext,
323-
if (BuildConfig.XgUSAAccessId.toLongOrNull() == null) 0 else BuildConfig.XgUSAAccessId.toLong())
324-
XGPushConfig.setAccessKey(applicationContext, BuildConfig.XgUSAAccessKey)
325-
XGApiConfig.setServerSuffix(applicationContext, CommonField.XG_ACCESS_POINT_USA)
326-
}
327-
Thread{
328-
//建议在线程中执行初始化
329-
XGPushManager.registerPush(applicationContext, object : XGIOperateCallback {
330-
override fun onSuccess(data: Any?, p1: Int) {
331-
L.e("注册成功，设备token为：$data")
332-
data?.let {
333-
runOnUiThread {
334-
App.data.xg_token = it.toString()
335-
bindXG()
336-
}
337-
}
338-
}
339-
340-
override fun onFail(data: Any?, errCode: Int, msg: String?) {
341-
L.e("注册失败，错误码：$errCode ,错误信息：$msg")
342-
}
343-
})
344-
}.start()
345-
}
346-
347309
/**
348310
* 绑定信鸽推送
349311
*/

0 commit comments

Comments
 (0)