diff --git a/iFish7/src/main/java/com/ifish/activity/AboutActivity.java b/iFish7/src/main/java/com/ifish/activity/AboutActivity.java index d94c02776..c95dad141 100644 --- a/iFish7/src/main/java/com/ifish/activity/AboutActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/AboutActivity.java @@ -10,6 +10,7 @@ package com.ifish.activity; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; +import android.content.Intent; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.os.Bundle; @@ -59,7 +60,9 @@ public class AboutActivity extends BaseActivity { super.onCreate(savedInstanceState); setContentView(R.layout.about_activity); initTitle("关于我们"); - findViewById(R.id.tv_statement).setOnClickListener(this); + findViewById(R.id.layout_explain).setOnClickListener(this); + findViewById(R.id.layout_policy).setOnClickListener(this); + findViewById(R.id.layout_register).setOnClickListener(this); c_logo = findMyViewById(R.id.c_logo); findViewById(R.id.c_logo).setOnClickListener(this); TextView tv_version = (TextView) findViewById(R.id.tv_version); @@ -248,10 +251,27 @@ public class AboutActivity extends BaseActivity { public void onClick(View v) { super.onClick(v); switch (v.getId()) { - case R.id.tv_statement: + case R.id.layout_explain: startActivity(StatementActivity.class); AnimationUtil.startAnimation(AboutActivity.this); break; + case R.id.layout_policy: + Intent ix = new Intent(); + ix.setClass(this, WebViewActivity.class);//注册协议 + ix.putExtra(WebViewActivity.URL, HttpManager.PRIVACY_URL); + ix.putExtra(WebViewActivity.WEBVIEWTITLE, Commons.Text.PRIVACY_TITLE); + startActivity(ix); + AnimationUtil.startAnimation(this); + break; + + case R.id.layout_register: + Intent i = new Intent(); + i.setClass(this, WebViewActivity.class);//注册协议 + i.putExtra(WebViewActivity.URL, HttpManager.REGISTERAGREEMENT_URL); + i.putExtra(WebViewActivity.WEBVIEWTITLE, Commons.Text.REGISTERAGREEMENT); + startActivity(i); + AnimationUtil.startAnimation(this); + break; case R.id.c_logo: // debugMode(); // changeURL(); diff --git a/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java b/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java index 483e98626..423522221 100644 --- a/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/LoadingActivity.java @@ -50,6 +50,7 @@ import com.ifish.utils.Config; import com.ifish.utils.ConfigUtil; import com.ifish.utils.HttpListener; import com.ifish.utils.HttpManager; +import com.ifish.utils.L; import com.ifish.utils.SPUtil; import com.ifish.utils.ToastUtil; import com.ifish.view.SuperTextView; @@ -307,6 +308,14 @@ public class LoadingActivity extends BaseActivityNotAnim { private void initapp() { + // jjia-push + // IPushService + // IIntentService + PushManager.getInstance().preInit(this); + PushManager.getInstance().initialize(this); + if (BuildConfig.DEBUG){ + PushManager.getInstance().setDebugLogger(this, s -> L.i("jjia--------"+s)); + } analysisBaseUrlError(); } diff --git a/iFish7/src/main/java/com/ifish/activity/LoginActivity.java b/iFish7/src/main/java/com/ifish/activity/LoginActivity.java index 58be1c86c..79abb4104 100644 --- a/iFish7/src/main/java/com/ifish/activity/LoginActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/LoginActivity.java @@ -127,6 +127,7 @@ public class LoginActivity extends BaseActivity { findViewById(R.id.title_text_right).setOnClickListener(this); findViewById(R.id.tv_forget).setOnClickListener(this); findViewById(R.id.tv_check).setOnClickListener(this); + findViewById(R.id.tv_policy).setOnClickListener(this); } @Override @@ -145,6 +146,15 @@ public class LoginActivity extends BaseActivity { startActivity(i); AnimationUtil.startAnimation(this); break; + + case R.id.tv_policy: + Intent ix = new Intent(); + ix.setClass(this, WebViewActivity.class);//注册协议 + ix.putExtra(WebViewActivity.URL, HttpManager.PRIVACY_URL); + ix.putExtra(WebViewActivity.WEBVIEWTITLE, Text.PRIVACY_TITLE); + startActivity(ix); + AnimationUtil.startAnimation(this); + break; case R.id.title_text_right: startActivity(RegisteredActivity.class); AnimationUtil.startAnimation(this); diff --git a/iFish7/src/main/java/com/ifish/activity/PushActivity.java b/iFish7/src/main/java/com/ifish/activity/PushActivity.java index 5d34030b9..498b0c32e 100644 --- a/iFish7/src/main/java/com/ifish/activity/PushActivity.java +++ b/iFish7/src/main/java/com/ifish/activity/PushActivity.java @@ -4,6 +4,8 @@ import android.os.Bundle; import androidx.appcompat.app.AppCompatActivity; +import com.ifish.utils.ToastUtil; + public class PushActivity extends AppCompatActivity { @Override @@ -11,5 +13,9 @@ public class PushActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_push); + + ToastUtil.show(this,"push---"); + + } } \ No newline at end of file diff --git a/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java b/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java index eadfd3230..574c47061 100644 --- a/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java +++ b/iFish7/src/main/java/com/ifish/baseclass/BaseApplication.java @@ -145,12 +145,7 @@ public class BaseApplication extends MultiDexApplication { } }); - // jjia-push - // IPushService - // IIntentService - PushManager.getInstance().preInit(this); - PushManager.getInstance().initialize(this); - PushManager.getInstance().setDebugLogger(this, s -> L.i("jjia--------"+s)); + } diff --git a/iFish7/src/main/java/com/ifish/push/IIntentService.java b/iFish7/src/main/java/com/ifish/push/IIntentService.java index 3449efa0d..e3cb90d03 100644 --- a/iFish7/src/main/java/com/ifish/push/IIntentService.java +++ b/iFish7/src/main/java/com/ifish/push/IIntentService.java @@ -39,6 +39,7 @@ public class IIntentService extends GTIntentService { } //通知点击 +// 通知点击回调接口（仅支持个推 SDK 通道下发的通知） @Override public void onNotificationMessageClicked(Context context, GTNotificationMessage gtNotificationMessage) { super.onNotificationMessageClicked(context, gtNotificationMessage); diff --git a/iFish7/src/main/res/layout/about_activity.xml b/iFish7/src/main/res/layout/about_activity.xml index 1a9816ee3..ad713a3c3 100644 --- a/iFish7/src/main/res/layout/about_activity.xml +++ b/iFish7/src/main/res/layout/about_activity.xml @@ -74,20 +74,132 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerHorizontal="true" + android:layout_marginTop="10dp" android:textColor="@color/text_hint_login" android:textSize="13sp" android:text="上海鱼影科技有限公司" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iFish7/src/main/res/layout/login_activity.xml b/iFish7/src/main/res/layout/login_activity.xml index 796a7b679..b1a170a4a 100644 --- a/iFish7/src/main/res/layout/login_activity.xml +++ b/iFish7/src/main/res/layout/login_activity.xml @@ -112,13 +112,14 @@ android:textColor="@color/main_tab_grey" android:textSize="14sp" /> - - + + + - +