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

 Conflicts:

	superapp-client/superappclient/build.gradle

	superapp-client/superappclient/src/main/assets/mobile-config.xml

	superapp-client/superappclient/src/main/java/com/ai/ipu/sa/App.java

show-client/app/build.gradle

@@ -77,6 +77,8 @@ dependencies {
    implementation(rootProject.ext.ipuPlugin.ipu_scan)
    implementation(rootProject.ext.ipuPlugin.ipu_map_gd)
    implementation(rootProject.ext.ipuPlugin.ipu_plugin_extend)
    implementation(rootProject.ext.ipuPlugin.ipu_plugin_basic)
    implementation(rootProject.ext.ipu.ipu_mobile_ui) //MainActivity中用到PathMenu
    implementation(rootProject.ext.ipuPlugin.ipu_map_bd)
    implementation(rootProject.ext.ipuPlugin.ipu_bluetooth)
    implementation(name: rootProject.ext.localAar.ipu_mobile_rn,ext:'aar'){

show-client/app/src/main/AndroidManifest.xml

@@ -61,7 +61,8 @@
        android:icon="@drawable/ic_launcher"
        android:label="@string/app_name"
        android:theme="@style/AppTheme" 
        android:hardwareAccelerated="true"> <!-- Application级应用加速,可以降低到Activity级 -->
        android:hardwareAccelerated="true"
        tools:replace="android:allowBackup"> <!-- Application级应用加速,可以降低到Activity级 -->
        <!-- <meta-data
            android:name="com.amap.api.v2.apikey"
            android:value="6afee5dced4c3b3a43c0feb11399bded"/> -->

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

@@ -59,8 +59,8 @@
	<action name="hideKeyBoard" class="com.ai.ipu.mobile.plugin.SoftKeyBoard" method="hideKeyBoard"/>
	<action name="toggleKeyBoard" class="com.ai.ipu.mobile.plugin.SoftKeyBoard" method="toggleKeyBoard"/>
	<!-- MobileCamera -->
	<action name="getPhoto" class="com.ai.ipu.mobile.plugin.MobileCamera" method="getPhoto" permission="camera"/>
	<action name="getPicture" class="com.ai.ipu.mobile.plugin.MobileCamera" method="getPicture" permission="camera"/>
	<action name="getPhoto" class="com.ai.ipu.mobile.plugin.MobileCamera" method="getPhoto" permissions="camera"/>
	<action name="getPicture" class="com.ai.ipu.mobile.plugin.MobileCamera" method="getPicture" permissions="camera"/>
	<action name="transImageToBase64" class="com.ai.ipu.mobile.plugin.MobileCamera" method="transImageToBase64"/>
	<action name="compressImage" class="com.ai.ipu.mobile.plugin.MobileCamera" method="compressImage"/>
	

show-client/config.gradle

@@ -56,7 +56,7 @@ ext{
            ipu_mobile_basic : "com.ai.ipu.mobile:ipu-mobile-basic:" + "${ipu_mobile_snapshot_version}",
            ipu_mobile_framework : "com.ai.ipu.mobile:ipu-mobile-framework:" + "${ipu_mobile_snapshot_version}",//目前这个为jar，之后更新为aar
            ipu_mobile_extend : "com.ai.ipu.mobile:ipu-plugin-extend:3.0-SNAPSHOT",
            ipu_mobile_ui : "com.ai.ipu.mobile:ipu-mobile-ui:${ipu_common_version}",
            ipu_mobile_ui : "com.ai.ipu.mobile:ipu-mobile-ui:${ipu_mobile_snapshot_version}",
    ]
    //IPU Hybird插件包
@@ -67,11 +67,13 @@ ext{
            ipu_asr : "com.ai.ipu.plugin.asr:ipu-asr:${ipu_mobile_snapshot_version}",
            ipu_customcamera : "com.ai.ipu.plugin:ipu-customcamera:${ipu_mobile_snapshot_version}",
            ipu_plugin_extend : "com.ai.ipu.plugin:ipu-plugin-extend:${ipu_mobile_snapshot_version}",
            ipu_plugin_basic : "com.ai.ipu.plugin:ipu-plugin-basic:${ipu_mobile_snapshot_version}",
            ipu_map_bd : "com.ai.ipu.plugin.map:ipu-map-bd:" + "${ipu_mobile_snapshot_version}",
            ipu_file_picker : "com.ai.ipu.plugin:ipu-file-picker:${ipu_mobile_snapshot_version}",
            ipu_dialog : "com.ai.ipu.plugin:ipu-dialog:${ipu_mobile_snapshot_version}",
            ipu_bluetooth : "com.ai.ipu.plugin:ipu-bluetooth:${ipu_mobile_snapshot_version}",
            ipu_jpush : "com.ai.ipu.plugin.push:ipu-push-jpush:${ipu_mobile_snapshot_version}"
            ipu_jpush : "com.ai.ipu.plugin.push:ipu-push-jpush:${ipu_mobile_snapshot_version}",
            ipu_video_compressor : "com.ai.ipu.plugin:ipu-video-compressor:${ipu_mobile_snapshot_version}"
    ]
    //RN 依赖包
@@ -101,7 +103,7 @@ ext{
            //replugin
            replugin : 'com.qihoo360.replugin:replugin-plugin-lib:' + "$replugin",
            //xxpermission
            xxpermission : 'com.github.getActivity:XXPermissions:12.6',
            xxpermission : 'com.github.getActivity:XXPermissions:12.8',
            //room
            room_runtime : "androidx.room:room-runtime:2.3.0",
            room_compiler: "androidx.room:room-compiler:2.3.0",
@@ -117,7 +119,10 @@ ext{
            //ybpush
            //glide
            glide : "com.github.bumptech.glide:glide:4.12.0"
            glide : "com.github.bumptech.glide:glide:4.12.0",
            android_lite_http : "android:android-lite-http:1.0",
            silicompressor : 'com.iceteck.silicompressorr:silicompressor:2.2.1'
    ]
    //测试依赖包

superapp-client/build.gradle

@@ -15,13 +15,11 @@ buildscript {
allprojects {
    repositories {
        jcenter()
//        jcenter()
        flatDir {
            dirs project(':ipu-mobile-common').file('libs')
        }
        google()
        maven{
            url  "https://dl.bintray.com/qihoo360/replugin"
        }
        maven { url 'https://jitpack.io' }
    }
}

superapp-client/superappclient/build.gradle

@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
android {
    compileSdkVersion 23
    compileSdkVersion 30
    defaultConfig {
        applicationId "com.ai.ipu.superapp"
@@ -58,6 +58,9 @@ dependencies {
//    implementation(name:'ipu-map-bd-1.0', ext:'aar')
    implementation(name:'ipu-push-jpush-1.0', ext:'aar')
    implementation(name:'ipu-customcamera-1.0', ext:'aar')
    implementation 'com.android.support:appcompat-v7:27.0.1'
//    implementation 'com.qihoo360.replugin:replugin-host-lib:2.3.1'
    implementation 'com.github.getActivity:XXPermissions:12.6'
    implementation 'com.android.support:appcompat-v7:23.0.1'
    //implementation 'com.qihoo360.replugin:replugin-host-lib:2.3.1'
}

superapp-client/superappclient/src/main/java/com/ai/ipu/sa/App.java

@@ -7,6 +7,11 @@ import android.util.Log;
import com.ai.ipu.mobile.dynamic.app.NativeMenuManager;
import com.ai.ipu.mobile.frame.IpuBasicApplication;
//import com.qihoo360.mobilesafe.core.BuildConfig;
//import com.qihoo360.replugin.RePlugin;
//import com.qihoo360.replugin.RePluginCallbacks;
//import com.qihoo360.replugin.RePluginConfig;
//import com.qihoo360.replugin.RePluginEventCallbacks;
/**
 * Created by Administrator on 2016/12/5.
@@ -16,32 +21,32 @@ public class App extends IpuBasicApplication {
    @Override
    public void onCreate() {
        super.onCreate();
        //RePlugin.App.onCreate();
//        RePlugin.App.onCreate();
        NativeMenuManager.initPluginManager(this);
    }
    @Override
    protected void attachBaseContext(Context base) {
        super.attachBaseContext(base);
        //RePlugin.App.attachBaseContext(this);
//        RePlugin.App.attachBaseContext(this);
    }
    @Override
    public void onLowMemory() {
        super.onLowMemory();
        //RePlugin.App.onLowMemory();
//        RePlugin.App.onLowMemory();
    }
    @Override
    public void onTrimMemory(int level) {
        super.onTrimMemory(level);
        //RePlugin.App.onTrimMemory(level);
//        RePlugin.App.onTrimMemory(level);
    }
    @Override
    public void onConfigurationChanged(Configuration newConfig) {
        super.onConfigurationChanged(newConfig);
        //RePlugin.App.onConfigurationChanged(newConfig);
//        RePlugin.App.onConfigurationChanged(newConfig);
    }
    @Override

superapp-client/superappclient/src/main/java/com/ai/ipu/sa/func/MobileOpenApp.java

@@ -21,10 +21,13 @@ import android.util.Log;
import android.widget.Toast;
import com.ai.ipu.basic.file.FileUtil;
import com.ai.ipu.basic.net.http.HttpTool;
import com.ai.ipu.mobile.dynamic.app.NativeMenu;
import com.ai.ipu.mobile.dynamic.app.NativeMenuManager;
import com.ai.ipu.mobile.frame.template.ResVersionManager;
import com.ai.ipu.mobile.ui.HintUtil;
import com.ai.ipu.mobile.ui.activity.IpuUrlActivity;
import com.ai.ipu.mobile.util.Constant;
import com.ai.ipu.mobile.util.NatvieMenuConstant;
import com.ai.ipu.sa.MainActivity;
import com.ai.ipu.sa.SubAppActivity;
@@ -76,6 +79,10 @@ public class MobileOpenApp extends Plugin {
        if(subAppOpenStatus.get(appId)!=null&&subAppOpenStatus.get(appId)){
        	openSubApp(ipuParam);
        }else{
			String host = MultipleManager.getCurrRequestHost();
			String servlet = MultipleManager.getCurrRequestServlet();
			String requestPath = MultipleManager.getCurrRequestPath();
        	getVersion(host + requestPath + servlet); // 通过getVersion判断资源列表是否加密
        	TemplateDownloader downloader = new TemplateDownloader(context) {
    			@Override
    			protected void downloadComplete() {
@@ -286,5 +293,13 @@ public class MobileOpenApp extends Plugin {
		}
	}
	protected IData getVersion(String url) throws Exception {
		Map<String, String> postParam = new HashMap<>();
		postParam.put(Constant.Server.ACTION, Constant.Version.VERSION_ACTION);// 接口名固定getVersion
		String data = HttpTool.urlEncode(HttpTool.toQueryString(postParam), "UTF-8");
		String result = HttpTool.httpRequest(url, data, Constant.HTTP_POST);
		DataMap res = new DataMap(result);
		ResVersionManager.setEncryptResVersions(res); //设置是否加密res.version.properties
		return res;
	}
}