合并6.8.0代码
This commit is contained in:
@@ -134,7 +134,7 @@ public class GoogleBillingManage implements PurchasesUpdatedListener {
|
||||
object.put("orderList", orderList);
|
||||
object.put("tradeNo", tradeNo);
|
||||
} catch (JSONException e) {
|
||||
throw new RuntimeException(e);
|
||||
e.printStackTrace();
|
||||
}
|
||||
return object;
|
||||
}
|
||||
@@ -195,11 +195,12 @@ public class GoogleBillingManage implements PurchasesUpdatedListener {
|
||||
try {
|
||||
return AdvertisingIdClient.getAdvertisingIdInfo(mContext).getId();
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
e.printStackTrace();
|
||||
return "";
|
||||
} catch (GooglePlayServicesNotAvailableException e) {
|
||||
throw new RuntimeException(e);
|
||||
e.printStackTrace(); return "";
|
||||
} catch (GooglePlayServicesRepairableException e) {
|
||||
throw new RuntimeException(e);
|
||||
e.printStackTrace(); return "";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -220,7 +221,7 @@ public class GoogleBillingManage implements PurchasesUpdatedListener {
|
||||
object.put("resultToken", resultToken);
|
||||
object.put("resultOrderId", resultOrderId);
|
||||
} catch (JSONException e) {
|
||||
throw new RuntimeException(e);
|
||||
e.printStackTrace();
|
||||
}
|
||||
return object;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user