Browse Source

Merge branch 'dev' of http://10.1.235.20:3000/ipu/android-share into dev

liuyf23 3 years ago
parent
commit
2a5192ec5f

+ 5 - 0
show-client/app/src/main/AndroidManifest.xml

@ -365,6 +365,11 @@
365 365
            tools:replace="android:value"
366 366
            android:value="5e4619bf"/>
367 367
368
        <meta-data
369
            tools:replace="android:value"
370
            android:name="JPUSH_APPKEY"
371
            android:value="952447fb3fe9840d397edcb6" />
372
368 373
    </application>
369 374
370 375
</manifest>

+ 4 - 0
show-client/app/src/main/assets/mobile-action.xml

@ -127,6 +127,7 @@
127 127
	<action name="unregisterForPushWithJpush"  class="com.ai.ipu.push.func.IpuJPushPlugin" method="unregisterForPush"></action>
128 128
	<action name="setJpushAlias" class="com.ai.ipu.push.func.IpuJPushPlugin" method="setAlias"></action>
129 129
	<action name="setJpushTags" class="com.ai.ipu.push.func.IpuJPushPlugin" method="setTags"></action>
130
	<action name="getJpushInfo" class="com.ai.ipu.push.func.IpuJPushPlugin" method="getJpushInfo"></action>
130 131
131 132
    <!-- Contact-->
132 133
	<action name="getContacts" class="com.ai.ipu.mobile.plugin.MobileContactDetail" method="getContacts"></action>
@ -231,4 +232,7 @@
231 232
	<action name="endListen" class="com.ai.ipu.mobile.asr.func.IpuVoice" method="endListen" />
232 233
233 234
	<action name="chooseFile" class="com.ai.ipu.mobile.file.picker.MobileFilePicker" method="chooseFile" />
235
236
	<!-- 检查是否禁止应用通知权限 -->
237
	<action name="isNotificationBlocked" class="com.ai.ipu.mobile.plugin.NotifySetting" method="isNotificationBlocked" />
234 238
</actions>

+ 3 - 1
show-client/config.gradle

@ -38,7 +38,9 @@ ext{
38 38
            v4 : 'androidx.legacy:legacy-support-v4:1.0.0',
39 39
            annotations : 'androidx.annotation:annotation:1.2.0',
40 40
            core : 'androidx.core:core:1.1.0',
41
            recyclerview : 'androidx.recyclerview:recyclerview:1.1.0'
41
            recyclerview : 'androidx.recyclerview:recyclerview:1.1.0',
42
            fragment : 'androidx.fragment:fragment:1.3.6',
43
            exifinterface : 'androidx.exifinterface:exifinterface:1.3.2'
42 44
    ]
43 45
44 46
    //AndroidSupport依赖包