Merge remote-tracking branch 'origin/master'

This commit is contained in:
18142669586 2023-01-13 17:36:30 +08:00
commit 16592aaecb

View File

@ -24,6 +24,7 @@ import com.yunbao.common.CommonAppConfig;
import com.yunbao.common.http.CommonHttpUtil; import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback; import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.utils.GoogleBillingUtilNew; import com.yunbao.common.utils.GoogleBillingUtilNew;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil; import com.yunbao.common.utils.ToastUtil;
import com.yunbao.main.R; import com.yunbao.main.R;
import com.yunbao.main.views.TestWebViewClient; import com.yunbao.main.views.TestWebViewClient;
@ -55,6 +56,10 @@ public class GoogleFragment extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
//通过参数中的布局填充获取对应布局 //通过参数中的布局填充获取对应布局
view = inflater.inflate(R.layout.activity_recharge, container, false); view = inflater.inflate(R.layout.activity_recharge, container, false);
if(StringUtil.isEmpty(url)){
Log.e(TAG, "URL为空" );
return view;
}
rlWebview = (WebView) view.findViewById(R.id.rlWebview); rlWebview = (WebView) view.findViewById(R.id.rlWebview);
Log.e("ttt", url); Log.e("ttt", url);
rlWebview.loadUrl(url); rlWebview.loadUrl(url);