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

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Jan 24 18:21:06 CST 2018
-debugName=147
+#Wed Jan 24 18:36:17 CST 2018
+debugName=148
 versionName=613
-debugCode=147
+debugCode=148
 versionCode=152

app_modular/appbooking/src/main/java/com/modular/booking/activity/services/BServicesActivity.java

@@ -130,13 +130,12 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
         mBanner = findViewById(R.id.city_industry_service_main_banner);
         mBanner.setImageLoader(new BannerImageLoader());
         
-//        List<String> imgList=new ArrayList<>();
-//        imgList.add("http://demo.sc.chinaz.com/Files/DownLoad/webjs1/201707/jiaoben5258/images/3-1.jpg");
-//        imgList.add("http://demo.sc.chinaz.com/Files/DownLoad/webjs1/201707/jiaoben5258/images/2-1.jpg");
-//        imgList.add("http://demo.sc.chinaz.com/Files/DownLoad/webjs1/201707/jiaoben5258/images/1-1.jpg");
-//        imgList.add("http://demo.sc.chinaz.com/Files/DownLoad/webjs1/201707/jiaoben5258/images/2-1.jpg");
-//        mBanner.update(imgList);
-//        mBanner.start();
+        List<String> imgList=new ArrayList<>();
+        imgList.add("http://113.105.74.140:8081/u/123/100123/201801/o/f5624e77ca374a319a28d06c92752fbb.png");
+        imgList.add("http://113.105.74.140:8081/u/123/100123/201801/o/f5624e77ca374a319a28d06c92752fbb.png");
+        imgList.add("http://113.105.74.140:8081/u/123/100123/201801/o/f5624e77ca374a319a28d06c92752fbb.png");
+        mBanner.update(imgList);
+        mBanner.start();
         
         
         List<SBMenuModel> menuModels = new ArrayList<>();
@@ -355,7 +354,6 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
                              imgList.add(url);
                              imgList.add(url);
                              imgList.add(url);
-                             imgList.add(url);
                              mBanner.update(imgList);
                              mBanner.start();
                          } catch (Exception e) {

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

@@ -8,6 +8,7 @@ import android.os.Handler;
 
 import com.common.LogUtil;
 import com.common.system.ActivityUtils;
+import com.core.app.Constants;
 
 /**
   * @desc:负责分发外部URL链接的中转界面
@@ -37,35 +38,42 @@ public class IntentUrlActivity extends Activity {
     }
 
     private void openIntentUrl(String action, Intent i_getvalue) {
-        if(Intent.ACTION_VIEW.equals(action)){
-            Uri uri = i_getvalue.getData();
-            if(uri != null){
-                String pagekind = uri.getQueryParameter("pagekind");
-                String id= uri.getQueryParameter("id");
-                LogUtil.d(TAG,"pagekind:"+pagekind+" id:"+id);
-                if ("A".equals(pagekind)){
-                    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("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("com.modular.work.platform.activity.PurchaseDetailsActivity");
-                    intent.putExtra("extra_b2b_list_id",id);
-                    intent.putExtra("extra_b2b_list_state","todo");
-                    startActivity(intent);
+        try {
+            if(Intent.ACTION_VIEW.equals(action)){
+                Uri uri = i_getvalue.getData();
+                if(uri != null){
+                    String pagekind = uri.getQueryParameter("pagekind");
+                    String id= uri.getQueryParameter("id");
+                    String enuu= uri.getQueryParameter("uu"); 
+                    LogUtil.d(TAG,"pagekind:"+pagekind+" id:"+id);
+                    if ("A".equals(pagekind)){
+                        Intent intent=new Intent("com.modular.work.platform.activity.CustomerInquiryDetailActivity");
+                        intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ID ,id);
+                        intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_STATE,"todo");
+                        intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ENUU,enuu);
+                        startActivity(intent);
+                    }
+                    if ("B".equals(pagekind)){//公共询价单
+                        Intent intent=new Intent("com.modular.work.platform.activity.CustomerInquiryDetailActivity");
+                        intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ID ,id);
+                        intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_STATE,"public_todo");
+                        intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ENUU,enuu);
+                        startActivity(intent);
+    
+                    }
+                    if ("C".equals(pagekind)){
+                        Intent intent=new Intent("com.modular.work.platform.activity.PurchaseDetailsActivity");
+                        intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ID ,id);
+                        intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_STATE,"todo");
+                        intent.putExtra(Constants.FLAG.EXTRA_B2B_LIST_ENUU,enuu);
+                        startActivity(intent);
+                    }
+                    overridePendingTransition(0,0);
+                    finish();
                 }
-                overridePendingTransition(0,0);
-                finish();
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }
 }