2021-01-11 1.更新MQTT连接和本地搜索网关方法。2.子账号相关接口完善

JLChen

2021-01-11 5a5a2b696866f947b6025d26c3302e8ffef46435

 Crabtree/ON/Properties/AndroidManifest.xml

@@ -1,150 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.crabtree" android:versionName="2.50217" android:versionCode="20200217">
   <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" />
   <!-- Required  一些系统要求的权限，此处是极光推送需求的权限，如访问网络等-->
   <permission android:name="com.hdl.on.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
   <uses-permission android:name="com.hdl.on.permission.JPUSH_MESSAGE" />
   <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.WRITE_SETTINGS" />
   <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
   <!-- Optional for location -->
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
   <!-- 用于开启 debug 版本的应用在6.0 系统上 层叠窗口权限 -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.crabtreenew" android:versionName="2.601071" android:versionCode="202101071">
   <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="28" />
   <!-- 在安卓P版本之后，必须要授予FOREGROUND_SERVICE权限，才能够使用前台服务 -->
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
   <!--  定位权限，用于APP通过获取定位坐标查询当前地区天气-->
   <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
   <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
   <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
   <uses-permission android:name="android.permission.GET_TASKS" />
   <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-feature android:name="android.hardware.location" android:required="false" />
   <uses-feature android:name="android.hardware.location.gps" android:required="false" />
   <uses-feature android:name="android.hardware.location.network" android:required="false" />
   <!--  拍照和读取手机相册权限 ，用于APP选择照片设置房间或者场景的背景-->
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
   <uses-permission android:name="android.permission.CAMERA" />
   <!--  播放本地音乐权限-->
   <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
   <!--  网络或者获取手机IP等信息，用于APP网络通信，设备控制，数据接收等-->
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
   <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
   <uses-permission android:name="android.permission.READ_PHONE_STATE" />
   <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
   <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.WRITE_SETTINGS" />
   <uses-permission android:name="android.permission.VIBRATE" />
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
   <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
   <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
   <uses-permission android:name="android.permission.GET_TASKS" />
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
   <uses-permission android:name="android.permission.BIND_ACCESSIBILITY_SERVICE" />
   <uses-permission android:name="android.permission.BIND_CARRIER_MESSAGING_SERVICE" />
   <uses-permission android:name="android.permission.BIND_CARRIER_SERVICES" />
   <uses-permission android:name="android.permission.BIND_CHOOSER_TARGET_SERVICE" />
   <uses-permission android:name="android.permission.BIND_CONDITION_PROVIDER_SERVICE" />
   <uses-permission android:name="android.permission.BIND_DREAM_SERVICE" />
   <uses-permission android:name="android.permission.BIND_INCALL_SERVICE" />
   <uses-permission android:name="android.permission.BIND_MIDI_DEVICE_SERVICE" />
   <uses-permission android:name="android.permission.BIND_NFC_SERVICE" />
   <uses-permission android:name="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE" />
   <uses-permission android:name="android.permission.BIND_PRINT_SERVICE" />
   <uses-permission android:name="android.permission.BIND_SCREENING_SERVICE" />
   <uses-permission android:name="android.permission.BIND_TELECOM_CONNECTION_SERVICE" />
   <uses-permission android:name="android.permission.BIND_TEXT_SERVICE" />
   <uses-permission android:name="android.permission.BIND_VPN_SERVICE" />
   <uses-permission android:name="android.permission.BIND_VR_LISTENER_SERVICE" />
   <uses-permission android:name="android.permission.WRITE_GSERVICES" />
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
   <uses-permission android:name="android.permission.FLASHLIGHT" />
   <uses-permission android:name="android.permission.READ_LOGS" />
   <uses-permission android:name="android.permission.WRITE_OWNER_DATA" />
   <uses-permission android:name="android.permission.RECORD_AUDIO" />
   <!-- zxing -->
   <uses-permission android:name="android.permission.CAMERA" />
   <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
   <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
   <!-- zxing -->
   <uses-permission android:name="android.hardware.camera" />
   <uses-permission android:name="android.hardware.camera.autofocus" />
   <!--修改pad安装不了-->
   <uses-feature android:name="android.hardware.camera" android:required="false" />
   <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
   <uses-feature android:name="android.hardware.location.gps" android:required="false" />
   <uses-feature android:name="android.hardware.location" android:required="false" />
   <uses-feature android:name="android.hardware.location.network" android:required="false" />
   <uses-feature android:name="android.hardware.telephony" android:required="false" />
   <uses-feature android:name="android.hardware.wifi" android:required="false" />
   <uses-feature android:name="android.hardware.bluetooth" android:required="false" />
   <application android:allowBackup="true" android:icon="@drawable/Icon" android:largeHeap="true" android:label="Crabtree-ON">
      <activity android:name="com.videogo.UiKitActivity" android:configChanges="orientation|keyboardHidden" android:screenOrientation="portrait" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
      <activity android:name="com.videogo.LoginSelectActivity" android:configChanges="orientation|keyboardHidden" android:screenOrientation="portrait" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
      <activity android:name="com.videogo.main.EzvizWebViewActivity" android:configChanges="orientation|keyboardHidden" android:screenOrientation="portrait" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
      <activity android:name="com.videogo.remoteplayback.list.PlayBackListActivity" android:configChanges="orientation|keyboardHidden|screenSize" android:screenOrientation="nosensor" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
      <activity android:name="com.videogo.OnActivity" android:screenOrientation="portrait" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
      <activity android:name="com.videogo.ui.cameralist.EZCameraListActivity" android:screenOrientation="portrait" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
      <activity android:name="com.videogo.ui.realplay.EZRealPlayActivity" android:configChanges="orientation|keyboardHidden|screenSize" android:screenOrientation="portrait" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
      <activity android:name="com.videogo.ui.message.EZMessageImageActivity2" android:screenOrientation="portrait" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></activity>
      <activity android:name="com.videogo.ui.message.EZMessageActivity2" android:screenOrientation="portrait" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></activity>
      <activity android:name="com.videogo.ui.remoteplayback.EZRemotePlayBackActivity" android:configChanges="orientation|keyboardHidden|screenSize" android:screenOrientation="portrait" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
      <activity android:name="com.videogo.devicemgt.EZDeviceSettingActivity" android:screenOrientation="portrait" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></activity>
      <activity android:name="com.videogo.devicemgt.ModifyDeviceNameActivity" android:screenOrientation="portrait" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
      <activity android:name="com.videogo.InterfaceDemoActivity" android:screenOrientation="portrait" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></activity>
      <activity android:name="com.videogo.scan.main.CaptureActivity" android:screenOrientation="portrait" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
      <activity android:name="com.videogo.ui.devicelist.SeriesNumSearchActivity" android:launchMode="singleTask" android:screenOrientation="portrait" android:windowSoftInputMode="adjustResize" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
      <activity android:name="com.videogo.ui.devicelist.AutoWifiNetConfigActivity" android:screenOrientation="portrait" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
      <activity android:name="com.videogo.ui.devicelist.AutoWifiConnectingActivity" android:screenOrientation="portrait" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
      <activity android:name="com.videogo.ui.devicelist.AutoWifiPrepareStepOneActivity" android:screenOrientation="portrait" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
      <activity android:name="com.videogo.ui.devicelist.AutoWifiResetActivity" android:screenOrientation="portrait" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
      <activity android:name="com.videogo.test.InterfaceTestActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></activity>
      <activity android:name="com.videogo.test.InterfaceSelfTestActivity" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></activity>
      <activity android:name="com.ezuikit.open.PlayActivity" android:configChanges="orientation|keyboardHidden|screenSize" android:exported="false" android:screenOrientation="landscape" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
      <activity android:name="ezviz.ezopensdk.scan.main.CaptureActivity" android:screenOrientation="portrait" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
      <activity android:name="com.ezuikit.open.scan.main.CaptureActivity" android:screenOrientation="portrait" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" />
      <receiver android:name="com.videogo.EzvizBroadcastReceiver" android:enabled="true" android:exported="false">
         <intent-filter>
            <action android:name="com.videogo.action.ADD_DEVICE_SUCCESS_ACTION" />
            <action android:name="com.videogo.action.OAUTH_SUCCESS_ACTION" />
            <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
         </intent-filter>
      </receiver>
      <activity android:name="cn.jpush.android.ui.PushActivity" android:configChanges="orientation|keyboardHidden" android:theme="@android:style/Theme.NoTitleBar" android:exported="false">
         <intent-filter>
            <action android:name="cn.jpush.android.ui.PushActivity" />
            <category android:name="android.intent.category.DEFAULT" />
            <category android:name="com.hdl.on" />
         </intent-filter>
      </activity>
      <service android:name="cn.jpush.android.service.PushService" android:process=":mult">
         <intent-filter>
            <action android:name="cn.jpush.android.intent.REGISTER" />
            <action android:name="cn.jpush.android.intent.REPORT" />
            <action android:name="cn.jpush.android.intent.PushService" />
            <action android:name="cn.jpush.android.intent.PUSH_TIME" />
         </intent-filter>
      </service>
      <service android:name="cn.jpush.android.service.DaemonService" android:enabled="true" android:exported="true">
         <intent-filter>
            <action android:name="cn.jpush.android.intent.DaemonService" />
            <category android:name="com.hdl.on" />
         </intent-filter>
      </service>
      <receiver android:name="cn.jpush.android.service.PushReceiver" android:enabled="true">
         <intent-filter android:priority="1000">
            <action android:name="cn.jpush.android.intent.NOTIFICATION_RECEIVED_PROXY" />
            <category android:name="com.hdl.on" />
         </intent-filter>
         <intent-filter>
            <action android:name="android.intent.action.USER_PRESENT" />
            <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
         </intent-filter>
         <!-- Optional -->
         <intent-filter>
            <action android:name="android.intent.action.PACKAGE_ADDED" />
            <action android:name="android.intent.action.PACKAGE_REMOVED" />
            <data android:scheme="package" />
         </intent-filter>
      </receiver>
      <activity android:name="cn.jpush.android.ui.PopWinActivity" android:exported="false" />
      <receiver android:name="cn.jpush.android.service.AlarmReceiver" android:exported="false" />
      <meta-data android:name="JPUSH_CHANNEL" android:value="developer-default" />
      <meta-data android:name="JPUSH_APPKEY" android:value="bcb35a1721fb9edfe9756329" />
   <application android:allowBackup="false" android:icon="@drawable/Icon" android:networkSecurityConfig="@xml/network_security_config" android:largeHeap="true" android:label="Crabtree-ON">
      <!-- 自动更新 -->
      <provider android:name="android.support.v4.content.FileProvider" android:authorities="com.hdl.crabtreenew.fileProvider" android:grantUriPermissions="true" android:exported="false">
         <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
      </provider>
   </application>
</manifest>