diff --git a/.gitignore b/.gitignore index 4994cba20..e12962d33 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,10 @@ gradlew.bat gradle.properties app/manifest-merger-release-report.txt /captures/ +app/src/main/java/net/coding/program/network/model/baidumap/ + +/.gradle/ +/gradle + +coding.jks + diff --git a/README.md b/README.md index 174151000..2dc5140ef 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ ### Coding Android客户端代码说明 -##编译环境 -Android Studio 2.2.3，用gradle引用的许多第三方库，第一次加载会有点慢，加载完毕后要build一下，这些待下划线的类（比如 MainActivity_）会在build之后自动生成。 +## 编译环境 +Android Studio 3.1.3，根据 `variants` 选择编译企业版或个人版。修改 `gradle.properties.sample` 为 `gradle.properties` 并修改文件中 `keystore` 相关的环境变量，编译企业版的时候，`DEV_ENTERPRISE` 设置为 `true` ,因为用 `gradle` 引用的许多第三方库，所以第一次加载会有点慢，加载完毕后要 `build` 一下，这些带下划线的类（比如 `MainActivity_`）会在build之后自动生成。 -##包说明 +## 包说明 >common 基类和工具类 >>comment 评论区 >>enter 输入框 @@ -21,7 +21,7 @@ Android Studio 2.2.3，用gradle引用的许多第三方库，第一次加载会 >third 一些第三方代码 >user 好友界面 -##一些觉得有必要提一下的 +## 一些觉得有必要提一下的 因为不想写一堆绑定函数，所以项目用了 [androidannotations](https://github.com/excilys/androidannotations)，如果以前没用过最好先看看。 显示图片用的[universal-image-loader](https://github.com/nostra13/Android-Universal-Image-Loader)，网络库用的[android-async-http](https://github.com/loopj/android-async-http)，因为登录以后保存的cookie都在[android-async-http](https://github.com/loopj/android-async-http)，有些图片需要登录后的cookie才能取到（例如项目文件里面的图片），这种情况就会用先用[android-async-http](https://github.com/loopj/android-async-http)下载图片（AttachmentimagePagerFragment.java）。 @@ -56,10 +56,10 @@ Android Studio 2.2.3，用gradle引用的许多第三方库，第一次加载会 - 用户统计用的是[umeng](http://www.umeng.com/)，因为以前用过，觉得还好，所以就继续用了。 -- 推送用的是腾讯的信鸽，之前用的是umeng推送，但有延迟有时候很大，而且用新帐号登录后还能收到旧帐号的推送，多种原因之下就换了。 +- 推送用的是腾讯的信鸽，之前用的是umeng推送，但有延迟有时候很大，而且用新账号登录后还能收到旧账号的推送，多种原因之下就换了。 -##用到的一些开源库说明 +## 用到的一些开源库说明 见我写的[blog](http://blog.coding.net/blog/android-open-source-library) -##License +## License Coding is available under the MIT license. See the LICENSE file for more info. \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 7b31d4cf5..d1217334e 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,136 +1,264 @@ apply plugin: 'com.android.application' -apply plugin: 'android-apt' -apply plugin: 'me.tatarka.retrolambda' +apply plugin: "kotlin-android" +apply plugin: 'kotlin-android-extensions' +apply plugin: "kotlin-kapt" android { - compileSdkVersion 23 - buildToolsVersion "23.0.3" + signingConfigs { + config { + // 定义在 gradle.properties + keyAlias KEYSTORE_ALIAS + keyPassword KEYSTORE_PASSWORD + storeFile file(KEYSTORE_PATH) + storePassword KEY_PASSWORD + } + } + compileSdkVersion compileSdkVersionValue + buildToolsVersion buildToolsVersionValue dexOptions { - javaMaxHeapSize "2g" + javaMaxHeapSize "4g" } + sourceSets { + main.java.srcDirs += "src/main/java" + main.java.srcDirs += "src/person/java" + } + dataBinding { + enabled = true + } defaultConfig { - useLibrary 'org.apache.http.legacy' - applicationId "net.coding.program" - renderscriptTargetApi 19 +// useLibrary 'org.apache.http.legacy' + renderscriptTargetApi 18 + renderscriptSupportModeEnabled true + multiDexEnabled true minSdkVersion 15 - targetSdkVersion 23 - } - productFlavors { - dev { - // dev utilizes minSDKVersion = 21 to allow the Android gradle plugin - // to pre-dex each module and produce an APK that can be tested on - // Android Lollipop without time consuming dex merging processes. - minSdkVersion 21 + javaCompileOptions { + annotationProcessorOptions { + // coding 和 coding 企业版 必须使用相同的包名，否则 androidannotations 生成代码会失败 + arguments = [resourcePackageName : "net.coding.program"] +// "logLevel" : "TRACE", // 打印更多 log，AA 生成错误会导致几百个编译错误 +// "logAppenderConsole": "true"] + } } - prod { - // The actual minSdkVersion for the application. - minSdkVersion 15 + } + android { + lintOptions { + checkReleaseBuilds false + abortOnError false } } + flavorDimensions "mode" + productFlavors { + + // 版本号不能放在 + person { + dimension "mode" + applicationId "net.coding.program" + versionCode 545 + versionName "5.4.5.20190219.1" + targetSdkVersion 23 + + manifestPlaceholders = [ + XG_ACCESS_ID : "0", + XG_ACCESS_KEY: "0", + ] + signingConfig signingConfigs.config + } + enterprise { + dimension "mode" + applicationId "net.coding.program.enterprise" + versionCode 298 + versionName "2.9.9.20190225.1" + targetSdkVersion 21 + // 信鸽依赖 + ndk { + abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64', 'x86' + // 还可以添加 , 'x86_64', 'mips', 'mips64' + } + + manifestPlaceholders = [ + XG_ACCESS_ID : "2100249649", + XG_ACCESS_KEY: "AE6DQ4C5G35G", + ] + signingConfig signingConfigs.config + } + } buildTypes { release { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + debuggable false + jniDebuggable false + signingConfig signingConfigs.config + } + debug { + signingConfig signingConfigs.config } } - packagingOptions { exclude 'META-INF/LICENSE.txt' exclude 'META-INF/NOTICE.txt' } - compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } } +//gradle.projectsEvaluated { +// tasks.withType(JavaCompile) { +// options.compilerArgs << "-Xmaxerrs" << "99999" // 显示更多的编译错误，默认只显示 100 个 +// } +//} + +//kapt { +// correctErrorTypes = true + +// javacOptions { +// option("-Xmaxerrs", 500) +// } +//} + dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:support-v4:23.1.1' - compile 'com.android.support:appcompat-v7:23.1.1' - compile 'com.android.support:multidex:1.0.1' - compile 'com.skyfishjy.ripplebackground:library:1.0.1' - compile 'com.loopj.android:android-async-http:1.4.9' - compile 'com.astuetz:pagerslidingtabstrip:1.0.1' - compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' - compile 'se.emilsjolander:stickylistheaders:2.7.0' - compile 'de.hdodenhof:circleimageview:1.3.0' - compile 'com.github.rampo.updatechecker:library:2.1.4' - compile 'com.daimajia.swipelayout:library:1.1.7@aar' - compile 'com.umeng.analytics:analytics:latest.integration' - compile 'com.melnykov:floatingactionbutton:1.3.0' - compile 'de.greenrobot:eventbus:2.4.0' - compile 'pl.droidsonroids.gif:android-gif-drawable:1.1.11' - compile 'com.android.support:support-v13:23.1.1' - compile 'com.ms-square:etsyblur:0.1.0' - compile 'com.github.lzyzsd:circleprogress:1.1.0@aar' - compile 'com.android.support:cardview-v7:23.1.1' - compile 'it.neokree:MaterialNavigationDrawer:1.3.2' - compile files('libs/BaiduLBS_Android.jar') - compile 'com.prolificinteractive:parallaxpager:2.2.1' - compile 'com.davemorrissey.labs:subsampling-scale-image-view:3.5.0' + kapt "org.androidannotations:androidannotations:$AAVersion" + + implementation project(':common-third-library') + implementation project(':push-coding') + implementation project(':push-xiaomi') + implementation project(':widget-pick-photo') + implementation project(':common-coding') + implementation project(':pay-coding') + implementation project(':terminal-coding') + + // 信鸽依赖, 只有企业版用了信鸽 + if (DEV_ENTERPRISE.toBoolean()) { + //信鸽jar + implementation 'com.tencent.xinge:xinge:3.2.2-release' + //wup包 + implementation 'com.tencent.wup:wup:1.0.0.E-release' + //mid包 + implementation 'com.tencent.mid:mid:4.0.6-release' + } + + // dagger 2 依赖 + def daggerVersion = '2.10' + implementation "com.google.dagger:dagger:$daggerVersion" + kapt "com.google.dagger:dagger-compiler:$daggerVersion" + implementation "com.google.dagger:dagger-android:$daggerVersion" + implementation "com.google.dagger:dagger-android-support:$daggerVersion" + + // if you use the support libraries + kapt "com.google.dagger:dagger-android-processor:$daggerVersion" + + configurations { + all*.exclude group: 'com.android.support', module: 'support-v13' + } + + // umeng 统计 + implementation 'com.umeng.analytics:analytics:6.1.2' + // 高版本fix使用support库crash - compile 'uk.co.chrisjenx:calligraphy:2.1.0' - compile 'com.dlazaro66.qrcodereaderview:qrcodereaderview:1.0.0' - compile 'org.apmem.tools:layouts:1.9@aar' + implementation 'uk.co.chrisjenx:calligraphy:2.1.0' + implementation 'com.dlazaro66.qrcodereaderview:qrcodereaderview:1.0.0' + implementation 'org.apmem.tools:layouts:1.9@aar' + //flow_layout - compile('cn.trinea.android.view.autoscrollviewpager:android-auto-scroll-view-pager:1.1.2') { + implementation('cn.trinea.android.view.autoscrollviewpager:android-auto-scroll-view-pager:1.1.2') { exclude module: 'support-v4' } - // compile 'com.twotoasters.jazzylistview:library:1.2.1' - compile project(':social_sdk_library_project') - compile 'com.bigkoo:convenientbanner:1.0.8' - compile 'com.android.support:design:23.1.1' - compile files('libs/pinyin4j-2.5.0.jar') - compile files('libs/jg_filter_sdk_1.1.jar') - compile files('libs/wup-1.0.0.E-SNAPSHOT.jar') - compile files('libs/Xg_sdk_v2.45_20160510_1845.jar') - compile project(':bottom-bar') - - compile 'com.alibaba:fastjson:1.1.44.android' - compile 'com.flyco.roundview:FlycoRoundView_Lib:1.1.4@aar' - compile 'com.marshalchen.ultimaterecyclerview:library:0.7.0' - - compile 'org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r' -} -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' - classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' - classpath 'me.tatarka:gradle-retrolambda:3.2.4' - } + // implementation 'com.twotoasters.jazzylistview:library:1.2.1' + + // implementation project(':social_sdk_library_project') + implementation project(':bottom-bar') + implementation project(':luban') + implementation 'com.bigkoo:convenientbanner:1.0.8' + + // 方便显示 view 显示一些样式，不用写 selector + implementation 'com.flyco.roundview:FlycoRoundView_Lib:1.1.4@aar' + + // 列表控件， + implementation 'com.marshalchen.ultimaterecyclerview:library:0.7.3' + + // 比 ultimaterecyclerview 轻量，用起来比较舒服，实现代码也好些 + implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.34' + implementation 'org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r' + implementation 'com.orhanobut:logger:1.15' + implementation 'com.github.bmelnychuk:atv:1.2.9' + + // 仿 apple 的 segmentied control + implementation 'info.hoang8f:android-segmented:1.0.6' + + // 圆形头像 + implementation 'com.mikhaellopez:circularimageview:3.0.2' + + // 文件下载 + implementation 'com.liulishuo.filedownloader:library:1.4.3' + + // xml 解析 + implementation 'org.jsoup:jsoup:1.10.3' + + // 常用工具类 + implementation 'com.blankj:utilcode:1.9.0' + + // git 库 + implementation 'org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r' + + // jar 依赖 + implementation files('libs/alipaySingle-20170510.jar') + implementation files('libs/BaiduLBS_Android.jar') + implementation files('../common-coding/libs/android-viewbadger.jar') + + // 小红点 + implementation files('../common-coding/libs/pinyin4j-2.5.0.jar') + implementation project(':share-coding') + implementation project(':git-code-coding') + + // 测试框架 + implementation "com.android.support:support-annotations:$supportVersion" + androidTestImplementation "com.android.support.test:runner:$runnerVersion" + androidTestImplementation "com.android.support.test:rules:$rulesVersion" + androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion" } +// 新功能提示，使用弹出框的样式 start ---------------------------------------------------------------- repositories { - mavenCentral() - mavenLocal() + jcenter() + maven { + url "https://jitpack.io" + } } dependencies { - def AAVersion = '4.1.0' - apt "org.androidannotations:androidannotations:$AAVersion" - compile "org.androidannotations:androidannotations-api:$AAVersion" + implementation 'com.github.cpiz:BubbleView:1.0.2' + + // 图片裁剪，系统的坑太多 + implementation 'com.github.yalantis:ucrop:2.2.2' } -apt { - arguments { - androidManifestFile variant.outputs[0]?.processResources?.manifestFile +// 新功能提示，使用弹出框的样式 end ---------------------------------------------------------------- +repositories { + flatDir { + dirs 'libs' } } +dependencies { + implementation(name: 'checknetwork', ext: 'aar') +} + +// 高斯模糊 start -------------------------------------------------------------------------- repositories { - flatDir { - dirs 'libs' //this way we can find the .aar file in libs folder + maven { url 'https://github.com/500px/500px-android-blur/raw/master/releases/' } + maven { + url 'https://maven.google.com/' + name 'Google' } } + dependencies { - compile(name:'checknetwork', ext:'aar') -} \ No newline at end of file + implementation 'com.fivehundredpx:blurringview:1.0.0' +} +// 高斯模糊 end -------------------------------------------------------------------------- diff --git a/app/enterprise/release/output.json b/app/enterprise/release/output.json new file mode 100644 index 000000000..4c9607236 --- /dev/null +++ b/app/enterprise/release/output.json @@ -0,0 +1 @@ +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":296,"versionName":"2.9.6.20180712.2","enabled":true,"outputFile":"app-enterprise-release.apk","fullName":"enterpriseRelease","baseName":"enterprise-release"},"path":"app-enterprise-release.apk","properties":{}}] \ No newline at end of file diff --git a/app/libs/BaiduLBS_Android.jar b/app/libs/BaiduLBS_Android.jar index f5a6743b0..56b40c518 100644 Binary files a/app/libs/BaiduLBS_Android.jar and b/app/libs/BaiduLBS_Android.jar differ diff --git a/app/libs/Xg_sdk_v2.45_20160510_1845.jar b/app/libs/Xg_sdk_v2.45_20160510_1845.jar deleted file mode 100644 index 33bf03d6a..000000000 Binary files a/app/libs/Xg_sdk_v2.45_20160510_1845.jar and /dev/null differ diff --git a/app/libs/alipaySingle-20170510.jar b/app/libs/alipaySingle-20170510.jar new file mode 100644 index 000000000..2a11ea8ac Binary files /dev/null and b/app/libs/alipaySingle-20170510.jar differ diff --git a/app/libs/jg_filter_sdk_1.1.jar b/app/libs/jg_filter_sdk_1.1.jar deleted file mode 100644 index bba19c1a0..000000000 Binary files a/app/libs/jg_filter_sdk_1.1.jar and /dev/null differ diff --git a/app/libs/wup-1.0.0.E-SNAPSHOT.jar b/app/libs/wup-1.0.0.E-SNAPSHOT.jar deleted file mode 100644 index edff96f85..000000000 Binary files a/app/libs/wup-1.0.0.E-SNAPSHOT.jar and /dev/null differ diff --git a/app/personProd/release/output.json b/app/personProd/release/output.json new file mode 100644 index 000000000..44e688f12 --- /dev/null +++ b/app/personProd/release/output.json @@ -0,0 +1,18 @@ +[ + { + "outputType": { + "type": "APK" + }, + "apkInfo": { + "type": "MAIN", + "splits": [], + "versionCode": 154 + }, + "path": "app-person-prod-release.apk", + "properties": { + "packageId": "net.coding.program", + "split": "", + "minSdkVersion": "15" + } + } +] \ No newline at end of file diff --git a/app/settings.gradle b/app/settings.gradle deleted file mode 100755 index 33069973b..000000000 --- a/app/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':app', ':library' diff --git a/app/src/androidTest/java/net/coding/program/ApplicationTest.java b/app/src/androidTest/java/net/coding/program/ApplicationTest.java index 5435cb384..5c7c29361 100755 --- a/app/src/androidTest/java/net/coding/program/ApplicationTest.java +++ b/app/src/androidTest/java/net/coding/program/ApplicationTest.java @@ -3,13 +3,10 @@ import android.app.Application; import android.test.ApplicationTestCase; -import net.coding.program.common.LoginBackground; -import net.coding.program.model.AccountInfo; -import net.coding.program.model.UserObject; +import net.coding.program.common.model.UserObject; import net.coding.program.third.EmojiFilter; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; /** * Testing Fundamentals @@ -56,21 +53,21 @@ public void testSaveGlobal() { // AccountInfo.saveReloginInfo(mContext, a1, a2); - assertEquals(AccountInfo.loadRelogininfo(mContext, a1), a2); - assertEquals(AccountInfo.loadRelogininfo(mContext, a2), a2); - assertTrue(AccountInfo.loadRelogininfo(mContext, b1).isEmpty()); - assertTrue(AccountInfo.loadRelogininfo(mContext, c2).isEmpty()); +// assertEquals(AccountInfo.loadRelogininfo(mContext, a1), a2); +// assertEquals(AccountInfo.loadRelogininfo(mContext, a2), a2); +// assertTrue(AccountInfo.loadRelogininfo(mContext, b1).isEmpty()); +// assertTrue(AccountInfo.loadRelogininfo(mContext, c2).isEmpty()); } public void testLoginBackground() { - LoginBackground loginBackground = new LoginBackground(mContext); - loginBackground.update(); - try { - signal.await(10, TimeUnit.SECONDS); - } catch (Exception e) { - - } - assertEquals(loginBackground.getPhotoCount(), 5); +// LoginBackground loginBackground = new LoginBackground(mContext); +// loginBackground.update(); +// try { +// signal.await(10, TimeUnit.SECONDS); +// } catch (Exception e) { +// +// } +// assertEquals(loginBackground.getPhotoCount(), 5); } public void testPinYing() { diff --git a/app/src/androidTest/java/net/coding/program/LoginTest.java b/app/src/androidTest/java/net/coding/program/LoginTest.java new file mode 100644 index 000000000..4babcffb0 --- /dev/null +++ b/app/src/androidTest/java/net/coding/program/LoginTest.java @@ -0,0 +1,48 @@ +package net.coding.program; + +import android.support.test.espresso.assertion.ViewAssertions; +import android.support.test.filters.LargeTest; +import android.support.test.rule.ActivityTestRule; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +import static android.support.test.espresso.Espresso.onView; +import static android.support.test.espresso.action.ViewActions.click; +import static android.support.test.espresso.action.ViewActions.closeSoftKeyboard; +import static android.support.test.espresso.action.ViewActions.replaceText; +import static android.support.test.espresso.action.ViewActions.typeText; +import static android.support.test.espresso.matcher.ViewMatchers.withId; + + +@RunWith(AndroidJUnit4.class) +@LargeTest +public class LoginTest { + + public static final String ACCOUNT_NAME = "1984"; + public static final String ACCOUNT_PASSWORD = "222222"; + public static final String ACCOUNT_PASSWORD_ERROR = "111111"; + + @Rule + public ActivityTestRule activityRule = new ActivityTestRule<>(LoginActivity_.class); + + @Test + public void loginFail() { + onView(withId(R.id.editName)).perform(replaceText(ACCOUNT_NAME), closeSoftKeyboard()); + onView(withId(R.id.editPassword)).perform(typeText(ACCOUNT_PASSWORD_ERROR), closeSoftKeyboard()); + onView(withId(R.id.loginButton)).perform(click()); + + onView(withId(R.id.bottomBar)).check(ViewAssertions.doesNotExist()); + } + + @Test + public void loginSuccess() { +// onView(withId(R.id.editName)).perform(replaceText(ACCOUNT_NAME), closeSoftKeyboard()); +// onView(withId(R.id.editPassword)).perform(typeText(ACCOUNT_PASSWORD), closeSoftKeyboard()); +// onView(withId(R.id.loginButton)).perform(click()); +// +// onView(withId(R.id.bottomBar)).check(Help.doesExist()); + } +} diff --git a/app/src/androidTest/java/net/coding/program/UpdateServiceTest.java b/app/src/androidTest/java/net/coding/program/UpdateServiceTest.java deleted file mode 100644 index 502ad5e62..000000000 --- a/app/src/androidTest/java/net/coding/program/UpdateServiceTest.java +++ /dev/null @@ -1,22 +0,0 @@ -package net.coding.program; - -import android.content.Intent; -import android.test.ServiceTestCase; -import android.test.suitebuilder.annotation.SmallTest; - -/** - * Created by chaochen on 15/1/25. - */ -public class UpdateServiceTest extends ServiceTestCase { - - public UpdateServiceTest() { - super(UpdateService.class); - } - - @SmallTest - public void test1() { - Intent intent = new Intent(getContext(), UpdateService.class); - startService(intent); - - } -} diff --git a/app/src/androidTest/java/net/coding/program/util/Help.java b/app/src/androidTest/java/net/coding/program/util/Help.java new file mode 100644 index 000000000..9a2b7ce53 --- /dev/null +++ b/app/src/androidTest/java/net/coding/program/util/Help.java @@ -0,0 +1,24 @@ +package net.coding.program.util; + +import android.support.test.espresso.NoMatchingViewException; +import android.support.test.espresso.ViewAssertion; +import android.support.test.espresso.util.HumanReadables; +import android.view.View; + +import static android.support.test.espresso.matcher.ViewMatchers.assertThat; +import static org.hamcrest.Matchers.is; + +public class Help { + + public static ViewAssertion doesExist() { + return new ViewAssertion() { + @Override + public void check(View view, NoMatchingViewException noViewFoundException) { + if (view == null) { + assertThat( + "View is not exist in the hierarchy: " + HumanReadables.describe(view), true, is(false)); + } + } + }; + } +} diff --git a/app/src/enterprise/AndroidManifest.xml b/app/src/enterprise/AndroidManifest.xml new file mode 100755 index 000000000..ad35016f1 --- /dev/null +++ b/app/src/enterprise/AndroidManifest.xml @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/enterprise/assets/icon-1-down.gif b/app/src/enterprise/assets/icon-1-down.gif new file mode 100644 index 000000000..fe6ae190d Binary files /dev/null and b/app/src/enterprise/assets/icon-1-down.gif differ diff --git a/app/src/enterprise/assets/icon-1-up.gif b/app/src/enterprise/assets/icon-1-up.gif new file mode 100644 index 000000000..d4598ca34 Binary files /dev/null and b/app/src/enterprise/assets/icon-1-up.gif differ diff --git a/app/src/enterprise/assets/icon-2-down.gif b/app/src/enterprise/assets/icon-2-down.gif new file mode 100644 index 000000000..38e6d65ae Binary files /dev/null and b/app/src/enterprise/assets/icon-2-down.gif differ diff --git a/app/src/enterprise/assets/icon-2-up.gif b/app/src/enterprise/assets/icon-2-up.gif new file mode 100644 index 000000000..2a99d3fe6 Binary files /dev/null and b/app/src/enterprise/assets/icon-2-up.gif differ diff --git a/app/src/enterprise/assets/icon-3-down.gif b/app/src/enterprise/assets/icon-3-down.gif new file mode 100644 index 000000000..6b6102172 Binary files /dev/null and b/app/src/enterprise/assets/icon-3-down.gif differ diff --git a/app/src/enterprise/assets/icon-3-up.gif b/app/src/enterprise/assets/icon-3-up.gif new file mode 100644 index 000000000..5fc6663e1 Binary files /dev/null and b/app/src/enterprise/assets/icon-3-up.gif differ diff --git a/app/src/enterprise/assets/icon-4-down.gif b/app/src/enterprise/assets/icon-4-down.gif new file mode 100644 index 000000000..fa5426015 Binary files /dev/null and b/app/src/enterprise/assets/icon-4-down.gif differ diff --git a/app/src/enterprise/assets/icon-4-up.gif b/app/src/enterprise/assets/icon-4-up.gif new file mode 100644 index 000000000..58612ce90 Binary files /dev/null and b/app/src/enterprise/assets/icon-4-up.gif differ diff --git a/app/src/enterprise/java/net/coding/program/EnterpriseApp.java b/app/src/enterprise/java/net/coding/program/EnterpriseApp.java new file mode 100755 index 000000000..8255384c8 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/EnterpriseApp.java @@ -0,0 +1,120 @@ +package net.coding.program; + +import android.content.Context; +import android.support.annotation.NonNull; +import android.text.TextUtils; + +import com.tencent.android.tpush.XGPushManager; + +import net.coding.program.common.Global; +import net.coding.program.common.GlobalData; +import net.coding.program.common.model.AccountInfo; +import net.coding.program.common.model.EnterpriseInfo; +import net.coding.program.compatible.CodingCompat; +import net.coding.program.compatible.EnterpriseCompatImp; + +/** + * Created by cc191954 on 14-8-9. + * 用来做一些初始化工作，比如设置 host， + * 初始化图片库配置 + */ +public class EnterpriseApp extends MyApp { + + @Override + public void onCreate() { + super.onCreate(); + + EnterpriseInfo.instance().init(this); + + String enterpriseName = EnterpriseInfo.instance().getGlobalkey(); + if (enterpriseName.equalsIgnoreCase(PRIVATE_GK)) { + initPrivateHost(this); + } else { + setHost(enterpriseName); + } + + EnterpriseInfo.instance().init(this); + + CodingCompat.init(new EnterpriseCompatImp()); + + Global.AUTHOR = "net.coding.program.enterprise.fileprovider"; + + XGPushManager.registerPush(this); + } + + public static void setHost(@NonNull String enterpriseName) { + String host = "https://e.coding.net"; + AccountInfo.CustomHost customHost = AccountInfo.getCustomHost(GlobalData.getInstance()); + if (customHost.getHost().equalsIgnoreCase("s")) { + if (TextUtils.isEmpty(enterpriseName)) { + host = "http://e.coding.codingprod.net"; + } else { + host = String.format("http://%s.coding.codingprod.net", enterpriseName); + } + } else { + if (enterpriseName.isEmpty()) { + host = "https://e.coding.net"; + } else { + host = String.format("https://%s.coding.net", enterpriseName); + } + } + + GlobalData.setEnterpriseGK(enterpriseName); + +// host = "http://codingcorp.coding.com"; + Global.HOST = host; + Global.HOST_API = Global.HOST + "/api"; + + if (enterpriseName.contains("_")) { + int start = host.indexOf("://") + "://".length(); + int end = host.indexOf("."); + Global.HOST = Global.HOST.substring(0, start) + "e" + Global.HOST.substring(end, Global.HOST.length()); + Global.HOST_API = Global.HOST + "/api"; + } + } + + private static void initPrivateHost(Context context) { + GlobalData.setEnterpriseGK(PRIVATE_GK); + Global.HOST = AccountInfo.loadLastPrivateHost(context); + Global.HOST_API = Global.HOST + "/api"; + } + + public static void setPrivateHost(@NonNull String host) { + String enterpriseGK = ""; + + String lowerHost = host.toLowerCase(); + if (!lowerHost.startsWith("http://") && !lowerHost.startsWith("https://")) { + host = String.format("http://%s", host); + } + + int start = host.indexOf("//"); + int end = host.indexOf("."); + if (start != -1 && end != -1) { + enterpriseGK = host.substring(start + "//".length(), end); + } + + GlobalData.setEnterpriseGK(PRIVATE_GK); + Global.HOST = host; + Global.HOST_API = Global.HOST + "/api"; + } + + public static String getEnterpriseGK(@NonNull String input) { + String enterpriseGK = ""; + + String lowerHost = input.toLowerCase(); + if (!lowerHost.startsWith("http://") && !lowerHost.startsWith("https://")) { + input = String.format("http://%s", input); + } + + int start = input.indexOf("//"); + int end = input.indexOf("."); + if (start != -1 && end != -1) { + enterpriseGK = input.substring(start + "//".length(), end); + } + + return enterpriseGK; + } + + + public static final String PRIVATE_GK = "ce"; +} diff --git a/app/src/enterprise/java/net/coding/program/EnterpriseEntranceActivity.java b/app/src/enterprise/java/net/coding/program/EnterpriseEntranceActivity.java new file mode 100644 index 000000000..3c89cd19f --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/EnterpriseEntranceActivity.java @@ -0,0 +1,173 @@ +package net.coding.program; + +import android.content.Intent; +import android.net.Uri; +import android.os.Handler; +import android.os.Message; + +import com.tencent.android.tpush.XGPushClickedResult; +import com.tencent.android.tpush.XGPushManager; + +import net.coding.program.common.Global; +import net.coding.program.common.GlobalData; +import net.coding.program.common.UnreadNotify; +import net.coding.program.common.WeakRefHander; +import net.coding.program.common.model.AccountInfo; +import net.coding.program.common.model.UserObject; +import net.coding.program.common.ui.BaseActivity; +import net.coding.program.compatible.CodingCompat; +import net.coding.program.login.ResetPasswordActivity_; +import net.coding.program.login.UserActiveActivity_; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.EActivity; +import org.json.JSONException; +import org.json.JSONObject; + +/** + * Created by cc191954 on 14-8-14. + * 启动页面 + */ +@EActivity(R.layout.activity_enterprise_entrance) +public class EnterpriseEntranceActivity extends BaseActivity implements Handler.Callback { + + public final String HOST_CURRENT = getHostCurrent(); + + public static String getHostCurrent() { + return Global.HOST_API + "/current_user"; + } + + private static final int HANDLER_MESSAGE_NEXT_ACTIVITY = 1; + + Uri background = null; + boolean mNeedUpdateUser = false; + WeakRefHander mWeakRefHandler; + + @AfterViews + void init() { + Uri uriData = getIntent().getData(); + if (uriData != null) { + String url = uriData.toString(); + String path = uriData.getPath(); + switch (path) { + case "/app/detect": { + String link = Global.decodeUtf8(uriData.getQueryParameter("link")); + Uri uriLink = Uri.parse(link); + String linkPath = uriLink.getPath(); + + switch (linkPath) { + case "/activate": + UserActiveActivity_.intent(this) + .link(link) + .start(); + break; + case "/user/resetPassword": + ResetPasswordActivity_.intent(this) + .link(link) + .start(); + break; + default: + WebActivity_.intent(this) + .url(link) + .start(); + break; + } + break; + } + + default: { + MyApp.openNewActivityFromMain(this, url); + } + } + + finish(); + return; + } + + mWeakRefHandler = new WeakRefHander(this); + + if (!mNeedUpdateUser) { + mWeakRefHandler.start(HANDLER_MESSAGE_NEXT_ACTIVITY, 1200); + } + + if (AccountInfo.isLogin(this)) { + getNetwork(HOST_CURRENT, HOST_CURRENT); + mNeedUpdateUser = true; + } + } + + @Override + protected void onStart() { + super.onStart(); + + XGPushClickedResult result = XGPushManager.onActivityStarted(this); + if (result != null) { + String custom = result.getCustomContent(); + if (custom != null && !custom.isEmpty()) { + try { + JSONObject json = new JSONObject(custom); + String url = json.getString("param_url"); + CodingCompat.instance().closePushReceiverActivity(EnterpriseEntranceActivity.this, url); + + } catch (Exception e) { + Global.errorLog(e); + } + } + } + } + + @Override + public boolean handleMessage(Message msg) { + if (msg.what == HANDLER_MESSAGE_NEXT_ACTIVITY) { + next(); + } + return true; + } + + @Override + public void parseJson(int code, JSONObject respanse, String tag, int pos, Object data) throws JSONException { + if (tag.equals(HOST_CURRENT)) { + mNeedUpdateUser = false; + if (code == 0) { + UserObject user = new UserObject(respanse.getJSONObject("data")); + AccountInfo.saveAccount(this, user); + GlobalData.sUserObject = user; + AccountInfo.saveReloginInfo(this, user); + next(); + } else { + showDialog("更新", + "刷新账户信息失败", + (dialog, which) -> getNetwork(HOST_CURRENT, HOST_CURRENT), + (dialog, which) -> finish(), + "重试", + "关闭程序"); + } + } + } + + void next() { + Intent intent; + String mGlobalKey = AccountInfo.loadAccount(this).global_key; + if (mGlobalKey.isEmpty()) { + intent = new Intent(this, CodingCompat.instance().getGuideActivity()); + if (background != null) { + intent.putExtra(LoginActivity.EXTRA_BACKGROUND, background); + } + + } else { +// if (AccountInfo.needDisplayGuide(this)) { +// intent = new Intent(this, FeatureActivity_.class); +// } else { + intent = new Intent(this, CodingCompat.instance().getMainActivity()); +// } + } + + startActivity(intent); + + UnreadNotify.update(this); + finish(); + + overridePendingTransition(R.anim.fade_in, R.anim.alpha_out); + } +} + diff --git a/app/src/enterprise/java/net/coding/program/EnterpriseMainActivity.java b/app/src/enterprise/java/net/coding/program/EnterpriseMainActivity.java new file mode 100644 index 000000000..fb87c995f --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/EnterpriseMainActivity.java @@ -0,0 +1,90 @@ +package net.coding.program; + +import android.support.v7.app.AlertDialog; + +import com.tencent.android.tpush.XGPushManager; + +import net.coding.program.common.Global; +import net.coding.program.common.GlobalData; +import net.coding.program.common.model.EnterpriseDetail; +import net.coding.program.common.model.EnterpriseInfo; +import net.coding.program.project.EnterpriseProjectFragment_; +import net.coding.program.setting.EnterpriseMainSettingFragment_; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.EActivity; +import org.json.JSONException; +import org.json.JSONObject; + +@EActivity(R.layout.activity_enterprise_main) +public class EnterpriseMainActivity extends MainActivity { + + private static final String TAG_ENTERPRSE = "TAG_ENTERPRSE"; + + @AfterViews + void initEnterpriseMainActivity() { + String host = String.format("%s/team/%s/get", Global.HOST_API, EnterpriseInfo.instance().getGlobalkey()); + getNetwork(host, TAG_ENTERPRSE); + } + + @Override + public void parseJson(int code, JSONObject respanse, String tag, int pos, Object data) throws JSONException { + if (tag.equals(TAG_ENTERPRSE)) { + if (code == 0) { // 服务过期了 + EnterpriseDetail enterpriseDetail = new EnterpriseDetail(respanse.optJSONObject("data")); + EnterpriseInfo.instance().update(this, enterpriseDetail); + + if (enterpriseDetail.isLocked()) { + String title = "服务已暂停"; + String message = "您订购的服务已过期，项目、任务等功能操作与高级权限将会失效。如需正常使用，请前往企业版网站订购。"; + new AlertDialog.Builder(this, R.style.MyAlertDialogStyle) + .setTitle(title) + .setMessage(message) + .setPositiveButton("知道了", null) + .show(); + } + } else { + // do nothing + } + } else { + super.parseJson(code, respanse, tag, pos, data); + } + } + + @Override + protected void switchProject() { + switchFragment(EnterpriseProjectFragment_.FragmentBuilder_.class); + } + + @Override + protected void switchSetting() { + switchFragment(EnterpriseMainSettingFragment_.FragmentBuilder_.class); + } + + protected void startExtraService() { + // 不启动服务 + } + + @Override + protected void startPushService() { + // 私有版没有推送 + if (GlobalData.isPrivateEnterprise()) { + return; + } + + runQQPushServer(); + } + + private void runQQPushServer() { + // 信鸽 push 服务会发 broadcast +// if (!MyApp.isDebug()) { + +// XGPushConfig.enableDebug(this, true); + String globalKey = GlobalData.sUserObject.global_key; + XGPushManager.bindAccount(getApplicationContext(), globalKey); +// pushInXiaomi(); +// } + } + + +} diff --git a/app/src/enterprise/java/net/coding/program/EnterpriseMyPushReceiver.java b/app/src/enterprise/java/net/coding/program/EnterpriseMyPushReceiver.java new file mode 100644 index 000000000..925adef74 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/EnterpriseMyPushReceiver.java @@ -0,0 +1,48 @@ +package net.coding.program; + +import android.app.NotificationManager; +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; + +import com.loopj.android.http.AsyncHttpClient; +import com.loopj.android.http.JsonHttpResponseHandler; + +import net.coding.program.common.Global; +import net.coding.program.common.network.MyAsyncHttpClient; + +public class EnterpriseMyPushReceiver extends BroadcastReceiver { + + public static final String PushClickBroadcast = "net.coding.program.EnterpriseMyPushReceiver.PushClickBroadcast"; + + public EnterpriseMyPushReceiver() { + } + + public static void closeNotify(Context context, String url) { + String notifys[] = EnterprisePushReceiver.sNotify; + NotificationManager mNotificationManager = (NotificationManager) + context.getSystemService(Context.NOTIFICATION_SERVICE); + for (int i = 0; i < notifys.length; ++i) { + if (url.equals(notifys[i])) { + mNotificationManager.cancel(i); + } + } + } + + @Override + public void onReceive(Context context, Intent intent) { + String url = intent.getStringExtra("data"); + + if (url != null) { + MyApp.openNewActivityFromMain(context, url); + } + + String id = intent.getStringExtra("id"); + if (id != null && !id.isEmpty()) { + AsyncHttpClient client = MyAsyncHttpClient.createClient(context); + final String host = Global.HOST_API + "/notification/mark-read?id=%s"; + client.post(String.format(host, id), new JsonHttpResponseHandler() { + }); + } + } +} diff --git a/app/src/enterprise/java/net/coding/program/EnterprisePushReceiver.java b/app/src/enterprise/java/net/coding/program/EnterprisePushReceiver.java new file mode 100755 index 000000000..73ed5b4b0 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/EnterprisePushReceiver.java @@ -0,0 +1,214 @@ +package net.coding.program; + +import android.app.Notification; +import android.app.NotificationManager; +import android.app.PendingIntent; +import android.content.Context; +import android.content.Intent; +import android.support.v4.app.NotificationCompat; +import android.util.Log; + +import com.orhanobut.logger.Logger; +import com.tencent.android.tpush.XGPushBaseReceiver; +import com.tencent.android.tpush.XGPushClickedResult; +import com.tencent.android.tpush.XGPushRegisterResult; +import com.tencent.android.tpush.XGPushShowedResult; +import com.tencent.android.tpush.XGPushTextMessage; + +import net.coding.program.common.Global; +import net.coding.program.common.GlobalData; +import net.coding.program.common.GlobalSetting; +import net.coding.program.common.model.AccountInfo; +import net.coding.program.common.push.PushUrl; +import net.coding.program.message.UsersListFragment; +import net.coding.program.route.URLSpanNoUnderline; + +import org.json.JSONObject; + +import java.util.Calendar; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Created by chaochen on 14-12-5. + */ + +public class EnterprisePushReceiver extends XGPushBaseReceiver { + + public static String sNotify[] = new String[5]; + static int notifyId = 0; + private static long sLastNotify = 0; + NotificationCompat.Builder builder; + + @Override + public void onRegisterResult(Context context, int i, XGPushRegisterResult xgPushRegisterResult) { + Log.d("", "" + context); + } + + @Override + public void onUnregisterResult(Context context, int i) { + Log.d("", "" + context); + } + + @Override + public void onSetTagResult(Context context, int i, String s) { + Log.d("", "" + context); + } + + @Override + public void onDeleteTagResult(Context context, int i, String s) { + Log.d("", "" + context); + } + + @Override + public void onTextMessage(Context context, XGPushTextMessage message) { + try { + if (!AccountInfo.isLogin(context)) { + return; + } + + Logger.d("ccccc" + message); + // 这个写法是为了方便调试，因为信鸽的后台不能输入 customContent + JSONObject jsonCustom = null; + try { + jsonCustom = new JSONObject(message.getCustomContent()); + } catch (Exception e) { + } + if (jsonCustom == null) { + jsonCustom = new JSONObject(message.getContent()); + } + + if (jsonCustom.has("cancel")) { + String cancelString = jsonCustom.optString("cancel"); + if (cancelString.equals("message")) { + cancel(context, true); + } else { + cancel(context, false); + } + + return; + } + + String id = jsonCustom.optString("notification_id", ""); + String url = jsonCustom.optString("param_url", ""); + + // 如果本地没有 2FA，就不显示这个推送 + if (PushUrl.INSTANCE.is2faLink(url)) { + String authUri = AccountInfo.loadAuth(context, GlobalData.sUserObject.global_key); + if (authUri.isEmpty()) { + return; + } + } + + if (url.isEmpty()) { + Log.e("", "收到空消息"); + return; + } + + Pattern pattern = Pattern.compile(URLSpanNoUnderline.PATTERN_URL_MESSAGE); + Matcher matcher = pattern.matcher(url); + if (matcher.find()) { + String noNotifyGlobalKey = GlobalSetting.getInstance().getMessageNotify(); + if (noNotifyGlobalKey.equals(matcher.group(1))) { + return; + } + } + + String title = message.getTitle(); + String msg = message.getContent(); + msg = msg.replaceAll("", "[$1]"); + + showNotify(context, title, msg, id, url); + + } catch (Exception e) { + Global.errorLog(e); + } + } + + private void cancel(Context ctx, boolean cannelMessage) { + String message = URLSpanNoUnderline.PATTERN_URL_MESSAGE; + Pattern pattern = Pattern.compile(message); + NotificationManager notificationManager = (NotificationManager) + ctx.getSystemService(Context.NOTIFICATION_SERVICE); + + for (int i = 0; i < sNotify.length; ++i) { + if (sNotify[i] == null) { + continue; + } + + Matcher matcher = pattern.matcher(sNotify[i]); + if (matcher.find() == cannelMessage) { + notificationManager.cancel(i); + } + } + } + + @Override + public void onNotifactionClickedResult(Context context, XGPushClickedResult xgPushClickedResult) { + Log.d("", xgPushClickedResult + " || cccccccc || " + xgPushClickedResult.getCustomContent()); + + } + + @Override + public void onNotifactionShowedResult(Context context, XGPushShowedResult xgPushShowedResult) { + Log.d("", xgPushShowedResult + " || sssssssss || " + xgPushShowedResult.getCustomContent()); + + } + + private void showNotify(Context context, String title, String msg, String id, String url) { + builder = new NotificationCompat.Builder(context) + .setSmallIcon(R.drawable.push_icon) + .setContentTitle(title) + .setContentText(msg); + + long time = Calendar.getInstance().getTimeInMillis(); + if (time - sLastNotify <= 10 * 1000) { // 小于10秒很可能是联网后一次收到了多个推送，只用呼吸灯提示 + builder.setDefaults(Notification.DEFAULT_LIGHTS); + } else { + builder.setDefaults(Notification.DEFAULT_ALL); + } + sLastNotify = time; + + Intent resultIntent = new Intent(EnterpriseMyPushReceiver.PushClickBroadcast); + resultIntent.setPackage(context.getPackageName()); + resultIntent.putExtra("data", url); + resultIntent.putExtra("id", id); + + notifyId++; + PendingIntent resultPendingIntent = PendingIntent.getBroadcast( + context, + notifyId, + resultIntent, + PendingIntent.FLAG_UPDATE_CURRENT + ); + + builder.setContentIntent(resultPendingIntent); + builder.setAutoCancel(true); + + NotificationManager mNotificationManager = (NotificationManager) + context.getSystemService(Context.NOTIFICATION_SERVICE); + + int notifyIdInt = -1; + for (int i = 0; i < sNotify.length; ++i) { + if (url.equals(sNotify[i])) { + notifyIdInt = i; + sNotify[notifyIdInt] = url; + break; + } + } + + if (notifyIdInt == -1) { + notifyIdInt = notifyId % 5; + sNotify[notifyIdInt] = url; + } + + Pattern pattern = Pattern.compile(URLSpanNoUnderline.PATTERN_URL_MESSAGE); + Matcher matcher = pattern.matcher(url); + if (matcher.find()) { + String globalKey = matcher.group(1); + UsersListFragment.receiverMessagePush(globalKey, msg); + } + + mNotificationManager.notify(notifyIdInt, builder.build()); + } +} diff --git a/app/src/enterprise/java/net/coding/program/common/model/EnterpriseAccount.java b/app/src/enterprise/java/net/coding/program/common/model/EnterpriseAccount.java new file mode 100644 index 000000000..4e313a755 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/common/model/EnterpriseAccount.java @@ -0,0 +1,77 @@ +package net.coding.program.common.model; + +import com.orhanobut.logger.Logger; + +import org.json.JSONObject; + +import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.Calendar; + +/** + * Created by chenchao on 2017/1/19. + */ + +public class EnterpriseAccount implements Serializable { + + private static final long serialVersionUID = -8068995659716038945L; + + public static final int MAX_TRIAL_DAYS = 15; + + public String balance; + public int remaindays; + public long createdat; + public long suspendedAt; + public boolean trial; + + public boolean payed; // 是否充值过 + public long estimateDate; + + + public EnterpriseAccount(JSONObject json) { + balance = json.optString("balance"); + remaindays = json.optInt("remain_days"); + createdat = json.optInt("created_at"); + trial = json.optBoolean("trial"); + payed = json.optBoolean("payed"); + estimateDate = json.optLong("estimate_date"); + suspendedAt = json.optLong("suspended_at"); + } + + public int estimateDate() { + return Math.abs(todayToEnd(estimateDate)); + } + + public int suspendedToToday() { + return Math.abs(todayToEnd(suspendedAt)); + } + + private int todayToEnd(long endTime) { + Calendar calendar = Calendar.getInstance(); + + long today = calendar.getTimeInMillis(); + + calendar.setTimeInMillis(endTime); + long end = setHour0(calendar); + + long diffTime = end - today; + int oneDay = 24 * 3600 * 1000; + long diffDay = diffTime / oneDay; + if (diffDay % oneDay > 0) { + diffDay++; + } + ++diffDay; + + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); + Logger.d("today %s %s %s", df.format(new Long(today)), df.format(new Long(end)), diffDay); + return (int) diffDay; + } + + private long setHour0(Calendar calendar) { + calendar.set(Calendar.HOUR_OF_DAY, 0); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.SECOND, 0); + return calendar.getTimeInMillis(); + } + +} diff --git a/app/src/enterprise/java/net/coding/program/common/model/EnterpriseAccountInfo.java b/app/src/enterprise/java/net/coding/program/common/model/EnterpriseAccountInfo.java new file mode 100644 index 000000000..e3232a3d8 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/common/model/EnterpriseAccountInfo.java @@ -0,0 +1,25 @@ +package net.coding.program.common.model; + +import android.content.Context; + +/** + * Created by chenchao on 2017/1/18. + */ + +public class EnterpriseAccountInfo extends AccountInfo { + + private static final String ENTERPRISE_DETAIL = "ENTERPRISE_DETAIL"; + + public static void saveEnterpriseDetail(Context context, EnterpriseDetail data) { + new DataCache().saveGlobal(context, data, ENTERPRISE_DETAIL); + } + + public static EnterpriseDetail loadEnterpriseDetail(Context context) { + EnterpriseDetail detail = new DataCache().loadGlobalObject(context, ENTERPRISE_DETAIL); + if (detail == null) { + detail = new EnterpriseDetail(); + } + + return detail; + } +} diff --git a/app/src/enterprise/java/net/coding/program/common/model/EnterpriseDetail.java b/app/src/enterprise/java/net/coding/program/common/model/EnterpriseDetail.java new file mode 100644 index 000000000..0f526b361 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/common/model/EnterpriseDetail.java @@ -0,0 +1,131 @@ +package net.coding.program.common.model; + +import net.coding.program.network.constant.MemberAuthority; + +import org.json.JSONObject; + +import java.io.Serializable; + +/** + * Created by chenchao on 2017/1/5. + */ + +public class EnterpriseDetail implements Serializable { + + private static final long serialVersionUID = 5353429366955903361L; + + public int createdat; + public int updatedat; + public String name = ""; + public String namepinyin = ""; + public String introduction = ""; + public String avatar = ""; + public int currentuserroleid; + public String path = ""; + public String htmllink = ""; + public String globalkey = ""; + public int membercount; + public int projectcount; + public boolean locked; + public int id; + public UserObject owner; + + // 企业所有者，管理员，普通成员, 这个字段来自另一个 api，感觉专门写个类没必要 + private MemberAuthority identity = MemberAuthority.member; + + public EnterpriseDetail(JSONObject json) { + id = json.optInt("id"); + createdat = json.optInt("created_at"); + updatedat = json.optInt("updated_at"); + name = json.optString("name", ""); + namepinyin = json.optString("name_pinyin", ""); + introduction = json.optString("introduction", ""); + avatar = json.optString("avatar", ""); + currentuserroleid = json.optInt("current_user_role_id"); + path = json.optString("path", ""); + htmllink = json.optString("html_link", ""); + globalkey = json.optString("global_key", ""); + membercount = json.optInt("member_count"); + projectcount = json.optInt("project_count"); + locked = json.optBoolean("locked"); + + if (json.has("owner")) { + owner = new UserObject(json.optJSONObject("owner")); + + if (owner.isMe()) { + identity = MemberAuthority.ower; + } + } + } + + public void setIdentity(MemberAuthority identity) { + this.identity = identity; + } + + public MemberAuthority getIdentity() { + return identity; + } + + public EnterpriseDetail() { + } + + public String getAvatar() { + return avatar; + } + + public int getCreatedat() { + return createdat; + } + + public int getCurrentuserroleid() { + return currentuserroleid; + } + + public String getGlobalkey() { + return globalkey; + } + + public String getHtmllink() { + return htmllink; + } + + public int getId() { + return id; + } + + public String getIntroduction() { + return introduction; + } + + public boolean isLocked() { + return locked; + } + + public int getMembercount() { + return membercount; + } + + public String getName() { + return name; + } + + public String getNamepinyin() { + return namepinyin; + } + + public UserObject getOwner() { + return owner; + } + + public String getPath() { + return path; + } + + public int getProjectcount() { + return projectcount; + } + + public int getUpdatedat() { + return updatedat; + } +} diff --git a/app/src/enterprise/java/net/coding/program/common/model/EnterpriseInfo.java b/app/src/enterprise/java/net/coding/program/common/model/EnterpriseInfo.java new file mode 100644 index 000000000..bdcf4ee8e --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/common/model/EnterpriseInfo.java @@ -0,0 +1,110 @@ +package net.coding.program.common.model; + +import android.content.Context; + +import net.coding.program.network.constant.MemberAuthority; + +/** + * Created by chenchao on 2017/1/5. + */ + +public class EnterpriseInfo { + + private static EnterpriseInfo enterpriseInfo; + + private EnterpriseDetail detail; + + private EnterpriseInfo() { + } + + public static EnterpriseInfo instance() { + if (enterpriseInfo == null) { + enterpriseInfo = new EnterpriseInfo(); + } + + return enterpriseInfo; + } + + public void init(Context context) { + detail = EnterpriseAccountInfo.loadEnterpriseDetail(context); + } + + public void update(Context context, EnterpriseDetail detail) { + this.detail = detail; + EnterpriseAccountInfo.saveEnterpriseDetail(context, detail); + } + + public MemberAuthority getIdentity() { + return detail.getIdentity(); + } + + public boolean canManagerEnterprise() { + MemberAuthority identity = detail.getIdentity(); + return identity == MemberAuthority.ower || identity == MemberAuthority.manager; + } + + // 是否企业所有者 + public boolean isOwner() { + return detail.getIdentity() == MemberAuthority.ower; + } + + public String getAvatar() { + return detail.getAvatar(); + } + + public UserObject getOwner() { + return detail.getOwner(); + } + + public int getCurrentuserroleid() { + return detail.getCurrentuserroleid(); + } + + public String getIntroduction() { + return detail.getIntroduction(); + } + + public boolean isLocked() { + return detail.isLocked(); + } + + public int getProjectcount() { + return detail.getProjectcount(); + } + + public String getName() { + return detail.getName(); + } + + public int getUpdatedat() { + return detail.getUpdatedat(); + } + + public String getNamepinyin() { + return detail.getNamepinyin(); + } + + public String getHtmllink() { + return detail.getHtmllink(); + } + + public String getGlobalkey() { + return detail.getGlobalkey(); + } + + public int getCreatedat() { + return detail.getCreatedat(); + } + + public int getMembercount() { + return detail.getMembercount(); + } + + public String getPath() { + return detail.getPath(); + } + + public int getId() { + return detail.getId(); + } +} diff --git a/app/src/enterprise/java/net/coding/program/common/model/EnterpriseUserObject.java b/app/src/enterprise/java/net/coding/program/common/model/EnterpriseUserObject.java new file mode 100644 index 000000000..e3890328c --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/common/model/EnterpriseUserObject.java @@ -0,0 +1,35 @@ +package net.coding.program.common.model; + +import org.json.JSONObject; + +import java.io.Serializable; + +/** + * Created by chenchao on 2017/1/6. + */ + +public class EnterpriseUserObject implements Serializable { + + private static final long serialVersionUID = 722208774167508837L; + + public int createdat; + public int updatedat; + public int teamid; + public int userid; + public UserObject user; + public int role; + public String alias = ""; + public String default2faMethod = ""; + + public EnterpriseUserObject(JSONObject json) { + createdat = json.optInt("created_at"); + updatedat = json.optInt("updated_at"); + teamid = json.optInt("team_id"); + userid = json.optInt("user_id"); + user = new UserObject(json.optJSONObject("user")); + role = json.optInt("role"); + alias = json.optString("alias", ""); + default2faMethod = json.optString("default2faMethod", ""); + } + +} diff --git a/app/src/enterprise/java/net/coding/program/common/model/payed/Billing.java b/app/src/enterprise/java/net/coding/program/common/model/payed/Billing.java new file mode 100644 index 000000000..dc38d3680 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/common/model/payed/Billing.java @@ -0,0 +1,44 @@ +package net.coding.program.common.model.payed; + +import org.json.JSONArray; +import org.json.JSONObject; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by chenchao on 2017/4/4. + * 付费订单 + */ + +public class Billing implements Serializable { + + static final SimpleDateFormat df = new SimpleDateFormat("yyyy.MM.dd"); + static final SimpleDateFormat timeFormat = new SimpleDateFormat("yyyy.MM.dd hh:mm"); + + private static final long serialVersionUID = 7066544112808570842L; + public int id; + public String price; + public long billingDate; + public long createdAt; + public int userCount; + + public Billing(JSONObject json) { + id = json.optInt("id"); + price = json.optString("price", ""); + billingDate = json.optLong("billing_date"); + createdAt = json.optLong("created_at"); + JSONArray userArray = json.optJSONArray("details"); + if (userArray != null) { + userCount = userArray.length(); + } + } + + public String getTitle() { + return String.format("结算日：%s", df.format(billingDate)); + } + + public String getTime() { + return timeFormat.format(createdAt); + } +} diff --git a/app/src/enterprise/java/net/coding/program/common/model/payed/Order.java b/app/src/enterprise/java/net/coding/program/common/model/payed/Order.java new file mode 100644 index 000000000..a9faccfba --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/common/model/payed/Order.java @@ -0,0 +1,65 @@ +package net.coding.program.common.model.payed; + +import net.coding.program.common.CodingColor; + +import org.json.JSONObject; + +import java.io.Serializable; +import java.text.SimpleDateFormat; + +/** + * Created by chenchao on 2017/4/4. + * 付费订单 + */ + +public class Order implements Serializable { + + static final SimpleDateFormat timeFormat = new SimpleDateFormat("yyyy.MM.dd hh:mm"); + + private static final long serialVersionUID = -2621229953327935467L; + + public String action; + public long createdAt; + public String creatorGK; + public String creatorName; + public String number; + public String price; + public String status; + + public String statusString = ""; + public int statusColor = 0xFF000000; + + public Order(JSONObject json) { + number = json.optString("number"); + price = json.optString("price"); + status = json.optString("status", ""); + action = json.optString("action", ""); + createdAt = json.optLong("created_at"); + creatorName = json.optString("creator_name", ""); + creatorGK = json.optString("creator_gk", ""); + + switch (status.toLowerCase()) { + case "pending": + statusString = "等待支付"; + statusColor = CodingColor.fontOrange; + break; + case "closed": + statusString = "关闭"; + statusColor = CodingColor.font4; + break; + default: // success + statusString = "成功"; + statusColor = CodingColor.fontGreen; + break; + } + } + + public String getAction() { + return String.format("充值 %s 元", price); + } + + public String getTime() { + return timeFormat.format(createdAt); + } + +} diff --git a/app/src/enterprise/java/net/coding/program/compatible/EnterpriseCompatImp.java b/app/src/enterprise/java/net/coding/program/compatible/EnterpriseCompatImp.java new file mode 100644 index 000000000..86ad78b0e --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/compatible/EnterpriseCompatImp.java @@ -0,0 +1,172 @@ +package net.coding.program.compatible; + +import android.app.Activity; +import android.content.Context; +import android.content.Intent; +import android.support.v4.app.Fragment; + +import com.tencent.android.tpush.XGPushManager; + +import net.coding.program.EnterpriseMainActivity_; +import net.coding.program.EnterpriseMyPushReceiver; +import net.coding.program.UserDetailEditActivity_; +import net.coding.program.common.GlobalData; +import net.coding.program.common.StartActivity; +import net.coding.program.common.model.AccountInfo; +import net.coding.program.common.model.ProjectObject; +import net.coding.program.guide.EnterpriseGuideActivity_; +import net.coding.program.login.phone.EnterprisePrivateEmailSetPasswordActivity_; +import net.coding.program.param.ProjectJumpParam; +import net.coding.program.project.EnterpriseProjectHomeFragment_; +import net.coding.program.project.detail.TopicEditFragment; +import net.coding.program.project.maopao.EnterprisePrivateProjectMaopaoEditFragment_; +import net.coding.program.project.maopao.EnterpriseProjectMaopaoActivity_; +import net.coding.program.project.maopao.EnterpriseProjectMaopaoEditFragment_; +import net.coding.program.user.EnterpriseAddMemberActivity_; +import net.coding.program.user.EnterpriseLoginActivity_; +import net.coding.program.user.PickUserActivity_; +import net.coding.program.user.PickUserRelayMessageActivity_; +import net.coding.program.user.UserDetailMoreActivity_; + +import java.util.ArrayList; + +/** + * Created by chenchao on 2016/12/28. + * 企业版与平台板不同的跳转页面 + * 私有部署的文件相关部分还是使用个人版 api + */ + +public class EnterpriseCompatImp implements ClassCompatInterface { + + @Override + public TopicEditFragment getProjectMaopaoEditFragment() { + if (GlobalData.isPrivateEnterprise()) { + return EnterprisePrivateProjectMaopaoEditFragment_.builder().build(); + } else { + return EnterpriseProjectMaopaoEditFragment_.builder().build(); + } + } + + @Override + public void loginOut(Context context, String gk) { + XGPushManager.delAccount(context, gk); + } + + @Override + public String getFileAuthor() { + return "net.coding.program.enterprise.fileprovider"; + } + + @Override + public Class getMainActivity() { + return EnterpriseMainActivity_.class; + } + + @Override + public Fragment getProjectHome(ProjectObject projectObject, boolean needReload) { + return EnterpriseProjectHomeFragment_.builder() + .mProjectObject(projectObject) + .needReload(needReload) + .build(); + } + + @Override + public void launchEnterprisePrivateEmailSetPasswordActivity(Context context) { + EnterprisePrivateEmailSetPasswordActivity_.intent(context) + .enterpriseName(AccountInfo.loadLastPrivateHost(context)) + .start(); + } + + + @Override + public Class getGuideActivity() { + return EnterpriseGuideActivity_.class; + } + + @Override + public Class getLoginActivity() { + return EnterpriseLoginActivity_.class; + } + + @Override + public void launchMyDetailActivity(Context context) { + UserDetailEditActivity_.intent(context).start(); + } + + @Override + public void launchUserDetailActivity(Context context, String globalKey) { + UserDetailMoreActivity_.intent(context).globalKey(globalKey).start(); + } + + @Override + public void launchUserDetailActivity(Context context, String globalKey, int result) { + UserDetailMoreActivity_.intent(context).globalKey(globalKey).start(); + } + + @Override + public void launchUserDetailActivity(Fragment fragment, String globalKey, int result) { + UserDetailMoreActivity_.intent(fragment).globalKey(globalKey).startForResult(result); + } + + @Override + public void launchAddMemberActivity(Fragment fragment, ProjectObject projectObject, ArrayList pickGlobalKeys, int result) { + Intent intent = new Intent(fragment.getActivity(), EnterpriseAddMemberActivity_.class); + intent.putExtra("projectObject", projectObject); + intent.putExtra("pickedGlobalKeys", pickGlobalKeys); + fragment.startActivityForResult(intent, result); + } + + @Override + public void launchPickUser(Context context, StartActivity startActivity, int result) { + Intent intent = new Intent(context, PickUserActivity_.class); + startActivity.startActivityForResult(intent, result); + } + + @Override + public void launchProjectMaopao(Fragment fragment, ProjectObject projectObject) { + EnterpriseProjectMaopaoActivity_.intent(fragment) + .projectObject(projectObject) + .start(); + } + + @Override + public void launchProjectMaopao(Activity fragment, ProjectObject projectObject) { + EnterpriseProjectMaopaoActivity_.intent(fragment) + .projectObject(projectObject) + .start(); + } + + @Override + public void launchPickUser(Activity activity, String relayString) { + PickUserRelayMessageActivity_.intent(activity) + .relayString(relayString) + .start(); + } + + @Override + public void closeNotify(Context context, String url) { + EnterpriseMyPushReceiver.closeNotify(context, url); + } + + @Override + public void closePushReceiverActivity(Activity context, String url) { + Intent resultIntent = new Intent(EnterpriseMyPushReceiver.PushClickBroadcast); + resultIntent.setPackage(context.getPackageName()); + resultIntent.putExtra("data", url); + context.sendBroadcast(resultIntent); + context.finish(); + } + + @Override + public void launchProjectMaopoaList(Context context, ProjectJumpParam param) { + EnterpriseProjectMaopaoActivity_.intent(context) + .jumpParam(param) + .start(); + } + + @Override + public void launchSetGKActivity(Context context) { + // 跳转到设置 GK 界面，企业版没有这个界面 + } + +} diff --git a/app/src/enterprise/java/net/coding/program/guide/EnterpriseGuideActivity.java b/app/src/enterprise/java/net/coding/program/guide/EnterpriseGuideActivity.java new file mode 100644 index 000000000..c96e0e87b --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/guide/EnterpriseGuideActivity.java @@ -0,0 +1,339 @@ +package net.coding.program.guide; + +import android.animation.Animator; +import android.animation.AnimatorListenerAdapter; +import android.animation.ObjectAnimator; +import android.animation.ValueAnimator; +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v4.view.GestureDetectorCompat; +import android.support.v7.app.AppCompatActivity; +import android.text.TextUtils; +import android.view.GestureDetector; +import android.view.MotionEvent; +import android.view.View; +import android.view.ViewGroup; +import android.view.animation.AccelerateInterpolator; +import android.widget.TextView; + +import com.fivehundredpx.android.blur.BlurringView; + +import net.coding.program.R; +import net.coding.program.common.Global; +import net.coding.program.common.GlobalData; +import net.coding.program.common.event.EventLoginSuccess; +import net.coding.program.user.EnterpriseLoginActivity_; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.Click; +import org.androidannotations.annotations.EActivity; +import org.androidannotations.annotations.ViewById; +import org.androidannotations.annotations.res.StringArrayRes; +import org.greenrobot.eventbus.EventBus; +import org.greenrobot.eventbus.Subscribe; +import org.greenrobot.eventbus.ThreadMode; + +import java.util.ArrayDeque; +import java.util.Queue; + +import pl.droidsonroids.gif.AnimationListener; +import pl.droidsonroids.gif.GifDrawable; +import pl.droidsonroids.gif.GifImageView; + + +@EActivity(R.layout.activity_enterprise_guide) +public class EnterpriseGuideActivity extends AppCompatActivity { + + private GestureDetectorCompat gesture; + + @ViewById + TextView gifTitle, gifContent; + + @ViewById + View blurrSourceView; + + @ViewById + BlurringView blurringView; + + @ViewById + GifImageView gifView; + + @ViewById + View pager0, pager1; + + @ViewById + View ball0, ball1, ball2; + + @ViewById + IndicatorView pageIndicate; + + @StringArrayRes(R.array.guide_content) + String[] guideContent; + + @StringArrayRes(R.array.guide_title) + String[] guideTitle; + + @StringArrayRes(R.array.guide_gif_down) + String[] gifDown; + + @StringArrayRes(R.array.guide_gif_up) + String[] gifUp; + + public static final int PAGER_COUNT = 5; + + private int indicatePos = 0; + + Queue gifQueue = new ArrayDeque<>(); + + ObjectAnimator titleAnimatorOut; + ObjectAnimator titleAnimatorIn; + float titleAlpha = 1; + + ObjectAnimator contentAnimatorOut; + ObjectAnimator contentAnimatorIn; + + int textInTime = 500; + int textOutTime = 300; + + boolean isGifPlaying = false; + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + EventBus.getDefault().register(this); + } + + @Override + protected void onDestroy() { + super.onDestroy(); + EventBus.getDefault().unregister(this); + } + + @Subscribe(threadMode = ThreadMode.MAIN) + public void onLoginEvent(EventLoginSuccess event) { + if (!isFinishing()) { + finish(); + } + } + + @Override + public boolean onTouchEvent(MotionEvent event) { + gesture.onTouchEvent(event); + return super.onTouchEvent(event); + } + + @AfterViews + void initEnterpriseGuideActivity() { + blurringView.setBlurredView(blurrSourceView); + + gesture = new GestureDetectorCompat(this, gestureListener); + + titleAnimatorOut = ObjectAnimator.ofFloat(gifTitle, "alpha", titleAlpha, 0); + titleAnimatorOut.setDuration(textOutTime); + titleAnimatorOut.setInterpolator(new AccelerateInterpolator()); + titleAnimatorIn = ObjectAnimator.ofFloat(gifTitle, "alpha", 0, 1); + titleAnimatorIn.setDuration(textInTime); + titleAnimatorIn.setInterpolator(new AccelerateInterpolator()); + + contentAnimatorOut = ObjectAnimator.ofFloat(gifContent, "alpha", titleAlpha, 0); + contentAnimatorOut.setDuration(textOutTime); + contentAnimatorOut.setInterpolator(new AccelerateInterpolator()); + contentAnimatorIn = ObjectAnimator.ofFloat(gifContent, "alpha", 0, 1); + contentAnimatorIn.setDuration(textInTime); + contentAnimatorIn.setInterpolator(new AccelerateInterpolator()); + + blurringView.invalidate(); + + int width = GlobalData.sWidthPix; + setPoint(ball0, width); + setPoint(ball1, width); + setPoint(ball2, width); + + int halfWidth = width / 4; + + ObjectAnimator ballAnimator = ObjectAnimator.ofFloat(ball0, "translationX", 0, halfWidth, 0, -halfWidth, 0).setDuration(20 * 1000); + ballAnimator.setRepeatCount(ObjectAnimator.INFINITE); + ballAnimator.addUpdateListener(animation -> blurringView.invalidate()); + ballAnimator.start(); + + ObjectAnimator ballAnimator1 = ObjectAnimator.ofFloat(ball1, "translationX", 0, halfWidth, 0, -halfWidth, 0).setDuration(15 * 1000); + ballAnimator1.setRepeatCount(ValueAnimator.INFINITE); + ballAnimator1.start(); + + ObjectAnimator ballAnimator2 = ObjectAnimator.ofFloat(ball2, "translationX", 0, -halfWidth, 0, halfWidth, 0).setDuration(20 * 1000); + ballAnimator2.setRepeatCount(ValueAnimator.INFINITE); + ballAnimator2.start(); + + pageIndicate.setPointStyle(true); + pageIndicate.setSelect(0); + } + + private void setPoint(View v, int size) { + ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) v.getLayoutParams(); + lp.width = size; + lp.height = size; + v.setLayoutParams(lp); + } + + private void setGifTitle(final String s) { + titleAnimatorOut.start(); + titleAnimatorOut.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + gifTitle.setText(s); + titleAnimatorIn.start(); + } + }); + } + + private void setGifContent(final String content) { + contentAnimatorOut.start(); + contentAnimatorOut.addListener(new AnimatorListenerAdapter() { + @Override + public void onAnimationEnd(Animator animation) { + gifContent.setText(content); + contentAnimatorIn.start(); + } + }); + } + + @Click + void sendButton() { + EnterpriseLoginActivity_.intent(this).start(); + } + + @Click + void sendButtonPrivate() { + EnterpriseLoginActivity_.intent(this).isPrivate(true).start(); + } + + private void playGif() { + if (isGifPlaying) { + return; + } + + playGifReal(); + } + + private void playGifReal() { + try { + if (!gifQueue.isEmpty()) { + isGifPlaying = true; + + String name = gifQueue.poll(); + + GifDrawable drawable = new GifDrawable(getAssets(), name); + + gifView.setImageDrawable(drawable); + drawable.start(); + + drawable.addAnimationListener(playGifListener); + } else { + isGifPlaying = false; + } + } catch (Exception e) { + Global.errorLog(e); + } + } + + AnimationListener playGifListener = loopNumber -> { + if (gifQueue.isEmpty()) { + isGifPlaying = false; + } else { + playGifReal(); + } + }; + + private void showPager0(boolean show) { + View showView = pager0; + View hideView = pager1; + if (!show) { + showView = pager1; + hideView = pager0; + } + + ObjectAnimator.ofFloat(showView, "alpha", 0f, 1f).setDuration(800).start(); + ObjectAnimator.ofFloat(hideView, "alpha", 1f, 0f).setDuration(800).start(); + + pageIndicate.setPointStyle(show); + } + + // 每次添加 2 个动画，第一个是退出动画，第二个是出现动画 因为添加动画到队列后，会立刻取出一个动画开始播放，所以队列中元素的数量只可能为 1 或 0（也可能出现更多，但手速达不到那么快） + // 为 1 说明还在播放上上个退出动画，所以上个出现动画可以删除了，这次也不用传入退出动画 + // 为 0 上个出现动画正在播放或已经播放完毕，所以要传入退出动画和出现动画 + private void addAnimate(int pos) { + if (gifQueue.isEmpty()) { + String down = gifDown[indicatePos]; + if (!TextUtils.isEmpty(down)) { + gifQueue.add(down); + } + } else { + gifQueue.clear(); + } + + String up = gifUp[pos]; + if (!TextUtils.isEmpty(up)) { + gifQueue.add(up); + } + + playGif(); + } + + private void scrollPager(int pos) { + if (pos < 0 || PAGER_COUNT <= pos) { + return; + } + + if (pos == indicatePos) { + return; + } + + if (pos == 0) { + showPager0(true); + } else if (indicatePos == 0) { + showPager0(false); + } + + pageIndicate.setSelect(pos); + + setGifTitle(guideTitle[pos]); + setGifContent(guideContent[pos]); + addAnimate(pos); + + indicatePos = pos; + } + + + GestureDetector.OnGestureListener gestureListener = new GestureDetector.SimpleOnGestureListener() { + + int scrollSum = 0; + boolean scrolling = false; + + @Override + public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) { + if (scrolling) { + scrollSum += distanceX; + if (scrollSum > 100) { + if (indicatePos < (PAGER_COUNT - 1)) { + scrollPager(indicatePos + 1); + scrolling = false; + } + } else if (scrollSum < -100) { + if (indicatePos > 0) { + scrollPager(indicatePos - 1); + scrolling = false; + } + } + } + return true; + } + + @Override + public boolean onDown(MotionEvent e) { + scrollSum = 0; + scrolling = true; + return true; + } + + }; +} diff --git a/app/src/enterprise/java/net/coding/program/login/phone/EnterpriseEmailSetPasswordActivity.java b/app/src/enterprise/java/net/coding/program/login/phone/EnterpriseEmailSetPasswordActivity.java new file mode 100644 index 000000000..9c24bbdee --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/login/phone/EnterpriseEmailSetPasswordActivity.java @@ -0,0 +1,49 @@ +package net.coding.program.login.phone; + +import android.text.TextUtils; +import android.view.View; + +import net.coding.program.EnterpriseApp; +import net.coding.program.R; +import net.coding.program.common.Global; +import net.coding.program.common.widget.LoginEditTextNew; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.EActivity; +import org.androidannotations.annotations.Extra; +import org.androidannotations.annotations.ViewById; + +/** + * Created by chenchao on 2017/1/4. + */ +@EActivity(R.layout.enterprise_activity_email_set_password) +public class EnterpriseEmailSetPasswordActivity extends EmailSetPasswordActivity { + + @Extra + String enterpriseName = ""; + + @ViewById + LoginEditTextNew enterpriseEdit; + + @ViewById + View enterpriseLine; + + @AfterViews + void initEnterpriseEmailSetPasswordActivity() { + enterpriseEdit.setText(enterpriseName); + hideActionbarShade(); + enterpriseEdit.setOnEditFocusChange(createEditLineFocus(enterpriseLine, 0xFF0160FF)); + + if (TextUtils.isEmpty(enterpriseName)) { + enterpriseEdit.requestFocus(); + } else { + emailEdit.requestFocus(); + } + } + + @Override + protected String getUrl() { + EnterpriseApp.setHost(enterpriseEdit.getTextString()); + return String.format("%s%s", Global.HOST_API, "/account/password/forget"); + } +} diff --git a/app/src/enterprise/java/net/coding/program/login/phone/EnterprisePrivateEmailSetPasswordActivity.java b/app/src/enterprise/java/net/coding/program/login/phone/EnterprisePrivateEmailSetPasswordActivity.java new file mode 100644 index 000000000..eb27c9689 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/login/phone/EnterprisePrivateEmailSetPasswordActivity.java @@ -0,0 +1,52 @@ +package net.coding.program.login.phone; + +import android.view.View; +import android.widget.TextView; + +import net.coding.program.EnterpriseApp; +import net.coding.program.R; +import net.coding.program.common.Global; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.EActivity; +import org.androidannotations.annotations.Extra; +import org.androidannotations.annotations.ViewById; + +/** + * Created by chenchao on 2017/1/4. + */ +@EActivity(R.layout.enterprise_private_activity_email_set_password) +public class EnterprisePrivateEmailSetPasswordActivity extends EmailSetPasswordActivity { + + @Extra + String enterpriseName = ""; + +// @ViewById +// LoginEditTextNew privateHost; + + @ViewById + View enterpriseLine; + + @ViewById + TextView toolbarTitle; + + @AfterViews + void initEnterpriseEmailSetPasswordActivity() { + String host = enterpriseName; + int start = host.indexOf("://"); + if (start != -1) { + host = host.substring(start + "://".length()); + } + + toolbarTitle.setText(String.format("找回密码\n%s", host)); + hideActionbarShade(); + + emailEdit.requestFocus(); + } + + @Override + protected String getUrl() { + EnterpriseApp.setPrivateHost(enterpriseName); + return String.format("%s%s", Global.HOST_API, "/account/password/forget"); + } +} diff --git a/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java b/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java new file mode 100644 index 000000000..9b21ff219 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectFragment.java @@ -0,0 +1,465 @@ +package net.coding.program.project; + +import android.annotation.SuppressLint; +import android.app.Activity; +import android.content.Intent; +import android.support.annotation.NonNull; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.SearchView; +import android.support.v7.widget.Toolbar; +import android.text.TextUtils; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.View; +import android.widget.ImageView; +import android.widget.TextView; + +import com.loopj.android.http.RequestParams; +import com.marshalchen.ultimaterecyclerview.UltimateRecyclerView; +import com.marshalchen.ultimaterecyclerview.UltimateRecyclerviewViewHolder; +import com.marshalchen.ultimaterecyclerview.quickAdapter.easyRegularAdapter; +import com.readystatesoftware.viewbadger.BadgeView; +import com.tbruyelle.rxpermissions2.RxPermissions; + +import net.coding.program.R; +import net.coding.program.common.Global; +import net.coding.program.common.GlobalCommon; +import net.coding.program.common.GlobalData; +import net.coding.program.common.ImageLoadTool; +import net.coding.program.common.event.EventRefresh; +import net.coding.program.common.model.AccountInfo; +import net.coding.program.common.model.ProjectObject; +import net.coding.program.common.model.UserObject; +import net.coding.program.common.ui.BaseFragment; +import net.coding.program.common.ui.shadow.RecyclerViewSpace; +import net.coding.program.common.umeng.UmengEvent; +import net.coding.program.common.util.PermissionUtil; +import net.coding.program.message.MessageListActivity_; +import net.coding.program.network.HttpObserver; +import net.coding.program.network.Network; +import net.coding.program.network.model.Pager; +import net.coding.program.project.init.create.ProjectCreateActivity_; +import net.coding.program.route.BlankViewDisplay; +import net.coding.program.task.add.TaskAddActivity_; +import net.coding.program.user.UsersListActivity; +import net.coding.program.util.TextWatcherAt; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.EFragment; +import org.androidannotations.annotations.OnActivityResult; +import org.androidannotations.annotations.ViewById; +import org.greenrobot.eventbus.Subscribe; +import org.greenrobot.eventbus.ThreadMode; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +@EFragment(R.layout.fragment_enterprise_project) +public class EnterpriseProjectFragment extends BaseFragment { + + private final String URL_PIN_DELETE = Global.HOST_API + "/user/projects/pin?ids=%s"; + private final String URL_PIN_SET = Global.HOST_API + "/user/projects/pin"; + + private final int RESULT_SELECT_USER = 2001; + + int msectionId = 0; + + @ViewById + UltimateRecyclerView listView; + + @ViewById + View blankLayout; + + @ViewById + Toolbar enterpriseProjectToolbar; + + @ViewById + View toolbarTitle; + + @ViewById + View topTip, closeTipButton; + + @ViewById + TextView topTipText; + + ArrayList listData = new ArrayList<>(); + ArrayList allListData = new ArrayList<>(); + + ProjectAdapter projectAdapter; + + private Comparator comparator = (lhs, rhs) -> { + if (lhs.isPin() && !rhs.isPin()) { + return -1; + } else if (!lhs.isPin() && rhs.isPin()) { + return 1; + } else { + return 0; + } + }; + + @Override + protected boolean useEventBus() { + return true; + } + + @AfterViews + void initEnterpriseProjectFramgent() { + initActionBar(); + + RecyclerView.LayoutManager manager = new LinearLayoutManager(getActivity()); + listView.setLayoutManager(manager); + RecyclerViewSpace space = new RecyclerViewSpace(getActivity()); + listView.addItemDecoration(space); + listView.setEmptyView(R.layout.fragment_enterprise_project_empty, + R.layout.fragment_enterprise_project_empty); + + listView.setDefaultOnRefreshListener(() -> onRefresh()); + listView.mSwipeRefreshLayout.setColorSchemeResources(R.color.font_green); + listView.setOnLoadMoreListener((itemsCount, maxLastVisiblePosition) -> loadMore()); + + allListData.clear(); + listData.clear(); + allListData.addAll(AccountInfo.loadProjects(getActivity())); + listData.addAll(allListData); + + projectAdapter = new ProjectAdapter(listData); + listView.setAdapter(projectAdapter); + + projectActionUtil = new ProjectActionUtil(getActivity().getBaseContext()); + projectActionUtil.setListener(pos -> { + ProjectObject project = listData.get(pos); + final int projectId = project.getId(); + if (project.isPin()) { + String pinDeleteUrl = String.format(URL_PIN_DELETE, projectId); + deleteNetwork(pinDeleteUrl, URL_PIN_DELETE, -1, project); + } else { + RequestParams params = new RequestParams(); + params.put("ids", projectId); + postNetwork(URL_PIN_SET, params, URL_PIN_SET, -1, project); + } + + projectActionUtil.close(); + }); + onRefresh(); + + setHasOptionsMenu(true); + + if (GlobalData.isPrivateEnterprise()) { + topTip.setVisibility(View.GONE); + } else { + soldOutTip(); + } + } + + private void soldOutTip() { + topTip.setVisibility(View.VISIBLE); + closeTipButton.setOnClickListener(v -> topTip.setVisibility(View.GONE)); + topTipText.setText(R.string.sold_out_app); + } + + private void initActionBar() { + enterpriseProjectToolbar.inflateMenu(R.menu.enterprise_main_project); + enterpriseProjectToolbar.setOnMenuItemClickListener(item -> { + switch (item.getItemId()) { + case R.id.actionCreateProject: + actionCreateProject(); + break; + case R.id.actionCreateTask: + actionCreateTask(); + break; + case R.id.actionSendMessage: + actionSendMessage(); + break; + case R.id.action2fa: + action2fa(); + break; + } + return true; + }); + + SearchView searchView = enterpriseProjectToolbar.findViewById(R.id.searchBar); + searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() { + @Override + public boolean onQueryTextSubmit(String s) { + return true; + } + + @Override + public boolean onQueryTextChange(String s) { + searchItem(s); + return true; + } + }); + + searchView.setOnCloseListener(() -> { + toolbarTitle.setVisibility(View.VISIBLE); + return false; + }); + searchView.setOnSearchClickListener(v -> toolbarTitle.setVisibility(View.GONE)); + } + + void actionCreateProject() { + ProjectCreateActivity_.intent(this).start(); + } + + void actionCreateTask() { + TaskAddActivity_.intent(this).mUserOwner(GlobalData.sUserObject).start(); + } + + void actionSendMessage() { + TextWatcherAt.startActivityAt(getActivity(), this, RESULT_SELECT_USER); + } + + @SuppressLint("CheckResult") + void action2fa() { + new RxPermissions(getActivity()) + .request(PermissionUtil.CAMERA_STORAGE) + .subscribe(granted -> { + if (granted) { + GlobalCommon.start2FAActivity(getActivity()); + } + }); + } + + private void onRefresh() { + Network.getRetrofit(getContext()) + .getProjects() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new HttpObserver>(getActivity()) { + @Override + public void onSuccess(Pager data) { + super.onSuccess(data); + + allListData.clear(); + listData.clear(); + int pinCount = 0; + for (ProjectObject item : data.list) { + if (item.isPin()) { + allListData.add(pinCount++, item); + } else { + allListData.add(item); + } + } + listData.addAll(allListData); + + msectionId = 0; + for (ProjectObject item : listData) { + if (!item.isPin()) { + break; + } + ++msectionId; + } + + AccountInfo.saveProjects(getActivity(), allListData); + projectAdapter.notifyDataSetChanged(); + + BlankViewDisplay.setBlank(allListData.size(), this, true, blankLayout, mOnClickRetry); + + } + + @Override + public void onFail(int errorCode, @NonNull String error) { + super.onFail(errorCode, error); + projectAdapter.notifyDataSetChanged(); + BlankViewDisplay.setBlank(allListData.size(), this, true, blankLayout, mOnClickRetry); + } + }); + } + + private View.OnClickListener clickItem = v -> { + Object object = v.getTag(); + if (object instanceof ProjectObject) { + ProjectObject item = (ProjectObject) object; + ProjectHomeActivity_.intent(this) + .mProjectObject(item) + .start(); + } + }; + + // 用于处理推送 + @Subscribe(threadMode = ThreadMode.MAIN) + public void onEventRefresh(EventRefresh event) { + if (event.refresh) { + onRefresh(); + } + } + + @Subscribe(threadMode = ThreadMode.MAIN) + public void onEventProjectModify(EventProjectModify event) { + onRefresh(); + } + + @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + + +// searchItem.setVisible(false); + + super.onCreateOptionsMenu(menu, inflater); + } + + private void searchItem(String s) { + s = s.toLowerCase(); + projectAdapter.notifyDataSetChanged(); + + listData.clear(); + if (TextUtils.isEmpty(s)) { + listData.addAll(allListData); + } else { + for (ProjectObject item : allListData) { + if (item.name.toLowerCase().contains(s)) { + listData.add(item); + } + } + } + + projectAdapter.notifyDataSetChanged(); + } + + View.OnClickListener mOnClickRetry = v -> onRefresh(); + + @Override + public void parseJson(int code, JSONObject respanse, String tag, int pos, Object data) throws JSONException { + if (tag.equals(URL_PIN_SET)) { + if (code == 0) { + umengEvent(UmengEvent.E_PROJECT, "设为常用"); + updatePin((ProjectObject) data, true); + } else { + showErrorMsg(code, respanse); + } + + } else if (tag.equals(URL_PIN_DELETE)) { + if (code == 0) { + umengEvent(UmengEvent.E_PROJECT, "取消常用"); + updatePin((ProjectObject) data, false); + } else { + showErrorMsg(code, respanse); + } + } + } + + private void updatePin(ProjectObject project, boolean pin) { + project.setPin(pin); + + Collections.sort(allListData, comparator); + searchItem(""); + } + + @Override + public void loadMore() { + } + + @OnActivityResult(RESULT_SELECT_USER) + void onSelectUser(int resultCode, Intent data) { + if (resultCode == Activity.RESULT_OK) { + UserObject user = (UserObject) data.getSerializableExtra(UsersListActivity.RESULT_EXTRA_USESR); + if (user != null) { + MessageListActivity_.intent(this).mUserObject(user).start(); + } + } + } + + protected class ProjectAdapter extends easyRegularAdapter { + + public ProjectAdapter(List list) { + super(list); + } + + @Override + protected int getNormalLayoutResId() { + return R.layout.enterprise_project_all_list_item; + } + + @Override + protected ProjectHolder newViewHolder(View view) { + view.setOnClickListener(clickItem); + return new ProjectHolder(view); + } + + @Override + protected void withBindHolder(ProjectHolder holder, ProjectObject data, int position) { + ProjectObject item = getItem(position); + + holder.privatePin.setVisibility(item.isPin() ? View.VISIBLE : View.INVISIBLE); + String ownerName = item.owner_user_name; + + holder.name.setVisibility(View.VISIBLE); + holder.name.setText(item.name); + + holder.desc.setText(item.getDescription()); + setClickEvent(holder.fLayoutAction, position); + int count = item.unReadActivitiesCount; + BadgeView badge = holder.badge; + Global.setBadgeView(badge, count); + + holder.fLayoutAction.setVisibility(View.VISIBLE); + holder.rootLayout.setTag(item); + iconfromNetwork(holder.image, item.icon, ImageLoadTool.optionsRounded2); + } + + @Override + public ProjectHolder newHeaderHolder(View view) { + return new ProjectHolder(view, true); + } + + @Override + public ProjectHolder newFooterHolder(View view) { + return new ProjectHolder(view, true); + } + } + + private ProjectActionUtil projectActionUtil; + + private void setClickEvent(final View fLayoutAction, final int position) { + fLayoutAction.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + projectActionUtil.show(fLayoutAction, position); + if (!listData.get(position).isPin()) { + projectActionUtil.getTxtSetting().setText("设为常用"); + projectActionUtil.getTxtSetting().setTextColor(getActivity().getResources().getColor(R.color.white)); + projectActionUtil.getTxtSetting().setBackgroundColor(getActivity().getResources().getColor(R.color.font_green)); + } else { + projectActionUtil.getTxtSetting().setText("取消常用"); + projectActionUtil.getTxtSetting().setTextColor(getActivity().getResources().getColor(R.color.font_green)); + projectActionUtil.getTxtSetting().setBackgroundColor(getActivity().getResources().getColor(R.color.divide)); + } + } + }); + } + + public static class ProjectHolder extends UltimateRecyclerviewViewHolder { + + public ImageView image; + public TextView name; + public TextView desc; + public BadgeView badge; + public ImageView privatePin; + public View fLayoutAction; + public View rootLayout; + + public ProjectHolder(View view, boolean isHeader) { + super(view); + } + + public ProjectHolder(View view) { + super(view); + rootLayout = view; + image = (ImageView) view.findViewById(R.id.icon); + badge = (BadgeView) view.findViewById(R.id.badge); + fLayoutAction = view.findViewById(R.id.flayoutAction); + desc = (TextView) view.findViewById(R.id.txtDesc); + privatePin = (ImageView) view.findViewById(R.id.privatePin); + name = (TextView) view.findViewById(R.id.name); + } + } +} diff --git a/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectHomeFragment.java b/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectHomeFragment.java new file mode 100644 index 000000000..978819ddd --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/project/EnterpriseProjectHomeFragment.java @@ -0,0 +1,12 @@ +package net.coding.program.project; + +import net.coding.program.R; +import net.coding.program.project.detail.ProjectFunction; + +import org.androidannotations.annotations.EFragment; + +@EFragment(R.layout.fragment_project_private) +public class EnterpriseProjectHomeFragment extends PrivateProjectHomeFragment { + + +} diff --git a/app/src/enterprise/java/net/coding/program/project/maopao/EnterprisePrivateProjectMaopaoEditFragment.java b/app/src/enterprise/java/net/coding/program/project/maopao/EnterprisePrivateProjectMaopaoEditFragment.java new file mode 100644 index 000000000..f5592603b --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/project/maopao/EnterprisePrivateProjectMaopaoEditFragment.java @@ -0,0 +1,29 @@ +package net.coding.program.project.maopao; + + +import net.coding.program.R; +import net.coding.program.common.Global; +import net.coding.program.project.detail.ProjectCampt; +import net.coding.program.task.TaskDespEditFragment; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.EFragment; + +@EFragment(R.layout.fragment_topic_edit) +public class EnterprisePrivateProjectMaopaoEditFragment extends TaskDespEditFragment { + + @AfterViews + void initProjectMaopaoEditFragment() { + edit.setHint(R.string.input_project_maopao_content); + } + + @Override + protected String getCustomUploadPhoto() { + + if (getActivity() instanceof ProjectCampt) { + return String.format("%s/project/%s/file/upload", Global.HOST_API, ((ProjectCampt) getActivity()).getProjectId()); + } else { + return Global.HOST_API + "/tweet/insert_image"; + } + } +} diff --git a/app/src/enterprise/java/net/coding/program/project/maopao/EnterpriseProjectMaopaoActivity.java b/app/src/enterprise/java/net/coding/program/project/maopao/EnterpriseProjectMaopaoActivity.java new file mode 100644 index 000000000..7c1a1a50b --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/project/maopao/EnterpriseProjectMaopaoActivity.java @@ -0,0 +1,15 @@ +package net.coding.program.project.maopao; + +import net.coding.program.R; + +import org.androidannotations.annotations.EActivity; + +@EActivity(R.layout.activity_project_maopao) +public class EnterpriseProjectMaopaoActivity extends ProjectMaopaoActivity { + + @Override + protected void initAdapter() { + projectMaopaoAdapter = new EnterpriseProjectMaopaoAdapter(listData, this, clickDelete, clickListItem); + } + +} diff --git a/app/src/enterprise/java/net/coding/program/project/maopao/EnterpriseProjectMaopaoAdapter.java b/app/src/enterprise/java/net/coding/program/project/maopao/EnterpriseProjectMaopaoAdapter.java new file mode 100644 index 000000000..758a3feff --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/project/maopao/EnterpriseProjectMaopaoAdapter.java @@ -0,0 +1,113 @@ +package net.coding.program.project.maopao; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; +import android.widget.TextView; + +import net.coding.program.R; +import net.coding.program.common.Global; +import net.coding.program.common.GlobalCommon; +import net.coding.program.common.GlobalData; +import net.coding.program.common.ImageLoadTool; +import net.coding.program.common.LoadMore; +import net.coding.program.common.MyImageGetter; +import net.coding.program.common.model.Maopao; +import net.coding.program.maopao.ContentArea; +import net.coding.program.pickphoto.ClickSmallImage; + +import java.util.List; + +/** + * Created by chenchao on 16/7/21. + * 项目公告的 adapter + */ +class EnterpriseProjectMaopaoAdapter extends BaseAdapter { + + List listData; + LoadMore loadMore; + View.OnClickListener clickDelete; + View.OnClickListener clickListItem; + + ClickSmallImage onClickImage; + MyImageGetter myImageGetter; + + ImageLoadTool imageLoadTool; + int mPxImageWidth; + + public EnterpriseProjectMaopaoAdapter(List listData, ProjectMaopaoActivity activity, + View.OnClickListener clickDelete, View.OnClickListener clickListItem) { + this.listData = listData; + this.loadMore = activity; + this.clickDelete = clickDelete; + this.clickListItem = clickListItem; + + onClickImage = new ClickSmallImage(activity); + myImageGetter = new MyImageGetter(activity); + imageLoadTool = activity.getImageLoad(); + mPxImageWidth = GlobalCommon.dpToPx(GlobalData.sWidthDp - 12 - 40 - 10 - 10 - 3 * 2) / 3; + } + + @Override + public int getCount() { + return listData.size(); + } + + @Override + public Object getItem(int position) { + return listData.get(position); + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ViewHolder holder; + if (convertView == null) { + convertView = LayoutInflater.from(parent.getContext()).inflate(R.layout.enterprise_list_item_project_maopao, parent, false); + holder = new ViewHolder(convertView); + convertView.setTag(holder); + } else { + holder = (ViewHolder) convertView.getTag(); + } + + Maopao.MaopaoObject data = listData.get(position); + ImageLoadTool.loadUserImage(holder.icon, data.owner.avatar); + holder.name.setText(data.owner.name); + holder.time.setText(Global.getTimeDetail(data.created_at)); + holder.content.setText(GlobalCommon.changeHyperlinkColor(data.content.replace("

", "").replace("

", "").replace("", "").replace("
", ""))); + + + holder.contentArea.setData(data); + + if (position == getCount() - 1) { + loadMore.loadMore(); + } + + return convertView; + } + + class ViewHolder { + + public ViewHolder(View v) { + icon = (ImageView) v.findViewById(R.id.icon); + name = (TextView) v.findViewById(R.id.name); + time = (TextView) v.findViewById(R.id.time); + content = (TextView) v.findViewById(R.id.content); + contentArea = new ContentArea(v, clickListItem, onClickImage, myImageGetter, imageLoadTool, mPxImageWidth); + } + + ImageView icon; + TextView name; + TextView time; + TextView content; + + ContentArea contentArea; + } + +} diff --git a/app/src/enterprise/java/net/coding/program/project/maopao/EnterpriseProjectMaopaoEditFragment.java b/app/src/enterprise/java/net/coding/program/project/maopao/EnterpriseProjectMaopaoEditFragment.java new file mode 100644 index 000000000..809e971c9 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/project/maopao/EnterpriseProjectMaopaoEditFragment.java @@ -0,0 +1,93 @@ +package net.coding.program.project.maopao; + + +import android.net.Uri; +import android.support.annotation.NonNull; + +import net.coding.program.R; +import net.coding.program.common.Global; +import net.coding.program.common.model.ProjectObject; +import net.coding.program.common.util.FileUtil; +import net.coding.program.common.widget.UploadHelp; +import net.coding.program.network.HttpObserver; +import net.coding.program.network.Network; +import net.coding.program.network.model.file.CodingFile; +import net.coding.program.task.TaskDespEditFragment; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.EFragment; + +import java.io.File; + +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +@EFragment(R.layout.fragment_topic_edit) +public class EnterpriseProjectMaopaoEditFragment extends TaskDespEditFragment { + + @AfterViews + void initProjectMaopaoEditFragment() { + edit.setHint(R.string.input_project_maopao_content); + } + + @Override + protected String getCustomUploadPhoto() { + return Global.HOST_API + "/tweet/insert_image"; + } + + @Override + protected void updateImage(Uri updateFileUri) { + String path = getProjectPath(); + if (path.startsWith("/")) { + String[] split = path.toLowerCase().replace("/user/", "").replace("/project", "").split("/"); + Network.getRetrofit(getContext()) + .getProject(split[0], split[1]) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new HttpObserver(getContext()) { + @Override + public void onSuccess(ProjectObject data) { + super.onSuccess(data); + + realUpdateImage(updateFileUri, data.id); + } + + @Override + public void onFail(int errorCode, @NonNull String error) { + super.onFail(errorCode, error); + showProgressBar(false); + } + }); + } else { + try { + int projectId = Integer.valueOf(path); + realUpdateImage(updateFileUri, projectId); + } catch (Exception e) { + showProgressBar(false); + showButtomToast("项目路径错误 " + path); + } + } + } + + private void realUpdateImage(Uri updateFileUri, int projectId) { + UploadHelp help = new UploadHelp(getContext(), projectId, 0, + new File(FileUtil.getPath(getContext(), updateFileUri)), + new UploadHelp.NetworkRequest() { + @Override + public void onProgress(int progress) { + } + + @Override + public void onSuccess(CodingFile codingFile) { + uploadImageSuccess(codingFile.ownerPreview); + showProgressBar(false); + } + + @Override + public void onFail() { + showProgressBar(false); + } + }, false); + help.upload(); + } +} diff --git a/app/src/enterprise/java/net/coding/program/setting/CommonPickProjectActivity.java b/app/src/enterprise/java/net/coding/program/setting/CommonPickProjectActivity.java new file mode 100644 index 000000000..ef16e9f13 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/setting/CommonPickProjectActivity.java @@ -0,0 +1,190 @@ +package net.coding.program.setting; + +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import com.marshalchen.ultimaterecyclerview.UltimateRecyclerviewViewHolder; + +import net.coding.program.R; +import net.coding.program.common.GlobalData; +import net.coding.program.common.ImageLoadTool; +import net.coding.program.common.ui.BackActivity; +import net.coding.program.common.ui.shadow.RecyclerViewSpace; +import net.coding.program.common.widget.CommonAdapter; +import net.coding.program.common.widget.CommonListView; +import net.coding.program.network.HttpObserver; +import net.coding.program.network.Network; +import net.coding.program.network.model.user.Member; +import net.coding.program.network.model.user.MemberRole; +import net.coding.program.project.detail.MemberAuthorityActivity_; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.EActivity; +import org.androidannotations.annotations.Extra; +import org.androidannotations.annotations.OnActivityResult; +import org.androidannotations.annotations.ViewById; + +import java.util.ArrayList; +import java.util.List; + +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +// 从企业所有项目中选择一个项目进行操作 +@EActivity(R.layout.common_simple_listview) +public class CommonPickProjectActivity extends BackActivity { + + private static final int RESULT_SET_AUTHORITY = 1; + + @Extra + Member member; + + @ViewById + CommonListView listView; + + ProjectAdapter adapter; + + ArrayList listData = new ArrayList<>(); + + @AfterViews + void initCommonPickProjectActivity() { + listView.setLayoutManager(new LinearLayoutManager(this)); + listView.addItemDecoration(new RecyclerViewSpace(this)); + + adapter = new ProjectAdapter(listData); + listView.setAdapter(adapter); + listView.setDefaultOnRefreshListener(() -> onRefresh()); + listView.enableDefaultSwipeRefresh(true); + + onRefresh(); + } + + private void onRefresh() { + Network.getRetrofit(CommonPickProjectActivity.this, listView) + .getUserJoinedProjects(GlobalData.getEnterpriseGK(), member.user.global_key) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new HttpObserver>(this, listView) { + @Override + public void onSuccess(List data) { + super.onSuccess(data); + listData.clear(); + listData.addAll(data); + adapter.notifyDataSetChanged(); + } + }); + } + + protected class ProjectAdapter extends CommonAdapter { + + public ProjectAdapter(List list) { + super(list); + } + + @Override + protected int getNormalLayoutResId() { + return R.layout.common_pick_project_list_item; + } + + @Override + protected ProjectHolder newViewHolder(View view) { + ProjectHolder holder = new ProjectHolder(view); + holder.rootLayout.setOnClickListener(clickItem); + return holder; + } + + @Override + protected void withBindHolder(ProjectHolder holder, MemberRole data, int position) { + MemberRole item = getItem(position); + holder.name.setText(item.project.name); + holder.authority.setText(data.getAuthority().projectName); + holder.rootLayout.setTag(item); + iconfromNetwork(holder.image, item.project.icon, ImageLoadTool.optionsRounded2); + } + + @Override + public long generateHeaderId(int i) { + return super.generateHeaderId(i); + } + + @Override + public ProjectHolder newHeaderHolder(View view) { + return new ProjectHolder(view, true); + } + + @Override + public void onBindHeaderViewHolder(RecyclerView.ViewHolder viewHolder, int pos) { + super.onBindHeaderViewHolder(viewHolder, pos); + } + + @Override + public UltimateRecyclerviewViewHolder onCreateHeaderViewHolder(ViewGroup parent) { + return super.onCreateHeaderViewHolder(parent); + } + + @Override + public boolean hasHeaderView() { + return super.hasHeaderView(); + } + + @Override + public long getHeaderId(int position) { + return super.getHeaderId(position); + } + + @Override + public ProjectHolder newFooterHolder(View view) { + return new ProjectHolder(view, true); + } + } + + public static class ProjectHolder extends UltimateRecyclerviewViewHolder { + + public TextView name; + public ImageView image; + public TextView authority; + public View rootLayout; + + public ProjectHolder(View view, boolean isHeader) { + super(view); + } + + public ProjectHolder(View view) { + super(view); + rootLayout = view; + name = (TextView) view.findViewById(R.id.name); + authority = (TextView) view.findViewById(R.id.authority); + image = (ImageView) view.findViewById(R.id.icon); + } + } + + private View.OnClickListener clickItem = v -> { + Object object = v.getTag(); + if (object instanceof MemberRole) { + MemberRole item = (MemberRole) object; + MemberAuthorityActivity_.intent(CommonPickProjectActivity.this) + .globayKey(member.user.global_key) + .authority(item.getAuthority()) + .projectId(item.projectId) + .startForResult(RESULT_SET_AUTHORITY); + } + }; + + @OnActivityResult(RESULT_SET_AUTHORITY) + void onResultSetAuthority(int result, @OnActivityResult.Extra int intentData, + @OnActivityResult.Extra int intentData1) { + if (result == RESULT_OK) { + for (MemberRole item : listData) { + if (item.projectId == intentData1) { + item.type = intentData; + adapter.notifyDataSetChanged(); + break; + } + } + } + } +} diff --git a/app/src/enterprise/java/net/coding/program/setting/EnterpriseAccountActivity.java b/app/src/enterprise/java/net/coding/program/setting/EnterpriseAccountActivity.java new file mode 100644 index 000000000..f1f6eac8f --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/setting/EnterpriseAccountActivity.java @@ -0,0 +1,173 @@ +package net.coding.program.setting; + +import android.app.Activity; +import android.os.Build; +import android.support.v7.widget.Toolbar; +import android.text.Spanned; +import android.view.View; +import android.widget.TextView; + +import com.nostra13.universalimageloader.core.DisplayImageOptions; +import com.nostra13.universalimageloader.core.ImageLoader; + +import de.hdodenhof.circleimageview.CircleImageView; + +import net.coding.program.R; +import net.coding.program.common.Global; +import net.coding.program.common.GlobalData; +import net.coding.program.common.base.MyJsonResponse; +import net.coding.program.common.model.EnterpriseAccount; +import net.coding.program.common.model.EnterpriseInfo; +import net.coding.program.common.network.MyAsyncHttpClient; +import net.coding.program.common.ui.BackActivity; +import net.coding.program.setting.order.OrderMainActivity_; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.Click; +import org.androidannotations.annotations.EActivity; +import org.androidannotations.annotations.OnActivityResult; +import org.androidannotations.annotations.OptionsItem; +import org.androidannotations.annotations.OptionsMenu; +import org.androidannotations.annotations.ViewById; +import org.androidannotations.annotations.res.ColorRes; +import org.json.JSONObject; + +@EActivity(R.layout.activity_enterprise_account) +@OptionsMenu(R.menu.enterprise_account_menu) +public class EnterpriseAccountActivity extends BackActivity { + + private static final int SETTING_REQUEST_CODE = 1000; + + // 默认企业头像，只在企业设置界面用到 + public static final DisplayImageOptions enterpriseIconOptions = new DisplayImageOptions + .Builder() + .showImageOnLoading(R.drawable.icon_user_monkey_circle) + .showImageForEmptyUri(R.drawable.icon_user_monkey_circle) + .showImageOnFail(R.drawable.icon_user_monkey_circle) + .cacheInMemory(true) + .cacheOnDisk(true) + .considerExifParams(true) + .build(); + + @ViewById + TextView accountState; + @ViewById + CircleImageView companyIcon; + @ViewById + TextView companyName; + @ViewById + Toolbar toolbar; + + EnterpriseAccount account; + + @ColorRes(R.color.font_red) + int fontRed; + + @ColorRes(R.color.font_orange) + int fontOragne; + + @AfterViews + void initEnterpriseAccountActivity() { + useToolbar(); + setActionBarTitle(""); + if (Build.VERSION.SDK_INT >= 21) { + getSupportActionBar().setElevation(0); + } + + updateUI(); + + loadDataFromNetwork(); + + if (GlobalData.isPrivateEnterprise()) { + findViewById(R.id.itemManagerLayout).setVisibility(View.GONE); + } + } + + @Override + protected void onRestart() { + super.onRestart(); + + loadDataFromNetwork(); + } + + private void loadDataFromNetwork() { + String host = String.format("%s/enterprise/%s", Global.HOST_API, EnterpriseInfo.instance().getGlobalkey()); + MyAsyncHttpClient.get(this, host, new MyJsonResponse(this) { + @Override + public void onMySuccess(JSONObject response) { + super.onMySuccess(response); + + account = new EnterpriseAccount(response.optJSONObject("data")); + Spanned countString; + + if (account.trial && !account.payed) { // 处于试用期 + int fontColor = account.remaindays > 5 ? fontOragne : fontRed; + countString = Global.createColorHtml("试用期剩余 ", String.valueOf(account.remaindays), " 天", fontColor); + } else { + if (account.payed) { + if (account.remaindays > 5) { // 付费期且未到期 + countString = Global.createColorHtml("账户余额：", account.balance, " 元", fontOragne); + } else if (account.remaindays > 0) { + countString = Global.createColorHtml("", "您的余额不足，请尽快订购", "", fontRed); + } else { // 付费期已到期 + String tip; + if (account.suspendedAt > 0) { // 已暂停 + tip = String.format("您的服务已暂停 %s 天，请订购后使用", account.suspendedToToday()); + } else { // 处于超时使用阶段 + tip = String.format("您的服务已超时使用 %s 天，请订购后使用", account.estimateDate()); + } + countString = Global.createColorHtml("", tip, "", fontRed); + } + } else { // 未付费而且试用期已过 + countString = Global.createColorHtml("", "您的试用期已结束，请订购后使用", "", fontRed); + } + } + + accountState.setText(countString); + } + + @Override + public void onMyFailure(JSONObject response) { + super.onMyFailure(response); + } + }); + } + + private void updateUI() { + ImageLoader.getInstance().displayImage(EnterpriseInfo.instance().getAvatar(), companyIcon, enterpriseIconOptions); + companyName.setText(EnterpriseInfo.instance().getName()); + } + + @Click + void itemProject() { + ManageProjectListActivity_.intent(this).start(); + } + + @Click + void itemMember() { + ManageMemberActivity_.intent(this).start(); + } + + @Click + void itemSupport() { + EnterpriseSupportActivity_.intent(this).start(); + } + + @Click + void itemManager() { + OrderMainActivity_.intent(this).account(account).start(); + } + + @OptionsItem + void action_setting() { + EnterpriseSettingActivity_.intent(this).startForResult(SETTING_REQUEST_CODE); + } + + @OnActivityResult(SETTING_REQUEST_CODE) + void OnSettingResult(int result) { + if (result == Activity.RESULT_OK) { + updateUI(); + } + } + +} diff --git a/app/src/enterprise/java/net/coding/program/setting/EnterpriseMainSettingFragment.kt b/app/src/enterprise/java/net/coding/program/setting/EnterpriseMainSettingFragment.kt new file mode 100644 index 000000000..6663ff382 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/setting/EnterpriseMainSettingFragment.kt @@ -0,0 +1,102 @@ +package net.coding.program.setting + +import android.view.View +import com.tbruyelle.rxpermissions2.RxPermissions +import kotlinx.android.synthetic.enterprise.enterprise_fragment_main_setting.* +import net.coding.program.R +import net.coding.program.common.GlobalData +import net.coding.program.common.model.EnterpriseInfo +import net.coding.program.common.ui.BaseFragment +import net.coding.program.common.util.PermissionUtil +import net.coding.program.compatible.CodingCompat +import net.coding.program.project.detail.file.LocalProjectFileActivity_ +import org.androidannotations.annotations.AfterViews +import org.androidannotations.annotations.Click +import org.androidannotations.annotations.EFragment + +/** + * Created by chenchao on 2017/1/5. + * 企业版的设置主界面 + */ +@EFragment(R.layout.enterprise_fragment_main_setting) +open class EnterpriseMainSettingFragment : BaseFragment() { + + @AfterViews + internal fun initEnterpriseMainSettingFragment() { + initMainSettingFragment() + + setToolbar("我的", R.id.toolbar) + var visible = View.GONE + if (EnterpriseInfo.instance().canManagerEnterprise()) { + visible = View.VISIBLE + companyName!!.text = EnterpriseInfo.instance().name + } + + itemManager!!.visibility = visible + itemManagerDivide!!.visibility = visible + + setHasOptionsMenu(false) + } + + @Click + fun itemManager() { + EnterpriseAccountActivity_.intent(this).start() + } + + private fun initMainSettingFragment() { + bindDataUserinfo() + } + + override fun onStart() { + super.onStart() + + loadUser() + bindDataUserinfo() + } + + private fun bindDataUserinfo() { + val me = GlobalData.sUserObject + iconfromNetwork(userIcon, me.avatar) + userIcon?.tag = me + userName.text = me.name + userGK.text = me.global_key + } + + private fun loadUser() { + } + + @Click + fun itemLocalFile() { + RxPermissions(activity!!) + .request(*PermissionUtil.STORAGE) + .subscribe { granted -> + if (granted!!) { + LocalProjectFileActivity_.intent(this).start() + } + } + } + + @Click + fun itemHelp() { + val url = "https://e.coding.net/help" + val title = getString(R.string.title_activity_help) + HelpActivity_.intent(this).url(url).title(title).start() + } + + @Click + fun userLayout() { + CodingCompat.instance().launchMyDetailActivity(activity) + } + + @Click + fun itemSetting() { + SettingActivity_.intent(this).start() + } + + @Click + fun itemAbout() { + AboutActivity_.intent(this).start() + } + + +} diff --git a/app/src/enterprise/java/net/coding/program/setting/EnterpriseNameActivity.java b/app/src/enterprise/java/net/coding/program/setting/EnterpriseNameActivity.java new file mode 100644 index 000000000..db650eeaa --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/setting/EnterpriseNameActivity.java @@ -0,0 +1,69 @@ +package net.coding.program.setting; + +import android.app.Activity; +import android.text.TextUtils; +import android.widget.EditText; + +import com.loopj.android.http.RequestParams; + +import net.coding.program.R; +import net.coding.program.common.Global; +import net.coding.program.common.model.EnterpriseDetail; +import net.coding.program.common.model.EnterpriseInfo; +import net.coding.program.common.ui.BackActivity; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.EActivity; +import org.androidannotations.annotations.OptionsItem; +import org.androidannotations.annotations.OptionsMenu; +import org.androidannotations.annotations.ViewById; +import org.json.JSONException; +import org.json.JSONObject; + +@EActivity(R.layout.activity_enterprise_name) +@OptionsMenu(R.menu.enterprise_edit_name_menu) +public class EnterpriseNameActivity extends BackActivity { + private static final String HOST_UPDATE_NAME = "HOST_UPDATE_NAME"; + public final String HOST_CURRENT = getHostCurrent(); + + public static String getHostCurrent() { + String host = String.format("%s/team/%s", Global.HOST_API, EnterpriseInfo.instance().getGlobalkey()); + return host + "/update"; + } + + @ViewById + EditText enterpriseNameEt; + + @AfterViews + void initView() { + setActionBarTitle(getString(R.string.enterprise_name)); + enterpriseNameEt.setText(EnterpriseInfo.instance().getName()); + } + + @OptionsItem + void action_edit_name() { + String name = enterpriseNameEt.getText().toString(); + if (!TextUtils.isEmpty(name)) { + RequestParams params = new RequestParams(); + params.put("name", name); + params.put("introduction", ""); + params.put("global_key", EnterpriseInfo.instance().getGlobalkey()); + postNetwork(HOST_CURRENT, params, HOST_UPDATE_NAME); + } + } + + @Override + public void parseJson(int code, JSONObject respanse, String tag, int pos, Object data) throws JSONException { + if (tag.equals(HOST_UPDATE_NAME)) { + if (code == 0) { + JSONObject dataObject = respanse.optJSONObject("data"); + EnterpriseDetail detail = new EnterpriseDetail(dataObject); + EnterpriseInfo.instance().update(this, detail); + setResult(Activity.RESULT_OK); + this.finish(); + } else { + showErrorMsg(code, respanse); + } + } + } +} diff --git a/app/src/enterprise/java/net/coding/program/setting/EnterpriseSettingActivity.java b/app/src/enterprise/java/net/coding/program/setting/EnterpriseSettingActivity.java new file mode 100644 index 000000000..0f7cbcab1 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/setting/EnterpriseSettingActivity.java @@ -0,0 +1,212 @@ +package net.coding.program.setting; + +import android.app.Activity; +import android.content.DialogInterface; +import android.content.Intent; +import android.net.Uri; +import android.os.Build; +import android.provider.MediaStore; +import android.support.v7.app.AlertDialog; +import android.widget.TextView; + +import com.loopj.android.http.RequestParams; +import com.nostra13.universalimageloader.core.ImageLoader; + +import net.coding.program.R; +import net.coding.program.common.CameraPhotoUtil; +import net.coding.program.common.Global; +import net.coding.program.common.ImageLoadTool; +import net.coding.program.common.model.EnterpriseDetail; +import net.coding.program.common.model.EnterpriseInfo; +import net.coding.program.common.ui.BackActivity; +import net.coding.program.common.util.FileUtil; +import net.coding.program.common.widget.FileProviderHelp; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.Click; +import org.androidannotations.annotations.EActivity; +import org.androidannotations.annotations.OnActivityResult; +import org.androidannotations.annotations.ViewById; +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.File; + +import de.hdodenhof.circleimageview.CircleImageView; + +import static android.content.Intent.FLAG_GRANT_READ_URI_PERMISSION; +import static android.content.Intent.FLAG_GRANT_WRITE_URI_PERMISSION; + +@EActivity(R.layout.activity_enterprise_setting) +public class EnterpriseSettingActivity extends BackActivity { + private static final int REQUEST_UPDATE_NAME = 1000; + private static final int RESULT_REQUEST_PHOTO = 1001; + private static final int RESULT_REQUEST_PHOTO_CROP = 1002; + + private static final String UPLOAD_IMG = "UPLOAD_IMG"; + private static final String PUT_IMG = "PUT_IMG"; + private static final String GET_IMG_DATA = "GET_IMG_DATA"; + + private final String uploadImgHost = getUploadImgHost(); + private final String updateImgHost = getUpdateHost(); + private final String getImgData = getImgHost(); + + @ViewById + CircleImageView enterpriseHead; + @ViewById + TextView enterpriseNameTv; + @ViewById + TextView personIp; + + private String getUploadImgHost() { + String host = String.format("%s/user", Global.HOST_API); + return host + "/avatar"; + } + + private String getUpdateHost() { + String host = String.format("%s/team/%s", Global.HOST_API, EnterpriseInfo.instance().getGlobalkey()); + return host + "/avatar"; + } + + private String getImgHost() { + String host = String.format("%s/team/%s", Global.HOST_API, EnterpriseInfo.instance().getGlobalkey()); + return host + "/get"; + } + + @AfterViews + void initView() { + setActionBarTitle(getString(R.string.enterprise_setting)); + ImageLoader.getInstance().displayImage(EnterpriseInfo.instance().getAvatar(), + enterpriseHead, EnterpriseAccountActivity.enterpriseIconOptions); + enterpriseNameTv.setText(EnterpriseInfo.instance().getName()); + personIp.setText(EnterpriseInfo.instance().getGlobalkey()); + } + + @Click + void enterpriseName() { + EnterpriseNameActivity_.intent(this).startForResult(REQUEST_UPDATE_NAME); + } + + @Click + void enterpriseHeadLayout() { + setIcon(); + } + + void setIcon() { + AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.MyAlertDialogStyle); + builder.setTitle("更换头像") + .setItems(R.array.camera_gallery, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + if (which == 0) { + camera(); + } else { + photo(); + } + } + }); + AlertDialog dialog = builder.create(); + dialog.show(); + } + + private Uri fileUri; + private Uri fileCropUri; + + private void camera() { + File tempFile = CameraPhotoUtil.getCacheFile(this); + fileUri = FileProviderHelp.getUriForFile(this, tempFile); + + Intent intentFromCapture = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + intentFromCapture.putExtra(MediaStore.EXTRA_OUTPUT, fileUri); + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {//7.0及以上 + intentFromCapture.addFlags(FLAG_GRANT_READ_URI_PERMISSION); + intentFromCapture.addFlags(FLAG_GRANT_WRITE_URI_PERMISSION); + } + + startActivityForResult(intentFromCapture, RESULT_REQUEST_PHOTO); + } + + private void photo() { + Intent i = new Intent(Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI); + startActivityForResult(i, RESULT_REQUEST_PHOTO); + } + + @OnActivityResult(REQUEST_UPDATE_NAME) + void updateNameResult(int result) { + if (result == Activity.RESULT_OK) { + enterpriseNameTv.setText(EnterpriseInfo.instance().getName()); + setResult(Activity.RESULT_OK); + } + } + + @OnActivityResult(RESULT_REQUEST_PHOTO) + void updateHeadResult(int result, Intent data) { + if (result == Activity.RESULT_OK) { + if (data != null && data.getData() != null) { + fileUri = data.getData(); + } + + fileCropUri = CameraPhotoUtil.getOutputMediaFileUri(); + Global.startPhotoZoom(this, fileUri, fileCropUri, RESULT_REQUEST_PHOTO_CROP); + } + } + + @OnActivityResult(RESULT_REQUEST_PHOTO_CROP) + void updatePhotoCropResult(int result, Intent data) { + if (result == Activity.RESULT_OK) { + try { + String filePath = FileUtil.getPath(this, fileCropUri); + RequestParams params = new RequestParams(); + params.put("images.jpg", new File(filePath)); + postNetwork(uploadImgHost, params, UPLOAD_IMG); + showDialogLoading(); + } catch (Exception e) { + Global.errorLog(e); + } + } + } + + @Override + public void parseJson(int code, JSONObject respanse, String tag, int pos, Object data) throws JSONException { + if (tag.equals(UPLOAD_IMG)) { + if (code == 0) { + String url = respanse.optString("data"); + putImg(url); + } else { + showErrorMsg(code, respanse); + hideProgressDialog(); + } + } else if (tag.equals(PUT_IMG)) { + hideProgressDialog(); + if (code == 0) { + getImgData(); + } else { + showErrorMsg(code, respanse); + hideProgressDialog(); + } + } else if (tag.equals(GET_IMG_DATA)) { + hideProgressDialog(); + if (code == 0) { + JSONObject dataObject = respanse.optJSONObject("data"); + EnterpriseDetail detail = new EnterpriseDetail(dataObject); + EnterpriseInfo.instance().update(this, detail); + ImageLoader.getInstance().displayImage(EnterpriseInfo.instance().getAvatar(), enterpriseHead, ImageLoadTool.options); + } else { + showErrorMsg(code, respanse); + } + } + + setResult(Activity.RESULT_OK); + } + + private void putImg(String url) { + RequestParams params = new RequestParams(); + params.put("url", url); + putNetwork(updateImgHost, params, PUT_IMG); + } + + public void getImgData() { + getNetwork(getImgHost(), GET_IMG_DATA); + } +} diff --git a/app/src/enterprise/java/net/coding/program/setting/EnterpriseSupportActivity.kt b/app/src/enterprise/java/net/coding/program/setting/EnterpriseSupportActivity.kt new file mode 100644 index 000000000..5eca84aa7 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/setting/EnterpriseSupportActivity.kt @@ -0,0 +1,56 @@ +package net.coding.program.setting + +import android.app.Activity +import android.content.Context +import android.content.DialogInterface +import android.content.Intent +import android.net.Uri +import net.coding.program.R +import net.coding.program.common.Global +import net.coding.program.common.ui.BackActivity +import org.androidannotations.annotations.Click +import org.androidannotations.annotations.EActivity + +@EActivity(R.layout.activity_enterprise_support) +open class EnterpriseSupportActivity : BackActivity() { + + @Click + fun itemPhone() { + dialPhoneNumber(this, "400-930-9163") + } + + @Click + fun itemEmail() { + composeEmail(this, arrayOf("enterprise@coding.net")) + } + + @Click + fun itemQQ() = try { + val uri1 = "mqqwpa://im/chat?chat_type=wpa&uin=2847276903&version=1" + startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(uri1))) + } catch (e: Exception) { + showDialog("已复制 QQ 号到剪贴板", + object : DialogInterface.OnClickListener { + override fun onClick(dialog: DialogInterface?, which: Int) { + Global.copy(this@EnterpriseSupportActivity, "2847276903") + } + }) + } + + fun dialPhoneNumber(activity: Activity, phoneNumber: String) { + val intent = Intent(Intent.ACTION_DIAL) + intent.data = Uri.parse("tel:$phoneNumber") + if (intent.resolveActivity(activity.packageManager) != null) { + activity.startActivity(intent) + } + } + + fun composeEmail(context: Context, addresses: Array) { + val intent = Intent(Intent.ACTION_SENDTO) + intent.data = Uri.parse("mailto:") // only email apps should handle this + intent.putExtra(Intent.EXTRA_EMAIL, addresses) + if (intent.resolveActivity(context.packageManager) != null) { + context.startActivity(intent) + } + } +} diff --git a/app/src/enterprise/java/net/coding/program/setting/ManageMemberActivity.java b/app/src/enterprise/java/net/coding/program/setting/ManageMemberActivity.java new file mode 100644 index 000000000..7984161c6 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/setting/ManageMemberActivity.java @@ -0,0 +1,349 @@ +package net.coding.program.setting; + +import android.os.Handler; +import android.os.Message; +import android.support.annotation.NonNull; +import android.support.v7.app.AlertDialog; +import android.support.v7.widget.LinearLayoutManager; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.EditText; +import android.widget.ImageView; +import android.widget.TextView; +import android.widget.Toast; + +import com.marshalchen.ultimaterecyclerview.UltimateRecyclerView; +import com.marshalchen.ultimaterecyclerview.UltimateRecyclerviewViewHolder; +import com.marshalchen.ultimaterecyclerview.quickAdapter.easyRegularAdapter; + +import net.coding.program.R; +import net.coding.program.common.Global; +import net.coding.program.common.GlobalData; +import net.coding.program.common.SimpleSHA1; +import net.coding.program.common.WeakRefHander; +import net.coding.program.common.model.AccountInfo; +import net.coding.program.common.model.EnterpriseInfo; +import net.coding.program.common.model.team.TeamMember; +import net.coding.program.common.ui.BackActivity; +import net.coding.program.common.ui.shadow.RecyclerViewSpace; +import net.coding.program.common.umeng.UmengEvent; +import net.coding.program.login.auth.AuthInfo; +import net.coding.program.login.auth.TotpClock; +import net.coding.program.network.BaseHttpObserver; +import net.coding.program.network.HttpObserver; +import net.coding.program.network.Network; +import net.coding.program.network.constant.MemberAuthority; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.EActivity; +import org.androidannotations.annotations.OnActivityResult; +import org.androidannotations.annotations.ViewById; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.ArrayList; +import java.util.List; + +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +@EActivity(R.layout.activity_manage_member) +public class ManageMemberActivity extends BackActivity implements Handler.Callback { + + private static final String TAG_PROJECT = "TAG_PROJECT"; + + private static final int RESULT_SET_ENTERPRISE_ROLE = 1; + private static final int RESULT_REMOVE_MEMBER = 2; + + @ViewById + UltimateRecyclerView listView; + + MemberAdapter adapter; + + ArrayList listData = new ArrayList<>(); + + @AfterViews + void initManageMemberActivity() { + listView.setLayoutManager(new LinearLayoutManager(this)); + listView.addItemDecoration(new RecyclerViewSpace(this)); + listView.setEmptyView(R.layout.fragment_enterprise_project_empty, R.layout.fragment_enterprise_project_empty); + + adapter = new MemberAdapter(listData); + listView.setAdapter(adapter); + listView.setDefaultOnRefreshListener(() -> onRefresh()); + listView.enableDefaultSwipeRefresh(true); + + onRefresh(); + + hander2fa = new WeakRefHander(this, 100); + } + + private void onRefresh() { + String host = String.format("%s/team/%s/members", Global.HOST_API, GlobalData.getEnterpriseGK()); + getNetwork(host, TAG_PROJECT); + } + + protected class MemberAdapter extends easyRegularAdapter { + + public MemberAdapter(List list) { + super(list); + } + + @Override + protected int getNormalLayoutResId() { + return R.layout.enterprise_manage_member_list_item; + } + + @Override + protected ProjectHolder newViewHolder(View view) { + ProjectHolder holder = new ProjectHolder(view); + holder.actionMore.setOnClickListener(clickItemMore); + holder.rootLayout.setOnClickListener(clickItemMore); + holder.rootLayout.setOnLongClickListener(longClickItem); + return holder; + } + + @Override + protected void withBindHolder(ProjectHolder holder, TeamMember data, int position) { + TeamMember item = getItem(position); + holder.name.setText(item.user.name); + holder.joinTime.setText(String.format("加入时间：%s", Global.mDateYMDHH.format(data.updatedat))); + holder.rootLayout.setTag(item); + holder.actionMore.setTag(item); + + MemberAuthority memberType = item.getType(); + int iconRes = memberType.getIcon(); + holder.name.setCompoundDrawablesWithIntrinsicBounds(0, 0, iconRes, 0); + iconfromNetwork(holder.image, item.user.avatar); + } + + @Override + public ProjectHolder newHeaderHolder(View view) { + return new ProjectHolder(view, true); + } + + @Override + public ProjectHolder newFooterHolder(View view) { + return new ProjectHolder(view, true); + } + } + + private View.OnClickListener clickItemMore = this::actionMore; + + private View.OnLongClickListener longClickItem = v -> { + actionMore(v); + return true; + }; + + private void actionMore(View v) { + TeamMember user = (TeamMember) v.getTag(); + if ((user.getType() == MemberAuthority.ower)) { + new AlertDialog.Builder(this, R.style.MyAlertDialogStyle) + .setItems(R.array.manager_member_to_owner, ((dialog, which) -> { + if (which == 0) { + actionModifyProjectRole(user); + } + })) + .show(); + } else if (EnterpriseInfo.instance().isOwner()) { + new AlertDialog.Builder(this, R.style.MyAlertDialogStyle) + .setItems(R.array.manager_member_by_owner, ((dialog, which) -> { + if (which == 0) { + actionModifyEnterpriseRole(user); + } else if (which == 1) { + actionModifyProjectRole(user); + } else if (which == 2) { + actionRemove(user); + } + })) + .show(); + } else { + new AlertDialog.Builder(this, R.style.MyAlertDialogStyle) + .setItems(R.array.manager_member_by_manager, ((dialog, which) -> { + if (which == 0) { + actionModifyProjectRole(user); + } else if (which == 1) { + actionRemove(user); + } + })) + .show(); + } + } + + public static class ProjectHolder extends UltimateRecyclerviewViewHolder { + + public TextView name; + public TextView joinTime; + public ImageView image; + public View rootLayout; + public View actionMore; + + public ProjectHolder(View view, boolean isHeader) { + super(view); + } + + public ProjectHolder(View view) { + super(view); + rootLayout = view; + name = (TextView) view.findViewById(R.id.name); + joinTime = (TextView) view.findViewById(R.id.joinTime); + image = (ImageView) view.findViewById(R.id.icon); + actionMore = view.findViewById(R.id.actionMore); + } + } + + @Override + public void parseJson(int code, JSONObject respanse, String tag, int pos, Object data) throws JSONException { + if (tag.equals(TAG_PROJECT)) { + if (code == 0) { + listData.clear(); + JSONArray array = respanse.optJSONArray("data"); + for (int i = 0; i < array.length(); ++i) { + listData.add(new TeamMember(array.optJSONObject(i))); + } + + adapter.notifyDataSetChanged(); + } else { + showErrorMsg(code, respanse); + } + } + } + + Handler hander2fa; + private EditText edit2fa; + + private void actionRemove(TeamMember user) { + Network.getRetrofit(this) + .need2FA() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new HttpObserver(ManageMemberActivity.this) { + @Override + public void onSuccess(String data) { + if (data.equals("totp")) { + actionRemove2FA(user); + } else { // password + actionRemoveNormal(user); + } + } + }); + } + + private void actionRemove2FA(TeamMember user) { + hander2fa.sendEmptyMessage(0); + LayoutInflater factory = LayoutInflater.from(this); + final View textEntryView = factory.inflate(R.layout.dialog_delete_project_2fa, null); + edit2fa = (EditText) textEntryView.findViewById(R.id.edit1); + AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.MyAlertDialogStyle); + AlertDialog dialog = builder + .setView(textEntryView) + .setPositiveButton("确定", (dialog1, whichButton) -> { + String editStr1 = edit2fa.getText().toString().trim(); + if (TextUtils.isEmpty(editStr1)) { + Toast.makeText(ManageMemberActivity.this, "密码不能为空", Toast.LENGTH_LONG).show(); + return; + } + actionDelete2FA(user, editStr1); + }) + .setNegativeButton("取消", null) + .show(); + + dialog.setOnDismissListener(dialog1 -> { + hander2fa.removeMessages(0); + edit2fa = null; + }); + } + + private void actionRemoveNormal(TeamMember user) { + LayoutInflater factory = LayoutInflater.from(this); + final View textEntryView = factory.inflate(R.layout.dialog_delete_project, null); + edit2fa = textEntryView.findViewById(R.id.edit1); + AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.MyAlertDialogStyle); + AlertDialog dialog = builder + .setView(textEntryView) + .setPositiveButton("确定", (dialog1, whichButton) -> { + String editStr1 = edit2fa.getText().toString().trim(); + if (TextUtils.isEmpty(editStr1)) { + Toast.makeText(ManageMemberActivity.this, "密码不能为空", Toast.LENGTH_LONG).show(); + return; + } + actionDelete2FA(user, SimpleSHA1.sha1(editStr1)); + }) + .setNegativeButton("取消", null) + .show(); + + dialog.setOnDismissListener(dialog1 -> { + hander2fa.removeMessages(0); + edit2fa = null; + }); + } + + private void actionDelete2FA(TeamMember user, String code) { + Network.getRetrofit(this) + .removeEnterpriseMember(GlobalData.getEnterpriseGK(), user.user.global_key, code) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new BaseHttpObserver(this) { + @Override + public void onSuccess() { + super.onSuccess(); + umengEvent(UmengEvent.E_USER_CENTER, "删除企业成员"); + showProgressBar(false); + + listData.remove(user); + adapter.notifyDataSetChanged(); + } + + @Override + public void onFail(int errorCode, @NonNull String error) { + super.onFail(errorCode, error); + showProgressBar(false); + } + }); + + showProgressBar(true); + } + + @Override + public boolean handleMessage(Message msg) { + if (edit2fa != null) { + String secret = AccountInfo.loadAuth(this, GlobalData.sUserObject.global_key); + if (secret.isEmpty()) { + return true; + } + + String code2FA = new AuthInfo(secret, new TotpClock(this)).getCode(); + edit2fa.setText(code2FA); + } + return true; + } + + private void actionModifyProjectRole(TeamMember user) { + CommonPickProjectActivity_.intent(this) + .member(user) + .start(); + } + + private void actionModifyEnterpriseRole(TeamMember user) { + SetEnterpriseAuthorityActivity_.intent(this) + .globayKey(user.user.global_key) + .authority(user.getType()) + .startForResult(RESULT_SET_ENTERPRISE_ROLE); + } + + @OnActivityResult(RESULT_SET_ENTERPRISE_ROLE) + void onResultSetEnterpriseRole(int resultCode, @OnActivityResult.Extra int intentData, + @OnActivityResult.Extra String intentData1) { + if (resultCode == RESULT_OK) { + for (TeamMember item : listData) { + if (item.user.global_key.equals(intentData1)) { + item.role = intentData; + break; + } + } + } + } + +} diff --git a/app/src/enterprise/java/net/coding/program/setting/ManageProjectListActivity.java b/app/src/enterprise/java/net/coding/program/setting/ManageProjectListActivity.java new file mode 100644 index 000000000..cfd279074 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/setting/ManageProjectListActivity.java @@ -0,0 +1,367 @@ +package net.coding.program.setting; + +import android.os.Handler; +import android.support.v7.app.AlertDialog; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.text.TextUtils; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.EditText; +import android.widget.ImageView; +import android.widget.TextView; + +import com.marshalchen.ultimaterecyclerview.UltimateRecyclerviewViewHolder; +import com.marshalchen.ultimaterecyclerview.stickyheadersrecyclerview.StickyRecyclerHeadersDecoration; + +import net.coding.program.R; +import net.coding.program.common.GlobalData; +import net.coding.program.common.ImageLoadTool; +import net.coding.program.common.SimpleSHA1; +import net.coding.program.common.WeakRefHander; +import net.coding.program.common.model.AccountInfo; +import net.coding.program.common.model.ProjectObject; +import net.coding.program.common.ui.BackActivity; +import net.coding.program.common.ui.shadow.RecyclerViewSpace; +import net.coding.program.common.umeng.UmengEvent; +import net.coding.program.common.widget.CommonAdapter; +import net.coding.program.common.widget.CommonListView; +import net.coding.program.login.auth.AuthInfo; +import net.coding.program.login.auth.TotpClock; +import net.coding.program.network.BaseHttpObserver; +import net.coding.program.network.HttpObserver; +import net.coding.program.network.Network; +import net.coding.program.project.EventProjectModify; +import net.coding.program.project.ProjectHomeActivity_; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.EActivity; +import org.androidannotations.annotations.ViewById; +import org.greenrobot.eventbus.Subscribe; +import org.greenrobot.eventbus.ThreadMode; + +import java.util.ArrayList; +import java.util.List; + +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +@EActivity(R.layout.common_simple_listview) +public class ManageProjectListActivity extends BackActivity { + + @ViewById + CommonListView listView; + + ProjectAdapter adapter; + + ArrayList listData = new ArrayList<>(); + private List listJoinData = new ArrayList<>(); + + Handler hander2fa; + private EditText edit2fa; + + @AfterViews + void initManageProjectListActivity() { + listView.setLayoutManager(new LinearLayoutManager(this)); + listView.addItemDecoration(new RecyclerViewSpace(this)); + + adapter = new ProjectAdapter(listData); + StickyRecyclerHeadersDecoration stickyHeader = new StickyRecyclerHeadersDecoration(adapter); + listView.addItemDecoration(stickyHeader); + + listView.setAdapter(adapter); + listView.setDefaultOnRefreshListener(() -> onRefresh()); + listView.enableDefaultSwipeRefresh(true); + + onRefresh(); + + hander2fa = new WeakRefHander(msg -> { + if (edit2fa != null) { + String secret = AccountInfo.loadAuth(getApplicationContext(), GlobalData.sUserObject.global_key); + if (secret.isEmpty()) { + return true; + } + + String code2FA = new AuthInfo(secret, new TotpClock(getApplicationContext())).getCode(); + edit2fa.setText(code2FA); + } + return true; + }, 100); + + } + + private void onRefresh() { + Network.getRetrofit(this) + .getProjects() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .flatMap(listHttpResult -> { + if (listHttpResult == null) { + return null; + } + listJoinData.clear(); + listJoinData.addAll(listHttpResult.data.list); + return Network.getRetrofit(ManageProjectListActivity.this, listView) + .getManagerProjects(GlobalData.getEnterpriseGK()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()); + }) + .subscribe(new HttpObserver>(this, listView) { + @Override + public void onSuccess(List data) { + super.onSuccess(data); + listData.clear(); + + int joinedPos = 0; + for (ProjectObject item : data) { + boolean find = false; + for (ProjectObject join : listJoinData) { + if (join.id == item.id) { + find = true; + join.memberNum = item.memberNum; + listData.add(joinedPos++, join); + break; + } + } + + if (!find) { + listData.add(item); + } + } + } + }); + } + + public static class DynamicSectionHolder extends UltimateRecyclerviewViewHolder { + + public static final int LAYOUT = R.layout.fragment_project_dynamic_list_head; + + public TextView head; + + public DynamicSectionHolder(View v) { + super(v); + head = (TextView) v.findViewById(R.id.head); + } + } + + protected class ProjectAdapter extends CommonAdapter { + + public ProjectAdapter(List list) { + super(list); + } + + @Override + protected int getNormalLayoutResId() { + return R.layout.enterprise_manage_project_list_item; + } + + @Override + protected ProjectHolder newViewHolder(View view) { + ProjectHolder holder = new ProjectHolder(view); + holder.rootLayout.setOnClickListener(clickItem); + holder.rootLayout.setOnLongClickListener(longClickItem); + holder.actionMore.setOnClickListener(clickItemMore); + return holder; + } + + @Override + protected void withBindHolder(ProjectHolder holder, ProjectObject data, int position) { + ProjectObject item = getItem(position); + holder.name.setText(item.name); + holder.memberCount.setText(String.format("%s 人", data.memberNum)); + holder.rootLayout.setTag(item); + holder.actionMore.setTag(item); + iconfromNetwork(holder.image, item.icon, ImageLoadTool.optionsRounded2); + } + + @Override + public long generateHeaderId(int i) { + if (getItem(i).isJoined()) { + return 0; + } else { + return 1; + } + } + + @Override + public ProjectHolder newHeaderHolder(View view) { + return new ProjectHolder(view, true); + } + + @Override + public void onBindHeaderViewHolder(RecyclerView.ViewHolder viewHolder, int pos) { + DynamicSectionHolder holder = (DynamicSectionHolder) viewHolder; + if (generateHeaderId(pos) == 0) { + holder.head.setText("我参与的"); + } else { + holder.head.setText("我未参与的"); + } + } + + @Override + public UltimateRecyclerviewViewHolder onCreateHeaderViewHolder(ViewGroup parent) { + View v = LayoutInflater.from(parent.getContext()).inflate(DynamicSectionHolder.LAYOUT, parent, false); + return new DynamicSectionHolder(v); + } + + @Override + public boolean hasHeaderView() { + return super.hasHeaderView(); + } + + @Override + public long getHeaderId(int position) { + return super.getHeaderId(position); + } + + @Override + public ProjectHolder newFooterHolder(View view) { + return new ProjectHolder(view, true); + } + } + + public static class ProjectHolder extends UltimateRecyclerviewViewHolder { + + public TextView name; + public TextView memberCount; + public ImageView image; + public View rootLayout; + public View actionMore; + + public ProjectHolder(View view, boolean isHeader) { + super(view); + } + + public ProjectHolder(View view) { + super(view); + rootLayout = view; + name = (TextView) view.findViewById(R.id.name); + memberCount = (TextView) view.findViewById(R.id.memberCount); + image = (ImageView) view.findViewById(R.id.icon); + actionMore = view.findViewById(R.id.actionMore); + } + } + + private View.OnClickListener clickItem = v -> { + Object object = v.getTag(); + if (object instanceof ProjectObject) { + ProjectObject item = (ProjectObject) object; + + if (item.isJoined()) { + ProjectHomeActivity_.intent(this) + .mProjectObject(item) + .start(); + } else { + showMiddleToast("无权进入项目"); + } + } + }; + + private View.OnLongClickListener longClickItem = v -> { + actionMore(v); + + return true; + }; + + private void actionMore(View v) { + ProjectObject project = (ProjectObject) v.getTag(); + new AlertDialog.Builder(v.getContext(), R.style.MyAlertDialogStyle) + .setItems(R.array.manager_project_item, (dialog, which) -> { + if (which == 0) { + Network.getRetrofit(ManageProjectListActivity.this) + .need2FA() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new HttpObserver(ManageProjectListActivity.this) { + @Override + public void onSuccess(String data) { + if (data.equals("totp")) { + showDeleteDialog2fa(project); + } else { // password + showDeleteDialog(project); + } + } + }); + } + }) + .show(); + } + + private View.OnClickListener clickItemMore = this::actionMore; + + private void showDeleteDialog2fa(ProjectObject project) { + hander2fa.sendEmptyMessage(0); + LayoutInflater factory = LayoutInflater.from(this); + final View textEntryView = factory.inflate(R.layout.dialog_delete_project_2fa, null); + edit2fa = (EditText) textEntryView.findViewById(R.id.edit1); + AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.MyAlertDialogStyle); + AlertDialog dialog = builder + .setView(textEntryView) + .setPositiveButton("确定", (dialog1, whichButton) -> { + String editStr1 = edit2fa.getText().toString().trim(); + if (TextUtils.isEmpty(editStr1)) { + showMiddleToast("验证码不能为空"); + return; + } + actionDelete2FA(project, editStr1); + }) + .setNegativeButton("取消", null) + .show(); + + dialog.setOnDismissListener(dialog1 -> { + hander2fa.removeMessages(0); + edit2fa = null; + }); + } + + private void showDeleteDialog(ProjectObject project) { + LayoutInflater factory = LayoutInflater.from(this); + final View textEntryView = factory.inflate(R.layout.dialog_delete_project, null); + final EditText edit1 = (EditText) textEntryView.findViewById(R.id.edit1); + new AlertDialog.Builder(this, R.style.MyAlertDialogStyle) + .setTitle("需要验证密码") + .setView(textEntryView) + .setPositiveButton("确定", (dialog1, whichButton) -> { + String editStr1 = edit1.getText().toString().trim(); + if (TextUtils.isEmpty(editStr1)) { + showMiddleToast("密码不能为空"); + return; + } + + actionDelete2FA(project, SimpleSHA1.sha1(editStr1)); + }) + .setNegativeButton("取消", null) + .show(); + } + + + private void actionDelete2FA(final ProjectObject project, String password) { + Network.getRetrofit(this) + .deleteProject(project.getV2PathById(), password) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new BaseHttpObserver(this) { + @Override + public void onSuccess() { + super.onSuccess(); + + umengEvent(UmengEvent.E_USER_CENTER, "删除企业项目"); + + showButtomToast("删除成功"); + listData.remove(project); + adapter.notifyDataSetChanged(); + } + }); + } + + @Override + protected boolean userEventBus() { + return true; + } + + @Subscribe(threadMode = ThreadMode.MAIN) + public void onEventProjectModify(EventProjectModify event) { + onRefresh(); + } +} diff --git a/app/src/enterprise/java/net/coding/program/setting/SetEnterpriseAuthorityActivity.java b/app/src/enterprise/java/net/coding/program/setting/SetEnterpriseAuthorityActivity.java new file mode 100644 index 000000000..7ece270e9 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/setting/SetEnterpriseAuthorityActivity.java @@ -0,0 +1,92 @@ +package net.coding.program.setting; + +import android.content.Intent; +import android.support.annotation.NonNull; + +import net.coding.program.R; +import net.coding.program.common.GlobalData; +import net.coding.program.common.ui.BackActivity; +import net.coding.program.common.umeng.UmengEvent; +import net.coding.program.network.BaseHttpObserver; +import net.coding.program.network.Network; +import net.coding.program.network.constant.MemberAuthority; +import net.coding.program.project.detail.DropdownListItemView; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.Click; +import org.androidannotations.annotations.EActivity; +import org.androidannotations.annotations.Extra; +import org.androidannotations.annotations.ViewById; + +import rx.android.schedulers.AndroidSchedulers; +import rx.schedulers.Schedulers; + +@EActivity(R.layout.activity_set_enterprise_authority) +public class SetEnterpriseAuthorityActivity extends BackActivity { + + @Extra + MemberAuthority authority; + + @Extra + String globayKey; + + @ViewById + DropdownListItemView enterprseManager, enterpriseMember; + + @AfterViews + void initMemberAuthorityActivity() { + enterprseManager.setText("管理员"); + enterpriseMember.setText("普通成员"); + + enterprseManager.setChecked(false); + enterpriseMember.setChecked(false); + + switch (authority) { + case manager: + enterprseManager.setChecked(true); + break; + case member: + enterpriseMember.setChecked(true); + break; + } + } + + @Click + void enterprseManager() { + modifyAuthority(MemberAuthority.manager.getType()); + } + + @Click + void enterpriseMember() { + modifyAuthority(MemberAuthority.member.getType()); + } + + private void modifyAuthority(int id) { + Network.getRetrofit(this) + .setEnterpriseRole(GlobalData.getEnterpriseGK(), globayKey, id) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new BaseHttpObserver(this) { + @Override + public void onSuccess() { + super.onSuccess(); + umengEvent(UmengEvent.E_USER_CENTER, "企业角色设置"); + showProgressBar(false); + + Intent intent = new Intent(); + intent.putExtra("intentData", id); + intent.putExtra("intentData1", globayKey); + setResult(RESULT_OK, intent); + + finish(); + } + + @Override + public void onFail(int errorCode, @NonNull String error) { + super.onFail(errorCode, error); + showProgressBar(false); + } + }); + showProgressBar(true); + } +} diff --git a/app/src/enterprise/java/net/coding/program/setting/order/BillingListFragment.java b/app/src/enterprise/java/net/coding/program/setting/order/BillingListFragment.java new file mode 100644 index 000000000..dbf1e7a25 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/setting/order/BillingListFragment.java @@ -0,0 +1,116 @@ +package net.coding.program.setting.order; + + +import android.content.Context; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.view.View; +import android.widget.TextView; + +import com.marshalchen.ultimaterecyclerview.UltimateRecyclerView; +import com.marshalchen.ultimaterecyclerview.UltimateRecyclerviewViewHolder; +import com.marshalchen.ultimaterecyclerview.quickAdapter.easyRegularAdapter; + +import net.coding.program.R; +import net.coding.program.common.event.EventRefresh; +import net.coding.program.common.model.payed.Billing; +import net.coding.program.common.ui.BaseFragment; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.EFragment; +import org.androidannotations.annotations.ViewById; +import org.greenrobot.eventbus.EventBus; +import org.greenrobot.eventbus.Subscribe; +import org.greenrobot.eventbus.ThreadMode; + +import java.util.List; + +@EFragment(R.layout.common_ul_recyclerview) +public class BillingListFragment extends BaseFragment { + + @ViewById + UltimateRecyclerView listView; + + MyAdapter myAdapter; + + @AfterViews + void initBillingListFragment() { + OrderMainActivity activity = (OrderMainActivity) getActivity(); + + RecyclerView.LayoutManager manager = new LinearLayoutManager(getActivity()); + listView.setLayoutManager(manager); + myAdapter = new MyAdapter(activity.getBillingList()); + listView.setAdapter(myAdapter); + } + + @Override + public void onAttach(Context context) { + super.onAttach(context); + EventBus.getDefault().register(this); + } + + @Override + public void onDetach() { + super.onDetach(); + EventBus.getDefault().unregister(this); + } + + @Subscribe(threadMode = ThreadMode.MAIN) + public void onEventRefresh(EventRefresh event) { + if (event.refresh) { + myAdapter.notifyDataSetChanged(); + } + } + + protected class MyAdapter extends easyRegularAdapter { + + public MyAdapter(List list) { + super(list); + } + + @Override + protected int getNormalLayoutResId() { + return R.layout.billing_item; + } + + @Override + protected BillingListFragment.ViewHolder newViewHolder(View view) { + return new BillingListFragment.ViewHolder(view); + } + + @Override + protected void withBindHolder(BillingListFragment.ViewHolder holder, Billing data, int position) { + holder.title.setText(data.getTitle()); + holder.count.setText(String.format("%s 人", data.userCount)); + holder.price.setText(String.format("¥ %s", data.price)); + holder.time.setText(data.getTime()); + + if (position == source.size() - 1) { + holder.nextTopDivide.setVisibility(View.GONE); + } else { + holder.nextTopDivide.setVisibility(View.VISIBLE); + } + } + } + + class ViewHolder extends UltimateRecyclerviewViewHolder { + + private TextView title; + private TextView count; + private TextView price; + private TextView time; + private View nextTopDivide; + + public ViewHolder(View view) { + super(view); + + title = (TextView) view.findViewById(R.id.title); + count = (TextView) view.findViewById(R.id.count); + price = (TextView) view.findViewById(R.id.price); + time = (TextView) view.findViewById(R.id.time); + nextTopDivide = view.findViewById(R.id.nextTopDivide); + } + } + + +} diff --git a/app/src/enterprise/java/net/coding/program/setting/order/EmptyFragment.java b/app/src/enterprise/java/net/coding/program/setting/order/EmptyFragment.java new file mode 100644 index 000000000..f801ce332 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/setting/order/EmptyFragment.java @@ -0,0 +1,13 @@ +package net.coding.program.setting.order; + + +import net.coding.program.R; +import net.coding.program.common.ui.BaseFragment; + +import org.androidannotations.annotations.EFragment; + +@EFragment(R.layout.order_empty) +public class EmptyFragment extends BaseFragment { + + +} diff --git a/app/src/enterprise/java/net/coding/program/setting/order/OrderListFragment.java b/app/src/enterprise/java/net/coding/program/setting/order/OrderListFragment.java new file mode 100644 index 000000000..d970436e2 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/setting/order/OrderListFragment.java @@ -0,0 +1,129 @@ +package net.coding.program.setting.order; + + +import android.content.Context; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.view.View; +import android.widget.TextView; + +import com.marshalchen.ultimaterecyclerview.UltimateRecyclerView; +import com.marshalchen.ultimaterecyclerview.UltimateRecyclerviewViewHolder; +import com.marshalchen.ultimaterecyclerview.quickAdapter.easyRegularAdapter; + +import net.coding.program.R; +import net.coding.program.common.event.EventRefresh; +import net.coding.program.common.model.payed.Order; +import net.coding.program.common.ui.BaseFragment; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.EFragment; +import org.androidannotations.annotations.ViewById; +import org.greenrobot.eventbus.EventBus; +import org.greenrobot.eventbus.Subscribe; +import org.greenrobot.eventbus.ThreadMode; + +import java.util.List; + +@EFragment(R.layout.common_ul_recyclerview) +public class OrderListFragment extends BaseFragment { + + @ViewById + UltimateRecyclerView listView; + + MyAdapter adapter; + + @AfterViews + void initOrderListFragment() { + OrderMainActivity activity = (OrderMainActivity) getActivity(); + + RecyclerView.LayoutManager manager = new LinearLayoutManager(getActivity()); + listView.setLayoutManager(manager); + + adapter = new MyAdapter(activity.getOrderList()); + listView.setAdapter(adapter); + } + + @Override + public void onAttach(Context context) { + super.onAttach(context); + EventBus.getDefault().register(this); + } + + @Override + public void onDetach() { + super.onDetach(); + EventBus.getDefault().unregister(this); + } + + @Subscribe(threadMode = ThreadMode.MAIN) + public void onEventRefresh(EventRefresh event) { + if (event.refresh) { + adapter.notifyDataSetChanged(); + } + } + + protected class MyAdapter extends easyRegularAdapter { + + public MyAdapter(List list) { + super(list); + } + + @Override + protected int getNormalLayoutResId() { + return R.layout.order_item; + } + + @Override + protected ViewHolder newViewHolder(View view) { + return new ViewHolder(view); + } + + @Override + protected void withBindHolder(ViewHolder holder, Order data, int position) { + + holder.title.setText(data.getAction()); + holder.style.setText(data.statusString); + holder.style.setTextColor(data.statusColor); + holder.id.setText(data.number); + holder.user.setText(data.creatorName); + holder.time.setText(data.getTime()); + + if (position == source.size() - 1) { + holder.nextTopDivide.setVisibility(View.GONE); + } else { + holder.nextTopDivide.setVisibility(View.VISIBLE); + } + } + } + + class ViewHolder extends UltimateRecyclerviewViewHolder { + + private TextView title; + private TextView style; + private View divideLine; + private TextView orderId; + private TextView orderUser; + private TextView orderTime; + private TextView id; + private TextView user; + private TextView time; + + private View nextTopDivide; + + public ViewHolder(View view) { + super(view); + title = (TextView) view.findViewById(R.id.title); + style = (TextView) view.findViewById(R.id.style); + divideLine = (View) view.findViewById(R.id.divideLine); + orderId = (TextView) view.findViewById(R.id.orderId); + orderUser = (TextView) view.findViewById(R.id.orderUser); + orderTime = (TextView) view.findViewById(R.id.orderTime); + id = (TextView) view.findViewById(R.id.id); + user = (TextView) view.findViewById(R.id.user); + time = (TextView) view.findViewById(R.id.time); + nextTopDivide = view.findViewById(R.id.nextTopDivide); + } + } + +} diff --git a/app/src/enterprise/java/net/coding/program/setting/order/OrderMainActivity.java b/app/src/enterprise/java/net/coding/program/setting/order/OrderMainActivity.java new file mode 100644 index 000000000..48eedc129 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/setting/order/OrderMainActivity.java @@ -0,0 +1,334 @@ +package net.coding.program.setting.order; + +import android.content.Context; +import android.support.design.widget.AppBarLayout; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentPagerAdapter; +import android.support.v4.view.ViewCompat; +import android.support.v4.view.ViewPager; +import android.support.v4.widget.SwipeRefreshLayout; +import android.text.Spanned; +import android.text.SpannedString; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import com.orhanobut.logger.Logger; + +import net.coding.program.R; +import net.coding.program.common.CodingColor; +import net.coding.program.common.Global; +import net.coding.program.common.event.EventRefresh; +import net.coding.program.common.model.EnterpriseAccount; +import net.coding.program.common.model.EnterpriseInfo; +import net.coding.program.common.model.payed.Billing; +import net.coding.program.common.model.payed.Order; +import net.coding.program.common.ui.BackActivity; +import net.coding.program.third.WechatTab; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.Click; +import org.androidannotations.annotations.EActivity; +import org.androidannotations.annotations.Extra; +import org.androidannotations.annotations.ViewById; +import org.androidannotations.annotations.res.ColorRes; +import org.greenrobot.eventbus.EventBus; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; + +@EActivity(R.layout.activity_order_main) +public class OrderMainActivity extends BackActivity { + + private static final String TAG_ORDERS = "TAG_ORDERS"; + private static final String TAG_BILLINGS = "TAG_BILLINGS"; + private static final String TAG_INFO = "TAG_INFO"; + + @Extra + EnterpriseAccount account; + + @ViewById + SwipeRefreshLayout swipeRefreshLayout; + + @ViewById + AppBarLayout appbarLayout; + + @ViewById + TextView topWarn, balanceTitle, balanceContent, balanceTip; + + @ViewById + View topTip; + + @ViewById + ViewGroup containerHeader; + + @ViewById + ViewGroup rootLayout; + + @ViewById + ViewPager viewPager; + + @ColorRes(R.color.font_orange) + int fontOragne; + + @ColorRes(R.color.font_red) + int fontRed; + + @ViewById + ImageView closeTipButton; + + private ArrayList orderList = new ArrayList<>(); + private ArrayList billingList = new ArrayList<>(); + + AppBarLayout.OnOffsetChangedListener appbarOffsetChange = new AppBarLayout.OnOffsetChangedListener() { + @Override + public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) { + Logger.d("offset " + verticalOffset); + swipeRefreshLayout.setEnabled(verticalOffset >= 0); + } + }; + + @AfterViews + void initOrderMainActivity() { + closeTipButton.setImageDrawable(Global.tintDrawable( + getResources().getDrawable(R.drawable.delete_edit_login_black), CodingColor.fontYellow)); + + initHeader(); + + swipeRefreshLayout.setColorSchemeResources(R.color.font_green); + swipeRefreshLayout.setOnRefreshListener(() -> { + String host = String.format("%s/enterprise/%s", Global.HOST_API, EnterpriseInfo.instance().getGlobalkey()); + getNetwork(host, TAG_INFO); + + }); + } + + @Override + public void onResume() { + super.onResume(); + appbarLayout.addOnOffsetChangedListener(appbarOffsetChange); + } + + @Override + public void onPause() { + super.onPause(); + appbarLayout.addOnOffsetChangedListener(appbarOffsetChange); + } + + private void initHeader() { + SimpleDateFormat df = new SimpleDateFormat("yyyy 年 MM月 dd日"); + String timeString = df.format(Long.valueOf(account.estimateDate)); + SpannedString empty = new SpannedString(""); + + boolean showTip = false; + Spanned warnString = empty; + Spanned balanceTitleString = empty; + Spanned balanceContentString = empty; + String balanceTipString = ""; + + if (account.trial && !account.payed) { // 处于试用期 + warnString = Global.createColorHtml("您正在免费试用 CODING 企业服务", fontOragne); + balanceTipString = String.format("预计可使用至 %s，剩余 %s 天", timeString, account.remaindays); + + if (account.payed) { // 试用期且付过费 + balanceTitleString = new SpannedString("账户余额（元）"); + balanceContentString = Global.createColorHtml(account.balance, fontOragne); + showOrderAndRecord(true); + } else { + showOrderAndRecord(false); + } + + } else { + if (account.payed) { + if (account.remaindays > 0) { // 付费期且未到期 + showTip = false; + if (account.remaindays > 5) { + } else { + warnString = Global.createColorHtml("您的账户余额不足，请尽快订购", fontRed); + } + + balanceTitleString = new SpannedString("账户余额（元）"); + balanceContentString = Global.createColorHtml(account.balance, fontOragne); + balanceTipString = String.format("预计可使用至 %s，剩余 %s 天", df.format(account.estimateDate), account.remaindays); + + showOrderAndRecord(true); + + } else { // 付费期已到期 + showTip = true; + warnString = Global.createColorHtml("您的服务已过期，请订购后使用", fontRed); + balanceTitleString = new SpannedString("已透支金额（元）"); + balanceContentString = Global.createColorHtml(account.balance, fontRed); + + if (account.suspendedAt > 0) { // 已暂停 + balanceTipString = String.format("服务已暂停 %s 天", account.suspendedToToday()); + showOrderAndRecord(false); + } else { // 处于超时使用阶段 + balanceTipString = String.format("过期时间为 %s，已超时使用 %s 天", df.format(account.estimateDate), account.estimateDate()); + showOrderAndRecord(true); + } + } + } else { // 未付费而且试用期已过 + showTip = true; + warnString = Global.createColorHtml("您的试用期已结束，请订购后使用", fontRed); + int suspand = account.suspendedToToday(); + balanceTipString = String.format("服务已暂停 %s 天", suspand); + + showOrderAndRecord(false); + } + } + + setHeader(showTip, warnString, balanceTitleString, balanceContentString, new SpannedString(balanceTipString)); + } + + private void showOrderAndRecord(boolean showOrder) { + String[] titles; + if (showOrder) { + titles = new String[]{MyDetailPagerAdapter.TITLE_ORDER}; + } else { + titles = new String[]{MyDetailPagerAdapter.TITLE_EMPTY}; + } + + MyDetailPagerAdapter adpter = new MyDetailPagerAdapter(this, getSupportFragmentManager(), titles); + viewPager.setAdapter(adpter); + + if (titles.length >= 2) { + WechatTab tabs = (WechatTab) getLayoutInflater().inflate(R.layout.common_pager_tabs, containerHeader, false); + containerHeader.addView(tabs); + tabs.setViewPager(viewPager); + ViewCompat.setElevation(tabs, 0); + + } else if (titles.length == 1) { + if (titles[0].equals(MyDetailPagerAdapter.TITLE_ORDER)) { + View tabs = getLayoutInflater().inflate(R.layout.order_section, containerHeader, false); + containerHeader.addView(tabs); + } + } + + ViewCompat.setElevation(findViewById(R.id.appbarLayout), 0); + + if (showOrder) { + loadOrderData(); + } + + } + + private void setHeader(boolean show, Spanned... spanneds) { + topTip.setVisibility(show ? View.VISIBLE : View.GONE); + TextView[] views = new TextView[]{ + topWarn, balanceTitle, balanceContent, balanceTip + }; + for (int i = 0; i < views.length; ++i) { + if (spanneds[i].length() == 0) { + views[i].setVisibility(View.GONE); + } else { + views[i].setVisibility(View.VISIBLE); + views[i].setText(spanneds[i]); + } + } + } + + @Click + void closeTipButton() { + topTip.setVisibility(View.GONE); + } + + private void loadOrderData() { + String url = String.format("%s/enterprise/%s/orders", Global.HOST_API, EnterpriseInfo.instance().getGlobalkey()); + getNetwork(url, TAG_ORDERS); + } + + private void loadBillings() { + String url = String.format("%s/enterprise/%s/billings", Global.HOST_API, EnterpriseInfo.instance().getGlobalkey()); + getNetwork(url, TAG_BILLINGS); + } + + public ArrayList getOrderList() { + return orderList; + } + + public ArrayList getBillingList() { + return billingList; + } + + @Override + public void parseJson(int code, JSONObject respanse, String tag, int pos, Object data) throws JSONException { + if (tag.equals(TAG_ORDERS)) { + if (code == 0) { + orderList.clear(); + JSONArray json = respanse.optJSONArray("data"); + for (int i = 0; i < json.length(); ++i) { + orderList.add(new Order(json.optJSONObject(i))); + } + + EventBus.getDefault().post(new EventRefresh(true)); + } else { + + } + } else if (tag.equals(TAG_BILLINGS)) { + if (code == 0) { + billingList.clear(); + JSONArray json = respanse.optJSONArray("data"); + for (int i = 0; i < json.length(); ++i) { + billingList.add(new Billing(json.optJSONObject(i))); + } + EventBus.getDefault().post(new EventRefresh(true)); + } else { + + } + + } else if (tag.equals(TAG_INFO)) { + swipeRefreshLayout.setRefreshing(false); + if (code == 0) { + account = new EnterpriseAccount(respanse.optJSONObject("data")); + initHeader(); + } else { + showButtomToast("刷新失败"); + } + } + } + + private static class MyDetailPagerAdapter extends FragmentPagerAdapter { + + private static final String TITLE_ORDER = "充值订单"; + private static final String TITLE_BILLING = "账单流水"; + private static final String TITLE_EMPTY = "TITLE_EMPTY"; + String[] titles; + + Context context; + + public MyDetailPagerAdapter(Context context, FragmentManager fm, String[] titles) { + super(fm); + this.context = context; + this.titles = titles; + } + + @Override + public Fragment getItem(int position) { + if (position == 0) { + if (titles[position].equals(TITLE_EMPTY)) { + return EmptyFragment_.builder().build(); + } else { + return OrderListFragment_.builder().build(); + } + } else { + return BillingListFragment_.builder().build(); + } + } + + @Override + public int getCount() { + return titles.length; + } + + @Override + public CharSequence getPageTitle(int position) { + return titles[position]; + } + } +} + diff --git a/app/src/enterprise/java/net/coding/program/user/BaseEnterpriseUserListActivity.java b/app/src/enterprise/java/net/coding/program/user/BaseEnterpriseUserListActivity.java new file mode 100644 index 000000000..ca46131ac --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/user/BaseEnterpriseUserListActivity.java @@ -0,0 +1,110 @@ +package net.coding.program.user; + +import android.support.v4.view.MenuItemCompat; +import android.support.v7.widget.SearchView; +import android.text.TextUtils; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; + +import net.coding.program.R; +import net.coding.program.common.Global; +import net.coding.program.common.model.EnterpriseInfo; +import net.coding.program.common.model.EnterpriseUserObject; +import net.coding.program.common.model.UserObject; +import net.coding.program.common.ui.BackActivity; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.EActivity; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.ArrayList; +import java.util.Collections; + +/** + * Created by chenchao on 2017/1/7. + */ +@EActivity(R.layout.activity_enterprise_add_member) +public abstract class BaseEnterpriseUserListActivity extends BackActivity { + + private static final String TAG_HOST_MEMBERS = "TAG_HOST_MEMBERS"; + + protected ArrayList listData = new ArrayList<>(); + protected ArrayList allListData = new ArrayList<>(); + + @AfterViews + void initBaseEnterpriseUserListActivity() { + String host = String.format("%s/team/%s/members", Global.HOST_API, EnterpriseInfo.instance().getGlobalkey()); + getNetwork(host, TAG_HOST_MEMBERS); + } + + @Override + public void parseJson(int code, JSONObject respanse, String tag, int pos, Object data) throws JSONException { + if (tag.equals(TAG_HOST_MEMBERS)) { + if (code == 0) { + parseUserJson(respanse); + } else { + showErrorMsg(code, respanse); + } + } else { + super.parseJson(code, respanse, tag, pos, data); + } + } + + protected void parseUserJson(JSONObject respanse) { + listData.clear(); + allListData.clear(); + JSONArray jsonArray = respanse.optJSONArray("data"); + for (int i = 0; i < jsonArray.length(); ++i) { + EnterpriseUserObject user = new EnterpriseUserObject(jsonArray.optJSONObject(i)); + allListData.add(user.user); + } + + Collections.sort(allListData); + listData.addAll(allListData); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + MenuInflater menuInflater = getMenuInflater(); + menuInflater.inflate(R.menu.users_fans, menu); + + MenuItem searchItem = menu.findItem(R.id.action_search); + searchItem.setIcon(R.drawable.ic_menu_search); + SearchView searchView = (SearchView) MenuItemCompat.getActionView(searchItem); + searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() { + @Override + public boolean onQueryTextSubmit(String s) { + return true; + } + + @Override + public boolean onQueryTextChange(String s) { + searchItem(s); + return true; + } + }); + + return true; + } + + protected void searchItem(String s) { + s = s.toLowerCase(); + + listData.clear(); + + if (TextUtils.isEmpty(s)) { + listData.addAll(allListData); + } else { + for (UserObject item : allListData) { + if (item.global_key.toLowerCase().contains(s) || + item.name.toLowerCase().contains(s)) { + listData.add(item); + } + } + } + } + +} diff --git a/app/src/enterprise/java/net/coding/program/user/EnterpriseAddMemberActivity.java b/app/src/enterprise/java/net/coding/program/user/EnterpriseAddMemberActivity.java new file mode 100644 index 000000000..ff77ba5d2 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/user/EnterpriseAddMemberActivity.java @@ -0,0 +1,189 @@ +package net.coding.program.user; + +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.CheckBox; +import android.widget.ImageView; +import android.widget.ListView; +import android.widget.TextView; + +import com.loopj.android.http.RequestParams; + +import net.coding.program.R; +import net.coding.program.common.Global; +import net.coding.program.common.model.ProjectObject; +import net.coding.program.common.model.UserObject; +import net.coding.program.common.umeng.UmengEvent; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.EActivity; +import org.androidannotations.annotations.Extra; +import org.androidannotations.annotations.ViewById; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.ArrayList; +import java.util.Collections; + +@EActivity(R.layout.activity_enterprise_add_member) +public class EnterpriseAddMemberActivity extends BaseEnterpriseUserListActivity { + + private static final String TAG_HOST_ADD_USER = "TAG_HOST_ADD_USER"; + private static final String TAG_HOST_DELETE_USER = "TAG_HOST_DELETE_USER"; + + ArrayList pickedData = new ArrayList<>(); + + @Extra + ProjectObject projectObject; + + @Extra + ArrayList pickedGlobalKeys; + + @ViewById + protected ListView listView; + + @AfterViews + void initEnterpriseAddMemberActivity() { + listView.setAdapter(adapter); + } + + @Override + protected void parseUserJson(JSONObject respanse) { + super.parseUserJson(respanse); + + for (String item : pickedGlobalKeys) { + for (UserObject user : listData) { + if (item.equals(user.global_key)) { + pickedData.add(user); + break; + } + } + } + + Collections.sort(allListData, (o1, o2) -> { + if (pickedData.contains(o1)) { + if (pickedData.contains(o2)) { + return o1.compareTo(o2); + } else { + return -1; + } + } else if (pickedData.contains(o2)) { + return 1; + } else { + return o1.compareTo(o2); + } + }); + + listData.clear(); + listData.addAll(allListData); + + adapter.notifyDataSetChanged(); + } + + @Override + protected void searchItem(String s) { + super.searchItem(s); + adapter.notifyDataSetChanged(); + } + + @Override + public void parseJson(int code, JSONObject respanse, String tag, int pos, Object data) throws JSONException { + if (tag.equals(TAG_HOST_ADD_USER)) { + if (code == 0) { + umengEvent(UmengEvent.PROJECT, "添加成员"); + + pickedData.add((UserObject) data); + + showMiddleToast(String.format("添加项目成员 %s 成功", ((UserObject) data).name)); + } else { + showErrorMsg(code, respanse); + } + adapter.notifyDataSetChanged(); + + } else if (tag.equals(TAG_HOST_DELETE_USER)) { + if (code == 0) { + pickedData.remove((UserObject) data); + + showMiddleToast(String.format("移除项目成员 %s 成功", ((UserObject) data).name)); + } else { + showErrorMsg(code, respanse); + } + adapter.notifyDataSetChanged(); + + } else { + super.parseJson(code, respanse, tag, pos, data); + } + } + + private View.OnClickListener clickMutual = v -> { + UserObject user = (UserObject) v.getTag(R.id.followed); + if (((CheckBox) v).isChecked()) { + final String urlAddUser = Global.HOST_API + "/project/" + projectObject.id + "/members/gk/add"; + RequestParams param = new RequestParams(); + param.put("users", user.global_key); + postNetwork(urlAddUser, param, TAG_HOST_ADD_USER, -1, user); + } else { + final String urlDeleteUser = Global.HOST_API + "/project/%s/kickout/%s"; + String url = String.format(urlDeleteUser, projectObject.getId(), user.id); + postNetwork(url, new RequestParams(), TAG_HOST_DELETE_USER, -1, user); + } + }; + + BaseAdapter adapter = new BaseAdapter() { + @Override + public int getCount() { + return listData.size(); + } + + @Override + public Object getItem(int position) { + return listData.get(position); + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + ViewHolder holder; + if (convertView == null) { + convertView = mInflater.inflate(R.layout.enterprise_add_member_list_item, parent, false); + holder = new ViewHolder(); + holder.icon = (ImageView) convertView.findViewById(R.id.icon); + holder.name = (TextView) convertView.findViewById(R.id.name); + holder.mutual = (CheckBox) convertView.findViewById(R.id.followed); + holder.bottomDivideLine = convertView.findViewById(R.id.bottomDivideLine); + holder.mutual.setVisibility(View.VISIBLE); + holder.mutual.setOnClickListener(clickMutual); + + convertView.setTag(holder); + } else { + holder = (ViewHolder) convertView.getTag(); + } + + final UserObject data = (UserObject) getItem(position); + iconfromNetwork(holder.icon, data.avatar); + holder.name.setText(data.name); + + boolean isPicked = pickedData.contains(data); + int drawableId = isPicked ? R.drawable.checkbox_follow_follow : R.drawable.checkbox_follow_fans; + holder.mutual.setButtonDrawable(drawableId); + holder.mutual.setChecked(isPicked); + holder.mutual.setTag(R.id.followed, data); + + holder.bottomDivideLine.setVisibility(position == (getCount() - 1) ? View.GONE : View.VISIBLE); + + return convertView; + } + }; + + static class ViewHolder { + ImageView icon; + TextView name; + CheckBox mutual; + View bottomDivideLine; + } +} diff --git a/app/src/enterprise/java/net/coding/program/user/EnterpriseLoginActivity.java b/app/src/enterprise/java/net/coding/program/user/EnterpriseLoginActivity.java new file mode 100644 index 000000000..d68152719 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/user/EnterpriseLoginActivity.java @@ -0,0 +1,620 @@ +package net.coding.program.user; + +import android.app.Activity; +import android.content.Intent; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.net.Uri; +import android.os.Bundle; +import android.support.v7.app.AlertDialog; +import android.text.Editable; +import android.text.TextWatcher; +import android.view.View; +import android.widget.EditText; +import android.widget.ImageView; +import android.widget.TextView; + +import com.loopj.android.http.AsyncHttpClient; +import com.loopj.android.http.AsyncHttpResponseHandler; +import com.loopj.android.http.RequestParams; +import com.nostra13.universalimageloader.core.DisplayImageOptions; +import com.nostra13.universalimageloader.core.assist.ImageScaleType; +import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer; +import com.tencent.android.tpush.XGPushManager; + +import net.coding.program.EnterpriseApp; +import net.coding.program.EnterpriseMainActivity_; +import net.coding.program.R; +import net.coding.program.common.Global; +import net.coding.program.common.GlobalCommon; +import net.coding.program.common.GlobalData; +import net.coding.program.common.SimpleSHA1; +import net.coding.program.common.event.EventLoginSuccess; +import net.coding.program.common.model.AccountInfo; +import net.coding.program.common.model.EnterpriseDetail; +import net.coding.program.common.model.EnterpriseInfo; +import net.coding.program.common.model.UserObject; +import net.coding.program.common.network.MyAsyncHttpClient; +import net.coding.program.common.network.NetworkImpl; +import net.coding.program.common.ui.BaseActivity; +import net.coding.program.common.umeng.UmengEvent; +import net.coding.program.common.util.InputCheck; +import net.coding.program.common.widget.LoginEditTextNew; +import net.coding.program.common.widget.input.SimpleTextWatcher; +import net.coding.program.compatible.CodingCompat; +import net.coding.program.login.PhoneRegisterActivity_; +import net.coding.program.login.auth.AuthInfo; +import net.coding.program.login.auth.TotpClock; +import net.coding.program.login.phone.Close2FAActivity_; +import net.coding.program.login.phone.EnterpriseEmailSetPasswordActivity_; +import net.coding.program.login.phone.EnterprisePrivateEmailSetPasswordActivity_; +import net.coding.program.network.constant.MemberAuthority; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.Click; +import org.androidannotations.annotations.EActivity; +import org.androidannotations.annotations.Extra; +import org.androidannotations.annotations.OnActivityResult; +import org.androidannotations.annotations.ViewById; +import org.json.JSONException; +import org.json.JSONObject; + +import java.util.Calendar; + +import cz.msebera.android.httpclient.Header; + +@EActivity(R.layout.enterprise_activity_login) +public class EnterpriseLoginActivity extends BaseActivity { + + private final String TAG_HOST_USER = "TAG_HOST_USER"; + private final String TAG_HOST_ENTERPRISE_DETAIL = "TAG_HOST_ENTERPRISE_DETAIL"; + private final String TAG_HOST_IS_ADMIN = "TAG_HOST_IS_ADMIN"; + private final String TAG_HOST_USER_NEED_2FA = "TAG_HOST_USER_NEED_2FA"; + + private static final int RESULT_CLOSE_2FA = 1; + + private final String CLOSE_2FA_TIP = "关闭两步验证"; + private String TAG_HOST_NEED_CAPTCHA = "TAG_HOST_NEED_CAPTCHA"; + private final String TAG_LOGIN = "TAG_LOGIN"; + private final String CE_INFO = "CE_INFO"; + + private static final int RESULT_CLOSE = 100; + + private String ssoType = "default"; + private boolean ssoEnabled = false; + + @Extra + Uri background; + + @Extra + boolean isPrivate = false; + + @ViewById + ImageView backButton; + + @ViewById + TextView login2faMenu, toolbarTitle; + + @ViewById + LoginEditTextNew enterpriseEdit, privateHost; + + @ViewById + ImageView imageValifyMain; + + @ViewById + LoginEditTextNew editName, editPassword, editValifyMain, edit2FA; + + @ViewById + View enterpriseLine, valifyLineMain, privateHostLayout, hostLayout, normalHostLayout; + + @ViewById + View captchaLayout, loginButton, layout2fa, loginLayout, layoutRoot; + + @ViewById + TextView loginFail; + + // 快速点击 5 次弹出对话框进入 staging 环境 + private int clickIconCount = 0; + private long lastClickTime = 0; + + private String enterpriseGK = ""; + + + DisplayImageOptions options = new DisplayImageOptions.Builder() + .showImageForEmptyUri(R.drawable.icon_user_monkey) + .showImageOnFail(R.drawable.icon_user_monkey) + .resetViewBeforeLoading(true) + .cacheOnDisk(true) + .imageScaleType(ImageScaleType.EXACTLY) + .bitmapConfig(Bitmap.Config.RGB_565) + .considerExifParams(true) + .displayer(new FadeInBitmapDisplayer(300)) + .build(); + + View androidContent; + + TextWatcher textWatcher = new SimpleTextWatcher() { + @Override + public void afterTextChanged(Editable s) { + upateLoginButton(); + } + }; + + private String globalKey = ""; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + XGPushManager.registerPush(this); + + if (AccountInfo.isLogin(this)) { + String gk = GlobalData.getEnterpriseGK(); + if (gk.equalsIgnoreCase(EnterpriseApp.PRIVATE_GK)) { + isPrivate = true; + } + } + } + + @AfterViews + void initEnterpriseLoginActivity() { + editName.addTextChangedListener(textWatcher); + editPassword.addTextChangedListener(textWatcher); + editValifyMain.addTextChangedListener(textWatcher); + upateLoginButton(); + + androidContent = findViewById(android.R.id.content); + + String lastLoginName = AccountInfo.loadLastLoginName(this); + if (!lastLoginName.isEmpty()) { + editName.setText(lastLoginName); + editPassword.requestFocus(); + } + + String lastCompanyName = AccountInfo.loadLastCompanyName(this); + if (!lastCompanyName.isEmpty()) { + enterpriseEdit.setText(lastCompanyName); + } + + if (isPrivate) { + String lastHost = AccountInfo.loadLastPrivateHost(this); + privateHost.setText(lastHost); + } + + enterpriseEdit.setOnEditFocusChange(createEditLineFocus(enterpriseLine)); + editValifyMain.setOnFocusChangeListener(createEditLineFocus(valifyLineMain)); + + hostLayout.setVisibility(View.VISIBLE); + if (isPrivate) { + normalHostLayout.setVisibility(View.GONE); + privateHostLayout.setVisibility(View.VISIBLE); + } else { + normalHostLayout.setVisibility(View.VISIBLE); + privateHostLayout.setVisibility(View.GONE); + } + } + + @Click + void clickNext() { + hostLayout.setVisibility(View.GONE); + enterpriseGK = enterpriseEdit.getTextString(); + toolbarTitle.setText(String.format("登录到\n%s", enterpriseGK)); + } + + @Click + void clickPrivateNext() { + hostLayout.setVisibility(View.GONE); + enterpriseGK = EnterpriseApp.PRIVATE_GK; + + String input = privateHost.getTextString(); + String divide = "://"; + int pos = input.indexOf(divide); + if (pos != -1) { + input = input.substring(pos + divide.length()); + } + + toolbarTitle.setText(String.format("登录到\n%s", input)); + } + + @Click + void backButton() { + onBackPressed(); + } + + @Click + void toolbarTitle() { + long clickTime = Calendar.getInstance().getTimeInMillis(); + long lastTemp = lastClickTime; + lastClickTime = clickTime; + if (clickTime - lastTemp < 1000) { + ++clickIconCount; + } else { + clickIconCount = 1; + } + + if (clickIconCount >= 5) { + clickIconCount = 0; + + AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.MyAlertDialogStyle); + View content = getLayoutInflater().inflate(R.layout.host_setting, null); + final EditText editText = content.findViewById(R.id.edit); + AccountInfo.CustomHost customHost = AccountInfo.getCustomHost(this); + editText.setText(customHost.getHost()); + editText.setHint(Global.DEFAULT_HOST); + builder.setView(content) + .setPositiveButton(R.string.action_ok, (dialog, which) -> { + String hostString = editText.getText().toString(); + AccountInfo.CustomHost customHost1 = new AccountInfo.CustomHost(hostString, ""); + if (!hostString.isEmpty()) { + AccountInfo.saveCustomHost(this, customHost1); + } else { + AccountInfo.removeCustomHost(this); + } + + AccountInfo.loginOut(this); + setResult(RESULT_OK); + }) + .setNegativeButton(R.string.action_cancel, null) + .show(); + } + } + + @Click + void imageValifyMain() { + editValifyMain.getEditText().requestFocus(); + downloadValifyPhoto(); + } + + @Click + void register() { + Global.popSoftkeyboard(this, editName, false); + PhoneRegisterActivity_.intent(this) + .startForResult(RESULT_CLOSE); + } + + @OnActivityResult(RESULT_CLOSE) + void resultRegiter(int result) { + if (result == Activity.RESULT_OK) { + EventLoginSuccess.Companion.sendMessage(); + finish(); + } + } + + private void needCaptcha() { + getNetwork(Global.HOST_API + "/captcha/login", TAG_HOST_NEED_CAPTCHA); + } + + private void downloadValifyPhoto() { + String host = Global.HOST_API + "/getCaptcha"; + AsyncHttpClient client = MyAsyncHttpClient.createClient(this); + + client.get(host, new AsyncHttpResponseHandler() { + @Override + public void onSuccess(int statusCode, Header[] headers, byte[] responseBody) { + imageValifyMain.setImageBitmap(BitmapFactory.decodeByteArray(responseBody, 0, responseBody.length)); + editValifyMain.setText(""); + } + + @Override + public void onFailure(int statusCode, Header[] headers, byte[] responseBody, Throwable error) { + showMiddleToast("获取验证码失败"); + } + }); + } + + @Click + protected final void loginButton() { + updateGlobalHost(); + getNetwork(Global.HOST_API + "/enterprise/info/ce", CE_INFO); + } + + private void login2fa() { + String input = edit2FA.getText().toString(); + if (input.isEmpty()) { + showMiddleToast("请输入身份验证器中的验证码"); + return; + } + + RequestParams params = new RequestParams(); + params.put("code", input); + postNetwork(Global.HOST_API + "/check_two_factor_auth_code", params, TAG_HOST_USER_NEED_2FA); + showProgressBar(true, "登录中"); + + Global.popSoftkeyboard(this, edit2FA, false); + } + + private void login(boolean sha1) { + try { + String name = editName.getTextString(); + String password = editPassword.getTextString(); + String captcha = editValifyMain.getTextString(); + + if (name.isEmpty()) { + showMiddleToast("邮箱或用户名不能为空"); + return; + } + + if (password.isEmpty()) { + showMiddleToast("密码不能为空"); + return; + } + + RequestParams params = new RequestParams(); + + params.put("account", name); + if (sha1) { + params.put("password", SimpleSHA1.sha1(password)); + } else { + params.put("password", password); + } + if (captchaLayout.getVisibility() == View.VISIBLE) { + params.put("j_captcha", captcha); + } + params.put("remember_me", true); + + updateGlobalHost(); + String HOST_LOGIN = String.format("%s/v2/account/login", Global.HOST_API); + + postNetwork(HOST_LOGIN, params, TAG_LOGIN); + showProgressBar(true, R.string.logining); + + Global.popSoftkeyboard(this, editName, false); + + } catch (Exception e) { + Global.errorLog(e); + } + } + + private void login() { + login(true); + } + + private void updateGlobalHost() { + if (isPrivate) { + EnterpriseApp.setPrivateHost(privateHost.getTextString()); + } else { + EnterpriseApp.setHost(enterpriseEdit.getTextString()); + } + } + + @Click + protected final void loginFail() { + String account = editName.getText().toString(); + if (!InputCheck.isPhone(account) && !InputCheck.isEmail(account)) { + account = ""; + } + + if (isPrivate) { + EnterprisePrivateEmailSetPasswordActivity_.intent(this) + .enterpriseName(privateHost.getTextString()) + .start(); + } else { + EnterpriseEmailSetPasswordActivity_.intent(this) + .enterpriseName(enterpriseGK) + .account(account) + .start(); + } + } + + @Click + void login2faMenu() { + if (login2faMenu.getText().equals(CLOSE_2FA_TIP)) { + Close2FAActivity_.intent(this).startForResult(RESULT_CLOSE_2FA); + } else { + GlobalCommon.start2FAActivity(this); + } + } + + @OnActivityResult(RESULT_CLOSE_2FA) + void onResultClose2FA(int resultCode) { + if (resultCode == RESULT_OK) { + show2FA(false); + } + } + + private void show2FA(boolean show) { + if (show) { + layout2fa.setVisibility(View.VISIBLE); + loginLayout.setVisibility(View.GONE); + String uri = AccountInfo.loadAuth(this, globalKey); + if (!uri.isEmpty()) { + String code2FA = new AuthInfo(uri, new TotpClock(this)).getCode(); + edit2FA.getText().clear(); + edit2FA.getText().insert(0, code2FA); + loginButton(); + } + + loginFail.setVisibility(View.GONE); + + login2faMenu.setText(CLOSE_2FA_TIP); + + + } else { + layout2fa.setVisibility(View.GONE); + loginLayout.setVisibility(View.VISIBLE); + + loginFail.setVisibility(View.VISIBLE); + + login2faMenu.setText("两步验证"); + } + } + + private UserObject currentUserInfo = null; + private EnterpriseDetail enterpriseDetail = null; + + @Override + public void parseJson(int code, JSONObject respanse, String tag, int pos, Object data) throws JSONException { + if (tag.equals(TAG_LOGIN)) { + if (code == 0) { + updateGlobalHost(); + EnterpriseMainActivity_.setNeedWarnEmailNoValidLogin(); + loginSuccess(respanse); + umengEvent(UmengEvent.USER, "普通登录"); + if (isPrivate) { + AccountInfo.saveLastPrivateHost(this, Global.HOST); + } + } else if (code == 3205) { + updateGlobalHost(); + EnterpriseMainActivity_.setNeedWarnEmailNoValidLogin(); + umengEvent(UmengEvent.USER, "2fa登录"); + globalKey = respanse.optJSONObject("msg").optString("two_factor_auth_code_not_empty", ""); + show2FA(true); + showProgressBar(false); + + } else { + loginFail(code, respanse, true); + } + + } else if (tag.equals(CE_INFO)) { + if (code == 0) { + try { + ssoEnabled = respanse.getJSONObject("data").getJSONObject("settings").getBoolean("ssoEnabled"); + ssoType = respanse.getJSONObject("data").getJSONObject("settings").getString("ssoType"); + } catch (Exception e) { + ssoEnabled = false; + ssoType = "default"; + } + if (layout2fa.getVisibility() == View.GONE) { + if (ssoEnabled && "ldap".equals(ssoType)) { + login(false); + } else { + login(); + } + } else { + login2fa(); + } + } + } else if (tag.equals(TAG_HOST_USER_NEED_2FA)) { + if (code == 0) { + loginSuccess(respanse); + if (isPrivate) { + AccountInfo.saveLastPrivateHost(this, Global.HOST); + } + } else { + loginFail(code, respanse, false); + } + } else if (tag.equals(TAG_HOST_USER)) { + if (code == 0) { + currentUserInfo = new UserObject(respanse.getJSONObject("data")); + + if (isPrivate) { + String url = String.format("%s/team/%s/get", Global.HOST_API, EnterpriseApp.PRIVATE_GK); + getNetwork(url, TAG_HOST_ENTERPRISE_DETAIL); + } else { + String url = String.format("%s/team/%s/get", Global.HOST_API, enterpriseGK); + getNetwork(url, TAG_HOST_ENTERPRISE_DETAIL); + } + } else { + showProgressBar(false); + showErrorMsg(code, respanse); + } + } else if (tag.equals(TAG_HOST_ENTERPRISE_DETAIL)) { + if (code == 0) { + enterpriseDetail = new EnterpriseDetail(respanse.optJSONObject("data")); + + String url = String.format("%s/team/%s/is_admin", Global.HOST_API, enterpriseGK); + getNetwork(url, TAG_HOST_IS_ADMIN); + } else { + showProgressBar(false); + showErrorMsg(code, respanse); + } + + } else if (tag.equals(TAG_HOST_IS_ADMIN)) { // 判断是否管理员 + if (code == 0) { + showProgressBar(false); + boolean isAdmin = respanse.optBoolean("data", false); + if (isAdmin) { + if (!EnterpriseInfo.instance().canManagerEnterprise()) { + enterpriseDetail.setIdentity(MemberAuthority.manager); + } + } + jumpMainActivity(); + } else { + showProgressBar(false); + showErrorMsg(code, respanse); + } + + } else if (tag.equals(TAG_HOST_NEED_CAPTCHA)) { + if (code == 0) { + if (respanse.getBoolean("data")) { + captchaLayout.setVisibility(View.VISIBLE); + downloadValifyPhoto(); + } + } else { + showErrorMsg(code, respanse); + } + } + } + + private void jumpMainActivity() throws JSONException { + EnterpriseInfo.instance().update(this, enterpriseDetail); + + AccountInfo.saveAccount(this, currentUserInfo); + GlobalData.sUserObject = currentUserInfo; + AccountInfo.saveReloginInfo(this, currentUserInfo); + + Global.syncCookie(this); + + String name = editName.getText().toString(); + AccountInfo.saveLastLoginName(this, name); + + String companyName = enterpriseGK; + AccountInfo.saveLastCompanyName(this, companyName); + + EventLoginSuccess.Companion.sendMessage(); + startActivity(new Intent(this, CodingCompat.instance().getMainActivity())); + finish(); + overridePendingTransition(R.anim.entrance_fade_in, R.anim.entrance_fade_out); + } + + private void loginFail(int code, JSONObject respanse, boolean needCaptcha) { + String msg = Global.getErrorMsg(respanse).replaceAll("
  • (.*?)
    • ", "\n$1"); + showMiddleToast(msg); + showProgressBar(false); + if (code != NetworkImpl.NETWORK_ERROR && + code != NetworkImpl.NETWORK_ERROR_SERVICE && + needCaptcha) { + needCaptcha(); + } + } + + private void loginSuccess(JSONObject respanse) throws JSONException { + UserObject user = new UserObject(respanse.getJSONObject("data")); + + String HOST_USER = Global.HOST_API + "/user/key/%s"; + getNetwork(String.format(HOST_USER, user.global_key), TAG_HOST_USER); + showProgressBar(true, R.string.logining); + } + + @Override + public void onBackPressed() { + if (layout2fa.getVisibility() == View.GONE) { + if (hostLayout.getVisibility() != View.VISIBLE) { + hostLayout.setVisibility(View.VISIBLE); + } else { + finish(); + } + } else { + show2FA(false); + } + } + + private void upateLoginButton() { + if (editName.getText().length() == 0) { + loginButton.setEnabled(false); + return; + } + + if (editPassword.getText().length() == 0) { + loginButton.setEnabled(false); + return; + } + + if (captchaLayout.getVisibility() == View.VISIBLE && + editValifyMain.getText().length() == 0) { + loginButton.setEnabled(false); + return; + } + + loginButton.setEnabled(true); + } +} \ No newline at end of file diff --git a/app/src/enterprise/java/net/coding/program/user/EnterpriseMyDetailActivity.java b/app/src/enterprise/java/net/coding/program/user/EnterpriseMyDetailActivity.java new file mode 100644 index 000000000..045738702 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/user/EnterpriseMyDetailActivity.java @@ -0,0 +1,60 @@ +package net.coding.program.user; + +import net.coding.program.R; +import net.coding.program.UserDetailEditActivity_; +import net.coding.program.common.Global; +import net.coding.program.common.GlobalCommon; +import net.coding.program.common.GlobalData; +import net.coding.program.common.model.UserObject; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.EActivity; +import org.json.JSONException; +import org.json.JSONObject; + +// TODO: 2018/1/4 删除 +@EActivity(R.layout.enterprise_activity_my_detail) +public class EnterpriseMyDetailActivity extends UserDetailCommonActivity { + + public final int RESULT_EDIT = 0; + private final String TAG_HOST_USER_INFO = "TAG_HOST_USER_INFO"; + + @AfterViews + void initMyDetailActivity() { + bindUI(GlobalData.sUserObject); + tv_follow_state.setText("编辑资料"); + rl_follow_state.setOnClickListener(v -> { + UserDetailEditActivity_ + .intent(this) + .startForResult(RESULT_EDIT); + }); + + final String HOST_USER_INFO = Global.HOST_API + "/user/key/"; + getNetwork(HOST_USER_INFO + GlobalData.sUserObject.global_key, TAG_HOST_USER_INFO); + } + + @Override + public void parseJson(int code, JSONObject respanse, String tag, int pos, Object data) throws JSONException { + if (tag.equals(TAG_HOST_USER_INFO)) { + if (code == 0) { + mUserObject = new UserObject(respanse.getJSONObject("data")); + bindUI(mUserObject); + } else { + showButtomToast("获取用户信息错误"); + } + } + openActivenessResult(code, respanse, tag); + } + + @Override + protected void onStart() { + super.onStart(); + + bindUI(GlobalData.sUserObject); + } + + public int getActionBarSize() { + return GlobalCommon.dpToPx(48); + } + +} diff --git a/app/src/enterprise/java/net/coding/program/user/EnterpriseUserDetailActivity.java b/app/src/enterprise/java/net/coding/program/user/EnterpriseUserDetailActivity.java new file mode 100644 index 000000000..389975253 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/user/EnterpriseUserDetailActivity.java @@ -0,0 +1,86 @@ +package net.coding.program.user; + +import android.view.View; +import android.widget.TextView; + +import net.coding.program.R; +import net.coding.program.common.Global; +import net.coding.program.common.GlobalCommon; +import net.coding.program.common.GlobalData; +import net.coding.program.common.model.UserObject; +import net.coding.program.message.MessageListActivity_; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.Click; +import org.androidannotations.annotations.EActivity; +import org.androidannotations.annotations.Extra; +import org.androidannotations.annotations.ViewById; +import org.json.JSONException; +import org.json.JSONObject; + +// TODO: 2018/1/4 删除 +@EActivity(R.layout.enterprise_activity_my_detail) +public class EnterpriseUserDetailActivity extends UserDetailCommonActivity { + + private final String TAG_HOST_USER_INFO = "TAG_HOST_USER_INFO"; + private final String HOST_USER_INFO = Global.HOST_API + "/user/key/"; + + @Extra + String globalKey; + + @ViewById + TextView moreDetail; + + @AfterViews + void initEnterpriseUserDetailActivity() { + if (GlobalData.sUserObject.global_key.equals(globalKey)) { + EnterpriseMyDetailActivity_.intent(this).start(); + finish(); + return; + } + + getNetwork(HOST_USER_INFO + globalKey, TAG_HOST_USER_INFO); + + } + + @Click + void moreDetail() { + if (mUserObject == null) { + return; + } + + UserDetailMoreActivity_.intent(this) + .mUserObject(mUserObject) + .start(); + } + + @Override + public void parseJson(int code, JSONObject respanse, String tag, int pos, Object data) throws JSONException { + if (tag.equals(TAG_HOST_USER_INFO)) { + if (code == 0) { + moreDetail.setVisibility(View.VISIBLE); + mUserObject = new UserObject(respanse.getJSONObject("data")); + bindUI(mUserObject); + } else { + showButtomToast("获取用户信息错误"); + } + } + openActivenessResult(code, respanse, tag); + } + + @Override + protected void bindUI(UserObject mUserObject) { + super.bindUI(mUserObject); + tv_follow_state.setText("发送私信"); + tv_follow_state.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_private_letter, 0, 0, 0); + rl_follow_state.setOnClickListener(v -> { + MessageListActivity_.intent(v.getContext()).mGlobalKey(globalKey).start(); + }); + } + + public int getActionBarSize() { + return GlobalCommon.dpToPx(48); + } + + +} diff --git a/app/src/enterprise/java/net/coding/program/user/PickUserActivity.java b/app/src/enterprise/java/net/coding/program/user/PickUserActivity.java new file mode 100644 index 000000000..55e731f84 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/user/PickUserActivity.java @@ -0,0 +1,226 @@ +package net.coding.program.user; + +import android.app.Activity; +import android.content.Intent; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; +import android.widget.ImageView; +import android.widget.SectionIndexer; +import android.widget.TextView; + +import net.coding.program.R; +import net.coding.program.common.model.UserObject; +import net.coding.program.third.sidebar.IndexableListView; +import net.coding.program.third.sidebar.StringMatcher; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.EActivity; +import org.androidannotations.annotations.ViewById; +import org.json.JSONObject; + +import java.util.ArrayList; + +import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter; + +@EActivity(R.layout.activity_pick_user) +public class PickUserActivity extends BaseEnterpriseUserListActivity { + + @ViewById + IndexableListView listView; + + UserAdapter adapter = new UserAdapter(); + + @AfterViews + void initPickUserActivity() { + adapter.initSection(); + listView.setAdapter(adapter); + listView.setFastScrollEnabled(true); + listView.setFastScrollAlwaysVisible(true); + + initListItemClick(); + } + + protected void initListItemClick() { + listView.setOnItemClickListener((parent, view, position, id) -> { + Intent intent = new Intent(); + UserObject user = (UserObject) parent.getItemAtPosition(position); + intent.putExtra(UsersListActivity.RESULT_EXTRA_NAME, user.name); + intent.putExtra(UsersListActivity.RESULT_EXTRA_USESR, user); + setResult(Activity.RESULT_OK, intent); + finish(); + }); + } + + @Override + protected void searchItem(String s) { + super.searchItem(s); + + adapter.notifyDataSetChanged(); + } + + @Override + protected void parseUserJson(JSONObject respanse) { + super.parseUserJson(respanse); + adapter.notifyDataSetChanged(); + } + + class UserAdapter extends BaseAdapter implements SectionIndexer, StickyListHeadersAdapter { + + private String mSections = "ABCDEFGHIJKLMNOPQRSTUVWXYZ#"; + private ArrayList mSectionTitle = new ArrayList<>(); + private ArrayList mSectionId = new ArrayList<>(); + + public void initSection() { + mSectionTitle.clear(); + mSectionId.clear(); + + if (allListData.size() > 0) { + String lastLetter = ""; + + for (int i = 0; i < allListData.size(); ++i) { + UserObject item = allListData.get(i); + if (!item.getFirstLetter().equals(lastLetter)) { + lastLetter = item.getFirstLetter(); + mSectionTitle.add(item.getFirstLetter()); + mSectionId.add(i); + } + } + } + } + + @Override + public int getCount() { + return listData.size(); + } + + @Override + public Object getItem(int position) { + return listData.get(position); + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public View getView(final int position, View convertView, ViewGroup parent) { + final ViewHolder holder; + if (convertView == null) { + convertView = mInflater.inflate(R.layout.activity_users_list_item, parent, false); + holder = new ViewHolder(); + holder.name = (TextView) convertView.findViewById(R.id.name); + holder.icon = (ImageView) convertView.findViewById(R.id.icon); + holder.divideTitle = (TextView) convertView.findViewById(R.id.divideTitle); + holder.divideLine = convertView.findViewById(R.id.divide_line); + convertView.setTag(holder); + } else { + holder = (ViewHolder) convertView.getTag(); + } + final UserObject data = listData.get(position); + + if (isSection(position)) { + holder.divideTitle.setVisibility(View.VISIBLE); + holder.divideTitle.setText(data.getFirstLetter()); + holder.divideLine.setVisibility(View.GONE); + } else { + holder.divideTitle.setVisibility(View.GONE); + holder.divideLine.setVisibility(View.VISIBLE); + } + + holder.name.setText(data.name); + iconfromNetwork(holder.icon, data.avatar); + + return convertView; + } + + @Override + public void notifyDataSetChanged() { + super.notifyDataSetChanged(); + initSection(); + } + + private boolean isSection(int pos) { + if (getCount() == 0) { + return true; + } + + if (pos == 0) { + return true; + } + + String currentItem = allListData.get(pos).getFirstLetter(); + String preItem = allListData.get(pos - 1).getFirstLetter(); + return !currentItem.equals(preItem); + } + + @Override + public int getPositionForSection(int section) { + // If there is no item for current section, previous section will be selected + for (int i = section; i >= 0; i--) { + for (int j = 0; j < getCount(); j++) { + if (i == 0) { + // For numeric section + for (int k = 0; k <= 9; k++) { + if (StringMatcher.match(((UserObject) getItem(j)).getFirstLetter().toUpperCase(), String.valueOf(k))) + return j; + } + } else { + if (StringMatcher.match(((UserObject) getItem(j)).getFirstLetter().toUpperCase(), String.valueOf(mSections.charAt(i)))) + return j; + } + } + } + return 0; + } + + @Override + public int getSectionForPosition(int position) { + return 0; + } + + @Override + public Object[] getSections() { + String[] sections = new String[mSections.length()]; + for (int i = 0; i < mSections.length(); i++) + sections[i] = String.valueOf(mSections.charAt(i)); + return sections; + } + + @Override + public View getHeaderView(int position, View convertView, ViewGroup parent) { + HeaderViewHolder holder; + if (convertView == null) { + holder = new HeaderViewHolder(); + convertView = getLayoutInflater().inflate(R.layout.fragment_project_dynamic_list_head, parent, false); + holder.mHead = (TextView) convertView.findViewById(R.id.head); + convertView.setTag(holder); + } else { + holder = (HeaderViewHolder) convertView.getTag(); + } + + holder.mHead.setText(mSectionTitle.get(getSectionForPosition(position))); + return convertView; + } + + @Override + public long getHeaderId(int i) { + return getSectionForPosition(i); + } + + class HeaderViewHolder { + TextView mHead; + } + + } + + + static class ViewHolder { + ImageView icon; + TextView name; + TextView divideTitle; + View divideLine; + } + +} diff --git a/app/src/enterprise/java/net/coding/program/user/PickUserRelayMessageActivity.java b/app/src/enterprise/java/net/coding/program/user/PickUserRelayMessageActivity.java new file mode 100644 index 000000000..e9be37b09 --- /dev/null +++ b/app/src/enterprise/java/net/coding/program/user/PickUserRelayMessageActivity.java @@ -0,0 +1,62 @@ +package net.coding.program.user; + +import com.loopj.android.http.RequestParams; + +import net.coding.program.R; +import net.coding.program.common.HtmlContent; +import net.coding.program.common.model.UserObject; +import net.coding.program.common.param.MessageParse; +import net.coding.program.message.MessageListActivity; + +import org.androidannotations.annotations.EActivity; +import org.androidannotations.annotations.Extra; +import org.json.JSONException; +import org.json.JSONObject; + +/** + * Created by chenchao on 2017/1/9. + * 选择成员转发私信 + */ +@EActivity(R.layout.activity_pick_user) +public class PickUserRelayMessageActivity extends PickUserActivity { + + private static final String TAG_RELAY_MESSAGE = "TAG_RELAY_MESSAGE"; + @Extra + String relayString = ""; + + @Override + protected void initListItemClick() { + listView.setOnItemClickListener((parent, view, position, id) -> { + UserObject user = (UserObject) parent.getItemAtPosition(position); + showDialog("转发给" + user.name, (dialog, which) -> { + MessageParse messageParse = HtmlContent.parseMessage(relayString); + RequestParams params = new RequestParams(); + String text = messageParse.text; + for (String url : messageParse.uris) { + String photoTemplate = "\n![图片](%s)"; + text += String.format(photoTemplate, url); + + } + params.put("content", text); + params.put("receiver_global_key", user.global_key); + postNetwork(MessageListActivity.getSendMessage(), params, TAG_RELAY_MESSAGE); + showProgressBar(true, "发送中..."); + }); + }); + } + + @Override + public void parseJson(int code, JSONObject respanse, String tag, int pos, Object data) throws JSONException { + if (tag.equals(TAG_RELAY_MESSAGE)) { + showProgressBar(false); + if (code == 0) { + showMiddleToast("发送成功"); + finish(); + } else { + showErrorMsg(code, respanse); + } + } else { + super.parseJson(code, respanse, tag, pos, data); + } + } +} diff --git a/app/src/enterprise/res/anim/fade_in.xml b/app/src/enterprise/res/anim/fade_in.xml new file mode 100644 index 000000000..c9516535a --- /dev/null +++ b/app/src/enterprise/res/anim/fade_in.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/app/src/enterprise/res/anim/fade_out.xml b/app/src/enterprise/res/anim/fade_out.xml new file mode 100644 index 000000000..78b284e82 --- /dev/null +++ b/app/src/enterprise/res/anim/fade_out.xml @@ -0,0 +1,11 @@ + + + + + + + diff --git a/app/src/enterprise/res/drawable-hdpi/app_icon.png b/app/src/enterprise/res/drawable-hdpi/app_icon.png new file mode 100644 index 000000000..5f0a5346a Binary files /dev/null and b/app/src/enterprise/res/drawable-hdpi/app_icon.png differ diff --git a/app/src/enterprise/res/drawable-mdpi/app_icon.png b/app/src/enterprise/res/drawable-mdpi/app_icon.png new file mode 100644 index 000000000..ab772ce03 Binary files /dev/null and b/app/src/enterprise/res/drawable-mdpi/app_icon.png differ diff --git a/app/src/enterprise/res/drawable-xhdpi/app_icon.png b/app/src/enterprise/res/drawable-xhdpi/app_icon.png new file mode 100644 index 000000000..5cb5ce885 Binary files /dev/null and b/app/src/enterprise/res/drawable-xhdpi/app_icon.png differ diff --git a/app/src/enterprise/res/drawable-xxhdpi/app_icon.png b/app/src/enterprise/res/drawable-xxhdpi/app_icon.png new file mode 100644 index 000000000..df7c80b09 Binary files /dev/null and b/app/src/enterprise/res/drawable-xxhdpi/app_icon.png differ diff --git a/app/src/enterprise/res/drawable-xxhdpi/icon_user_monkey_circle.png b/app/src/enterprise/res/drawable-xxhdpi/icon_user_monkey_circle.png new file mode 100644 index 000000000..468d86760 Binary files /dev/null and b/app/src/enterprise/res/drawable-xxhdpi/icon_user_monkey_circle.png differ diff --git a/app/src/enterprise/res/drawable-xxhdpi/push_icon.png b/app/src/enterprise/res/drawable-xxhdpi/push_icon.png new file mode 100644 index 000000000..db8bef4d5 Binary files /dev/null and b/app/src/enterprise/res/drawable-xxhdpi/push_icon.png differ diff --git a/app/src/enterprise/res/drawable/guide0_circle0.xml b/app/src/enterprise/res/drawable/guide0_circle0.xml new file mode 100644 index 000000000..12a1b4c0c --- /dev/null +++ b/app/src/enterprise/res/drawable/guide0_circle0.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/enterprise/res/drawable/guide0_circle1.xml b/app/src/enterprise/res/drawable/guide0_circle1.xml new file mode 100644 index 000000000..c2b9db004 --- /dev/null +++ b/app/src/enterprise/res/drawable/guide0_circle1.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/enterprise/res/drawable/guide0_circle2.xml b/app/src/enterprise/res/drawable/guide0_circle2.xml new file mode 100644 index 000000000..b9216a90b --- /dev/null +++ b/app/src/enterprise/res/drawable/guide0_circle2.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/enterprise/res/layout/activity_about.xml b/app/src/enterprise/res/layout/activity_about.xml new file mode 100755 index 000000000..f43012cf3 --- /dev/null +++ b/app/src/enterprise/res/layout/activity_about.xml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/enterprise/res/layout/activity_close_2fa.xml b/app/src/enterprise/res/layout/activity_close_2fa.xml new file mode 100644 index 000000000..f93a3c209 --- /dev/null +++ b/app/src/enterprise/res/layout/activity_close_2fa.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/enterprise/res/layout/activity_enterprise_account.xml b/app/src/enterprise/res/layout/activity_enterprise_account.xml new file mode 100644 index 000000000..cee2ca3fb --- /dev/null +++ b/app/src/enterprise/res/layout/activity_enterprise_account.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/enterprise/res/layout/activity_enterprise_account_toolbar.xml b/app/src/enterprise/res/layout/activity_enterprise_account_toolbar.xml new file mode 100644 index 000000000..8eafb5c3e --- /dev/null +++ b/app/src/enterprise/res/layout/activity_enterprise_account_toolbar.xml @@ -0,0 +1,17 @@ + + + + + + + + + diff --git a/app/src/enterprise/res/layout/activity_enterprise_add_member.xml b/app/src/enterprise/res/layout/activity_enterprise_add_member.xml new file mode 100644 index 000000000..8e0cfc3b6 --- /dev/null +++ b/app/src/enterprise/res/layout/activity_enterprise_add_member.xml @@ -0,0 +1,19 @@ + + + + + + diff --git a/app/src/enterprise/res/layout/activity_enterprise_entrance.xml b/app/src/enterprise/res/layout/activity_enterprise_entrance.xml new file mode 100755 index 000000000..edf74ab46 --- /dev/null +++ b/app/src/enterprise/res/layout/activity_enterprise_entrance.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/enterprise/res/layout/activity_enterprise_guide.xml b/app/src/enterprise/res/layout/activity_enterprise_guide.xml new file mode 100644 index 000000000..506828069 --- /dev/null +++ b/app/src/enterprise/res/layout/activity_enterprise_guide.xml @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/enterprise/res/layout/activity_enterprise_main.xml b/app/src/enterprise/res/layout/activity_enterprise_main.xml new file mode 100644 index 000000000..06ee65ec6 --- /dev/null +++ b/app/src/enterprise/res/layout/activity_enterprise_main.xml @@ -0,0 +1,20 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/enterprise/res/layout/activity_enterprise_setting.xml b/app/src/enterprise/res/layout/activity_enterprise_setting.xml new file mode 100644 index 000000000..500f8e8e9 --- /dev/null +++ b/app/src/enterprise/res/layout/activity_enterprise_setting.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/enterprise/res/layout/activity_enterprise_support.xml b/app/src/enterprise/res/layout/activity_enterprise_support.xml new file mode 100644 index 000000000..7ed6c8e6c --- /dev/null +++ b/app/src/enterprise/res/layout/activity_enterprise_support.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/enterprise/res/layout/activity_help.xml b/app/src/enterprise/res/layout/activity_help.xml new file mode 100644 index 000000000..da2d8e684 --- /dev/null +++ b/app/src/enterprise/res/layout/activity_help.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/enterprise/res/layout/activity_manage_member.xml b/app/src/enterprise/res/layout/activity_manage_member.xml new file mode 100644 index 000000000..b88649a3a --- /dev/null +++ b/app/src/enterprise/res/layout/activity_manage_member.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/app/src/enterprise/res/layout/activity_maopao_detail.xml b/app/src/enterprise/res/layout/activity_maopao_detail.xml new file mode 100755 index 000000000..73639a2f5 --- /dev/null +++ b/app/src/enterprise/res/layout/activity_maopao_detail.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + diff --git a/app/src/enterprise/res/layout/activity_order_main.xml b/app/src/enterprise/res/layout/activity_order_main.xml new file mode 100644 index 000000000..bd99936f1 --- /dev/null +++ b/app/src/enterprise/res/layout/activity_order_main.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/enterprise/res/layout/activity_pick_user.xml b/app/src/enterprise/res/layout/activity_pick_user.xml new file mode 100644 index 000000000..af69d69c6 --- /dev/null +++ b/app/src/enterprise/res/layout/activity_pick_user.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/app/src/enterprise/res/layout/activity_set_enterprise_authority.xml b/app/src/enterprise/res/layout/activity_set_enterprise_authority.xml new file mode 100644 index 000000000..92edb30b5 --- /dev/null +++ b/app/src/enterprise/res/layout/activity_set_enterprise_authority.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/enterprise/res/layout/activity_user_detail_more.xml b/app/src/enterprise/res/layout/activity_user_detail_more.xml new file mode 100644 index 000000000..046fda71f --- /dev/null +++ b/app/src/enterprise/res/layout/activity_user_detail_more.xml @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/enterprise/res/layout/activity_users_list_item.xml b/app/src/enterprise/res/layout/activity_users_list_item.xml new file mode 100755 index 000000000..8b8c5bb15 --- /dev/null +++ b/app/src/enterprise/res/layout/activity_users_list_item.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/enterprise/res/layout/common_pick_project_list_item.xml b/app/src/enterprise/res/layout/common_pick_project_list_item.xml new file mode 100755 index 000000000..27b83963c --- /dev/null +++ b/app/src/enterprise/res/layout/common_pick_project_list_item.xml @@ -0,0 +1,43 @@ + + + + + + + + + + diff --git a/app/src/enterprise/res/layout/enterprise_activity_email_set_password.xml b/app/src/enterprise/res/layout/enterprise_activity_email_set_password.xml new file mode 100644 index 000000000..f22493736 --- /dev/null +++ b/app/src/enterprise/res/layout/enterprise_activity_email_set_password.xml @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/enterprise/res/layout/enterprise_activity_login.xml b/app/src/enterprise/res/layout/enterprise_activity_login.xml new file mode 100755 index 000000000..e8de045b2 --- /dev/null +++ b/app/src/enterprise/res/layout/enterprise_activity_login.xml @@ -0,0 +1,303 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/enterprise/res/layout/enterprise_activity_my_detail.xml b/app/src/enterprise/res/layout/enterprise_activity_my_detail.xml new file mode 100644 index 000000000..42d1b8769 --- /dev/null +++ b/app/src/enterprise/res/layout/enterprise_activity_my_detail.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/enterprise/res/layout/enterprise_add_member_list_item.xml b/app/src/enterprise/res/layout/enterprise_add_member_list_item.xml new file mode 100755 index 000000000..58e7e0b21 --- /dev/null +++ b/app/src/enterprise/res/layout/enterprise_add_member_list_item.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + diff --git a/app/src/enterprise/res/layout/enterprise_fragment_main_setting.xml b/app/src/enterprise/res/layout/enterprise_fragment_main_setting.xml new file mode 100644 index 000000000..1fcaa7136 --- /dev/null +++ b/app/src/enterprise/res/layout/enterprise_fragment_main_setting.xml @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/enterprise/res/layout/enterprise_list_item_project_maopao.xml b/app/src/enterprise/res/layout/enterprise_list_item_project_maopao.xml new file mode 100644 index 000000000..40b30c6a1 --- /dev/null +++ b/app/src/enterprise/res/layout/enterprise_list_item_project_maopao.xml @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/enterprise/res/layout/enterprise_manage_member_list_item.xml b/app/src/enterprise/res/layout/enterprise_manage_member_list_item.xml new file mode 100755 index 000000000..293a97b49 --- /dev/null +++ b/app/src/enterprise/res/layout/enterprise_manage_member_list_item.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + diff --git a/app/src/enterprise/res/layout/enterprise_manage_project_list_item.xml b/app/src/enterprise/res/layout/enterprise_manage_project_list_item.xml new file mode 100755 index 000000000..9b2491c68 --- /dev/null +++ b/app/src/enterprise/res/layout/enterprise_manage_project_list_item.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + diff --git a/app/src/enterprise/res/layout/enterprise_private_activity_email_set_password.xml b/app/src/enterprise/res/layout/enterprise_private_activity_email_set_password.xml new file mode 100644 index 000000000..675887c6c --- /dev/null +++ b/app/src/enterprise/res/layout/enterprise_private_activity_email_set_password.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/enterprise/res/layout/enterprise_project_all_list_item.xml b/app/src/enterprise/res/layout/enterprise_project_all_list_item.xml new file mode 100755 index 000000000..692e3bc14 --- /dev/null +++ b/app/src/enterprise/res/layout/enterprise_project_all_list_item.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/enterprise/res/layout/enterprise_view_user_info.xml b/app/src/enterprise/res/layout/enterprise_view_user_info.xml new file mode 100644 index 000000000..097e7de3c --- /dev/null +++ b/app/src/enterprise/res/layout/enterprise_view_user_info.xml @@ -0,0 +1,412 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/enterprise/res/layout/fragment_enterprise_project.xml b/app/src/enterprise/res/layout/fragment_enterprise_project.xml new file mode 100644 index 000000000..340bc16de --- /dev/null +++ b/app/src/enterprise/res/layout/fragment_enterprise_project.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/enterprise/res/layout/fragment_enterprise_project_empty.xml b/app/src/enterprise/res/layout/fragment_enterprise_project_empty.xml new file mode 100644 index 000000000..b3dc84c6e --- /dev/null +++ b/app/src/enterprise/res/layout/fragment_enterprise_project_empty.xml @@ -0,0 +1,59 @@ + + + + + + + + + + +