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

WeiChat/build.gradle

@@ -131,13 +131,13 @@ android {
                     //赋值app属性版本名
                     //variant.mergedFlavor.versionName = getVersionName() + "_" + variant.productFlavors[0].name+"(Build"+currentVersionCode+")"
                     //variant.mergedFlavor.versionName ="v"+versionArray[0].toString().substring(0,1)+"."+ versionArray[0].toString().substring(1,2)+"."+  versionArray[0].toString().substring(2,3)
-                    def releaseInfo= "v"+versionArray[0].toString().substring(0,1)+"."+ versionArray[0].toString().substring(1,2)+"."+  versionArray[0].toString().substring(2,3)+ "_" + variant.productFlavors[0].name+"(Build"+versionArray[1]+")"
+                    def releaseInfo = "v" + versionArray[0].toString().substring(0, 1) + "." + versionArray[0].toString().substring(1, 2) + "." + versionArray[0].toString().substring(2, 3) + "_" + variant.productFlavors[0].name + "(Build" + versionArray[1] + ")"
                     fileName = "WeiChat_${releaseInfo}_release.apk"
 
                 } else if (variant.buildType.name.equals('debug')) {
                     //赋值app属性版本名
-                    variant.mergedFlavor.versionName = getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name+"(Build"+versionArray[3]+")"+"_debug"
-                    def debugInfo= getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name+"(Build"+versionArray[3]+")"
+                    variant.mergedFlavor.versionName = getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name + "(Build" + versionArray[3] + ")" + "_debug"
+                    def debugInfo = getVersionName() + "_" + releaseTime() + "_" + variant.productFlavors[0].name + "(Build" + versionArray[3] + ")"
                     fileName = "WeiChat_${debugInfo}_debug.apk"
 
                 }
@@ -253,6 +253,8 @@ dependencies {
     compile project(':appbooking')
 //    compile project(':android-pdf-viewer')
     compile project(':apputils')
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    compile 'com.android.support:support-v4:26.+'
 }
 
 buildscript {

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

@@ -7,17 +7,27 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.support.annotation.NonNull;
 import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.AdapterView;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import android.widget.PopupWindow;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -25,9 +35,13 @@ import com.alibaba.fastjson.JSON;
 import com.common.LogUtil;
 import com.common.config.BaseConfig;
 import com.common.data.JSONUtil;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.preferences.PreferenceUtils;
+import com.common.system.DisplayUtil;
 import com.common.system.PermissionUtil;
+import com.core.adapter.ItemPopListAdapter;
+import com.core.adapter.ItemsSelectType1;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUAS;
 import com.core.api.wxapi.ApiUtils;
@@ -46,6 +60,7 @@ import com.me.network.app.http.rx.Result2Listener;
 import com.me.network.app.http.rx.ResultSubscriber;
 import com.modular.apputils.listener.OnPlayListener;
 import com.modular.apputils.utils.playsdk.AliPlay;
+import com.scwang.smartrefresh.layout.util.DensityUtil;
 import com.uas.appme.other.model.Master;
 import com.uas.appme.settings.activity.BaseInfoActivity;
 import com.uas.appme.settings.activity.CheckWagesActivity;
@@ -60,6 +75,7 @@ import com.xzjmyk.pm.activity.util.im.UserRoleUtils;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.im.audio.FaceRecognition.FaceView.OnlineFaceDemo;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -121,27 +137,32 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
                 case 2://切换账套
                     result = msg.getData().getString("result");
                     Map<Object, Object> resultsMap = FlexJsonUtil.fromJson(result);
-                    List<Master> mList = FlexJsonUtil.fromJsonArray(
-                            FlexJsonUtil.toJson(resultsMap.get("masters")),
-                            Master.class);
-                    //保存账套列表
-                    CommonUtil.setSharedPreferences(ct, "erp_masterlist", JSON.toJSONString(
-                            resultsMap.get("masters")
-                    ));
-                    if (CommonUtil.isDialogShowing(mDialog)) {
-                        return;
-                    }
-                    if (!((Activity) ct).isFinishing()) {
-                        mDialog = new MasterDialog(ct, "切换账套",
-                                new MasterDialog.PickDialogListener() {
-                                    @Override
-                                    public void onListItemClick(int position, final Master master) {
-                                        Login(master);
-                                    }
-                                });
-                        mDialog.show();
-                        mDialog.initViewData(mList);
+                    List<Master> mList = FlexJsonUtil.fromJsonArray(FlexJsonUtil.toJson(resultsMap.get("masters")), Master.class);
+                    CommonUtil.setSharedPreferences(ct, "erp_masterlist", JSON.toJSONString(resultsMap.get("masters")));
+                    List<ItemsSelectType1> selectType1s=new ArrayList<>();
+                    if (!ListUtils.isEmpty(mList)) {
+                        for (int i = 0; i < mList.size(); i++) {
+                            ItemsSelectType1 itemsSelectType1=new ItemsSelectType1();
+                            itemsSelectType1.setName(mList.get(i).getMa_function());
+                            itemsSelectType1.setEn_name(mList.get(i).getMa_user());
+                            selectType1s.add(itemsSelectType1);
+                        }
                     }
+                    showPopDialog(ct,selectType1s);
+//                    if (CommonUtil.isDialogShowing(mDialog)) {
+//                        return;
+//                    }
+//                    if (!((Activity) ct).isFinishing()) {
+//                        mDialog = new MasterDialog(ct, "切换账套",
+//                                new MasterDialog.PickDialogListener() {
+//                                    @Override
+//                                    public void onListItemClick(int position, final Master master) {
+//                                        Login(master);
+//                                    }
+//                                });
+//                        mDialog.show();
+//                        mDialog.initViewData(mList);
+//                    }
                     break;
                 case 3://切换账套登录
                     Map<String, Object> results = FlexJsonUtil.fromJson(msg
@@ -444,18 +465,18 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
                     showToact(R.string.networks_out);
                     return;
                 }
-                com.core.net.http.ViewUtil.LoginTask(MyApplication.getInstance().mLoginUser.getTelephone()
+             ViewUtil.LoginTask(MyApplication.getInstance().mLoginUser.getTelephone()
                         , CommonUtil.getSharedPreferences(ct, "user_password"), ct);
                 break;
             case R.id.editInfoIv://个人资料
                 ct.startActivity(new Intent(getActivity(), BaseInfoActivity.class));
                 break;
-            case R.id.rl_master_change://切换账套
+            case R.id.rl_master_change:
                 if (!platform) {
                     changeMaster();
                 }
                 break;
-            case R.id.my_friend_rl://我的朋友圈
+            case R.id.my_friend_rl:
                 setChangerRemain(true);
                 MainActivity.isUnReadWork = false;
                 Intent intent = new Intent(getActivity(), BusinessCircleActivity.class);
@@ -512,6 +533,9 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
                 Master master = mList.get(i);
                 if (master.getMa_user().equals(en_master)) {
                     master_tv.setText(master.getMa_function());
+                    if (adapter!=null) {
+                        selectId=i;
+                    }
                     CommonUtil.setSharedPreferences(ct, "Master_ch", master.getMa_function());
                 }
             }
@@ -533,20 +557,29 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
             ViewUtil.httpSendRequest(ct, url, params, mhandler, headers, 2, null, null, "get");
         } else {
             String masterlist = CommonUtil.getSharedPreferences(ct, "erp_masterlist");
-            Log.i("bbb", masterlist);
             List<Master> mList = JSON.parseArray(masterlist, Master.class);
-            if (CommonUtil.isDialogShowing(mDialog)) {
-                return;
+            List<ItemsSelectType1> selectType1s=new ArrayList<>();
+            if (!ListUtils.isEmpty(mList)) {
+                for (int i = 0; i < mList.size(); i++) {
+               ItemsSelectType1 itemsSelectType1=new ItemsSelectType1();
+               itemsSelectType1.setName(mList.get(i).getMa_function());
+               itemsSelectType1.setEn_name(mList.get(i).getMa_user());
+               selectType1s.add(itemsSelectType1);
+                }
             }
-            mDialog = new MasterDialog(ct, getString(R.string.user_dialog_master),
-                    new MasterDialog.PickDialogListener() {
-                        @Override
-                        public void onListItemClick(int position, final Master master) {
-                            Login(master);
-                        }
-                    });
-            mDialog.show();
-            mDialog.initViewData(mList);
+            showPopDialog(ct,selectType1s);
+//            if (CommonUtil.isDialogShowing(mDialog)) {
+//                return;
+//            }
+//            mDialog = new MasterDialog(ct, getString(R.string.user_dialog_master),
+//                    new MasterDialog.PickDialogListener() {
+//                        @Override
+//                        public void onListItemClick(int position, final Master master) {
+//                            Login(master);
+//                        }
+//                    });
+//            mDialog.show();
+//            mDialog.initViewData(mList);
         }
 
     }
@@ -631,8 +664,55 @@ public class MeFragment extends SupportToolBarFragment implements View.OnClickLi
     public void onFailure(String resultStatus, String resultInfo) {
         showToact(  "支付失败");
     }
-    
-    
-    
-    
+
+
+    public PopupWindow popupWindow = null;
+    public int selectId=0;
+    public ItemPopListAdapter adapter;
+    public void  showPopDialog(final Activity ct, List<ItemsSelectType1> itemsSelectType1s){
+        View view = null;
+        popupWindow=null;
+        WindowManager windowManager = (WindowManager)ct. getSystemService(Context.WINDOW_SERVICE);
+        if (popupWindow == null) {
+            LayoutInflater layoutInflater = (LayoutInflater) ct.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            view = layoutInflater.inflate(com.core.app.R.layout.pop_dialog_list, null);
+            ListView plist = view.findViewById(com.core.app.R.id.mList);
+            List<ItemsSelectType1> datas =itemsSelectType1s;
+            adapter = new ItemPopListAdapter(ct, datas);
+            adapter.setSelectId(selectId);
+            plist.setAdapter(adapter);
+            plist.setSelection(selectId);
+            Drawable drawable = ct.getResources().getDrawable(com.core.app.R.drawable.selector_check_items);
+            plist.setSelector(drawable);
+            plist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                @Override
+                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                    popupWindow.dismiss();
+                    selectId = position;
+                    adapter.setSelectId(selectId);
+                    adapter.notifyDataSetChanged();
+                    ItemPopListAdapter.ViewHolder viewHolder= (ItemPopListAdapter.ViewHolder) view.getTag();
+                    ItemsSelectType1 model=viewHolder.model;
+                    Master master=new Master();
+                    master.setMa_user(model.getEn_name());
+                    master.setMa_function(model.getName());
+                    Login(master);
+                }});
+            popupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth()- DensityUtil.dp2px(50), LinearLayout.LayoutParams.WRAP_CONTENT);
+        }
+        popupWindow.setFocusable(true);
+        popupWindow.setOutsideTouchable(true);
+        popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                DisplayUtil.backgroundAlpha(ct, 1f);
+            }
+        });
+        DisplayUtil.backgroundAlpha(ct, 0.5f);
+        popupWindow.setBackgroundDrawable(new BitmapDrawable());
+        popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+        popupWindow.showAtLocation(ct.getWindow().getDecorView(), Gravity.CENTER, 0, 0);
+    }
+
+
 }

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

@@ -0,0 +1,161 @@
+package com.xzjmyk.pm.activity.ui.me;
+
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.andreabaccega.widget.FormEditText;
+import com.common.config.BaseConfig;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.utils.ToastUtil;
+import com.core.widget.MyListView;
+import com.me.network.app.http.HttpClient;
+import com.me.network.app.http.Method;
+import com.me.network.app.http.rx.Result2Listener;
+import com.me.network.app.http.rx.ResultSubscriber;
+import com.modular.apputils.listener.OnPlayListener;
+import com.modular.apputils.utils.playsdk.AliPlay;
+import com.modular.apputils.utils.playsdk.WxPlay;
+import com.xzjmyk.pm.activity.R;
+
+public class PayListActivity extends BaseActivity implements OnPlayListener {
+
+    private Button pay_btn;
+    private int type;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_pay_list);
+        initView();
+        initData();
+        initEvent();
+    }
+
+    private void initEvent() {
+        pay_btn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                switch(type){
+                    case 1:
+//                        payName="微信";
+                        toWxPay();
+                        break;
+                    case 2:
+//                        payName="支付宝";
+                        toAliPay();
+                        break;
+                    case 3:
+//                        payName="银联";
+                        break;
+                    default:break;
+                }
+            }
+        });
+    }
+
+    /**
+     * 支付宝
+     */
+    private void toAliPay() {
+        new HttpClient.Builder("http://qq784602719.imwork.net:43580/")
+                .isDebug(BaseConfig.isDebug())
+                .build()
+                .Api()
+                .send(new HttpClient.Builder()
+                        .url("fruits/alipay/createOrder.do")
+                        .method(Method.POST)
+                        .build(), new ResultSubscriber<>(new Result2Listener<Object>() {
+
+                    @Override
+                    public void onResponse(Object o) {
+                        Log.i(TAG, "Success:" + o.toString());
+                        String message = o.toString();
+                        message = JSON.parseObject(o.toString()).getString("data");
+                        Log.i(TAG, "message:" + message);
+                        AliPlay.api().alipay(PayListActivity.this, message, PayListActivity.this);
+                    }
+
+                    @Override
+                    public void onFailure(Object t) {
+                        Log.i(TAG, "Failure:" + t.toString());
+                    }
+                }));
+    }
+
+    /**
+     * 微信支付
+     */
+    private void toWxPay() {
+                new HttpClient.Builder("http://nf20718343.iask.in:15161")
+                        .isDebug(BaseConfig.isDebug())
+                        .build()
+                        .Api()
+                        .send(new HttpClient.Builder()
+                        .url("/wxpay/appPay")
+                                .add("userid", MyApplication.getInstance().getLoginUserId())
+                                .add("totalFee",0.01)
+                        .method(Method.POST)
+                        .build(), new ResultSubscriber<>(new Result2Listener<Object>() {
+
+                    @Override
+                    public void onResponse(Object o) {
+                        Log.i(TAG, "Success:" + o.toString());
+                        String message = o.toString();
+                        JSONObject data = JSON.parseObject(JSON.parseObject(o.toString()).getString("msg"));
+                        message = data.toJSONString();
+                        Log.i(TAG, "message:" + message);
+                        WxPlay.api().wxPay(ct, message, PayListActivity.this);
+                    }
+
+                    @Override
+                    public void onFailure(Object t) {
+                        Log.i(TAG, "Failure:" + t.toString());
+                    }
+                }));
+    }
+
+    private void initView() {
+        FormEditText money_et = findViewById(R.id.money_et);
+        pay_btn = findViewById(R.id.pay_btn);
+        MyListView orders_lv = findViewById(R.id.orders_lv);
+
+        type = getIntent().getIntExtra("paytype", -1);
+        String payName = null;
+        switch(type){
+            case 1:
+                payName="微信";
+                break;
+            case 2:
+                payName="支付宝";
+                break;
+            case 3:
+                payName="银联";
+                break;
+            default:break;
+        }
+        pay_btn.setText(payName);
+    }
+    private void initData() {
+
+    }
+
+    @Override
+    public void onSuccess(String resultStatus, String resultInfo) {
+        ToastUtil.showToast(ct, "支付成功");
+    }
+
+    @Override
+    public void onFailure(String resultStatus, String resultInfo) {
+        ToastUtil.showToast(ct, "支付失败");
+    }
+
+    @Override
+    public void onPointerCaptureChanged(boolean hasCapture) {
+
+    }
+}

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

@@ -0,0 +1,46 @@
+package com.xzjmyk.pm.activity.ui.me;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.core.base.BaseActivity;
+
+public class PayTestActivity extends BaseActivity {
+    private int paytype = -1;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+//        setContentView(R.layout.activity_pay_test);
+//        initView();
+    }
+
+//    private void initView() {
+//        findViewById(R.id.wxpay_btn).setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                paytype = 1;
+//              gotoPayActivity(paytype);
+//            }
+//        });
+//        findViewById(R.id.alipay_btn).setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                paytype = 2;
+//                gotoPayActivity(paytype);
+//            }
+//        });
+//        findViewById(R.id.unionpay_btn).setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                paytype = 3;
+//                gotoPayActivity(paytype);
+//        }
+//        });
+//    }
+
+    private void gotoPayActivity(int type) {
+        startActivity(new Intent(this,PayListActivity.class)
+                                    .putExtra("paytype",type));
+    }
+}

WeiChat/src/main/res/drawable/selector_me_menu_item_bg.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/me_menu_item_press" android:state_checked="true"/>
     <item android:drawable="@color/me_menu_item_press" android:state_pressed="true"/>
     <item android:drawable="@color/me_menu_item_press" android:state_selected="true"/>
-
     <item android:drawable="@color/me_menu_item_normal"/>
 </selector>

WeiChat/src/main/res/layout/activity_pay_list.xml

@@ -0,0 +1,74 @@
+<?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.xzjmyk.pm.activity.ui.me.PayListActivity">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+        <com.andreabaccega.widget.FormEditText
+            android:id="@+id/money_et"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:textColor="@color/dark_dark_grey"
+            android:padding="10dp"
+            android:layout_centerVertical="true"
+            android:background="@null"
+            android:hint="请输入支付金额"
+            android:textSize="15sp"
+            android:gravity="center"
+            android:maxLength="6"
+            android:inputType="number"
+            android:text="0.01"
+            />
+        <Button
+            android:id="@+id/pay_btn"
+            android:layout_margin="20dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:background="@drawable/bg_bule_btn"
+            android:padding="10dp"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_main"
+            android:visibility="visible"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="订单列表:"
+            android:textSize="@dimen/text_main"
+            android:layout_marginLeft="20dp"
+            />
+
+        <com.core.widget.CustomerScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fillViewport="true">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="10dp"
+                    android:background="#FBFBFB" />
+                <com.core.widget.MyListView
+                    android:id="@+id/orders_lv"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:padding="10dp"
+                    android:visibility="visible"
+                    android:background="@color/white"
+                    >
+                </com.core.widget.MyListView>
+            </LinearLayout>
+        </com.core.widget.CustomerScrollView>
+    </LinearLayout>
+
+
+</android.support.constraint.ConstraintLayout>

WeiChat/src/main/res/layout/content_pay_test.xml

@@ -0,0 +1,11 @@
+<?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"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior"
+    tools:context="com.xzjmyk.pm.activity.ui.me.PayTestActivity"
+    tools:showIn="@layout/activity_pay_test">
+
+</android.support.constraint.ConstraintLayout>

WeiChat/src/main/res/layout/fragment_me.xml

@@ -566,6 +566,7 @@
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
+
     </LinearLayout>
 
 </ScrollView>

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon May 21 10:45:33 CST 2018
-debugName=270
+#Mon May 21 16:53:56 CST 2018
+debugName=298
 versionName=630
-debugCode=270
+debugCode=298
 versionCode=170

app_core/common/src/main/java/com/core/adapter/ItemPopListAdapter.java

@@ -20,7 +20,7 @@ import java.util.List;
 public class ItemPopListAdapter extends BaseAdapter {
 
     private List<ItemsSelectType1> objects = new ArrayList<ItemsSelectType1>();
-    private int selectId=7;
+    private int selectId=0;
     private Context context;
     private LayoutInflater layoutInflater;
 
@@ -59,31 +59,30 @@ public class ItemPopListAdapter extends BaseAdapter {
             convertView = layoutInflater.inflate(R.layout.item_pop_list_select, null);
             convertView.setTag(new ViewHolder(convertView));
         }
-        initializeViews((ItemsSelectType1)getItem(position), (ViewHolder) convertView.getTag(),position);
+        if (selectId==position) {
+            convertView.setBackgroundResource(R.color.me_menu_item_press);
+        }else{
+            convertView.setBackgroundResource(android.R.color.transparent);
+        }
+        initializeViews(getItem(position), (ViewHolder) convertView.getTag(),position);
         return convertView;
     }
 
     private void initializeViews(ItemsSelectType1 object, ViewHolder holder,int position) {
-       // holder.tvItemName.setSelected(object.isSelected());
         holder.tvItemName.setText(object.getName());
-       if (selectId==position) {
-           holder.checkBox.setChecked(true);
-       }else{
-           holder.checkBox.setChecked(false);
-       }
-       holder.checkBox.setFocusable(false);
-       holder.checkBox.setClickable(false);
+        holder.checkBox.setFocusable(false);
+        holder.checkBox.setClickable(false);
+        holder.model=object;
     }
 
     public class ViewHolder {
-//        private LinearLayout llPopTop;
         public TextView tvItemName;
         public CheckBox checkBox;
+        public ItemsSelectType1 model;
 
         public ViewHolder(View view) {
-//            llPopTop = (LinearLayout) view.findViewById(R.id.ll_pop_top);
-            tvItemName = (TextView) view.findViewById(R.id.tv_item_name);
-            checkBox= (CheckBox) view.findViewById(R.id.cb_select);
+            tvItemName = view.findViewById(R.id.tv_item_name);
+            checkBox= view.findViewById(R.id.cb_select);
         }
     }
 }

app_core/common/src/main/java/com/core/adapter/ItemsSelectType1.java

@@ -6,6 +6,7 @@ package com.core.adapter;
 public class ItemsSelectType1 {
     
     private String name;//名称
+    private String en_name;//英文名称
     private boolean selected=false;//是否被选中
 
     public String getName() {
@@ -16,10 +17,18 @@ public class ItemsSelectType1 {
         this.name = name;
     }
 
+    public String getEn_name() {
+        return en_name;
+    }
+
+    public void setEn_name(String en_name) {
+        this.en_name = en_name;
+    }
+
     public boolean isSelected() {
         return selected;
     }
-
+    
     public void setSelected(boolean selected) {
         this.selected = selected;
     }

app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -317,7 +317,6 @@ public class ViewUtil {
         startNetThread(url, params, handler, Constants.SUCCESS_LOGIN, message,
                 bundle, "get");*/
 //        }
-
         HttpRequest.getInstance().sendRequest(Constants.ACCOUNT_CENTER_HOST,
                 new HttpParams.Builder()
                         .url("sso/login/mobile")
@@ -751,7 +750,7 @@ public class ViewUtil {
                 if (select > items.length) {
                     select = 0;
                 }
-
+                popupWindow=null;
                 showPopDialog((Activity) ct,itemsSelectType1s,phone,password);
 //                loginERPDialog = new MaterialDialog.Builder(ct)
 //                        .title(ct.getString(R.string.user_dialog_company))
@@ -771,7 +770,8 @@ public class ViewUtil {
 
 
     public static PopupWindow popupWindow = null;
-    public static int selectId;
+    public static int selectId=0;
+    public static ItemPopListAdapter adapter;
     public static void  showPopDialog(final Activity ct, List<ItemsSelectType1> itemsSelectType1s
     , final String phone, final String password){
         erp_phone=phone;
@@ -786,8 +786,10 @@ public class ViewUtil {
             view = layoutInflater.inflate(R.layout.pop_dialog_list, null);
             ListView plist = view.findViewById(R.id.mList);
             List<ItemsSelectType1> datas =itemsSelectType1s;
-            final ItemPopListAdapter adapter = new ItemPopListAdapter(ct, datas);
+            adapter = new ItemPopListAdapter(ct, datas);
+            adapter.setSelectId(selectId);
             plist.setAdapter(adapter);
+            plist.setSelection(selectId);
             Drawable drawable = ct.getResources().getDrawable(R.drawable.selector_check_items);
             plist.setSelector(drawable);
             plist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@@ -803,7 +805,6 @@ public class ViewUtil {
                 }});
             popupWindow = new PopupWindow(view, windowManager.getDefaultDisplay().getWidth()- DensityUtil.dp2px(50), LinearLayout.LayoutParams.WRAP_CONTENT);
         }
-
         popupWindow.setFocusable(true);
         popupWindow.setOutsideTouchable(true);
         popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {

app_core/common/src/main/res/drawable/selector_check_items.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/icon_select_sure" android:state_checked="true"/>
+    <item android:drawable="@color/gray" android:state_checked="true"/>
     <item android:drawable="@color/item_line" android:state_checked="false"/>
     <item android:drawable="@color/item_line" />
 </selector>

app_core/common/src/main/res/drawable/selector_me_menu_item_bg.xml

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/me_menu_item_press" android:state_checked="true"/>
     <item android:drawable="@color/me_menu_item_press" android:state_pressed="true"/>
     <item android:drawable="@color/me_menu_item_press" android:state_selected="true"/>
-
     <item android:drawable="@color/me_menu_item_normal"/>
 </selector>

app_core/common/src/main/res/layout/activity_expense_reimbursement.xml

@@ -112,7 +112,7 @@
                     android:textColor="@color/text_main"
                     android:textSize="15sp" />
 
-                <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                <com.andreabaccega.widget.FormEditText
                     android:id="@+id/reimbursement_currency_fet"
                     android:layout_width="100dp"
                     android:layout_height="wrap_content"

app_core/common/src/main/res/layout/activity_feedback.xml

@@ -1,7 +1,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="#EBE9EA">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#EBE9EA">
 
     <ScrollView
         android:id="@+id/scroll_view"
@@ -142,4 +142,4 @@
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
-</RelativeLayout>
+</RelativeLayout>

app_core/common/src/main/res/layout/item_pop_list_select.xml

@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:id="@+id/tv_top"
     android:background="@drawable/selector_me_menu_item_bg">
     <TextView
         android:id="@+id/tv_item_name"

app_core/common/src/main/res/layout/pop_dialog_list.xml

@@ -25,7 +25,6 @@
             android:id="@+id/mList"
             style="@style/ListViewBasic"
             android:layout_height="300dp"
-            android:layout_marginBottom="20dp"
             android:dividerHeight="0dp">
         </ListView>
 </LinearLayout>

app_modular/appbooking/src/main/java/com/modular/booking/adapter/ItemPopListAdapter.java

@@ -60,6 +60,11 @@ public class ItemPopListAdapter extends BaseAdapter {
             convertView = layoutInflater.inflate(R.layout.item_pop_list_select, null);
             convertView.setTag(new ViewHolder(convertView));
         }
+        if (selectId==position) {
+            convertView.setBackgroundResource(R.color.me_menu_item_press);
+        }else{
+            convertView.setBackgroundResource(android.R.color.transparent);
+        }
         initializeViews((ItemsSelectType1)getItem(position), (ViewHolder) convertView.getTag(),position);
         return convertView;
     }
@@ -67,11 +72,11 @@ public class ItemPopListAdapter extends BaseAdapter {
     private void initializeViews(ItemsSelectType1 object, ViewHolder holder,int position) {
        // holder.tvItemName.setSelected(object.isSelected());
         holder.tvItemName.setText(object.getName());
-       if (selectId==position) {
-           holder.checkBox.setChecked(true);
-       }else{
-           holder.checkBox.setChecked(false);
-       }
+//       if (selectId==position) {
+//           holder.checkBox.setChecked(true);
+//       }else{
+//           holder.checkBox.setChecked(false);
+//       }
        holder.checkBox.setFocusable(false);
        holder.checkBox.setClickable(false);
     }

app_modular/appbooking/src/main/res/drawable/selector_check_items.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/icon_select_sure" android:state_checked="true"/>
-    <item android:drawable="@color/item_line" android:state_checked="false"/>
-    <item android:drawable="@color/item_line" />
+    <item android:drawable="@color/gray" android:state_checked="true"/>
+    <item android:drawable="@color/white" android:state_checked="false"/>
+    <item android:drawable="@color/white" />
 </selector>

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

@@ -2,20 +2,19 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/selector_me_menu_item_bg">
+    android:id="@+id/tv_top"
+    android:background="@drawable/select_weixin_list_item">
     <TextView
         android:id="@+id/tv_item_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
+        android:layout_marginLeft="20dp"
         android:paddingLeft="2dp"
         android:paddingRight="2dp"
         android:paddingTop="10dp"
         android:paddingBottom="10dp"
         android:textSize="14sp"
-        
-        android:gravity="center"
-
+        android:gravity="left"
         android:text="xxx" />
     <CheckBox
         android:id="@+id/cb_select"
@@ -25,6 +24,5 @@
         android:button="@null"
         android:background="@drawable/selector_check_items"
         android:checked="true"
-        android:layout_toLeftOf="@+id/tv_item_name"
-        />
+        android:layout_toLeftOf="@+id/tv_item_name"/>
 </RelativeLayout>

app_modular/appme/src/main/java/com/uas/appme/settings/activity/CheckWagesActivity.java

@@ -28,7 +28,6 @@ import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
-import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;

app_modular/appme/src/main/java/com/uas/appme/settings/activity/WagesDetailsActivity.java

@@ -109,6 +109,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
 
 
     private void showDatas(String result) {
+        LogUtil.prinlnLongMsg("resultWage",result);
         haveData = true;
         wages_ll.setVisibility(View.VISIBLE);
         try {
@@ -116,7 +117,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
             if (salaryObject != null){
                 JSONArray configsArray = salaryObject.getJSONArray("configs");
                 JSONObject dataObject = salaryObject.getJSONObject("data");
-                if (dataObject.size() == 0) {
+                if ( dataObject == null || dataObject.size() == 0 ||  ListUtils.isEmpty(configsArray)) {
                     showEnty();
                     return;
                 }
@@ -163,6 +164,7 @@ public class WagesDetailsActivity extends BaseActivity implements View.OnClickLi
             }
        } catch (Exception e) {
             e.printStackTrace();
+            showEnty();
         }
 }
 

app_modular/apputils/src/main/java/com/modular/apputils/utils/playsdk/WxPlay.java

@@ -2,7 +2,6 @@ package com.modular.apputils.utils.playsdk;
 
 
 import android.content.Context;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
@@ -19,7 +18,6 @@ import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 public class WxPlay {
     private IWXAPI wxApi;
     private static WxPlay api;
-
     public static WxPlay api() {
         if (api == null) {
             synchronized (WxPlay.class) {
@@ -30,9 +28,7 @@ public class WxPlay {
         }
         return api;
     }
-
-    private WxPlay() {
-
+        private WxPlay() {
     }
 
     public void wxPay(Context context, String orderInfo, OnPlayListener onPlayListener) {
@@ -59,4 +55,5 @@ public class WxPlay {
         }
 
     }
+
 }

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/fragment/CharitableListFragment.java

@@ -369,12 +369,9 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
 ////
 //                }
 //            });
-
-
     }
 
     private CharitableAdapter charitableAdapter;
-
     private void setContantData(List<CharitModel> models) {
 //        if (charitableAdapter == null) {
         charitableAdapter = new CharitableAdapter(ct, models, new CharitableAdapter.MyClickListener() {

app_modular/appworks/src/main/java/com/uas/appworks/widget/SelectPlayPop.java

@@ -177,6 +177,7 @@ public class SelectPlayPop {
                 hideKeyboard(ct, autoNumEd);
             }
         });
+
         giftBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {