mirror of
https://gitee.com/willfree/min-vpn-client_v2.git
synced 2026-10-04 19:42:00 +08:00
经过测试,找到了图片一直抖动的原因,是viewExtensionKt中的一个方法实现的动画效果,问题就出自这里,但还不知道怎么解决
This commit is contained in:
1 parent
71cad5c33e
commit
887a091a7c
3 files changed
+22
-26
No files matched your search
@@ -57,7 +57,7 @@ public class MainActivity extends MINVpnBaseActivity<MainActivityPresenter>
|
||||
private EasyBar easyBar;
|
||||
private TextView VPNstatus;
|
||||
private RadioGroup etProxyMode;
|
||||
private RadioButton ruleProxy;
|
||||
// private RadioButton ruleProxy;
|
||||
private RadioButton globalProxy;
|
||||
private RadioButton serverSettingProxy;
|
||||
private SpinKitView spinKit;
|
||||
@@ -71,7 +71,7 @@ public class MainActivity extends MINVpnBaseActivity<MainActivityPresenter>
|
||||
easyBar=findViewById(R.id.easyBar);
|
||||
VPNstatus=findViewById(R.id.VPNstatus);
|
||||
etProxyMode=findViewById(R.id.etProxyMode);
|
||||
ruleProxy=findViewById(R.id.ruleProxy);
|
||||
// ruleProxy=findViewById(R.id.ruleProxy);
|
||||
globalProxy=findViewById(R.id.globalProxy);
|
||||
serverSettingProxy=findViewById(R.id.serverSettingProxy);
|
||||
spinKit=findViewById(R.id.spinKit);
|
||||
@@ -110,12 +110,10 @@ public class MainActivity extends MINVpnBaseActivity<MainActivityPresenter>
|
||||
|
||||
// 根据MINVpnAPI显示当前VPN的模式
|
||||
int flag= MINVpnSettingAPI.INSTANCE.getProxyMode();
|
||||
if(flag==0){
|
||||
etProxyMode.check(ruleProxy.getId()); // 规则
|
||||
}else if(flag==1){
|
||||
etProxyMode.check(globalProxy.getId()); // 全局
|
||||
if(flag==1){
|
||||
etProxyMode.check(globalProxy.getId()); // 全局,外网
|
||||
}else if(flag==2){
|
||||
etProxyMode.check(serverSettingProxy.getId());// 服务器设定
|
||||
etProxyMode.check(serverSettingProxy.getId());// 服务器设定,内网
|
||||
}
|
||||
|
||||
etProxyMode.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
|
||||
@@ -123,7 +121,7 @@ public class MainActivity extends MINVpnBaseActivity<MainActivityPresenter>
|
||||
public void onCheckedChanged(RadioGroup group, int checkedId) {
|
||||
if(!isConnected){
|
||||
// 执行连接流程
|
||||
connectVpn();
|
||||
// connectVpn();
|
||||
}else{
|
||||
// 执行断开流程
|
||||
disconnectVpn();
|
||||
@@ -144,9 +142,7 @@ public class MainActivity extends MINVpnBaseActivity<MainActivityPresenter>
|
||||
connectVpn();
|
||||
// 更新选定的模式
|
||||
int cacheflag=etProxyMode.getCheckedRadioButtonId();
|
||||
if(cacheflag==ruleProxy.getId()){
|
||||
MINVpnSettingAPI.INSTANCE.updateProxyMode(0); // 规则
|
||||
}else if(cacheflag==globalProxy.getId()){
|
||||
if(cacheflag==globalProxy.getId()){
|
||||
MINVpnSettingAPI.INSTANCE.updateProxyMode(1); // 全局
|
||||
}else if(cacheflag==serverSettingProxy.getId()){
|
||||
MINVpnSettingAPI.INSTANCE.updateProxyMode(2);// 服务器设定
|
||||
@@ -268,7 +264,7 @@ public class MainActivity extends MINVpnBaseActivity<MainActivityPresenter>
|
||||
btnConnect.setImageResource(R.drawable.launch);
|
||||
}
|
||||
System.out.println("fuck 3");
|
||||
ViewExtensionKt.animer2(btnConnect,ViewExtensionKt.alphaAnimation(btnConnect,
|
||||
ViewExtensionKt.animer(btnConnect,ViewExtensionKt.alphaAnimation(btnConnect,
|
||||
0.3f,0.1f));
|
||||
System.out.println("fuck 4");
|
||||
}
|
||||
@@ -284,7 +280,7 @@ public class MainActivity extends MINVpnBaseActivity<MainActivityPresenter>
|
||||
// 修改按钮状态
|
||||
btnConnect.setClickable(true);
|
||||
btnConnect.setImageResource(R.drawable.launch);
|
||||
ViewExtensionKt.animer2(btnConnect,ViewExtensionKt.alphaAnimation(btnConnect,
|
||||
ViewExtensionKt.animer(btnConnect,ViewExtensionKt.alphaAnimation(btnConnect,
|
||||
0.3f,0.1f));
|
||||
}
|
||||
}
|
||||
@@ -178,9 +178,9 @@ public enum MINVpnSettingAPI {
|
||||
}
|
||||
|
||||
// -----------------主界面-连接VPN---------------
|
||||
//0 rule
|
||||
//1 global
|
||||
//2 server setting
|
||||
//0 rule => 废弃
|
||||
//1 global 全局流量,用于访问外网
|
||||
//2 server setting 根据VPN服务器的握手应答信息进行设置,用于访问内网
|
||||
public int getProxyMode(){
|
||||
return EncryptedSharedPreferenceUtil.get(context,
|
||||
SP_PROXY_MODE,2);
|
||||
|
||||
@@ -68,16 +68,16 @@
|
||||
app:layout_constraintTop_toBottomOf="@id/btnConnect"
|
||||
>
|
||||
|
||||
<RadioButton
|
||||
android:id="@+id/ruleProxy"
|
||||
android:layout_width="@dimen/dp_120"
|
||||
android:layout_height="@dimen/dp_50"
|
||||
android:textColorHint="@color/colorPrimary"
|
||||
android:hint="规则模式"
|
||||
android:checked="true"
|
||||
android:layout_marginLeft="@dimen/dp_20"
|
||||
app:layout_constraintLeft_toLeftOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
<!-- <RadioButton-->
|
||||
<!-- android:id="@+id/ruleProxy"-->
|
||||
<!-- android:layout_width="@dimen/dp_120"-->
|
||||
<!-- android:layout_height="@dimen/dp_50"-->
|
||||
<!-- android:textColorHint="@color/colorPrimary"-->
|
||||
<!-- android:hint="规则模式"-->
|
||||
<!-- android:checked="true"-->
|
||||
<!-- android:layout_marginLeft="@dimen/dp_20"-->
|
||||
<!-- app:layout_constraintLeft_toLeftOf="parent"-->
|
||||
<!-- app:layout_constraintTop_toTopOf="parent" />-->
|
||||
|
||||
<RadioButton
|
||||
android:id="@+id/globalProxy"
|
||||
|
||||
Reference in new issue
Block a user