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

# Conflicts:
#	WeiChat/version.properties

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -580,7 +580,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
         autoPresenter = AutoPresenter.onCreate();
 //		startService(new Intent(MainActivity.this, AutoErpService.class));
         LogUtil.d("OnCreate end:" + DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS));
-
+       
     }
 
     private AutoPresenter autoPresenter;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -39,6 +39,7 @@ import com.core.utils.FlexJsonUtil;
 import com.core.utils.ToastUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.modular.booking.activity.services.DishSelectActivity;
 import com.uas.appme.other.model.Master;
 import com.uas.appme.settings.activity.BaseInfoActivity;
 import com.uas.appme.settings.activity.CheckWagesActivity;
@@ -351,9 +352,10 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         picture_selector_rl.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-              startActivity(new Intent("com.modular.apputils.activity.SimpleWebActivity")
-              .putExtra("url","http://qq784602719.imwork.net:13767/Chapter/")
-              );
+                startActivity(new Intent(ct, DishSelectActivity.class));
+//              startActivity(new Intent("com.modular.apputils.activity.SimpleWebActivity")
+//              .putExtra("url","http://qq784602719.imwork.net:13767/Chapter/")
+//              );
             }
         });
         picture_selector_rl.setOnLongClickListener(new View.OnLongClickListener() {

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Jan 23 17:51:35 CST 2018
-debugName=135
+#Wed Jan 24 16:39:59 CST 2018
+debugName=146
 versionName=613
-debugCode=135
+debugCode=146
 versionCode=152

app_core/common/src/main/java/com/common/LogUtil.java

@@ -102,14 +102,14 @@ public class LogUtil {
 				for (int i = 0; i <= chunkCount; i++) {
 					int max = 3000 * (i + 1);
 					if (max >= responseInfo.length()) {
-						Log.i(TAG, "【chunk " + i + " of " + chunkCount + "】:" + responseInfo.substring(3000 * i));
+						Log.d(TAG, "【"+ i + "】" + responseInfo.substring(3000 * i));
 					} else {
-						Log.i(TAG, "【chunk " + i + " of " + chunkCount + "】:" + responseInfo.substring(3000 * i, max));
+						Log.d(TAG, "【" + i+ "】" + responseInfo.substring(3000 * i, max));
 					}
 				}
 			} else {
-				Log.v(TAG, "sb.length = " + responseInfo.length());
-				Log.i(TAG, responseInfo.toString());
+				Log.d(TAG, "sb.length = " + responseInfo.length());
+				Log.d(TAG, responseInfo.toString());
 			}
 		}
 

app_core/common/src/main/java/com/common/system/ActivityUtils.java

@@ -7,6 +7,8 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 
+import com.core.app.MyApplication;
+
 import java.util.List;
 
 /**
@@ -19,6 +21,22 @@ import java.util.List;
  */
 public class ActivityUtils {
 
+    /**
+     * 判断程序是否打开
+     * @return
+     */
+    public static boolean isRunningInForeground() {
+        boolean isActivityFound = false;
+        ActivityManager activityManager = (ActivityManager) MyApplication.getInstance().getSystemService(Context.ACTIVITY_SERVICE);
+        List<ActivityManager.RunningTaskInfo> services = activityManager
+                .getRunningTasks(1);
+        if (services.get(0).topActivity.getPackageName().toString()
+                .equalsIgnoreCase(MyApplication.getInstance().getPackageName().toString())) {
+            isActivityFound = true;
+        }
+        return isActivityFound;
+    }
+
     private ActivityUtils() {
         throw new UnsupportedOperationException("u can't instantiate me...");
     }

app_modular/appbooking/src/main/AndroidManifest.xml

@@ -16,8 +16,9 @@
             android:name=".activity.services.BServiceSearchActivity"
             android:windowSoftInputMode="adjustPan|stateHidden" />
         <activity android:name=".activity.services.BServiceDetailActivity" />
-        <activity android:name=".activity.utils.GridSelectActivity"></activity>
-        <activity android:name=".activity.utils.GridSelectDateActivity"></activity>
+        <activity android:name=".activity.utils.GridSelectActivity" />
+        <activity android:name=".activity.utils.GridSelectDateActivity" />
+        <activity android:name=".activity.services.DishSelectActivity"></activity>
     </application>
 
 </manifest>

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

@@ -0,0 +1,81 @@
+package com.modular.booking.activity.services;
+
+import android.os.Bundle;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.common.LogUtil;
+import com.core.base.OABaseActivity;
+import com.me.network.app.http.HttpClient;
+import com.me.network.app.http.Method;
+import com.me.network.app.http.rx.ResultListener;
+import com.me.network.app.http.rx.ResultSubscriber;
+import com.modular.booking.R;
+import com.modular.booking.model.Product;
+import com.modular.booking.model.ProductCategory;
+
+import java.util.List;
+
+/**
+  * @desc:选择菜品
+  * @author：Arison on 2018/1/24
+  */
+public class DishSelectActivity extends OABaseActivity {
+  private static final String TAG = "DishSelectActivity";
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_dish_select);
+        
+        initView();
+        initEvent();
+        initData();
+    }
+    
+    private void initView(){
+        getSupportActionBar().setTitle("选菜");
+    }
+    
+    private void initEvent(){}
+    
+    private void initData(){
+          HttpClient httpClient=new HttpClient.Builder("http://www.haidiyun.top:9908/").build();
+                 httpClient.Api().send(new HttpClient.Builder()
+                 .url("api?client=DAFFF430FA37&handler=Hdy&method=GetBasicData")
+                 .method(Method.GET)
+                 .build(),new ResultSubscriber<Object>(new ResultListener<Object>() {
+          
+                     @Override
+                     public void onResponse(Object o) {
+                         //LogUtil.prinlnLongMsg(TAG,o.toString());
+                         try {
+                             String data=   JSON.parseObject(o.toString()).getString("Data");
+                             JSONArray dishCategories= JSON.parseObject(data).getJSONArray("DishCategories");
+                             JSONArray dishs=JSON.parseObject(data).getJSONArray("Dishs");
+                             
+                             List<ProductCategory> productCategorys= JSON.parseArray(dishCategories.toJSONString(), ProductCategory.class);
+                             List<Product> products= JSON.parseArray(dishs.toJSONString(), Product.class);
+                             for (int i = 0; i < productCategorys.size(); i++) {
+                                // LogUtil.d(TAG,"菜类："+productCategorys.get(i).getName());
+                                 String code=productCategorys.get(i).getCode();  //关联菜单
+                                 for (int j = 0; j < products.size(); j++) {
+                                    // LogUtil.d(TAG,"菜名："+products.get(j).getDishCategoryCode());
+                                     String dishCategoryCode=products.get(j).getDishCategoryCode();
+                                     if (code.equals(dishCategoryCode)){
+                                         productCategorys.get(i).getProducts().add(products.get(j));
+                                     }
+                                 }
+                             }
+
+                            
+                            LogUtil.prinlnLongMsg(TAG,JSON.toJSONString(productCategorys));
+                          
+                         } catch (Exception e) {
+                             LogUtil.d(TAG,"发生了异常 e:"+e.toString());
+                             e.printStackTrace();
+                         }
+                     }
+                 }));
+    }
+    
+}

app_modular/appbooking/src/main/java/com/modular/booking/model/Product.java

@@ -0,0 +1,119 @@
+package com.modular.booking.model;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.util.List;
+
+/**
+ * Created by Arison on 2018/1/24.
+ */
+
+public class Product implements Parcelable {
+
+    private String   Code;
+    private String   DishCategoryCode;
+    private String   DishCategoryName;
+    private String   Name;
+    private String   HelpCode;
+    private boolean   IsWeightConfim;
+    
+    private List<UnitItems> UnitItems;
+    
+    public Product() {
+    }
+
+    public String getCode() {
+        return Code;
+    }
+
+    public void setCode(String code) {
+        Code = code;
+    }
+
+    public String getDishCategoryCode() {
+        return DishCategoryCode;
+    }
+
+    public void setDishCategoryCode(String dishCategoryCode) {
+        DishCategoryCode = dishCategoryCode;
+    }
+
+    public String getDishCategoryName() {
+        return DishCategoryName;
+    }
+
+    public void setDishCategoryName(String dishCategoryName) {
+        DishCategoryName = dishCategoryName;
+    }
+
+    public String getName() {
+        return Name;
+    }
+
+    public void setName(String name) {
+        Name = name;
+    }
+
+    public String getHelpCode() {
+        return HelpCode;
+    }
+
+    public void setHelpCode(String helpCode) {
+        HelpCode = helpCode;
+    }
+
+    public boolean isWeightConfim() {
+        return IsWeightConfim;
+    }
+
+    public void setWeightConfim(boolean weightConfim) {
+        IsWeightConfim = weightConfim;
+    }
+
+    public List<com.modular.booking.model.UnitItems> getUnitItems() {
+        return UnitItems;
+    }
+
+    public void setUnitItems(List<com.modular.booking.model.UnitItems> unitItems) {
+        UnitItems = unitItems;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(this.Code);
+        dest.writeString(this.DishCategoryCode);
+        dest.writeString(this.DishCategoryName);
+        dest.writeString(this.Name);
+        dest.writeString(this.HelpCode);
+        dest.writeByte(this.IsWeightConfim ? (byte) 1 : (byte) 0);
+        dest.writeTypedList(this.UnitItems);
+    }
+
+    protected Product(Parcel in) {
+        this.Code = in.readString();
+        this.DishCategoryCode = in.readString();
+        this.DishCategoryName = in.readString();
+        this.Name = in.readString();
+        this.HelpCode = in.readString();
+        this.IsWeightConfim = in.readByte() != 0;
+        this.UnitItems = in.createTypedArrayList(com.modular.booking.model.UnitItems.CREATOR);
+    }
+
+    public static final Creator<Product> CREATOR = new Creator<Product>() {
+        @Override
+        public Product createFromParcel(Parcel source) {
+            return new Product(source);
+        }
+
+        @Override
+        public Product[] newArray(int size) {
+            return new Product[size];
+        }
+    };
+}

app_modular/appbooking/src/main/java/com/modular/booking/model/ProductCategory.java

@@ -0,0 +1,87 @@
+package com.modular.booking.model;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by Arison on 2018/1/24.
+ * 产品类别
+ */
+public class ProductCategory implements Parcelable {
+
+    private String  ParentCode;
+    private String  Code;
+    private String  Name;
+    
+    private List<Product> products=new ArrayList<>();
+
+    public List<Product> getProducts() {
+        return products;
+    }
+
+    public void setProducts(List<Product> products) {
+        this.products = products;
+    }
+
+    public String getParentCode() {
+        return ParentCode;
+    }
+
+    public void setParentCode(String parentCode) {
+        ParentCode = parentCode;
+    }
+
+    public String getCode() {
+        return Code;
+    }
+
+    public void setCode(String code) {
+        Code = code;
+    }
+
+    public String getName() {
+        return Name;
+    }
+
+    public void setName(String name) {
+        Name = name;
+    }
+
+    public ProductCategory() {
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(this.ParentCode);
+        dest.writeString(this.Code);
+        dest.writeString(this.Name);
+        dest.writeTypedList(this.products);
+    }
+
+    protected ProductCategory(Parcel in) {
+        this.ParentCode = in.readString();
+        this.Code = in.readString();
+        this.Name = in.readString();
+        this.products = in.createTypedArrayList(Product.CREATOR);
+    }
+
+    public static final Creator<ProductCategory> CREATOR = new Creator<ProductCategory>() {
+        @Override
+        public ProductCategory createFromParcel(Parcel source) {
+            return new ProductCategory(source);
+        }
+
+        @Override
+        public ProductCategory[] newArray(int size) {
+            return new ProductCategory[size];
+        }
+    };
+}

app_modular/appbooking/src/main/java/com/modular/booking/model/UnitItems.java

@@ -0,0 +1,71 @@
+package com.modular.booking.model;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+/**
+ * Created by Arison on 2018/1/24.
+ */
+
+public class UnitItems implements Parcelable {
+    private String  UnitCode;
+    private String  UnitName;
+    private int    Price;
+
+    public String getUnitCode() {
+        return UnitCode;
+    }
+
+    public void setUnitCode(String unitCode) {
+        UnitCode = unitCode;
+    }
+
+    public String getUnitName() {
+        return UnitName;
+    }
+
+    public void setUnitName(String unitName) {
+        UnitName = unitName;
+    }
+
+    public int getPrice() {
+        return Price;
+    }
+
+    public void setPrice(int price) {
+        Price = price;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(this.UnitCode);
+        dest.writeString(this.UnitName);
+        dest.writeInt(this.Price);
+    }
+
+    public UnitItems() {
+    }
+
+    protected UnitItems(Parcel in) {
+        this.UnitCode = in.readString();
+        this.UnitName = in.readString();
+        this.Price = in.readInt();
+    }
+    // 
+    public static final Creator<UnitItems> CREATOR = new Creator<UnitItems>() {
+        @Override
+        public UnitItems createFromParcel(Parcel source) {
+            return new UnitItems(source);
+        }
+
+        @Override
+        public UnitItems[] newArray(int size) {
+            return new UnitItems[size];
+        }
+    };
+}

app_modular/appbooking/src/main/res/layout/activity_dish_select.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.modular.booking.activity.services.DishSelectActivity">
+
+</android.support.constraint.ConstraintLayout>

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

@@ -4,21 +4,39 @@ import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
 
 import com.common.LogUtil;
+import com.common.system.ActivityUtils;
 
 /**
   * @desc:负责分发外部URL链接的中转界面
   * @author：Arison on 2018/1/9
   */
 public class IntentUrlActivity extends Activity {
-private static final String TAG = "IntentUrlActivity";
+    private static final String TAG = "IntentUrlActivity";
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_intent_url);
-        Intent i_getvalue = getIntent();
-        String action = i_getvalue.getAction();
+        final Intent i_getvalue = getIntent();
+        final String action = i_getvalue.getAction();
+        final boolean isOpenApp=   ActivityUtils.isRunningInForeground();
+        LogUtil.d(TAG,"isOpenApp:"+isOpenApp);
+        if (isOpenApp){
+            openIntentUrl(action, i_getvalue);
+        }else{
+            startActivity(new Intent("com.modular.main.MainActivity"));
+            new Handler().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    openIntentUrl(action, i_getvalue);
+                }
+            },200);
+        }
+    }
+
+    private void openIntentUrl(String action, Intent i_getvalue) {
         if(Intent.ACTION_VIEW.equals(action)){
             Uri uri = i_getvalue.getData();
             if(uri != null){
@@ -37,7 +55,7 @@ private static final String TAG = "IntentUrlActivity";
                     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");

app_modular/appworks/src/main/AndroidManifest.xml

@@ -409,7 +409,8 @@
             </intent-filter>
         </activity>
         
-        <activity android:name=".OA.platform.activity.PurchaseDetailsActivity" >
+        <activity android:name=".OA.platform.activity.PurchaseDetailsActivity"
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="com.modular.work.platform.activity.PurchaseDetailsActivity" />
                 <category android:name="android.intent.category.DEFAULT" />