增加flutter回调native充值页面; 打开赛事商城页面
This commit is contained in:
1
app/proguard-rules.pro
vendored
1
app/proguard-rules.pro
vendored
@@ -384,4 +384,5 @@
|
|||||||
-keep class io.flutter.embedding.android.** { *; }
|
-keep class io.flutter.embedding.android.** { *; }
|
||||||
-keep class io.flutter.plugins.** { *; }
|
-keep class io.flutter.plugins.** { *; }
|
||||||
-keep class com.yuxiaor.flutter.g_faraday.** { *; }
|
-keep class com.yuxiaor.flutter.g_faraday.** { *; }
|
||||||
|
-keep class net.sqlcipher.** { *; }
|
||||||
|
|
||||||
|
@@ -65,6 +65,7 @@ import com.yizhuan.erban.R;
|
|||||||
import com.yizhuan.erban.module_hall.HallDataManager;
|
import com.yizhuan.erban.module_hall.HallDataManager;
|
||||||
import com.yizhuan.erban.radish.wallet.RadishWalletManager;
|
import com.yizhuan.erban.radish.wallet.RadishWalletManager;
|
||||||
import com.yizhuan.erban.reciever.ConnectiveChangedReceiver;
|
import com.yizhuan.erban.reciever.ConnectiveChangedReceiver;
|
||||||
|
import com.yizhuan.erban.ui.pay.ChargeActivity;
|
||||||
import com.yizhuan.erban.utils.PushMessageHandler;
|
import com.yizhuan.erban.utils.PushMessageHandler;
|
||||||
import com.yizhuan.xchat_android_constants.XChatConstants;
|
import com.yizhuan.xchat_android_constants.XChatConstants;
|
||||||
import com.yizhuan.xchat_android_core.Constants;
|
import com.yizhuan.xchat_android_core.Constants;
|
||||||
@@ -261,7 +262,13 @@ public class XChatApplication extends Application {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void pushNativeRoute(String pageName, HashMap<String, String> arguments) {
|
public void pushNativeRoute(String pageName, HashMap<String, String> arguments) {
|
||||||
|
if (pageName == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (pageName.equals("charge")) {
|
||||||
|
FlutterBoost.instance().currentActivity()
|
||||||
|
.startActivity(ChargeActivity.getIntent(FlutterBoost.instance().currentActivity()));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@@ -13,6 +13,7 @@ import androidx.annotation.Nullable;
|
|||||||
import androidx.core.content.ContextCompat;
|
import androidx.core.content.ContextCompat;
|
||||||
import androidx.databinding.DataBindingUtil;
|
import androidx.databinding.DataBindingUtil;
|
||||||
|
|
||||||
|
import com.idlefish.flutterboost.FlutterBoost;
|
||||||
import com.yizhuan.erban.MainActivity;
|
import com.yizhuan.erban.MainActivity;
|
||||||
import com.yizhuan.erban.R;
|
import com.yizhuan.erban.R;
|
||||||
import com.yizhuan.erban.UIHelper;
|
import com.yizhuan.erban.UIHelper;
|
||||||
@@ -379,6 +380,9 @@ public class MeFragment extends BaseMvpFragment<IMainFragmentView, MainFragmentP
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
break;
|
||||||
|
case R.id.match_mall:
|
||||||
|
FlutterBoost.instance().open("mall", null);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
@@ -103,6 +103,14 @@ public class ChargeActivity extends BaseActivity {
|
|||||||
private final int BINDCODE_GOLD = 200;
|
private final int BINDCODE_GOLD = 200;
|
||||||
private CompositeDisposable compositeDisposable = new CompositeDisposable();
|
private CompositeDisposable compositeDisposable = new CompositeDisposable();
|
||||||
|
|
||||||
|
public static Intent getIntent(Context context) {
|
||||||
|
UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
|
||||||
|
if (context == null || userInfo == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return new Intent(context, ChargeActivity.class);
|
||||||
|
}
|
||||||
|
|
||||||
public static void start(Context context) {
|
public static void start(Context context) {
|
||||||
UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
|
UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
|
||||||
if (context == null || userInfo == null) return;
|
if (context == null || userInfo == null) return;
|
||||||
|
@@ -371,6 +371,7 @@
|
|||||||
app:layout_rowWeight="1" />
|
app:layout_rowWeight="1" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
android:id="@+id/match_mall"
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_marginTop="15dp"
|
android:layout_marginTop="15dp"
|
||||||
android:drawableTop="@mipmap/icon_decoration"
|
android:drawableTop="@mipmap/icon_decoration"
|
||||||
@@ -378,6 +379,7 @@
|
|||||||
android:text="商城"
|
android:text="商城"
|
||||||
android:textColor="@color/color_c6c6e9"
|
android:textColor="@color/color_c6c6e9"
|
||||||
android:textSize="13sp"
|
android:textSize="13sp"
|
||||||
|
android:onClick="@{click}"
|
||||||
app:layout_columnWeight="1"
|
app:layout_columnWeight="1"
|
||||||
app:layout_rowWeight="1" />
|
app:layout_rowWeight="1" />
|
||||||
|
|
||||||
|
Submodule xplan-flutter updated: a9508182ce...b8fab44a7d
Reference in New Issue
Block a user