更新Jmsdk，兼容android10

优化游客登录成功后截图
更新gdt

log_sdk/gdt/libs/config.json

@@ -0,0 +1,3 @@
+[
+	"GDTActionSDK.min.1.4.9.jar"
+]

package_utils.py

@@ -855,10 +855,21 @@ def packLogJar(game, sdk, subChannel, config, logSdk):
     # 找到所有lib依赖
     sdkPath = file_utils.getFullLogSDKPath(logSdk)
     libs = os.path.join(sdkPath, 'libs')
-    for jar in os.listdir(libs):
-        if not jar.endswith('.jar'):
-            continue
-        dexCmd += ' ' + os.path.join(libs, jar)
+    libConfig = os.path.join(libs, 'config.json')
+
+    # 存在配置文件
+    if os.path.exists(libConfig):
+        jsonText = file_utils.readFile(libConfig)
+        libList = json.loads(jsonText)
+        for jar in libList:
+            if not jar.endswith('.jar'):
+                continue
+            dexCmd += ' ' + os.path.join(libs, jar)
+    else:
+        for jar in os.listdir(libs):
+            if not jar.endswith('.jar'):
+                continue
+            dexCmd += ' ' + os.path.join(libs, jar)
 
     # sdk实现类
     print('packageing all log jar ...')

sdk/jm/libs/config.json

@@ -5,6 +5,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20190918.jar"
+		"jm_sdk_20190924.jar"
 	]
 }

sdk/jm/manifest.xml

@@ -9,6 +9,7 @@
 	</permissions>
 
     <application>
+		<uses-library android:name="org.apache.http.legacy" android:required="false"/>
         <activity
             android:name="com.jmhy.sdk.activity.JmLoginActivity"
             android:screenOrientation="behind"

sdk/jm/res/layout/jmlogin_main.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/linear"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -50,7 +51,7 @@
                 android:layout_below="@+id/ivkefu"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="v1.0.1" 
+                tools:text="v1.0.1"
                 android:layout_alignParentRight="true"
                 android:textColor="#d5dad3"
                 android:textSize="10sp"

sdk/jm/res/layout/jmsetuser_3.xml

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <LinearLayout
+        android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
         android:layout_height="@dimen/jm_login_height"
         android:paddingLeft="15dp"

sdk/jm/res/layout/jmsetuser_new.xml

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <LinearLayout
+        android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
         android:layout_height="@dimen/jm_login_height"
         android:paddingLeft="15dp"

sdk/jm/res/values-zh-rCN/jm_strings.xml

@@ -38,7 +38,7 @@
     <string name="user_forgot_msg">忘记密码</string>
     <string name="login_tip">亲，快点登陆吧！</string>
     <string name="function_not_open">此功能暂未开通</string>
-    <string name="snapshot_save">截图已保存</string>
+    <string name="snapshot_save">截图已保存到相册</string>
     <string name="exit_title">是否退出游戏？</string>
     <string name="exit_no">继续游戏</string>
     <string name="exit_yes">退出游戏</string>

sdk/jm/res/values/jm_strings.xml

@@ -38,7 +38,7 @@
     <string name="user_forgot_msg">Password forgotten</string>
     <string name="login_tip">Dear customer, please login in!</string>
     <string name="function_not_open">This function is temporarily not open</string>
-    <string name="snapshot_save">Screenshot is saved</string>
+    <string name="snapshot_save">Screenshot is save to Album</string>
     <string name="exit_title">To exit the game?</string>
     <string name="exit_no">Continue the game</string>
     <string name="exit_yes">Exit the game</string>

sdk/jm_beiyu/libs/config.json

@@ -17,6 +17,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20190918.jar"
+		"jm_sdk_20190924.jar"
 	]
 }

sdk/jm_beiyu/manifest.xml

@@ -18,6 +18,7 @@
 	</permissions>
 
     <application>
+		<uses-library android:name="org.apache.http.legacy" android:required="false"/>
         <activity
             android:name="com.jmhy.sdk.activity.JmLoginActivity"
             android:screenOrientation="behind"

sdk/jm_beiyu/res/layout/jmlogin_main.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/linear"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -50,7 +51,7 @@
                 android:layout_below="@+id/ivkefu"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="v1.0.1" 
+                tools:text="v1.0.1"
                 android:layout_alignParentRight="true"
                 android:textColor="#d5dad3"
                 android:textSize="10sp"

sdk/jm_beiyu/res/layout/jmsetuser_3.xml

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <LinearLayout
+        android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
         android:layout_height="@dimen/jm_login_height"
         android:paddingLeft="15dp"

sdk/jm_beiyu/res/layout/jmsetuser_new.xml

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <LinearLayout
+        android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
         android:layout_height="@dimen/jm_login_height"
         android:paddingLeft="15dp"

sdk/jm_beiyu/res/values-zh-rCN/jm_strings.xml

@@ -38,7 +38,7 @@
     <string name="user_forgot_msg">忘记密码</string>
     <string name="login_tip">亲，快点登陆吧！</string>
     <string name="function_not_open">此功能暂未开通</string>
-    <string name="snapshot_save">截图已保存</string>
+    <string name="snapshot_save">截图已保存到相册</string>
     <string name="exit_title">是否退出游戏？</string>
     <string name="exit_no">继续游戏</string>
     <string name="exit_yes">退出游戏</string>

sdk/jm_beiyu/res/values/jm_strings.xml

@@ -38,7 +38,7 @@
     <string name="user_forgot_msg">Password forgotten</string>
     <string name="login_tip">Dear customer, please login in!</string>
     <string name="function_not_open">This function is temporarily not open</string>
-    <string name="snapshot_save">Screenshot is saved</string>
+    <string name="snapshot_save">Screenshot is save to Album</string>
     <string name="exit_title">To exit the game?</string>
     <string name="exit_no">Continue the game</string>
     <string name="exit_yes">Exit the game</string>

sdk/jm_cangyu/libs/config.json

@@ -6,6 +6,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20190918.jar"
+		"jm_sdk_20190924.jar"
 	]
 }

sdk/jm_cangyu/manifest.xml

@@ -23,6 +23,7 @@
 
     <application>
         <!-- jmsdk -->
+		<uses-library android:name="org.apache.http.legacy" android:required="false"/>
         <activity
             android:name="com.jmhy.sdk.activity.JmLoginActivity"
             android:screenOrientation="behind"

sdk/jm_cangyu/res/layout/jmlogin_main.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/linear"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -50,7 +51,7 @@
                 android:layout_below="@+id/ivkefu"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="v1.0.1" 
+                tools:text="v1.0.1"
                 android:layout_alignParentRight="true"
                 android:textColor="#d5dad3"
                 android:textSize="10sp"

sdk/jm_cangyu/res/layout/jmsetuser_3.xml

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <LinearLayout
+        android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
         android:layout_height="@dimen/jm_login_height"
         android:paddingLeft="15dp"

sdk/jm_cangyu/res/layout/jmsetuser_new.xml

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <LinearLayout
+        android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
         android:layout_height="@dimen/jm_login_height"
         android:paddingLeft="15dp"

sdk/jm_cangyu/res/values-zh-rCN/jm_strings.xml

@@ -38,7 +38,7 @@
     <string name="user_forgot_msg">忘记密码</string>
     <string name="login_tip">亲，快点登陆吧！</string>
     <string name="function_not_open">此功能暂未开通</string>
-    <string name="snapshot_save">截图已保存</string>
+    <string name="snapshot_save">截图已保存到相册</string>
     <string name="exit_title">是否退出游戏？</string>
     <string name="exit_no">继续游戏</string>
     <string name="exit_yes">退出游戏</string>

sdk/jm_cangyu/res/values/jm_strings.xml

@@ -38,7 +38,7 @@
     <string name="user_forgot_msg">Password forgotten</string>
     <string name="login_tip">Dear customer, please login in!</string>
     <string name="function_not_open">This function is temporarily not open</string>
-    <string name="snapshot_save">Screenshot is saved</string>
+    <string name="snapshot_save">Screenshot is save to Album</string>
     <string name="exit_title">To exit the game?</string>
     <string name="exit_no">Continue the game</string>
     <string name="exit_yes">Exit the game</string>

sdk/jm_jq/libs/config.json

@@ -7,6 +7,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20190918.jar"
+		"jm_sdk_20190924.jar"
 	]
 }

sdk/jm_jq/manifest.xml

@@ -18,6 +18,7 @@
 
     <application>
         <!-- jmsdk -->
+		<uses-library android:name="org.apache.http.legacy" android:required="false"/>
         <activity
             android:name="com.jmhy.sdk.activity.JmLoginActivity"
             android:screenOrientation="behind"

sdk/jm_jq/res/layout/jmlogin_main.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/linear"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -50,7 +51,7 @@
                 android:layout_below="@+id/ivkefu"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="v1.0.1" 
+                tools:text="v1.0.1"
                 android:layout_alignParentRight="true"
                 android:textColor="#d5dad3"
                 android:textSize="10sp"

sdk/jm_jq/res/layout/jmsetuser_3.xml

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <LinearLayout
+        android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
         android:layout_height="@dimen/jm_login_height"
         android:paddingLeft="15dp"

sdk/jm_jq/res/layout/jmsetuser_new.xml

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <LinearLayout
+        android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
         android:layout_height="@dimen/jm_login_height"
         android:paddingLeft="15dp"

sdk/jm_jq/res/values-zh-rCN/jm_strings.xml

@@ -38,7 +38,7 @@
     <string name="user_forgot_msg">忘记密码</string>
     <string name="login_tip">亲，快点登陆吧！</string>
     <string name="function_not_open">此功能暂未开通</string>
-    <string name="snapshot_save">截图已保存</string>
+    <string name="snapshot_save">截图已保存到相册</string>
     <string name="exit_title">是否退出游戏？</string>
     <string name="exit_no">继续游戏</string>
     <string name="exit_yes">退出游戏</string>

sdk/jm_jq/res/values/jm_strings.xml

@@ -38,7 +38,7 @@
     <string name="user_forgot_msg">Password forgotten</string>
     <string name="login_tip">Dear customer, please login in!</string>
     <string name="function_not_open">This function is temporarily not open</string>
-    <string name="snapshot_save">Screenshot is saved</string>
+    <string name="snapshot_save">Screenshot is save to Album</string>
     <string name="exit_title">To exit the game?</string>
     <string name="exit_no">Continue the game</string>
     <string name="exit_yes">Exit the game</string>

sdk/jm_oppo/libs/config.json

@@ -6,7 +6,7 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20190918.jar"
+		"jm_sdk_20190924.jar"
 	],
 	"nopay":[
 		"gamesdk-20180621.jar",
@@ -15,6 +15,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_nopay_20190918.jar"
+		"jm_sdk_nopay_20190924.jar"
 	]
 }

sdk/jm_oppo/manifest.xml

@@ -19,6 +19,7 @@
 	</permissions>
 
     <application>
+		<uses-library android:name="org.apache.http.legacy" android:required="false"/>
         <activity
             android:name="com.jmhy.sdk.activity.JmLoginActivity"
             android:screenOrientation="behind"

sdk/jm_oppo/res/layout/jmlogin_main.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/linear"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -50,7 +51,7 @@
                 android:layout_below="@+id/ivkefu"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="v1.0.1" 
+                tools:text="v1.0.1"
                 android:layout_alignParentRight="true"
                 android:textColor="#d5dad3"
                 android:textSize="10sp"

sdk/jm_oppo/res/layout/jmsetuser_3.xml

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <LinearLayout
+        android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
         android:layout_height="@dimen/jm_login_height"
         android:paddingLeft="15dp"

sdk/jm_oppo/res/layout/jmsetuser_new.xml

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <LinearLayout
+        android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
         android:layout_height="@dimen/jm_login_height"
         android:paddingLeft="15dp"

sdk/jm_oppo/res/values-zh-rCN/jm_strings.xml

@@ -38,7 +38,7 @@
     <string name="user_forgot_msg">忘记密码</string>
     <string name="login_tip">亲，快点登陆吧！</string>
     <string name="function_not_open">此功能暂未开通</string>
-    <string name="snapshot_save">截图已保存</string>
+    <string name="snapshot_save">截图已保存到相册</string>
     <string name="exit_title">是否退出游戏？</string>
     <string name="exit_no">继续游戏</string>
     <string name="exit_yes">退出游戏</string>

sdk/jm_oppo/res/values/jm_strings.xml

@@ -38,7 +38,7 @@
     <string name="user_forgot_msg">Password forgotten</string>
     <string name="login_tip">Dear customer, please login in!</string>
     <string name="function_not_open">This function is temporarily not open</string>
-    <string name="snapshot_save">Screenshot is saved</string>
+    <string name="snapshot_save">Screenshot is save to Album</string>
     <string name="exit_title">To exit the game?</string>
     <string name="exit_no">Continue the game</string>
     <string name="exit_yes">Exit the game</string>

sdk/jm_quick/libs/config.json

@@ -6,6 +6,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20190918.jar"
+		"jm_sdk_20190924.jar"
 	]
 }

sdk/jm_quick/manifest.xml

@@ -13,6 +13,7 @@
 	</permissions>
 
     <application>
+		<uses-library android:name="org.apache.http.legacy" android:required="false"/>
         <activity
             android:name="com.jmhy.sdk.activity.JmLoginActivity"
             android:screenOrientation="behind"

sdk/jm_quick/res/layout/jmlogin_main.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/linear"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -50,7 +51,7 @@
                 android:layout_below="@+id/ivkefu"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="v1.0.1" 
+                tools:text="v1.0.1"
                 android:layout_alignParentRight="true"
                 android:textColor="#d5dad3"
                 android:textSize="10sp"

sdk/jm_quick/res/layout/jmsetuser_3.xml

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <LinearLayout
+        android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
         android:layout_height="@dimen/jm_login_height"
         android:paddingLeft="15dp"

sdk/jm_quick/res/layout/jmsetuser_new.xml

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <LinearLayout
+        android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
         android:layout_height="@dimen/jm_login_height"
         android:paddingLeft="15dp"

sdk/jm_quick/res/values-zh-rCN/jm_strings.xml

@@ -38,7 +38,7 @@
     <string name="user_forgot_msg">忘记密码</string>
     <string name="login_tip">亲，快点登陆吧！</string>
     <string name="function_not_open">此功能暂未开通</string>
-    <string name="snapshot_save">截图已保存</string>
+    <string name="snapshot_save">截图已保存到相册</string>
     <string name="exit_title">是否退出游戏？</string>
     <string name="exit_no">继续游戏</string>
     <string name="exit_yes">退出游戏</string>

sdk/jm_quick/res/values/jm_strings.xml

@@ -38,7 +38,7 @@
     <string name="user_forgot_msg">Password forgotten</string>
     <string name="login_tip">Dear customer, please login in!</string>
     <string name="function_not_open">This function is temporarily not open</string>
-    <string name="snapshot_save">Screenshot is saved</string>
+    <string name="snapshot_save">Screenshot is save to Album</string>
     <string name="exit_title">To exit the game?</string>
     <string name="exit_no">Continue the game</string>
     <string name="exit_yes">Exit the game</string>

sdk/jm_qytx/libs/config.json

@@ -6,7 +6,7 @@
 		"qytx_pro_3.4.1.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20190918.jar"
+		"jm_sdk_20190924.jar"
 	],
 	"nopay":[
 		"android-support-v4.jar",
@@ -15,6 +15,6 @@
 		"qytx_pro_3.4.1.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_nopay_20190918.jar"
+		"jm_sdk_nopay_20190924.jar"
 	]
 }

sdk/jm_qytx/manifest.xml

@@ -23,6 +23,7 @@
 
     <application>
         <!-- jmsdk -->
+		<uses-library android:name="org.apache.http.legacy" android:required="false"/>
         <activity
             android:name="com.jmhy.sdk.activity.JmLoginActivity"
             android:screenOrientation="behind"

sdk/jm_qytx/res/layout/jmlogin_main.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/linear"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -50,7 +51,7 @@
                 android:layout_below="@+id/ivkefu"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="v1.0.1" 
+                tools:text="v1.0.1"
                 android:layout_alignParentRight="true"
                 android:textColor="#d5dad3"
                 android:textSize="10sp"

sdk/jm_qytx/res/layout/jmsetuser_3.xml

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <LinearLayout
+        android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
         android:layout_height="@dimen/jm_login_height"
         android:paddingLeft="15dp"

sdk/jm_qytx/res/layout/jmsetuser_new.xml

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <LinearLayout
+        android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
         android:layout_height="@dimen/jm_login_height"
         android:paddingLeft="15dp"

sdk/jm_qytx/res/values-zh-rCN/jm_strings.xml

@@ -38,7 +38,7 @@
     <string name="user_forgot_msg">忘记密码</string>
     <string name="login_tip">亲，快点登陆吧！</string>
     <string name="function_not_open">此功能暂未开通</string>
-    <string name="snapshot_save">截图已保存</string>
+    <string name="snapshot_save">截图已保存到相册</string>
     <string name="exit_title">是否退出游戏？</string>
     <string name="exit_no">继续游戏</string>
     <string name="exit_yes">退出游戏</string>

sdk/jm_qytx/res/values/jm_strings.xml

@@ -38,7 +38,7 @@
     <string name="user_forgot_msg">Password forgotten</string>
     <string name="login_tip">Dear customer, please login in!</string>
     <string name="function_not_open">This function is temporarily not open</string>
-    <string name="snapshot_save">Screenshot is saved</string>
+    <string name="snapshot_save">Screenshot is save to Album</string>
     <string name="exit_title">To exit the game?</string>
     <string name="exit_no">Continue the game</string>
     <string name="exit_yes">Exit the game</string>

sdk/jm_xq/libs/config.json

@@ -9,6 +9,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20190918.jar"
+		"jm_sdk_20190924.jar"
 	]
 }

sdk/jm_xq/manifest.xml

@@ -15,6 +15,52 @@
 	</permissions>
 
     <application>
+		<!-- jmsdk -->
+		<uses-library android:name="org.apache.http.legacy" android:required="false"/>
+        <activity
+            android:name="com.jmhy.sdk.activity.JmLoginActivity"
+            android:screenOrientation="behind"
+			android:launchMode="singleTop"
+			android:configChanges="orientation|keyboardHidden|screenSize"
+            android:theme="@style/jm_Transparent" />
+        <activity
+            android:name="com.jmhy.sdk.activity.JmAutoLoginActivity"
+            android:screenOrientation="behind"
+			android:launchMode="singleTop"
+			android:configChanges="orientation|keyboardHidden|screenSize"
+            android:theme="@style/jm_Transparent" />
+        <activity
+            android:name="com.jmhy.sdk.activity.JmUserinfoActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="behind"
+			android:launchMode="singleTop"
+            android:theme="@style/jm_Transparent" />
+        <activity
+            android:name="com.jmhy.sdk.activity.JmpayActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="behind"
+			android:launchMode="singleTop"
+            android:theme="@style/jm_Transparent" />
+        <activity
+            android:name="com.jmhy.sdk.activity.JmCommunityActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="portrait"
+			android:launchMode="singleTop"
+            android:theme="@android:style/Theme.Holo.Light.NoActionBar.Fullscreen" />
+		<activity
+            android:name="com.jmhy.sdk.activity.PermissionActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="behind"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
+		<activity
+            android:name="com.jmhy.sdk.activity.ForceActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="behind"
+            android:launchMode="singleTop"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
+
+        <service android:name="com.jmhy.sdk.push.PushService" />
+		
         <!-- 冰鸟SDK -->
         <activity
             android:name="com.xunqu.sdk.union.ui.ActivityContainer"
@@ -73,50 +119,5 @@
             android:name="com.switfpass.pay.activity.QQWapPayWebView"
             android:screenOrientation="sensorPortrait" />
         <!-- wxpay end -->
-
-        <!-- jmsdk -->
-        <activity
-            android:name="com.jmhy.sdk.activity.JmLoginActivity"
-            android:screenOrientation="behind"
-			android:launchMode="singleTop"
-			android:configChanges="orientation|keyboardHidden|screenSize"
-            android:theme="@style/jm_Transparent" />
-        <activity
-            android:name="com.jmhy.sdk.activity.JmAutoLoginActivity"
-            android:screenOrientation="behind"
-			android:launchMode="singleTop"
-			android:configChanges="orientation|keyboardHidden|screenSize"
-            android:theme="@style/jm_Transparent" />
-        <activity
-            android:name="com.jmhy.sdk.activity.JmUserinfoActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="behind"
-			android:launchMode="singleTop"
-            android:theme="@style/jm_Transparent" />
-        <activity
-            android:name="com.jmhy.sdk.activity.JmpayActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="behind"
-			android:launchMode="singleTop"
-            android:theme="@style/jm_Transparent" />
-        <activity
-            android:name="com.jmhy.sdk.activity.JmCommunityActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="portrait"
-			android:launchMode="singleTop"
-            android:theme="@android:style/Theme.Holo.Light.NoActionBar.Fullscreen" />
-		<activity
-            android:name="com.jmhy.sdk.activity.PermissionActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="behind"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
-		<activity
-            android:name="com.jmhy.sdk.activity.ForceActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="behind"
-            android:launchMode="singleTop"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
-
-        <service android:name="com.jmhy.sdk.push.PushService" />
     </application>
 </manifest>

sdk/jm_xq/res/layout/jmlogin_main.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/linear"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -50,7 +51,7 @@
                 android:layout_below="@+id/ivkefu"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="v1.0.1" 
+                tools:text="v1.0.1"
                 android:layout_alignParentRight="true"
                 android:textColor="#d5dad3"
                 android:textSize="10sp"

sdk/jm_xq/res/layout/jmsetuser_3.xml

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <LinearLayout
+        android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
         android:layout_height="@dimen/jm_login_height"
         android:paddingLeft="15dp"

sdk/jm_xq/res/layout/jmsetuser_new.xml

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <LinearLayout
+        android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
         android:layout_height="@dimen/jm_login_height"
         android:paddingLeft="15dp"

sdk/jm_xq/res/values-zh-rCN/jm_strings.xml

@@ -38,7 +38,7 @@
     <string name="user_forgot_msg">忘记密码</string>
     <string name="login_tip">亲，快点登陆吧！</string>
     <string name="function_not_open">此功能暂未开通</string>
-    <string name="snapshot_save">截图已保存</string>
+    <string name="snapshot_save">截图已保存到相册</string>
     <string name="exit_title">是否退出游戏？</string>
     <string name="exit_no">继续游戏</string>
     <string name="exit_yes">退出游戏</string>

sdk/jm_xq/res/values/jm_strings.xml

@@ -38,7 +38,7 @@
     <string name="user_forgot_msg">Password forgotten</string>
     <string name="login_tip">Dear customer, please login in!</string>
     <string name="function_not_open">This function is temporarily not open</string>
-    <string name="snapshot_save">Screenshot is saved</string>
+    <string name="snapshot_save">Screenshot is save to Album</string>
     <string name="exit_title">To exit the game?</string>
     <string name="exit_no">Continue the game</string>
     <string name="exit_yes">Exit the game</string>

sdk/jm_yijie/libs/config.json

@@ -8,6 +8,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20190918.jar"
+		"jm_sdk_20190924.jar"
 	]
 }

sdk/jm_yijie/manifest.xml

@@ -15,6 +15,7 @@
 	</permissions>
 
     <application>
+		<uses-library android:name="org.apache.http.legacy" android:required="false"/>
         <activity
             android:name="com.jmhy.sdk.activity.JmLoginActivity"
             android:screenOrientation="behind"

sdk/jm_yijie/res/layout/jmlogin_main.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/linear"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -50,7 +51,7 @@
                 android:layout_below="@+id/ivkefu"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="v1.0.1" 
+                tools:text="v1.0.1"
                 android:layout_alignParentRight="true"
                 android:textColor="#d5dad3"
                 android:textSize="10sp"

sdk/jm_yijie/res/layout/jmsetuser_3.xml

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <LinearLayout
+        android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
         android:layout_height="@dimen/jm_login_height"
         android:paddingLeft="15dp"

sdk/jm_yijie/res/layout/jmsetuser_new.xml

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <LinearLayout
+        android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
         android:layout_height="@dimen/jm_login_height"
         android:paddingLeft="15dp"

sdk/jm_yijie/res/values-zh-rCN/jm_strings.xml

@@ -38,7 +38,7 @@
     <string name="user_forgot_msg">忘记密码</string>
     <string name="login_tip">亲，快点登陆吧！</string>
     <string name="function_not_open">此功能暂未开通</string>
-    <string name="snapshot_save">截图已保存</string>
+    <string name="snapshot_save">截图已保存到相册</string>
     <string name="exit_title">是否退出游戏？</string>
     <string name="exit_no">继续游戏</string>
     <string name="exit_yes">退出游戏</string>

sdk/jm_yijie/res/values/jm_strings.xml

@@ -38,7 +38,7 @@
     <string name="user_forgot_msg">Password forgotten</string>
     <string name="login_tip">Dear customer, please login in!</string>
     <string name="function_not_open">This function is temporarily not open</string>
-    <string name="snapshot_save">Screenshot is saved</string>
+    <string name="snapshot_save">Screenshot is save to Album</string>
     <string name="exit_title">To exit the game?</string>
     <string name="exit_no">Continue the game</string>
     <string name="exit_yes">Exit the game</string>

sdk/jm_ysdk/libs/config.json

@@ -7,6 +7,6 @@
 		"org.apache.http.legacy.jar",
 		"walle.jar",
 		"walle-reader-1.1.6.jar",
-		"jm_sdk_20190918.jar"
+		"jm_sdk_20190924.jar"
 	]
 }

sdk/jm_ysdk/manifest.xml

@@ -15,6 +15,52 @@
 	</permissions>
 
     <application>
+		<!-- jmsdk -->
+		<uses-library android:name="org.apache.http.legacy" android:required="false"/>
+        <activity
+            android:name="com.jmhy.sdk.activity.JmLoginActivity"
+            android:screenOrientation="behind"
+			android:launchMode="singleTop"
+			android:configChanges="orientation|keyboardHidden|screenSize"
+            android:theme="@style/jm_Transparent" />
+        <activity
+            android:name="com.jmhy.sdk.activity.JmAutoLoginActivity"
+            android:screenOrientation="behind"
+			android:launchMode="singleTop"
+			android:configChanges="orientation|keyboardHidden|screenSize"
+            android:theme="@style/jm_Transparent" />
+        <activity
+            android:name="com.jmhy.sdk.activity.JmUserinfoActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="behind"
+			android:launchMode="singleTop"
+            android:theme="@style/jm_Transparent" />
+        <activity
+            android:name="com.jmhy.sdk.activity.JmpayActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="behind"
+			android:launchMode="singleTop"
+            android:theme="@style/jm_Transparent" />
+        <activity
+            android:name="com.jmhy.sdk.activity.JmCommunityActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="portrait"
+			android:launchMode="singleTop"
+            android:theme="@android:style/Theme.Holo.Light.NoActionBar.Fullscreen" />
+		<activity
+            android:name="com.jmhy.sdk.activity.PermissionActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="behind"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
+		<activity
+            android:name="com.jmhy.sdk.activity.ForceActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:screenOrientation="behind"
+            android:launchMode="singleTop"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
+
+        <service android:name="com.jmhy.sdk.push.PushService" />
+	
         <!-- TODO SDK接入 QQ接入配置 START -->
         <activity
             android:name="com.tencent.tauth.AuthActivity"
@@ -94,51 +140,6 @@
             android:windowSoftInputMode="stateAlwaysHidden"/>
         <!-- TODO GAME SDK Midas接入配置 END -->
 
-        <!-- jmsdk -->
-        <activity
-            android:name="com.jmhy.sdk.activity.JmLoginActivity"
-            android:screenOrientation="behind"
-			android:launchMode="singleTop"
-			android:configChanges="orientation|keyboardHidden|screenSize"
-            android:theme="@style/jm_Transparent" />
-        <activity
-            android:name="com.jmhy.sdk.activity.JmAutoLoginActivity"
-            android:screenOrientation="behind"
-			android:launchMode="singleTop"
-			android:configChanges="orientation|keyboardHidden|screenSize"
-            android:theme="@style/jm_Transparent" />
-        <activity
-            android:name="com.jmhy.sdk.activity.JmUserinfoActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="behind"
-			android:launchMode="singleTop"
-            android:theme="@style/jm_Transparent" />
-        <activity
-            android:name="com.jmhy.sdk.activity.JmpayActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="behind"
-			android:launchMode="singleTop"
-            android:theme="@style/jm_Transparent" />
-        <activity
-            android:name="com.jmhy.sdk.activity.JmCommunityActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="portrait"
-			android:launchMode="singleTop"
-            android:theme="@android:style/Theme.Holo.Light.NoActionBar.Fullscreen" />
-		<activity
-            android:name="com.jmhy.sdk.activity.PermissionActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="behind"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
-		<activity
-            android:name="com.jmhy.sdk.activity.ForceActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="behind"
-            android:launchMode="singleTop"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
-
-        <service android:name="com.jmhy.sdk.push.PushService" />
-
         <!-- ysdk登录界面 -->
         <activity
             android:name="com.inner.sdk.ui.YsdkLoginActivity"

sdk/jm_ysdk/res/layout/jmlogin_main.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/linear"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -50,7 +51,7 @@
                 android:layout_below="@+id/ivkefu"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="v1.0.1" 
+                tools:text="v1.0.1"
                 android:layout_alignParentRight="true"
                 android:textColor="#d5dad3"
                 android:textSize="10sp"

sdk/jm_ysdk/res/layout/jmsetuser_3.xml

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <LinearLayout
+        android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
         android:layout_height="@dimen/jm_login_height"
         android:paddingLeft="15dp"

sdk/jm_ysdk/res/layout/jmsetuser_new.xml

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <LinearLayout
+        android:id="@+id/content_view"
         android:layout_width="@dimen/jm_login_width"
         android:layout_height="@dimen/jm_login_height"
         android:paddingLeft="15dp"

sdk/jm_ysdk/res/values-zh-rCN/jm_strings.xml

@@ -38,7 +38,7 @@
     <string name="user_forgot_msg">忘记密码</string>
     <string name="login_tip">亲，快点登陆吧！</string>
     <string name="function_not_open">此功能暂未开通</string>
-    <string name="snapshot_save">截图已保存</string>
+    <string name="snapshot_save">截图已保存到相册</string>
     <string name="exit_title">是否退出游戏？</string>
     <string name="exit_no">继续游戏</string>
     <string name="exit_yes">退出游戏</string>

sdk/jm_ysdk/res/values/jm_strings.xml

@@ -38,7 +38,7 @@
     <string name="user_forgot_msg">Password forgotten</string>
     <string name="login_tip">Dear customer, please login in!</string>
     <string name="function_not_open">This function is temporarily not open</string>
-    <string name="snapshot_save">Screenshot is saved</string>
+    <string name="snapshot_save">Screenshot is save to Album</string>
     <string name="exit_title">To exit the game?</string>
     <string name="exit_no">Continue the game</string>
     <string name="exit_yes">Exit the game</string>