bug fix: 1.百度支付回调从新设计 2. 更改源更换启动方式

app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt

@@ -141,6 +141,7 @@ class NewMainActivity : BaseActivity() {
     var GetNodeTimeOutNum = 5;
     var  dialogDoMainChoose:DialogDoMainChoose? =null
     private var broadcastReceiver: BroadcastReceiver? = null
+    private val mPageInfo = PageInfo()
     companion object {
         //记录心跳失败次数
         var HEART_BEAT_FAILURE_FREQUENCY = 0
@@ -283,6 +284,8 @@ class NewMainActivity : BaseActivity() {
         if(!isExpire){
             nodeIsChange()
         }
+        //用于检测是否进行了百度上传
+        mainAtyVM.getExpensesRecord(mPageInfo)
 
     }
 
@@ -1484,5 +1487,17 @@ class NewMainActivity : BaseActivity() {
         stopUploadTimer()
         mainAtyVM.stopHeartBeat()
     }
+    class PageInfo {
+        var page = 1
+        fun nextPage() {
+            page++
+        }
 
+        fun reset() {
+            page = 1
+        }
+
+        val isFirstPage: Boolean
+            get() = page == 1
+    }
 }

app/src/main/java/com/yingmao/clash/vm/MainAtyVM.kt

@@ -12,6 +12,7 @@ import com.yingmao.clash.act.NewMainActivity
 import com.yingmao.clash.base.PublicViewMode
 import com.cncat.vpn.common.log.Log
 import com.google.gson.Gson
+import com.yingmao.clash.act.PageInfo
 import com.yingmao.clash.app.MainApplication
 import com.yingmao.clash.conf.BZYConstants
 import com.yingmao.clash.entity.CheckLoginRsp
@@ -346,4 +347,18 @@ class MainAtyVM : PublicViewMode() {
         val httpApi = NetService.instances.createHttps(HttpApi::class.java)
         doAsync(HttpReqType.SelectNode) { httpApi.selectNodeInfo(BuildConfig.productId) }
     }
+    fun getExpensesRecord(page : NewMainActivity.PageInfo){
+        val httpApi = NetService.instances.createHttps(HttpApi::class.java)
+        val username = MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_REMEMBER_USERNAME,"")!!
+        val phToken = MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_PH_TOKEN,"")!!
+        val userId = MMKV.defaultMMKV().decodeString(BZYConstants.MMKV_KEY_USER_ID)!!
+        val params = hashMapOf<String,String>(
+            "phoneNumber" to username,
+            "userId" to userId,
+            "phToken" to phToken,
+            "pageno" to "${page.page}",
+            "pageSize" to "5",
+        )
+        doAsync(HttpReqType.EXPENSES_RECORD){httpApi.phOrderList(params)}
+    }
 }