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

# Conflicts:
#	WeiChat/version.properties
#	app_core/common/src/main/assets/work_menu.json

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

@@ -36,6 +36,7 @@ import com.core.app.MyApplication;
 import com.core.broadcast.MsgBroadcast;
 import com.core.net.http.ViewUtil;
 import com.core.utils.FlexJsonUtil;
+import com.core.utils.NotificationManage;
 import com.core.utils.ToastUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.lidroid.xutils.view.annotation.ViewInject;
@@ -43,7 +44,6 @@ import com.uas.appme.other.model.Master;
 import com.uas.appme.settings.activity.BaseInfoActivity;
 import com.uas.appme.settings.activity.CheckWagesActivity;
 import com.uas.appme.settings.activity.SettingActivity;
-import com.uas.appme.settings.activity.SigatureActivity;
 import com.uas.appme.widget.MasterDialog;
 import com.uuzuche.lib_zxing.activity.CaptureActivity;
 import com.xzjmyk.pm.activity.CaptureResultActivity;
@@ -176,7 +176,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                     Map<String, Object> results = FlexJsonUtil.fromJson(msg
                             .getData().getString("result"));
                     if ((Boolean) results.get("success")) {
-                        
+
                         ViewUtil.ToastMessage(ct, "账套切换成功！", Style.holoGreenLight, 3000);
                         String sessionId = results.get("sessionId").toString();
                         String master = msg.getData().getString("master");
@@ -224,18 +224,18 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         }
         platform = ApiUtils.getApiModel() instanceof ApiPlatform;
         if (ApiUtils.getApiModel() instanceof ApiUAS) {
-            LogUtil.d(TAG,"uas 模式！");
+            LogUtil.d(TAG, "uas 模式！");
             //getChinaMaster();
             company_tv.setText(CommonUtil.getSharedPreferences(ct, "erp_commpany"));
             // 这样写的目的，是为了初始化本页面的时候，时时根据英文名字来查询当前的中文账套
             if (!StringUtil.isEmpty(CommonUtil.getSharedPreferences(ct, "Master_ch"))) {
                 master_tv.setText(CommonUtil.getSharedPreferences(ct, "Master_ch"));
-            }else{
+            } else {
                 master_tv.setText(CommonUtil.getSharedPreferences(ct, "erp_master"));
             }
             rl_master_change.setVisibility(View.VISIBLE);
         } else {
-            LogUtil.d(TAG,"b2b 模式！");
+            LogUtil.d(TAG, "b2b 模式！");
             company_tv.setText(CommonUtil.getSharedPreferences(ct, "companyName"));
             master_tv.setText(CommonUtil.getSharedPreferences(ct, "spaceId"));
             rl_master_change.setVisibility(View.GONE);
@@ -262,17 +262,18 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         }
     }
 
-//    private String getImageUrl(int id) {
+    //    private String getImageUrl(int id) {
 //        return CommonUtil.getAppBaseUrl(ct) + "common/downloadbyId.action?id=" + id + "&sessionId=" +
 //                CommonUtil.getSharedPreferences(ct, "sessionId") +
 //                "&sessionUser=" + CommonUtil.getSharedPreferences(ct, "erp_username") +
 //                "&master=" + CommonUtil.getSharedPreferences(ct, "erp_master");
 //    }
     private static final String TAG = "MeFragment";
+
     private void initView() {
-        LogUtil.d(TAG,"initView()");
+        LogUtil.d(TAG, "initView()");
         ct = getActivity();
-        
+
 //       new Thread(new Runnable() {
 //           @Override
 //           public void run() {
@@ -293,11 +294,11 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         mAvatarImg = (ImageView) findViewById(R.id.avatar_img);
         mNickNameTv = (TextView) findViewById(R.id.nick_name_tv);
         mPhoneNumTv = (TextView) findViewById(R.id.phone_number_tv);
-        
+
         IntentFilter loginFilter = new IntentFilter();
         loginFilter.addAction("com.app.home.update");
         LocalBroadcastManager.getInstance(ct).registerReceiver(updateLoginState, loginFilter);
-        
+
         String loginUserId = MyApplication.getInstance().mLoginUser.getUserId();
         AvatarHelper.getInstance().display(loginUserId, mAvatarImg, true, true);
         mNickNameTv.setText(MyApplication.getInstance().mLoginUser.getNickName());
@@ -314,7 +315,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
             }
         });
 
-       
+
         getChinaMaster();
         updateStatus();
 
@@ -364,12 +365,8 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         picture_selector_rl.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-//                startActivity(new Intent(ct, PictureSelectorDemo.class));
-//                startActivity(new Intent(ct, PersonalRegActivity.class));
-//                startActivity(new Intent(ct,TemperatureActivity.class));
-//                startActivity(new Intent(ct,ToastDemoActivity.class));
-                startActivity(new Intent(ct, SigatureActivity.class));
-
+                NotificationManage notificationManage = new NotificationManage();
+                notificationManage.sendNotification(MyApplication.getInstance(), "UU互联通知测试消息！", MainActivity.class);
             }
         });
         picture_selector_rl.setOnLongClickListener(new View.OnLongClickListener() {
@@ -634,7 +631,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
             if (intent.getAction().equals("com.app.home.update")) {
                 String falg = intent.getStringExtra("falg");
                 platform = ApiUtils.getApiModel() instanceof ApiPlatform;
-                LogUtil.d(TAG,"falg="+falg);
+                LogUtil.d(TAG, "falg=" + falg);
                 if (!"home".equals(falg)) {
                     updateStatus();
                 }
@@ -644,7 +641,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                     master_tv.setText(CommonUtil.getSharedPreferences(ct, "erp_master"));
                     rl_master_change.setVisibility(View.VISIBLE);
                 }
-                if ("B2B".equals(falg)){
+                if ("B2B".equals(falg)) {
                     company_tv.setText(CommonUtil.getSharedPreferences(ct, "companyName"));
                     master_tv.setText(CommonUtil.getSharedPreferences(ct, "spaceId"));
                     rl_master_change.setVisibility(View.GONE);

WeiChat/src/main/java/com/xzjmyk/pm/activity/wxapi/WXPayEntryActivity.java

@@ -3,6 +3,7 @@ package com.xzjmyk.pm.activity.wxapi;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.widget.Toast;
 
 import com.core.app.Constants;
 import com.tencent.mm.opensdk.constants.ConstantsAPI;
@@ -11,6 +12,7 @@ import com.tencent.mm.sdk.modelbase.BaseResp;
 import com.tencent.mm.sdk.openapi.IWXAPI;
 import com.tencent.mm.sdk.openapi.IWXAPIEventHandler;
 import com.tencent.mm.sdk.openapi.WXAPIFactory;
+import com.xzjmyk.pm.activity.R;
 
 public class WXPayEntryActivity extends Activity implements IWXAPIEventHandler {
     private IWXAPI api;
@@ -36,21 +38,19 @@ public class WXPayEntryActivity extends Activity implements IWXAPIEventHandler {
 
     @Override
     public void onResp(BaseResp resp) {
-
-        // 0 支付成功
-        // -2取消
+        /**
+         * 0 支付成功
+         * -1 支付错误
+         * -2 用户取消
+         */
         if (resp.getType() == ConstantsAPI.COMMAND_PAY_BY_WX) {
-//			AlertDiaWedroidLog.Builder builder = new AlertDiaWedroidLog.Builder(this);
-//			builder.setTitle(R.string.app_tip);
-//			builder.setMessage(getString(R.string.pay_result_callback_msg, String.valueOf(resp.errCode)));
-//			builder.show();
-            Intent mIntent = new Intent("wxpay");
             if (resp.errCode == 0) {
-                mIntent.putExtra("result", true);
-            } else {
-                mIntent.putExtra("result", false);
+                Toast.makeText(this, R.string.str_error_wechat_pay_success, Toast.LENGTH_LONG).show();
+            } else if (resp.errCode == -1) {
+                Toast.makeText(this, R.string.str_error_wechat_pay_fail, Toast.LENGTH_LONG).show();
+            } else if (resp.errCode == -2) {
+                Toast.makeText(this, R.string.str_error_wechat_pay_cancel, Toast.LENGTH_LONG).show();
             }
-            sendBroadcast(mIntent);
         }
         finish();
     }

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

@@ -18,7 +18,7 @@
                 android:id="@+id/avatar_img"
                 android:layout_width="60dp"
                 android:layout_height="60dp"
-
+                android:scaleType="fitXY"
                 android:layout_alignParentLeft="true"
                 android:layout_centerVertical="true"
                 android:contentDescription="@string/app_name"

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Dec 26 20:15:16 CST 2017
-debugName=248
+#Tue Dec 26 18:41:26 CST 2017
+debugName=277
 versionName=613
-debugCode=248
+debugCode=277
 versionCode=152

app_core/common/src/main/assets/work_menu.json

@@ -23,6 +23,15 @@
         "menuUrl": "",
         "caller": "",
         "isHide": false
+      },
+      {
+        "isLocalMenu": true,
+        "menuName": "商旅服务",
+        "menuIcon": "",
+        "menuActivity": "com.modular.work.BusinessTravelActivity",
+        "menuUrl": "",
+        "caller": "",
+        "isHide": false
       } , {
         "isLocalMenu": true,
         "menuName": "str_work_charitable_donations",

app_core/common/src/main/java/com/core/app/Constants.java

@@ -454,5 +454,8 @@ public class Constants {
     public interface FLAG {
         String DEVICE_CALLER = "device_caller";
         String DEVICE_CLASS = "device_class";
+        String DEVICE_WHICH_PAGE = "device_which_page";
+        String DEVICE_FROM_COMMON = "device_from_common";
+        String DEVICE_FROM_QUERY = "device_from_common";
     }
 }

app_core/common/src/main/java/com/core/app/MyApplication.java

@@ -335,11 +335,12 @@ public class MyApplication extends BaseApplication {
 
 		mAvatarRoundImageOptions = new DisplayImageOptions.Builder().bitmapConfig(Bitmap.Config.RGB_565).
 				cacheInMemory(true).cacheOnDisc(true)
-				.displayer(new RoundedBitmapDisplayer(10)).
-						resetViewBeforeLoading(true).
-						showImageForEmptyUri(R.drawable.avatar_normal)
+				.displayer(new RoundedBitmapDisplayer(10))
+				.resetViewBeforeLoading(true)
+				.showImageForEmptyUri(R.drawable.avatar_normal)
 				.showImageOnFail(R.drawable.avatar_normal)
-				.showImageOnLoading(R.drawable.avatar_normal).build();
+				.showImageOnLoading(R.drawable.avatar_normal)
+				.build();
 
 		mAvatarNormalImageOptions = new DisplayImageOptions.Builder()
 				.bitmapConfig(Bitmap.Config.RGB_565)

app_core/common/src/main/java/com/core/utils/NotificationManage.java

@@ -39,11 +39,13 @@ public class NotificationManage {
     private void sendNotification(Context context, int icon, String title, String group, String content, Class<? extends Activity> clazz) {
         NotificationManager mNotificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
         NotificationCompat.Builder builder = new NotificationCompat.Builder(context.getApplicationContext());
-        builder.setSmallIcon(icon);
         builder.setDefaults(Notification.DEFAULT_SOUND | Notification.DEFAULT_VIBRATE);
         builder.setAutoCancel(true);
         builder.setContentTitle(title);
         builder.setContentText(content);
+        builder.setTicker(content);
+        builder.setSmallIcon(icon);
+        builder.setLargeIcon(BitmapFactory.decodeResource(context.getResources(), R.drawable.uuu));
         if (!StringUtil.isEmpty(group))
             builder.setGroup(group);
         Intent intent = new Intent(context, clazz);
@@ -70,9 +72,7 @@ public class NotificationManage {
         if (System.currentTimeMillis() - oldTime > minutes2time) {//如果当前时间大于上次时间2分钟
             sharePrefer.edit().putLong("SIGNIN_TIME", System.currentTimeMillis());
             sendNotification(context, R.drawable.uuu, context.getString(R.string.common_dialog_title), action, clazz);
-        } else {
-            //无效
-        }
+        } 
     }
 
     //update

app_core/common/src/main/java/com/core/utils/helper/AvatarHelper.java

@@ -260,7 +260,7 @@ public class AvatarHelper {
         if (isThumb) {
             ImageLoader.getInstance().displayImage(url, imageView, MyApplication.mAvatarRoundImageOptions);
         } else {
-            ImageLoader.getInstance().displayImage(url, imageView, MyApplication.mAvatarRoundImageOptions);
+            ImageLoader.getInstance().displayImage(url, imageView, MyApplication.mAvatarNormalImageOptions);
         }
     }
 

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

@@ -274,7 +274,12 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                 llPanelBusiness.setVisibility(View.VISIBLE);
                 llPanelWait.setVisibility(View.GONE);
                 try {
-                    getSteatListStates(JSON.parseObject(dataService ).getString("sb_companyid"));//获取餐饮类别状态信息
+                    if (!isEdited){
+                        getSteatListStates(JSON.parseObject(dataService).getString("sb_companyid"));//获取餐饮类别状态信息
+                    }else{
+                        getSteatListStates(model.getCompanyid());//获取餐饮类别状态信息
+                    }
+                    
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -1367,6 +1372,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                     tv_food_peoples.setVisibility(View.GONE);
                     addSubUtils.setVisibility(View.VISIBLE);
                     tvSeatsRight.setVisibility(View.GONE);
+               
                 } else {
                     if (StringUtil.isEmpty(data.getString("sb_starttime"))) {
                         tv_food_times.setText(data.getString("sb_endtime"));
@@ -1394,7 +1400,7 @@ public class BServiceAddActivity extends OABaseActivity implements View.OnClickL
                         }
                     }
 
-                    tvSeatsRight .setCompoundDrawables(null,null,null,null);
+                    tv_food_seats .setCompoundDrawables(null,null,null,null);
                     tv_food_peoples .setCompoundDrawables(null,null,null,null);
                     tv_food_times .setCompoundDrawables(null,null,null,null);
                     tv_food_rooms.setCompoundDrawables(null,null,null,null);

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

@@ -133,7 +133,7 @@ public class BServicesActivity extends OABaseActivity implements View.OnClickLis
         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/4-1.jpg");
+        imgList.add("http://demo.sc.chinaz.com/Files/DownLoad/webjs1/201707/jiaoben5258/images/2-1.jpg");
         mBanner.update(imgList);
         mBanner.start();
         List<SBMenuModel> menuModels = new ArrayList<>();

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

@@ -75,7 +75,7 @@ public class ItemBserviceListAdapter extends BaseAdapter {
     }
 
     private void initializeViews(final SBListModel object, ViewHolder holder) {
-        AvatarHelper.getInstance().display(object.getUrl(),holder.ivIcon,true);
+        AvatarHelper.getInstance().display(object.getUrl(),holder.ivIcon,false);
         holder.tvTitle.setText(object.getName());
         holder.tvType.setText(object.getType());
         holder.tvDistance.setText(object.getDistance());

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

@@ -124,7 +124,7 @@
                     android:layout_width="290dp"
                     android:layout_toRightOf="@id/tag_club_technician"
                     android:contentDescription="@string/service_club_list"
-                    android:drawablePadding="6dp"
+                    
                     android:drawableRight="@drawable/oa_next"
                     android:ellipsize="end"
                     android:hint="@string/common_select" />
@@ -167,7 +167,7 @@
                     style="@style/item_menu_input"
                     android:layout_width="290dp"
                     android:layout_toRightOf="@id/tag_club_peoples"
-                    android:drawablePadding="6dp"
+                    
                     android:drawableRight="@drawable/oa_next"
                     android:hint="@string/common_select" />
             </RelativeLayout>
@@ -200,7 +200,7 @@
                     android:layout_width="290dp"
                     android:layout_toRightOf="@id/tag_hospital_time"
                     android:contentDescription="@string/service_hospital_times"
-                    android:drawablePadding="6dp"
+                    
                     android:drawableRight="@drawable/oa_next"
                     android:ellipsize="end"
                     android:hint="@string/common_select" />
@@ -242,7 +242,7 @@
                     style="@style/item_menu_input"
                     android:layout_width="290dp"
                     android:layout_toRightOf="@id/tag_hospital_people"
-                    android:drawablePadding="6dp"
+                    
                     android:drawableRight="@drawable/oa_next"
                     android:hint="@string/common_select" />
             </RelativeLayout>
@@ -274,7 +274,7 @@
                     style="@style/item_menu_input"
                     android:layout_width="290dp"
                     android:layout_toRightOf="@id/tag_sport_time"
-                    android:drawablePadding="6dp"
+                    
                     android:drawableRight="@drawable/oa_next"
                     android:ellipsize="end"
                     android:hint="@string/common_select" />
@@ -318,7 +318,7 @@
                     style="@style/item_menu_input"
                     android:layout_width="290dp"
                     android:layout_toRightOf="@id/tag_sport_peoples"
-                    android:drawablePadding="6dp"
+                    
                     android:drawableRight="@drawable/oa_next"
                     android:hint="@string/common_select" />
             </RelativeLayout>
@@ -353,7 +353,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_alignParentTop="true"
                     android:layout_toRightOf="@id/tag_hair_times"
-                    android:drawablePadding="6dp"
+                    
                     android:drawableRight="@drawable/oa_next"
                     android:ellipsize="end"
                     android:hint="@string/common_select" />
@@ -399,7 +399,7 @@
                     style="@style/item_menu_input"
                     android:layout_width="290dp"
                     android:layout_toRightOf="@id/company_tag"
-                    android:drawablePadding="6dp"
+                    
                     android:drawableRight="@drawable/oa_next"
                     android:hint="@string/common_select" />
             </RelativeLayout>
@@ -429,7 +429,7 @@
                     style="@style/item_menu_input"
                     android:layout_width="290dp"
                     android:layout_toRightOf="@id/tag_food_peoples"
-                    android:drawablePadding="6dp"
+                    
                     android:drawableRight="@drawable/oa_next"
                     android:hint="" />
 
@@ -468,7 +468,7 @@
                     style="@style/item_menu_input"
                     android:layout_width="290dp"
                     android:layout_toRightOf="@id/tag_food_times"
-                    android:drawablePadding="6dp"
+                  
                     android:drawableRight="@drawable/oa_next"
                     android:ellipsize="end"
                     android:hint="@string/common_select" />
@@ -550,7 +550,9 @@
                         android:id="@+id/tvSeatsLeft"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_margin="10dp"
+                        android:layout_marginBottom="10dp"
+                        android:layout_marginTop="10dp"
+                        android:layout_marginLeft="10dp"
                         android:textColor="@color/blue_seats_num"
                         android:textStyle="bold"
                         android:text="排队实况"/>
@@ -563,8 +565,10 @@
                         android:id="@+id/tvSeatsRight"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_margin="10dp"
-                       android:drawableLeft="@drawable/icon_line_v"
+                        android:layout_marginBottom="10dp"
+                        android:layout_marginTop="10dp"
+                        android:layout_marginLeft="3dp"
+                        android:drawableLeft="@drawable/icon_line_v"
                         android:textColor="@color/gray"
                         android:textStyle="bold"
                         android:text="商家释放"/>

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

@@ -5,11 +5,12 @@
     android:layout_height="match_parent"
     android:background="@drawable/bg_main"
     tools:context="com.modular.booking.activity.services.BServicesActivity">
+
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/mListView"
+        style="@style/ListViewBasic"
         android:layout_below="@+id/voiceSearchView"
-        android:dividerHeight="0.1dp"
         android:background="@color/transparent"
         android:divider="@color/item_line"
-        style="@style/ListViewBasic" />
+        android:dividerHeight="0.1dp" />
 </RelativeLayout>

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

@@ -96,10 +96,11 @@
             <EditText
                 android:id="@+id/et_book_phone"
                 style="@style/item_menu_input"
-                android:layout_width="110dp"
+                android:layout_width="wrap_content"
                 android:drawableLeft="@drawable/icon_tel"
                 android:drawablePadding="2dp"
                 android:ellipsize="end"
+            
                 android:hint="@string/common_input2"
                 android:inputType="phone"
                 android:textColor="#0CB88C" />
@@ -130,6 +131,7 @@
                 android:gravity="top|left"
                 android:layout_width="match_parent"
                 android:layout_height="100dp"
+                android:paddingTop="2dp"
                 android:layout_toRightOf="@id/tag_book_notes"
                 android:drawablePadding="6dp"
                 android:hint="请输入您的要求，我们会尽量满足" />

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

@@ -50,6 +50,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
+            android:gravity="center_vertical"
             android:layout_marginLeft="7dp"
             android:layout_toRightOf="@+id/sl_header"
             android:orientation="vertical">
@@ -72,7 +73,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:drawableLeft="@drawable/icon_map"
-                android:drawablePadding="3dp"
+                android:drawablePadding="6dp"
                 android:elevation="2dp"
                 android:gravity="center_vertical"
                 android:text="********"

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

@@ -32,7 +32,7 @@
         android:layout_width="45dp"
         android:layout_height="45dp"
         android:layout_marginBottom="10dp"
-        android:background="@null"
+        
         android:src="@drawable/defaultpic">
     </de.hdodenhof.circleimageview.CircleImageView>
 </LinearLayout>

app_modular/apputils/src/main/res/values-en/strings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="str_error_wechat_pay_success">支付成功</string>
+    <string name="str_error_wechat_pay_fail">支付失败</string>
+    <string name="str_error_wechat_pay_cancel">支付已取消</string>
+</resources>

app_modular/apputils/src/main/res/values-zh-rCN/strings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="str_error_wechat_pay_success">支付成功</string>
+    <string name="str_error_wechat_pay_fail">支付失败</string>
+    <string name="str_error_wechat_pay_cancel">支付已取消</string>
+</resources>

app_modular/apputils/src/main/res/values-zh-rTW/strings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="str_error_wechat_pay_success">支付成功</string>
+    <string name="str_error_wechat_pay_fail">支付失败</string>
+    <string name="str_error_wechat_pay_cancel">支付已取消</string>
+</resources>

app_modular/apputils/src/main/res/values/strings.xml

@@ -1,3 +1,6 @@
 <resources>
     <string name="app_name">AppUtils</string>
+    <string name="str_error_wechat_pay_success">支付成功</string>
+    <string name="str_error_wechat_pay_fail">支付失败</string>
+    <string name="str_error_wechat_pay_cancel">支付已取消</string>
 </resources>

app_modular/appworks/src/main/java/com/uas/appworks/activity/DeviceQueryActivity.java

@@ -79,10 +79,10 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
     private int mPageIndex = 1, mPageSize = 25;
     private List<DataInquiryFlexBean> mDeviceQueryFlexBeans;
     private DataInquiryFlexAdapter mDeviceQueryFlexAdapter;
-    private List<DataInquiryFlexBean.RowBean.RowChildBean> mAllRowChildBeans;
+    private List<DataInquiryFlexBean.RowBean.RowChildBean> mRowChildBeans, mAllRowChildBeans;
     private String mFuzzyField = "";
     private int mOldPosition = -1;
-    private String mCaller = "Device", mClass;
+    private String mCaller = "Device", mClass, mWhichPage;
 
     @Override
     protected int getLayout() {
@@ -137,12 +137,17 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
         if (intent != null) {
             mCaller = intent.getStringExtra(Constants.FLAG.DEVICE_CALLER);
             mClass = intent.getStringExtra(Constants.FLAG.DEVICE_CLASS);
+            mWhichPage = intent.getStringExtra(Constants.FLAG.DEVICE_WHICH_PAGE);
         }
 
         if (TextUtils.isEmpty(mCaller)) {
             mCaller = "Device";
         }
 
+        if (TextUtils.isEmpty(mWhichPage)) {
+            mWhichPage = Constants.FLAG.DEVICE_FROM_QUERY;
+        }
+
         if (!TextUtils.isEmpty(mClass)) {
             String dc_class = "dc_class";
 //            if (mCaller != null && mCaller.equals("DeviceChange!Maintain")) {
@@ -197,36 +202,37 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 int reallyPosition = (int) parent.getItemIdAtPosition(position);
-                List<DataInquiryFlexBean.RowBean> rowBeans = mDeviceQueryFlexAdapter.getObjects().get(reallyPosition).getRowBeans();
-                String keyValue = null, status = null;
-                for (DataInquiryFlexBean.RowBean rowBean : rowBeans) {
-                    List<DataInquiryFlexBean.RowBean.RowChildBean> rowChildBeans = rowBean.getRowChildBeans();
-                    for (DataInquiryFlexBean.RowBean.RowChildBean rowChildBean : rowChildBeans) {
+                if (Constants.FLAG.DEVICE_FROM_COMMON.equals(mWhichPage)) {
+                    String keyValue = null, status = null;
+                    List<DataInquiryFlexBean.RowBean.RowChildBean> childBeans = mDeviceQueryFlexAdapter.getRowChildBeans().get(reallyPosition);
+                    for (DataInquiryFlexBean.RowBean.RowChildBean rowChildBean : childBeans) {
                         if ("dc_id".equals(rowChildBean.getField())) {
                             keyValue = rowChildBean.getValue();
                         }
                         if ("dc_status".equals(rowChildBean.getField())) {
                             status = rowChildBean.getValue();
                         }
+                        if (keyValue != null && status != null) {
+                            break;
+                        }
                     }
-                    if (keyValue != null && status != null) {
-                        break;
-                    }
-                }
-                startActivity(new Intent(mContext, CommonDocDetailsActivity.class)
-                        .putExtra("caller", mCaller)
-                        .putExtra("keyValue", keyValue)
-                        .putExtra("device", true)
-                        .putExtra("status", status));
-                /*if (CommonUtil.isRepeatClick()) {
-                    if (mOldPosition == reallyPosition) {
-                        mDeviceQueryFlexAdapter.getObjects().get(reallyPosition).setIsFlex(!mDeviceQueryFlexAdapter.getObjects().get(reallyPosition).isFlex());
-                        mDeviceQueryFlexAdapter.notifyDataSetChanged();
-                    } else {
-                        mOldPosition = reallyPosition;
+                    startActivity(new Intent(mContext, CommonDocDetailsActivity.class)
+                            .putExtra("caller", mCaller)
+                            .putExtra("keyValue", keyValue)
+                            .putExtra("device", true)
+                            .putExtra("status", status));
+
+                } else {
+                    if (CommonUtil.isRepeatClick()) {
+                        if (mOldPosition == reallyPosition) {
+                            mDeviceQueryFlexAdapter.getObjects().get(reallyPosition).setIsFlex(!mDeviceQueryFlexAdapter.getObjects().get(reallyPosition).isFlex());
+                            mDeviceQueryFlexAdapter.notifyDataSetChanged();
+                        } else {
+                            mOldPosition = reallyPosition;
+                        }
                     }
+                    mOldPosition = reallyPosition;
                 }
-                mOldPosition = reallyPosition;*/
             }
         });
         mDataListView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
@@ -547,15 +553,15 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
                         JSONObject columnsObject = columnsArray.getJSONObject(i);
                         if (columnsObject != null) {
                             int width = JSONUtil.getInt(columnsObject, "width");
-                            if (width > 0) {
-                                SchemeConditionBean columnsConditionBean = new SchemeConditionBean();
-                                columnsConditionBean.setCaption(JSONUtil.getText(columnsObject, "caption"));
-                                columnsConditionBean.setField(JSONUtil.getText(columnsObject, "dataIndex"));
-                                columnsConditionBean.setWidth(JSONUtil.getInt(columnsObject, "width"));
-                                columnsConditionBean.setType(JSONUtil.getText(columnsObject, "type"));
-
-                                columnsConditionBeans.add(columnsConditionBean);
-                            }
+//                            if (width > 0) {
+                            SchemeConditionBean columnsConditionBean = new SchemeConditionBean();
+                            columnsConditionBean.setCaption(JSONUtil.getText(columnsObject, "caption"));
+                            columnsConditionBean.setField(JSONUtil.getText(columnsObject, "dataIndex"));
+                            columnsConditionBean.setWidth(JSONUtil.getInt(columnsObject, "width"));
+                            columnsConditionBean.setType(JSONUtil.getText(columnsObject, "type"));
+
+                            columnsConditionBeans.add(columnsConditionBean);
+//                            }
                         }
                     }
 
@@ -593,7 +599,9 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
                     /**
                      * 列表数据解析
                      */
+                    List<List<DataInquiryFlexBean.RowBean.RowChildBean>> rowChildBeans = new ArrayList<>();
                     for (int i = 0; i < listdataArray.size(); i++) {
+                        mRowChildBeans = new ArrayList<>();
                         mAllRowChildBeans = new ArrayList<>();
                         JSONObject listdataObject = listdataArray.getJSONObject(i);
                         if (listdataObject != null) {
@@ -603,6 +611,7 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
                             List<DataInquiryFlexBean.RowBean> rowBeans = new ArrayList<>();
 
                             for (int j = 0; j < columnsConditionBeans.size(); j++) {
+                                int width = columnsConditionBeans.get(j).getWidth();
                                 String field = columnsConditionBeans.get(j).getField();
                                 String type = columnsConditionBeans.get(j).getType();
                                 String caption = columnsConditionBeans.get(j).getCaption();
@@ -614,21 +623,25 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
                                     rowChildBean.setCaption(caption);
                                     rowChildBean.setValue(value);
                                     rowChildBean.setField(field);
-                                    rowChildBean.setWidth(columnsConditionBeans.get(j).getWidth());
+                                    rowChildBean.setWidth(width);
 
                                     mAllRowChildBeans.add(rowChildBean);
+                                    if (width > 0) {
+                                        mRowChildBeans.add(rowChildBean);
+                                    }
                                 }
                             }
+                            rowChildBeans.add(mAllRowChildBeans);
 
-                            for (int k = 0; k < mAllRowChildBeans.size(); k++) {
+                            for (int k = 0; k < mRowChildBeans.size(); k++) {
                                 DataInquiryFlexBean.RowBean rowBean = new DataInquiryFlexBean.RowBean();
 
                                 List<DataInquiryFlexBean.RowBean.RowChildBean> childBeans = new ArrayList<>();
 
-                                DataInquiryFlexBean.RowBean.RowChildBean rowChildBean1 = mAllRowChildBeans.get(k);
+                                DataInquiryFlexBean.RowBean.RowChildBean rowChildBean1 = mRowChildBeans.get(k);
                                 childBeans.add(rowChildBean1);
-                                if (rowChildBean1.getWidth() <= 100 && k < (mAllRowChildBeans.size() - 1)) {
-                                    DataInquiryFlexBean.RowBean.RowChildBean rowChildBean2 = mAllRowChildBeans.get(k + 1);
+                                if (rowChildBean1.getWidth() <= 100 && k < (mRowChildBeans.size() - 1)) {
+                                    DataInquiryFlexBean.RowBean.RowChildBean rowChildBean2 = mRowChildBeans.get(k + 1);
                                     if (rowChildBean2.getWidth() <= 100) {
                                         childBeans.add(rowChildBean2);
                                         k++;
@@ -640,10 +653,10 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
                                 rowBeans.add(rowBean);
                             }
                             deviceQueryFlexBean.setRowBeans(rowBeans);
-
                             mDeviceQueryFlexBeans.add(deviceQueryFlexBean);
                         }
                     }
+                    mDeviceQueryFlexAdapter.setRowChildBeans(rowChildBeans);
                     mDeviceQueryFlexAdapter.notifyDataSetChanged();
                 } catch (Exception e) {
                     mDeviceQueryFlexAdapter.notifyDataSetChanged();

app_modular/appworks/src/main/java/com/uas/appworks/datainquiry/adapter/DataInquiryFlexAdapter.java

@@ -22,6 +22,7 @@ import java.util.List;
 public class DataInquiryFlexAdapter extends BaseAdapter {
     private final int mFlexLines = 3;
     private List<DataInquiryFlexBean> objects = new ArrayList<DataInquiryFlexBean>();
+    private List<List<DataInquiryFlexBean.RowBean.RowChildBean>> mRowChildBeans = new ArrayList<>();
 
     private Context context;
     private LayoutInflater layoutInflater;
@@ -32,6 +33,14 @@ public class DataInquiryFlexAdapter extends BaseAdapter {
         this.objects = objects;
     }
 
+    public List<List<DataInquiryFlexBean.RowBean.RowChildBean>> getRowChildBeans() {
+        return mRowChildBeans;
+    }
+
+    public void setRowChildBeans(List<List<DataInquiryFlexBean.RowBean.RowChildBean>> rowChildBeans) {
+        mRowChildBeans = rowChildBeans;
+    }
+
     public List<DataInquiryFlexBean> getObjects() {
         return objects;
     }