Merge branch 'feature_arison' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature

# Conflicts:
#	WeiChat/version.properties
#	app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DeviceDataFormAddActivity.java

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Jan 09 17:20:53 CST 2018
-debugName=26
+#Tue Jan 09 18:02:40 CST 2018
+debugName=32
 versionName=611
-debugCode=26
+debugCode=32
 versionCode=150

app_core/common/src/main/res/anim/anim_activity_back_in.xml

@@ -4,5 +4,4 @@
     android:fromXDelta="-100%p"
     android:toXDelta="0"
     >
-
 </translate>

app_modular/apputils/src/main/java/com/modular/apputils/IntentUrlActivity.java

@@ -32,6 +32,7 @@ private static final String TAG = "IntentUrlActivity";
                     intent.putExtra("url","https://www.baidu.com");
                     intent.putExtra("p","询价单");
                     startActivity(intent);
+                    
                 }
                 if ("B".equals(pagekind)){
                     Intent intent=new Intent(this, SimpleWebActivity.class);
@@ -48,6 +49,7 @@ private static final String TAG = "IntentUrlActivity";
                     intent.putExtra("p","采购单");
                     startActivity(intent);
                 }
+                overridePendingTransition(0,0);
                 finish();
             }
         }

app_modular/apputils/src/main/java/com/modular/apputils/activity/SimpleWebActivity.java

@@ -7,6 +7,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.view.KeyEvent;
 import android.webkit.CookieManager;
 import android.webkit.CookieSyncManager;
 import android.webkit.WebSettings;
@@ -132,6 +133,16 @@ private static final String TAG = "SimpleWebActivity";
     @Override
     public void onBackPressed() {
         startActivity( new Intent("com.modular.main.MainActivity"));
-        overridePendingTransition(com.core.app.R.anim.anim_activity_out, com.core.app.R.anim.anim_activity_in);
+        overridePendingTransition(com.core.app.R.anim.anim_activity_back_in,com.core.app.R.anim.anim_activity_back_out);
+        //overridePendingTransition(R.anim.anim_activity_back_in,R.anim.anim_activity_back_out);
+    }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK && webView.canGoBack()) {
+            webView.goBack();// 返回前一个页面
+            return true;
+        }
+        return super.onKeyDown(keyCode, event);
     }
 }