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

# Conflicts:
#	WeiChat/version.properties
#	app_core/common/build.gradle

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Jan 22 14:23:05 CST 2018
-debugName=133
+#Tue Jan 23 17:51:35 CST 2018
+debugName=135
 versionName=613
-debugCode=133
+debugCode=135
 versionCode=152

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

@@ -6,7 +6,6 @@ import android.net.Uri;
 import android.os.Bundle;
 
 import com.common.LogUtil;
-import com.modular.apputils.activity.SimpleWebActivity;
 
 /**
   * @desc:负责分发外部URL链接的中转界面
@@ -27,27 +26,24 @@ private static final String TAG = "IntentUrlActivity";
                 String id= uri.getQueryParameter("id");
                 LogUtil.d(TAG,"pagekind:"+pagekind+" id:"+id);
                 if ("A".equals(pagekind)){
-//                    Intent intent=new Intent(this, CustomerInquiryDetailActivity
-//                            .class);
-//             
-//                    intent.putExtra("extra_b2b_list_id",id);
-//                    intent.putExtra("extra_b2b_list_state","todo");
-//                    startActivity(intent);
-                    
+                    Intent intent=new Intent("com.modular.work.platform.activity.CustomerInquiryDetailActivity");
+
+                    intent.putExtra("extra_b2b_list_id",id);
+                    intent.putExtra("extra_b2b_list_state","todo");
+                    startActivity(intent);
                 }
                 if ("B".equals(pagekind)){//公共询价单
-//                    Intent intent=new Intent(this, CustomerInquiryDetailActivity
-//                            .class);
-//                    intent.putExtra("extra_b2b_list_id",id);
-//                    intent.putExtra("extra_b2b_list_state","public_todo");
-//                    startActivity(intent);
+                    Intent intent=new Intent("com.modular.work.platform.activity.CustomerInquiryDetailActivity");
+                    intent.putExtra("extra_b2b_list_id",id);
+                    intent.putExtra("extra_b2b_list_state","public_todo");
+                    startActivity(intent);
                   
                 }
                 if ("C".equals(pagekind)){
-//                    Intent intent=new Intent(this, PurchaseDetailsActivity.class);
-//                    intent.putExtra("extra_b2b_list_id",id);
-//                    intent.putExtra("extra_b2b_list_state","todo");
-//                    startActivity(intent);
+                    Intent intent=new Intent("com.modular.work.platform.activity.PurchaseDetailsActivity");
+                    intent.putExtra("extra_b2b_list_id",id);
+                    intent.putExtra("extra_b2b_list_state","todo");
+                    startActivity(intent);
                 }
                 overridePendingTransition(0,0);
                 finish();

app_modular/appworks/src/main/AndroidManifest.xml

@@ -401,8 +401,20 @@
             android:theme="@style/StyledBlueIndicators"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity android:name=".activity.PublicInquiryDetailActivity" />
-        <activity android:name=".activity.CustomerInquiryDetailActivity"/>
-        <activity android:name=".OA.platform.activity.PurchaseDetailsActivity" />
+        
+        <activity android:name=".activity.CustomerInquiryDetailActivity">
+            <intent-filter>
+                <action android:name="com.modular.work.platform.activity.CustomerInquiryDetailActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        
+        <activity android:name=".OA.platform.activity.PurchaseDetailsActivity" >
+            <intent-filter>
+                <action android:name="com.modular.work.platform.activity.PurchaseDetailsActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
     </application>
 
 </manifest>

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/PurchaseDetailsActivity.java

@@ -13,7 +13,6 @@ import android.widget.Toast;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;