8.22 1、外送/自取模塊更名 2、取消外送/自取按鈕權限控制 3、多個頁面加入loading

Signed-off-by: Wyh <1239658231>

base-module/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java

@@ -7,7 +7,6 @@ import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Build;
 import android.os.RemoteException;
 import android.os.RemoteException;
-import android.util.Log;
 
 
 import androidx.annotation.NonNull;
 import androidx.annotation.NonNull;
 
 
@@ -124,6 +123,21 @@ public class GsaCloudApplication extends BaseApplication {
         AppCrashHandler.getInstance().init(this);
         AppCrashHandler.getInstance().init(this);
 
 
         androidSetting = new FunctionStyleUtils();
         androidSetting = new FunctionStyleUtils();
+
+        // 设定一些通用的属性，这些属性在每次统计事件中都会附带
+        // 注意：如果此处的属性名与内置属性的名称相同，则内置属性会被覆盖
+//        Tracker.INSTANCE.addProperty("附加的属性1", "附加的属性1");
+//        Tracker.INSTANCE.addProperty("附加的属性2", "附加的属性2");
+//        // 设定上报数据的主机和接口
+//        // 注意：该方法一定要在Tracker.initialize()方法前调用
+//        // 否则会由于上报地址未初始化，在触发启动事件时导致崩溃
+//        Tracker.INSTANCE.setService("host", "path");
+//        // 设定上报数据的项目名称
+//        Tracker.INSTANCE.setProjectName("項目名");
+//        // 设定上报数据的模式
+//        Tracker.INSTANCE.setMode(TrackerMode.DEBUG_ONLY);
+//        // 初始化AndroidTracker
+//        Tracker.INSTANCE.initialize(this);
     }
     }
 
 
     public Activity getCurrentActivity() {
     public Activity getCurrentActivity() {

base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/crash/AppCrashHandler.java

@@ -198,10 +198,12 @@ public class AppCrashHandler implements UncaughtExceptionHandler {
 
 
                         @Override
                         @Override
                         public void onSubscribe(Disposable d) {
                         public void onSubscribe(Disposable d) {
+                            Log.e("eee", "onSubscribe");
                         }
                         }
 
 
                         @Override
                         @Override
                         public void onNext(String data) {
                         public void onNext(String data) {
+                            Log.e("eee", "上傳錯誤日誌成功");
                             if(!TextUtils.isEmpty(data)){
                             if(!TextUtils.isEmpty(data)){
                                 BaseResult result = JsonUtils.parseObject(data, BaseResult.class);
                                 BaseResult result = JsonUtils.parseObject(data, BaseResult.class);
                                 if (result != null && result.isSuccess()) {
                                 if (result != null && result.isSuccess()) {
@@ -218,11 +220,14 @@ public class AppCrashHandler implements UncaughtExceptionHandler {
                         @Override
                         @Override
                         public void onError(Throwable t) {
                         public void onError(Throwable t) {
                             XLog.d(TAG, "sendFileMultipart onError: " + t.getMessage());
                             XLog.d(TAG, "sendFileMultipart onError: " + t.getMessage());
+                            Log.e("eee", "onError");
                         }
                         }
 
 
                         @Override
                         @Override
                         public void onComplete() {
                         public void onComplete() {
+                            Log.e("eee", "onComplete");
                         }
                         }
+
                     });
                     });
         }
         }
     }
     }
@@ -261,8 +266,6 @@ public class AppCrashHandler implements UncaughtExceptionHandler {
                 fos.write(sb.toString().getBytes());
                 fos.write(sb.toString().getBytes());
                 fos.close();
                 fos.close();
                 return fileName;
                 return fileName;
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
             } catch (IOException e) {
             } catch (IOException e) {
                 e.printStackTrace();
                 e.printStackTrace();
             }
             }

other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/BtnBuilder.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/BtnBuilder.kt

@@ -60,16 +60,17 @@ class BtnBuilder(var functions: List<Function>) {
     }
     }
 
 
     private fun getBtn(key:String, btnCode:Int, btnContent: String, btnColor: Int, btnImg: Int): BtnBean? {
     private fun getBtn(key:String, btnCode:Int, btnContent: String, btnColor: Int, btnImg: Int): BtnBean? {
-        for (value in functions) {
-            if (value.resUrl == key) {
-                return when {
-                    value.status == 3 -> BtnBean(btnCode, btnContent, R.color.color_ccc, btnImg)
-//                    value.status == 1 -> BtnBean(btnCode, btnContent, btnColor, btnImg)
-                    else -> BtnBean(btnCode, btnContent, btnColor, btnImg)
-                }
-            }
-        }
-        return null
+//        for (value in functions) {
+//            if (value.resUrl == key) {
+//                return when {
+//                    value.status == 3 -> BtnBean(btnCode, btnContent, R.color.color_ccc, btnImg)
+////                    value.status == 1 -> BtnBean(btnCode, btnContent, btnColor, btnImg)
+//                    else -> BtnBean(btnCode, btnContent, btnColor, btnImg)
+//                }
+//            }
+//        }
+//        return null
+        return BtnBean(btnCode, btnContent, btnColor, btnImg)
     }
     }
 
 
 }
 }

other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/OrderList.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/model/bean/OrderList.kt

@@ -5,7 +5,8 @@ class OrderList {
     private var success: Boolean = false
     private var success: Boolean = false
     private var sysTime: Long = 0
     private var sysTime: Long = 0
     private var data: DataBeanX? = null
     private var data: DataBeanX? = null
-
+    var errCode: String? = null
+    var errMsg:String? = null
     class DataBeanX {
     class DataBeanX {
 
 
 
 

other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/model/viewModel/PageViewModel.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/model/viewModel/PageViewModel.kt

@@ -57,6 +57,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
 
 
     var mOrderList = arrayListOf<MutableLiveData<ArrayList<OrderList.DataBeanX.DataBean>>>()
     var mOrderList = arrayListOf<MutableLiveData<ArrayList<OrderList.DataBeanX.DataBean>>>()
 
 
+    var orderList = MutableLiveData<OrderList>()
     //其他的所有數據
     //其他的所有數據
     var otherInfo = MutableLiveData<OrderList.DataBeanX.DataBean>()
     var otherInfo = MutableLiveData<OrderList.DataBeanX.DataBean>()
 
 
@@ -136,6 +137,8 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
                     getOrderGroupNum(restaurantId)
                     getOrderGroupNum(restaurantId)
                     loadInfo(isLoadMore, position)
                     loadInfo(isLoadMore, position)
                 } else {
                 } else {
+                    orderList.postValue(this)
+                    mOrderList[position].value = null
                     OkHttp3Utils.noticePersonnel(AppConstans.RP_ORDER_LIST_ERROR, "獲取訂單列表失敗")
                     OkHttp3Utils.noticePersonnel(AppConstans.RP_ORDER_LIST_ERROR, "獲取訂單列表失敗")
                 }
                 }
             }
             }

other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/fragment/PlaceholderFragment.kt → delivery_pick_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/fragment/PlaceholderFragment.kt

@@ -11,6 +11,7 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication
 import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication
+import com.gingersoft.gsa.cloud.base.utils.other.TextUtil
 import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils
 import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils
 import com.gingersoft.gsa.cloud.ui.utils.AppDialog
 import com.gingersoft.gsa.cloud.ui.utils.AppDialog
 import com.gingersoft.gsa.other_order_mode.R
 import com.gingersoft.gsa.other_order_mode.R
@@ -79,6 +80,21 @@ class PlaceholderFragment : BaseFragment(R.layout.fragment_other_order) {
             }
             }
         })
         })
 
 
+        pageViewModel.orderList.observe(viewLifecycleOwner, Observer {
+            refresh_layout.finishRefresh()
+            refresh_layout.finishLoadMore()
+            it?.let {
+                if (!it.isSuccess()) {
+                    if (TextUtil.isNotEmptyOrNullOrUndefined(it.errMsg)) {
+                        //訂單未請求成功才調用
+                        ToastUtils.show(activity, it.errMsg)
+                    } else {
+                        ToastUtils.show(activity, "獲取訂單列表失敗")
+                    }
+                }
+            }
+        })
+
         // 设置 Header 顏色
         // 设置 Header 顏色
         refresh_layout.setPrimaryColorsId(R.color.color_f0, R.color.color_66)
         refresh_layout.setPrimaryColorsId(R.color.color_f0, R.color.color_66)
         // 下拉刷新，加載更多
         // 下拉刷新，加載更多
@@ -106,7 +122,8 @@ class PlaceholderFragment : BaseFragment(R.layout.fragment_other_order) {
     }
     }
 
 
     private fun getOrderList(pageViewModel: PageViewModel, isLoadMore: Boolean) {
     private fun getOrderList(pageViewModel: PageViewModel, isLoadMore: Boolean) {
-        pageViewModel.getOrderList(GsaCloudApplication.getRestaurantId(activity).toString(), arguments?.getInt(INDEX) ?: 0, page.toString(), isLoadMore)
+        pageViewModel.getOrderList(GsaCloudApplication.getRestaurantId(activity).toString(), arguments?.getInt(INDEX)
+                ?: 0, page.toString(), isLoadMore)
     }
     }
 
 
     companion object {
     companion object {