Преглед изворни кода

fix: 解决MyRetrofit冲突

master
huting пре 2 година
родитељ
комит
19ec997ffc

+ 2
- 6
app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/MyRetrofit.java Прегледај датотеку

@@ -40,17 +40,13 @@ import retrofit2.converter.scalars.ScalarsConverterFactory;
public class MyRetrofit {
//是否设置缓存
private static final boolean Cache = false;
<<<<<<< HEAD
/**
* 修改文件上传地址:VPN访问:192.168.101.145:6001、办公网络访问:222.85.144.89:19003
* 回显地址:222.85.144.89:19002/xxxxxx
*/
// private final String BaseUrl = "http://192.168.100.63:8087/ifzt/api/";
=======
private final String BaseUrl = "http://192.168.100.63:8087/ifzt/api/";
>>>>>>> c03e8c06c8c823800a0c6457f50cebd8c5a105ff
// private final String BaseUrl = "http://192.168.100.63:8087/ifzt/api/";
// private final String BaseUrl = "http://58.16.58.161:19002/ifzt/api/";
// private final String BaseUrl = "http://222.85.144.89:19002/ifzt/api/";
private final String BaseUrl = "http://222.85.144.89:19002/ifzt/api/";
private final String appId = "admin001";
private final String IFCODE = "";
private final String bizContent = "";

+ 1
- 1
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/TopEntrapmentActivity.java Прегледај датотеку

@@ -413,7 +413,7 @@ public class TopEntrapmentActivity extends AppActivity implements INRechargeChoo
inputValue = FunHelper.getText(binding.etInputMoney);
}
});
//立即充值
binding.nextStep.setOnClickListener(new View.OnClickListener() {
@Override

Loading…
Откажи
Сачувај